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

content/browser/background_sync/background_sync_manager.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/background_sync/background_sync_manager.h"
 
 #include "base/barrier_closure.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/metrics/field_trial.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/browser/background_sync/background_sync_metrics.h"
 #include "content/browser/background_sync/background_sync_network_observer.h"
 #include "content/browser/background_sync/background_sync_power_observer.h"
 #include "content/browser/background_sync/background_sync_registration_handle.h"
 #include "content/browser/background_sync/background_sync_registration_options.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/browser/service_worker/service_worker_storage.h"
 #include "content/browser/storage_partition_impl.h"
 #include "content/public/browser/background_sync_controller.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_ANDROID)
-#include "content/browser/android/background_sync_launcher_android.h"
 #include "content/browser/android/background_sync_network_observer_android.h"
 #endif
 
 namespace content {
 
 class BackgroundSyncManager::RefCountedRegistration
     : public base::RefCounted<RefCountedRegistration> {
  public:
   BackgroundSyncRegistration* value() { return &registration_; }
   const BackgroundSyncRegistration* value() const { return &registration_; }
@@ skipping 937 matching lines @@
         if (registration.options()->periodicity == SYNC_ONE_SHOT) {
           keep_browser_alive_for_one_shot = true;
         } else {
           // TODO(jkarlin): Support keeping the browser alive for periodic
           // syncs.
         }
       }
     }
   }
 
-  // TODO(jkarlin): Use the context's path instead of the 'this' pointer as an
-  // identifier. See crbug.com/489705.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(&BackgroundSyncLauncherAndroid::LaunchBrowserWhenNextOnline,
-                 this, keep_browser_alive_for_one_shot));
+      base::Bind(&BackgroundSyncManager::SchedulePendingRegistrationsOnUIThread,
+                 base::Unretained(this), keep_browser_alive_for_one_shot));
+
 #else
 // TODO(jkarlin): Toggle Chrome's background mode.
 #endif
 }
 
+void BackgroundSyncManager::SchedulePendingRegistrationsOnUIThread(
+    bool keep_browser_alive_for_one_shot) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  if (!service_worker_context_)  // happens in tests?
+    return;
+  StoragePartitionImpl* storage_partition_impl =
+      service_worker_context_->storage_partition();
+  if (!storage_partition_impl)  // happens in tests
+    return;
+  BackgroundSyncController* background_sync_controller =
+      storage_partition_impl->browser_context()->GetBackgroundSyncController();

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

It seems like the above code should be consolidated into a
BackgroundSyncManager::GetBackgroundSyncController function that can return
nullptr

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

Done. That's a good idea. I've refactored the other code that accesses the
controller (in NotifyBackgroundSyncRegisteredOnUIThread) to use that as well.
(And made it a function in the anonymous namespace that takes a
scoped_refptr<ServiceWorkerContextWrapper> as argument)

+
+  if (background_sync_controller) {
+    // TODO(jkarlin): Use the context's path instead of the 'this' pointer as an
+    // identifier. See crbug.com/489705.
+    background_sync_controller->LaunchBrowserWhenNextOnline(
+        this, keep_browser_alive_for_one_shot);
+  }
+}
+
 void BackgroundSyncManager::FireReadyEvents() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   if (disabled_)
     return;
 
   op_scheduler_.ScheduleOperation(
       base::Bind(&BackgroundSyncManager::FireReadyEventsImpl,
                  weak_ptr_factory_.GetWeakPtr(), MakeEmptyCompletion()));
 }
@@ skipping 313 matching lines @@
 BackgroundSyncManager::MakeStatusCompletion(const StatusCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   return base::Bind(
       &BackgroundSyncManager::CompleteOperationCallback<StatusCallback,
                                                         BackgroundSyncStatus>,
       weak_ptr_factory_.GetWeakPtr(), callback);
 }
 
 }  // namespace content