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

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

 // Copyright 2012 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.
 
 package org.chromium.content.browser;
 
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.view.KeyEvent;
@@ skipping 235 matching lines @@
 
     /**
      * Returns the bottom system window inset in pixels. The system window inset represents the area
      * of a full-screen window that is partially or fully obscured by the status bar, navigation
      * bar, IME or other system windows.
      * @return The bottom system window inset.
      */
     public int getSystemWindowInsetBottom() {
         return 0;
     }
+
+    /**
+     * Return the product version.
+     */
+    public String getProductVersion() {
+        return "";
+    }
 }