Move gcm-independent parts of push messaging out of gcm namespace and directory

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 9b7389fc542cb6ec4b5e9f6408f8e529c20c3b50..a646fd22f96f2123ce8c9e38b600339875fbc502 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -60,10 +60,9 @@
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
+#include "chrome/browser/push_messaging/push_messaging_service_factory.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
-#include "chrome/browser/services/gcm/push_messaging_service_impl.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_ui_util.h"
@@ -691,8 +690,6 @@ void ProfileImpl::DoFinalInit() {
   model->AddObserver(new BookmarkModelLoadedObserver(this));
 #endif
 
-  gcm::PushMessagingServiceImpl::InitializeForProfile(this);

[Peter Beverloo, 2015/02/25 23:55:05]

I think we need to keep this.

The reason that we're running some code when the profile gets initialized is
that the GCM client in Chrome doesn't actually establish a connection unless
there's an "application" (in this case, PushMessagingServiceImpl) in a state
where it can receive messages.

InitializeForProfile ensures this by reading a preference containing the number
of active registrations for said profile. If there are any, we force creation of
the PushMessagingServiceImpl and increase the push registration count, which
then adds that instance as a handler on the GCM Driver. This, in turn, may
establish a connection to GCM in case there wasn't one.

If I'm reading your refactoring correct, right now we innitialize
PushMessagingServiceImpl lazily when someone requests an instance through the
factory. This would break in non-test scenarios.

[kbalazs, 2015/02/27 22:40:36]

Yes, I missed it. I put it back.

-
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS)
   signin_ui_util::InitializePrefsForProfile(this);
 #endif
@@ -1067,8 +1064,7 @@ storage::SpecialStoragePolicy* ProfileImpl::GetSpecialStoragePolicy() {
 }
 
 content::PushMessagingService* ProfileImpl::GetPushMessagingService() {
-  return gcm::GCMProfileServiceFactory::GetForProfile(
-      this)->push_messaging_service();
+  return PushMessagingServiceFactory::GetForProfile(this);
 }
 
 content::SSLHostStateDelegate* ProfileImpl::GetSSLHostStateDelegate() {