[Background Sync] Use GcmNetworkManager to start the browser for sync events.

chrome/browser/android/background_sync_launcher_android.cc

Index: chrome/browser/android/background_sync_launcher_android.cc
diff --git a/content/browser/android/background_sync_launcher_android.cc b/chrome/browser/android/background_sync_launcher_android.cc
similarity index 85%
rename from content/browser/android/background_sync_launcher_android.cc
rename to chrome/browser/android/background_sync_launcher_android.cc
index 693817baa8a8174bad383aac37131c9531a0603e..9bffa0150c823f96247c80e89ec68bcc87237c17 100644
--- a/content/browser/android/background_sync_launcher_android.cc
+++ b/chrome/browser/android/background_sync_launcher_android.cc
@@ -2,12 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/android/background_sync_launcher_android.h"
+#include "chrome/browser/android/background_sync_launcher_android.h"
 
 #include "content/public/browser/browser_thread.h"
 #include "jni/BackgroundSyncLauncher_jni.h"
 
-namespace content {
+using content::BrowserThread;
+
+namespace chrome {
+namespace android {
 

[jkarlin, 2015/10/14 18:30:28]

top level namespace

[iclelland, 2015/10/14 19:31:24]

Done.

 namespace {
 base::LazyInstance<BackgroundSyncLauncherAndroid> g_background_sync_launcher =
@@ -23,7 +26,7 @@ BackgroundSyncLauncherAndroid* BackgroundSyncLauncherAndroid::Get() {
 
 // static
 void BackgroundSyncLauncherAndroid::LaunchBrowserWhenNextOnline(
-    const BackgroundSyncManager* registrant,
+    const content::BackgroundSyncManager* registrant,
     bool launch_when_next_online) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
@@ -31,7 +34,7 @@ void BackgroundSyncLauncherAndroid::LaunchBrowserWhenNextOnline(
 }
 
 void BackgroundSyncLauncherAndroid::LaunchBrowserWhenNextOnlineImpl(
-    const BackgroundSyncManager* registrant,
+    const content::BackgroundSyncManager* registrant,
     bool launch_when_next_online) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
@@ -45,7 +48,7 @@ void BackgroundSyncLauncherAndroid::LaunchBrowserWhenNextOnlineImpl(
   bool now_launching = !launch_when_next_online_registrants_.empty();
   if (was_launching != now_launching) {
     JNIEnv* env = base::android::AttachCurrentThread();
-    Java_BackgroundSyncLauncher_setLaunchWhenNextOnline(
+    Java_BackgroundSyncLauncher_launchBrowserWhenNextOnlineIfStopped(
         env, java_launcher_.obj(), base::android::GetApplicationContext(),
         now_launching);
   }
@@ -71,4 +74,5 @@ BackgroundSyncLauncherAndroid::~BackgroundSyncLauncherAndroid() {
   Java_BackgroundSyncLauncher_destroy(env, java_launcher_.obj());
 }
 
-}  // namespace content
+}  // namespace android
+}  // namespace chrome