Merge from Chromium at DEPS revision 30.0.1599.82

This commit was generated by merge_to_master.py.

Change-Id: I8dd637c3a839c16cbab4d0b6b1edbfc557986168

build/util/LASTCHANGE

-LASTCHANGE=225297
+LASTCHANGE=225636

chrome/VERSION

 MAJOR=30
 MINOR=0
 BUILD=1599
-PATCH=80
+PATCH=82

chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc

@@ -146,8 +146,6 @@ void EnrollmentScreenHandler::ResetAuth(
   if (browsing_data_remover_ || refresh_token_revoker_ || access_token_revoker_)
     return;
 
-  auth_reset_callbacks_.push_back(callback);
-
   if (oauth_fetcher_) {
     if (!oauth_fetcher_->oauth2_access_token().empty()) {
       access_token_revoker_.reset(new TokenRevoker(this));

content/browser/android/content_view_core_impl.cc

@@ -1591,12 +1591,17 @@ void ContentViewCoreImpl::SetAccessibilityEnabled(JNIEnv* env, jobject obj,
     return;
   RenderWidgetHostImpl* host_impl = RenderWidgetHostImpl::From(
       host_view->GetRenderWidgetHost());
+  BrowserAccessibilityState* accessibility_state =
+      BrowserAccessibilityState::GetInstance();
   if (enabled) {
-    BrowserAccessibilityState::GetInstance()->EnableAccessibility();
-    if (host_impl)
+    // This enables accessibility globally unless it was explicitly disallowed
+    // by a command-line flag.
+    accessibility_state->OnScreenReaderDetected();
+    // If it was actually enabled globally, enable it for this RenderWidget now.
+    if (accessibility_state->IsAccessibleBrowser() && host_impl)
       host_impl->SetAccessibilityMode(AccessibilityModeComplete);
   } else {
-    BrowserAccessibilityState::GetInstance()->DisableAccessibility();
+    accessibility_state->DisableAccessibility();
     if (host_impl)
       host_impl->SetAccessibilityMode(AccessibilityModeOff);
   }

content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java

@@ -550,7 +550,7 @@ class ContentViewGestureHandler implements LongPressDelegate {
                                     pinchBy(e.getEventTime(),
                                             Math.round(mDoubleTapDragZoomAnchorX),
                                             Math.round(mDoubleTapDragZoomAnchorY),
-                                            (float) Math.pow(dy < 0 ?
+                                            (float) Math.pow(dy > 0 ?
                                                     1.0f - DOUBLE_TAP_DRAG_ZOOM_SPEED :
                                                     1.0f + DOUBLE_TAP_DRAG_ZOOM_SPEED,
                                                     Math.abs(dy * mPxToDp)));