[Android] Upstream content detection and ChromeBrowserProvider tests.

chrome/android/testshell/chrome_main_delegate_testshell_android.cc

Index: chrome/android/testshell/chrome_main_delegate_testshell_android.cc
diff --git a/chrome/android/testshell/chrome_main_delegate_testshell_android.cc b/chrome/android/testshell/chrome_main_delegate_testshell_android.cc
index 25d6623462b70d0c1490cd390ecd5186a164bfb7..0e1b6566fdae06de9d6cbb41eaf25299a54c211f 100644
--- a/chrome/android/testshell/chrome_main_delegate_testshell_android.cc
+++ b/chrome/android/testshell/chrome_main_delegate_testshell_android.cc
@@ -7,6 +7,9 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "chrome/android/testshell/tab_manager.h"
+#include "chrome/browser/search_engines/template_url_prepopulate_data.h"
+
+static const char kDefaultCountryCode[] = "US";
 
 static base::android::RegistrationMethod kRegistrationMethods[] = {
     { "TabManager", chrome::RegisterTabManager },
@@ -18,6 +21,11 @@ ChromeMainDelegateTestShellAndroid::ChromeMainDelegateTestShellAndroid() {
 ChromeMainDelegateTestShellAndroid::~ChromeMainDelegateTestShellAndroid() {
 }
 
+bool ChromeMainDelegateTestShellAndroid::BasicStartupComplete(int* exit_code) {
+  TemplateURLPrepopulateData::InitCountryCode(kDefaultCountryCode);
+  return ChromeMainDelegateAndroid::BasicStartupComplete(exit_code);
+}
+
 bool ChromeMainDelegateTestShellAndroid::RegisterApplicationNativeMethods(
     JNIEnv* env) {
   if (!ChromeMainDelegateAndroid::RegisterApplicationNativeMethods(env))