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

android_webview/native/aw_contents_statics.cc

 // Copyright 2014 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.
 
 #include "android_webview/native/aw_contents_statics.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/net/aw_url_request_context_getter.h"
 #include "android_webview/common/aw_version_info_values.h"
 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
@@ skipping 82 matching lines @@
 }
 
 // static
 void SetLegacyCacheRemovalDelayForTest(JNIEnv*,
                                        const JavaParamRef<jclass>&,
                                        jlong delay_ms) {
   AwBrowserContext::SetLegacyCacheRemovalDelayForTest(delay_ms);
 }
 
 // static
-ScopedJavaLocalRef<jstring> GetProductVersion(JNIEnv* env,
-                                              const JavaParamRef<jclass>&) {
-  return base::android::ConvertUTF8ToJavaString(env, PRODUCT_VERSION);
-}
-
-// static
 void SetServiceWorkerIoThreadClient(
     JNIEnv* env,
     const JavaParamRef<jclass>&,
     const base::android::JavaParamRef<jobject>& io_thread_client,
     const base::android::JavaParamRef<jobject>& browser_context) {
   AwContentsIoThreadClientImpl::SetServiceWorkerIoThreadClient(
       io_thread_client, browser_context);
 }
 
 
 bool RegisterAwContentsStatics(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview