[Android] Upstream content detection and ChromeBrowserProvider tests.

content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java

Index: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
index a7c300641877fa11a96fb280becab42da5413417..64322b062f2d11ec83b9011a46eb9a824a60c5f1 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
@@ -4,9 +4,11 @@
 
 package org.chromium.content.browser.test.util;
 
+import android.content.Context;
 
 import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper;
+import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnStartContentIntentHelper;
 
 /**
  * The default ContentViewClient used by ContentView tests.
@@ -17,15 +19,21 @@ import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnEval
 public class TestContentViewClient extends ContentViewClient {
 
     private OnEvaluateJavaScriptResultHelper mOnEvaluateJavaScriptResultHelper;
+    private OnStartContentIntentHelper mOnStartContentIntentHelper;
 
     public TestContentViewClient() {
         mOnEvaluateJavaScriptResultHelper = new OnEvaluateJavaScriptResultHelper();
+        mOnStartContentIntentHelper = new OnStartContentIntentHelper();
     }
 
     public OnEvaluateJavaScriptResultHelper getOnEvaluateJavaScriptResultHelper() {
         return mOnEvaluateJavaScriptResultHelper;
     }
 
+    public OnStartContentIntentHelper getOnStartContentIntentHelper() {
+        return mOnStartContentIntentHelper;
+    }
+
     /**
      * ATTENTION!: When overriding the following methods, be sure to call
      * the corresponding methods in the super class. Otherwise
@@ -37,4 +45,9 @@ public class TestContentViewClient extends ContentViewClient {
         super.onEvaluateJavaScriptResult(id, jsonResult);
         mOnEvaluateJavaScriptResultHelper.notifyCalled(id, jsonResult);
     }
+
+    @Override
+    public void onStartContentIntent(Context context, String contentUrl) {
+        mOnStartContentIntentHelper.notifyCalled(contentUrl);
+    }
 }