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

chrome/browser/android/background_sync_launcher_android.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // 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 =
     LAZY_INSTANCE_INITIALIZER;
 }
 
 // static
 BackgroundSyncLauncherAndroid* BackgroundSyncLauncherAndroid::Get() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   return g_background_sync_launcher.Pointer();
 }
 
 // static
 void BackgroundSyncLauncherAndroid::LaunchBrowserWhenNextOnline(
-    const BackgroundSyncManager* registrant,
+    const content::BackgroundSyncManager* registrant,
     bool launch_when_next_online) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Get()->LaunchBrowserWhenNextOnlineImpl(registrant, launch_when_next_online);
 }
 
 void BackgroundSyncLauncherAndroid::LaunchBrowserWhenNextOnlineImpl(
-    const BackgroundSyncManager* registrant,
+    const content::BackgroundSyncManager* registrant,
     bool launch_when_next_online) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   bool was_launching = !launch_when_next_online_registrants_.empty();
 
   if (launch_when_next_online)
     launch_when_next_online_registrants_.insert(registrant);
   else
     launch_when_next_online_registrants_.erase(registrant);
 
   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);
   }
 }
 
 // static
 bool BackgroundSyncLauncherAndroid::RegisterLauncher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 BackgroundSyncLauncherAndroid::BackgroundSyncLauncherAndroid() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   JNIEnv* env = base::android::AttachCurrentThread();
   java_launcher_.Reset(Java_BackgroundSyncLauncher_create(
       env, base::android::GetApplicationContext()));
 }
 
 BackgroundSyncLauncherAndroid::~BackgroundSyncLauncherAndroid() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_BackgroundSyncLauncher_destroy(env, java_launcher_.obj());
 }
 
-}  // namespace content
+}  // namespace android
+}  // namespace chrome