[GCM] //ios/chrome/browser/services/gcm -> //ios/chrome/browser/gcm

Opportunistic cleanup to make the GCM embedder directory under
//ios/chrome parallel with the GCM embedder directory under //chrome.

TBR=sdefresne@chromium.org

Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Idebde38dc33d29a5f74f15385d532df4a54d62a7
Reviewed-on: https://chromium-review.googlesource.com/1068943
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Nicolas Zea <zea@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561470}

ios/chrome/browser/BUILD.gn

@@ -187,6 +187,7 @@ source_set("browser_impl") {
     "//ios/chrome/browser/browser_state:browser_state_impl",
     "//ios/chrome/browser/component_updater",
     "//ios/chrome/browser/first_run",
+    "//ios/chrome/browser/gcm",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/metrics:expired_histograms_array",
@@ -194,7 +195,6 @@ source_set("browser_impl") {
     "//ios/chrome/browser/open_from_clipboard",
     "//ios/chrome/browser/prefs",
     "//ios/chrome/browser/prefs:browser_prefs",
-    "//ios/chrome/browser/services/gcm",
     "//ios/chrome/browser/translate",
     "//ios/chrome/browser/update_client",
     "//ios/chrome/browser/web_resource",

ios/chrome/browser/application_context_impl.cc

@@ -38,13 +38,13 @@
 #include "ios/chrome/browser/browser_state/chrome_browser_state_manager_impl.h"
 #include "ios/chrome/browser/chrome_paths.h"
 #include "ios/chrome/browser/component_updater/ios_component_updater_configurator.h"
+#include "ios/chrome/browser/gcm/ios_chrome_gcm_profile_service_factory.h"
 #include "ios/chrome/browser/history/history_service_factory.h"
 #include "ios/chrome/browser/ios_chrome_io_thread.h"
 #include "ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.h"
 #include "ios/chrome/browser/pref_names.h"
 #include "ios/chrome/browser/prefs/browser_prefs.h"
 #include "ios/chrome/browser/prefs/ios_chrome_pref_service_factory.h"
-#include "ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.h"
 #include "ios/chrome/browser/update_client/ios_chrome_update_query_params_delegate.h"
 #include "ios/chrome/browser/web_resource/web_resource_util.h"
 #include "ios/chrome/common/channel_info.h"

ios/chrome/browser/browser_state/BUILD.gn

@@ -92,6 +92,7 @@ source_set("browser_state_impl") {
     "//ios/chrome/browser/download",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/feature_engagement",
+    "//ios/chrome/browser/gcm",
     "//ios/chrome/browser/google",
     "//ios/chrome/browser/google:google_logo",
     "//ios/chrome/browser/history",
@@ -104,7 +105,6 @@ source_set("browser_state_impl") {
     "//ios/chrome/browser/prefs:browser_prefs",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
-    "//ios/chrome/browser/services/gcm",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/snapshots",

ios/chrome/browser/browser_state/browser_state_keyed_service_factories.mm

@@ -22,6 +22,7 @@
 #include "ios/chrome/browser/favicon/ios_chrome_large_icon_cache_factory.h"
 #include "ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.h"
 #include "ios/chrome/browser/feature_engagement/tracker_factory.h"
+#include "ios/chrome/browser/gcm/ios_chrome_gcm_profile_service_factory.h"
 #include "ios/chrome/browser/google/google_logo_service_factory.h"
 #include "ios/chrome/browser/google/google_url_tracker_factory.h"
 #include "ios/chrome/browser/history/history_service_factory.h"
@@ -34,7 +35,6 @@
 #include "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h"
 #include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
 #include "ios/chrome/browser/search_engines/template_url_service_factory.h"
-#include "ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.h"
 #include "ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios_factory.h"
 #include "ios/chrome/browser/signin/about_signin_internals_factory.h"
 #include "ios/chrome/browser/signin/account_consistency_service_factory.h"

ios/chrome/browser/services/gcm/instance_id/BUILD.gn → ios/chrome/browser/gcm/instance_id/BUILD.gn

@@ -12,7 +12,7 @@ source_set("instance_id") {
     "//components/gcm_driver",
     "//components/keyed_service/ios",
     "//ios/chrome/browser/browser_state:browser_state",
-    "//ios/chrome/browser/services/gcm",
+    "//ios/chrome/browser/gcm",
     "//ios/web",
   ]
 }

ios/chrome/browser/services/gcm/instance_id/ios_chrome_instance_id_profile_service_factory.cc → ios/chrome/browser/gcm/instance_id/ios_chrome_instance_id_profile_service_factory.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ios/chrome/browser/services/gcm/instance_id/ios_chrome_instance_id_profile_service_factory.h"
+#include "ios/chrome/browser/gcm/instance_id/ios_chrome_instance_id_profile_service_factory.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
@@ -10,7 +10,7 @@
 #include "components/gcm_driver/instance_id/instance_id_profile_service.h"
 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#include "ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.h"
+#include "ios/chrome/browser/gcm/ios_chrome_gcm_profile_service_factory.h"
 
 // static
 instance_id::InstanceIDProfileService*

ios/chrome/browser/services/gcm/instance_id/ios_chrome_instance_id_profile_service_factory.h → ios/chrome/browser/gcm/instance_id/ios_chrome_instance_id_profile_service_factory.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_SERVICES_GCM_INSTANCE_ID_IOS_CHROME_INSTANCE_ID_PROFILE_SERVICE_FACTORY_H_
-#define IOS_CHROME_BROWSER_SERVICES_GCM_INSTANCE_ID_IOS_CHROME_INSTANCE_ID_PROFILE_SERVICE_FACTORY_H_
+#ifndef IOS_CHROME_BROWSER_GCM_INSTANCE_ID_IOS_CHROME_INSTANCE_ID_PROFILE_SERVICE_FACTORY_H_
+#define IOS_CHROME_BROWSER_GCM_INSTANCE_ID_IOS_CHROME_INSTANCE_ID_PROFILE_SERVICE_FACTORY_H_
 
 #include <memory>
 
@@ -47,4 +47,4 @@ class IOSChromeInstanceIDProfileServiceFactory
   DISALLOW_COPY_AND_ASSIGN(IOSChromeInstanceIDProfileServiceFactory);
 };
 
-#endif  // IOS_CHROME_BROWSER_SERVICES_GCM_INSTANCE_ID_IOS_CHROME_INSTANCE_ID_PROFILE_SERVICE_FACTORY_H_
+#endif  // IOS_CHROME_BROWSER_GCM_INSTANCE_ID_IOS_CHROME_INSTANCE_ID_PROFILE_SERVICE_FACTORY_H_

ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.cc → ios/chrome/browser/gcm/ios_chrome_gcm_profile_service_factory.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.h"
+#include "ios/chrome/browser/gcm/ios_chrome_gcm_profile_service_factory.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"

ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.h → ios/chrome/browser/gcm/ios_chrome_gcm_profile_service_factory.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_SERVICES_GCM_IOS_CHROME_GCM_PROFILE_SERVICE_FACTORY_H_
-#define IOS_CHROME_BROWSER_SERVICES_GCM_IOS_CHROME_GCM_PROFILE_SERVICE_FACTORY_H_
+#ifndef IOS_CHROME_BROWSER_GCM_IOS_CHROME_GCM_PROFILE_SERVICE_FACTORY_H_
+#define IOS_CHROME_BROWSER_GCM_IOS_CHROME_GCM_PROFILE_SERVICE_FACTORY_H_
 
 #include <memory>
 #include <string>
@@ -54,4 +54,4 @@ class IOSChromeGCMProfileServiceFactory
   DISALLOW_COPY_AND_ASSIGN(IOSChromeGCMProfileServiceFactory);
 };
 
-#endif  // IOS_CHROME_BROWSER_SERVICES_GCM_IOS_CHROME_GCM_PROFILE_SERVICE_FACTORY_H_
+#endif  // IOS_CHROME_BROWSER_GCM_IOS_CHROME_GCM_PROFILE_SERVICE_FACTORY_H_

ios/chrome/browser/invalidation/BUILD.gn

@@ -17,7 +17,7 @@ source_set("invalidation") {
     "//components/prefs",
     "//components/signin/core/browser",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/services/gcm",
+    "//ios/chrome/browser/gcm",
     "//ios/chrome/browser/signin",
     "//ios/web",
     "//net",

ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.mm

@@ -20,7 +20,7 @@
 #include "components/signin/core/browser/profile_identity_provider.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#include "ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.h"
+#include "ios/chrome/browser/gcm/ios_chrome_gcm_profile_service_factory.h"
 #include "ios/chrome/browser/signin/oauth2_token_service_factory.h"
 #include "ios/chrome/browser/signin/signin_manager_factory.h"
 #include "ios/web/public/web_client.h"

ios/chrome/browser/services/OWNERS

-zea@chromium.org
-
-# COMPONENT: Services>CloudMessaging
-
-# TEAM: ios-directory-owners@chromium.org
-# OS: iOS

ios/chrome/browser/sync/BUILD.gn

@@ -49,12 +49,12 @@ source_set("sync") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/dom_distiller",
     "//ios/chrome/browser/favicon",
+    "//ios/chrome/browser/gcm",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/invalidation",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
-    "//ios/chrome/browser/services/gcm",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync/glue",

ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.cc

@@ -21,12 +21,12 @@
 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/favicon/favicon_service_factory.h"
+#include "ios/chrome/browser/gcm/ios_chrome_gcm_profile_service_factory.h"
 #include "ios/chrome/browser/history/history_service_factory.h"
 #include "ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.h"
 #include "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h"
 #include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
 #include "ios/chrome/browser/search_engines/template_url_service_factory.h"
-#include "ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.h"
 #include "ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h"
 #include "ios/chrome/browser/signin/about_signin_internals_factory.h"
 #include "ios/chrome/browser/signin/identity_manager_factory.h"

ios/chrome/browser/ui/webui/gcm/BUILD.gn

@@ -13,7 +13,7 @@ source_set("gcm") {
     "//components/resources",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/services/gcm",
+    "//ios/chrome/browser/gcm",
     "//ios/web",
   ]
 }

ios/chrome/browser/ui/webui/gcm/gcm_internals_ui.cc

@@ -20,7 +20,7 @@
 #include "components/grit/components_resources.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
-#include "ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.h"
+#include "ios/chrome/browser/gcm/ios_chrome_gcm_profile_service_factory.h"
 #include "ios/web/public/web_ui_ios_data_source.h"
 #include "ios/web/public/webui/web_ui_ios.h"
 #include "ios/web/public/webui/web_ui_ios_message_handler.h"