[Android] Upstream content detection and ChromeBrowserProvider tests.

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

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
index 411738b37ceb56cb9f7287ec68d7ff3245a6f7a4..a3cea97adb0dc4a11797a22f243ccb9b86be4c23 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
@@ -132,20 +132,20 @@ public class ContentViewClient {
     /**
      * Called when a new content intent is requested to be started.
      */
-    public void onStartContentIntent(Context context, String contentUrl) {
+    public void onStartContentIntent(Context context, String intentUrl) {
         Intent intent;
         // Perform generic parsing of the URI to turn it into an Intent.
         try {
-            intent = Intent.parseUri(contentUrl, Intent.URI_INTENT_SCHEME);
+            intent = Intent.parseUri(intentUrl, Intent.URI_INTENT_SCHEME);
         } catch (URISyntaxException ex) {
-            Log.w(TAG, "Bad URI " + contentUrl + ": " + ex.getMessage());
+            Log.w(TAG, "Bad URI " + intentUrl + ": " + ex.getMessage());
             return;
         }
 
         try {
             context.startActivity(intent);
         } catch (ActivityNotFoundException ex) {
-            Log.w(TAG, "No application can handle " + contentUrl);
+            Log.w(TAG, "No application can handle " + intentUrl);
         }
     }
 }