Fix a nasty scroll bug for Chrome Now-on-tap feature. Also combine the

content/browser/web_contents/web_contents_android.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
 
 #include <jni.h>
 
 #include <memory>
@@ skipping 135 matching lines @@
   jboolean HasAccessedInitialDocument(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& jobj);
 
   jint GetThemeColor(JNIEnv* env,
                      const base::android::JavaParamRef<jobject>& obj);
 
   void RequestAccessibilitySnapshot(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
-      const base::android::JavaParamRef<jobject>& callback,
-      jfloat y_offset,
-      jfloat x_scroll);
+      const base::android::JavaParamRef<jobject>& callback);
 
   void ResumeMediaSession(JNIEnv* env,
                           const base::android::JavaParamRef<jobject>& obj);
   void SuspendMediaSession(JNIEnv* env,
                            const base::android::JavaParamRef<jobject>& obj);
   void StopMediaSession(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& obj);
 
   base::android::ScopedJavaLocalRef<jstring> GetEncoding(
       JNIEnv* env,
@@ skipping 38 matching lines @@
   SynchronousCompositorClient* synchronous_compositor_client_;
 
   base::WeakPtrFactory<WebContentsAndroid> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_