Split GCMDriver into platform-specific implementations

chrome/browser/services/gcm/gcm_profile_service.cc

 // Copyright (c) 2013 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 "chrome/browser/services/gcm/gcm_profile_service.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/gcm_utils.h"
 #include "chrome/browser/signin/profile_identity_provider.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "components/gcm/gcm_client_factory.h"
-#include "components/gcm/gcm_driver.h"
+#include "components/gcm/gcm_driver_desktop.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/identity_provider.h"
 #include "net/url_request/url_request_context_getter.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #endif
 
@@ skipping 41 matching lines @@
     on_by_default = true;
   }
   registry->RegisterBooleanPref(
       prefs::kGCMChannelEnabled,
       on_by_default,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 GCMProfileService::GCMProfileService(Profile* profile)
     : profile_(profile) {
   DCHECK(!profile->IsOffTheRecord());

[fgorski, 2014/05/07 18:50:14]

There might be a few more headers to ifdef I think. (speculating)

[johnme, 2014/05/08 16:08:02]

Done. Also removed a bunch of unused headers from gcm_driver.cc.

 }
 
 GCMProfileService::~GCMProfileService() {
 }
 
 void GCMProfileService::Initialize(
     scoped_ptr<GCMClientFactory> gcm_client_factory) {
   DCHECK(!driver_);
 
+#if defined(OS_ANDROID)
+  driver_.reset(new GCMDriverAndroid(
+      content::BrowserThread::GetMessageLoopProxyForThread(
+          content::BrowserThread::UI)));
+#else
   scoped_refptr<base::SequencedWorkerPool> worker_pool(
       content::BrowserThread::GetBlockingPool());
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner(
       worker_pool->GetSequencedTaskRunnerWithShutdownBehavior(
           worker_pool->GetSequenceToken(),
           base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
 
-  driver_.reset(new GCMDriver(
+  driver_.reset(new GCMDriverDesktop(
       GetChromeBuildInfo(),
       gcm_client_factory.Pass(),
       scoped_ptr<IdentityProvider>(new ProfileIdentityProvider(
           SigninManagerFactory::GetForProfile(profile_),
           ProfileOAuth2TokenServiceFactory::GetForProfile(profile_),
-#if defined(OS_ANDROID)
-          NULL)),
-#else
           LoginUIServiceFactory::GetForProfile(profile_))),
-#endif
       profile_->GetPath().Append(chrome::kGCMStoreDirname),
       profile_->GetRequestContext(),
       blocking_task_runner,
       content::BrowserThread::GetMessageLoopProxyForThread(
           content::BrowserThread::UI),
       content::BrowserThread::GetMessageLoopProxyForThread(
           content::BrowserThread::IO)));
+#endif
 }
 
 void GCMProfileService::Shutdown() {
   if (driver_)
     driver_->Shutdown();
 }
 
 }  // namespace gcm