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

chrome/browser/push_messaging/push_messaging_service_factory.cc

Index: chrome/browser/push_messaging/push_messaging_service_factory.cc
diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.cc b/chrome/browser/push_messaging/push_messaging_service_factory.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b09b5e097bc22b393ed8b5b4d638f4e7cb817fd4
--- /dev/null
+++ b/chrome/browser/push_messaging/push_messaging_service_factory.cc
@@ -0,0 +1,49 @@
+// Copyright (c) 2015 The Chromium Authors. All rights reserved.

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

nit: no more (c)

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

Done.

+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/push_messaging/push_messaging_service_factory.h"
+
+#include "chrome/browser/profiles/incognito_helpers.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
+#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
+#include "components/keyed_service/content/browser_context_dependency_manager.h"
+
+// static
+content::PushMessagingService* PushMessagingServiceFactory::GetForProfile(
+    content::BrowserContext* profile) {
+  // GCM is not supported in incognito mode and thus push api is neither.

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

I don't think GCM cares anymore about incognito mode. Could you use this comment
instead?

  // The Push API is not currently supported in incognito mode. See
  // https://crbug.com/401439.

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

Done.

+  if (profile->IsOffTheRecord())
+    return NULL;
+
+  return static_cast<PushMessagingServiceImpl*>(
+      GetInstance()->GetServiceForBrowserContext(profile, true));
+}
+
+// static
+PushMessagingServiceFactory* PushMessagingServiceFactory::GetInstance() {
+  return Singleton<PushMessagingServiceFactory>::get();
+}
+
+PushMessagingServiceFactory::PushMessagingServiceFactory()
+    : BrowserContextKeyedServiceFactory(
+        "PushMessagingProfileService",

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

nit: two more spaces of indent here.

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

Done.

+        BrowserContextDependencyManager::GetInstance()) {
+  DependsOn(gcm::GCMProfileServiceFactory::GetInstance());
+}
+
+PushMessagingServiceFactory::~PushMessagingServiceFactory() {
+}
+
+KeyedService* PushMessagingServiceFactory::BuildServiceInstanceFor(
+    content::BrowserContext* context) const {
+  Profile* profile = Profile::FromBrowserContext(context);
+  CHECK(!profile->IsOffTheRecord());
+  return new PushMessagingServiceImpl(profile);
+}
+
+content::BrowserContext* PushMessagingServiceFactory::GetBrowserContextToUse(
+    content::BrowserContext* context) const {
+  return chrome::GetBrowserContextOwnInstanceInIncognito(context);
+}