Use Sync FakeServer in Android tests via custom APK

chrome/android/shell/chrome_main_delegate_chrome_shell_for_test_android.cc

Index: chrome/android/shell/chrome_main_delegate_chrome_shell_for_test_android.cc
diff --git a/chrome/android/shell/chrome_main_delegate_chrome_shell_android.cc b/chrome/android/shell/chrome_main_delegate_chrome_shell_for_test_android.cc
similarity index 50%
copy from chrome/android/shell/chrome_main_delegate_chrome_shell_android.cc
copy to chrome/android/shell/chrome_main_delegate_chrome_shell_for_test_android.cc
index 6e9b7c3a1177fd0ebef32b0775cce7d222fbaaae..d1c6ed54ec4fafb91c2a29c80c4a104fbb746fe4 100644
--- a/chrome/android/shell/chrome_main_delegate_chrome_shell_android.cc
+++ b/chrome/android/shell/chrome_main_delegate_chrome_shell_for_test_android.cc
@@ -2,25 +2,35 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/android/shell/chrome_main_delegate_chrome_shell_android.h"
+#include "chrome/android/shell/chrome_main_delegate_chrome_shell_for_test_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
+#include "sync/test/fake_server/android/fake_server_helper_android.h"
 
 static const char kDefaultCountryCode[] = "US";
 
 ChromeMainDelegateAndroid* ChromeMainDelegateAndroid::Create() {
-  return new ChromeMainDelegateChromeShellAndroid();
+  return new ChromeMainDelegateChromeShellForTestAndroid();
 }
 
-ChromeMainDelegateChromeShellAndroid::ChromeMainDelegateChromeShellAndroid() {
+ChromeMainDelegateChromeShellForTestAndroid::
+ChromeMainDelegateChromeShellForTestAndroid() {
 }
 
-ChromeMainDelegateChromeShellAndroid::~ChromeMainDelegateChromeShellAndroid() {
+ChromeMainDelegateChromeShellForTestAndroid::
+~ChromeMainDelegateChromeShellForTestAndroid() {
 }
 
-bool ChromeMainDelegateChromeShellAndroid::BasicStartupComplete(
+bool
+ChromeMainDelegateChromeShellForTestAndroid::RegisterApplicationNativeMethods(
+    JNIEnv* env) {
+  return ChromeMainDelegateAndroid::RegisterApplicationNativeMethods(env) &&

[rlarocque, 2014/08/09 01:19:59]

I noticed the caller
(chromium/src/chrome/app/android/chrome_main_delegate_android.cc) ignores the
return value.

Not sure if that matters.  It does make your use of && seem a bit out of place,
though.

[pval...(no longer on Chromium), 2014/08/12 01:21:35]

I feel like what I did here is in the spirit of how the function should work
(return true iff registration succeeded)

[Yaron, 2014/08/12 17:22:03]

It probably shouldn't. :(
 
Agreed

[rlarocque, 2014/08/12 22:02:27]

It also leaves things half-initialized if the second call fails.  That's the
part that seems bad, but probably doesn't matter.

If it did happen, it would probably result in a fatal error sooner or later. 
But it wouldn't be caught by the caller, since it's not checking the return
value.

[pval...(no longer on Chromium), 2014/08/14 00:35:39]

I think we should keep this code as-is and add a TODO/file a bug for actually
using the return value. How does that sound?

[rlarocque, 2014/08/14 00:44:02]

SGTM

+      FakeServerHelperAndroid::Register(env);
+}
+
+bool ChromeMainDelegateChromeShellForTestAndroid::BasicStartupComplete(
     int* exit_code) {
   TemplateURLPrepopulateData::InitCountryCode(kDefaultCountryCode);
   return ChromeMainDelegateAndroid::BasicStartupComplete(exit_code);