[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.
[email protected]
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 <[email protected]>
Reviewed-by: Sylvain Defresne <[email protected]>
Reviewed-by: Nicolas Zea <[email protected]>
Cr-Commit-Position: refs/heads/master@{#561470}diff --git a/ios/chrome/browser/BUILD.gn b/ios/chrome/browser/BUILD.gn
index 2a8d43a..564985e 100644
--- a/ios/chrome/browser/BUILD.gn
+++ b/ios/chrome/browser/BUILD.gn
@@ -187,6 +187,7 @@
"//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 @@
"//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",
diff --git a/ios/chrome/browser/application_context_impl.cc b/ios/chrome/browser/application_context_impl.cc
index a56cc00..776b1cd 100644
--- a/ios/chrome/browser/application_context_impl.cc
+++ b/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"
diff --git a/ios/chrome/browser/browser_state/BUILD.gn b/ios/chrome/browser/browser_state/BUILD.gn
index de91492..91902a5 100644
--- a/ios/chrome/browser/browser_state/BUILD.gn
+++ b/ios/chrome/browser/browser_state/BUILD.gn
@@ -92,6 +92,7 @@
"//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 @@
"//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",
diff --git a/ios/chrome/browser/browser_state/browser_state_keyed_service_factories.mm b/ios/chrome/browser/browser_state/browser_state_keyed_service_factories.mm
index d185b84..790dbf02 100644
--- a/ios/chrome/browser/browser_state/browser_state_keyed_service_factories.mm
+++ b/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"
diff --git a/ios/chrome/browser/services/gcm/BUILD.gn b/ios/chrome/browser/gcm/BUILD.gn
similarity index 100%
rename from ios/chrome/browser/services/gcm/BUILD.gn
rename to ios/chrome/browser/gcm/BUILD.gn
diff --git a/ios/chrome/browser/services/gcm/OWNERS b/ios/chrome/browser/gcm/OWNERS
similarity index 100%
rename from ios/chrome/browser/services/gcm/OWNERS
rename to ios/chrome/browser/gcm/OWNERS
diff --git a/ios/chrome/browser/services/gcm/instance_id/BUILD.gn b/ios/chrome/browser/gcm/instance_id/BUILD.gn
similarity index 92%
rename from ios/chrome/browser/services/gcm/instance_id/BUILD.gn
rename to ios/chrome/browser/gcm/instance_id/BUILD.gn
index 90d2039b..218ad14 100644
--- a/ios/chrome/browser/services/gcm/instance_id/BUILD.gn
+++ b/ios/chrome/browser/gcm/instance_id/BUILD.gn
@@ -12,7 +12,7 @@
"//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",
]
}
diff --git a/ios/chrome/browser/services/gcm/instance_id/ios_chrome_instance_id_profile_service_factory.cc b/ios/chrome/browser/gcm/instance_id/ios_chrome_instance_id_profile_service_factory.cc
similarity index 90%
rename from ios/chrome/browser/services/gcm/instance_id/ios_chrome_instance_id_profile_service_factory.cc
rename to ios/chrome/browser/gcm/instance_id/ios_chrome_instance_id_profile_service_factory.cc
index dba4514..e3ccfabc 100644
--- a/ios/chrome/browser/services/gcm/instance_id/ios_chrome_instance_id_profile_service_factory.cc
+++ b/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*
diff --git a/ios/chrome/browser/services/gcm/instance_id/ios_chrome_instance_id_profile_service_factory.h b/ios/chrome/browser/gcm/instance_id/ios_chrome_instance_id_profile_service_factory.h
similarity index 80%
rename from ios/chrome/browser/services/gcm/instance_id/ios_chrome_instance_id_profile_service_factory.h
rename to ios/chrome/browser/gcm/instance_id/ios_chrome_instance_id_profile_service_factory.h
index cd28dc24..2e58d33 100644
--- a/ios/chrome/browser/services/gcm/instance_id/ios_chrome_instance_id_profile_service_factory.h
+++ b/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 @@
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_
diff --git a/ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.cc b/ios/chrome/browser/gcm/ios_chrome_gcm_profile_service_factory.cc
similarity index 96%
rename from ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.cc
rename to ios/chrome/browser/gcm/ios_chrome_gcm_profile_service_factory.cc
index 13f3a24..7487428 100644
--- a/ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.cc
+++ b/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"
diff --git a/ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.h b/ios/chrome/browser/gcm/ios_chrome_gcm_profile_service_factory.h
similarity index 86%
rename from ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.h
rename to ios/chrome/browser/gcm/ios_chrome_gcm_profile_service_factory.h
index 7c99568..4b61409 100644
--- a/ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.h
+++ b/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 @@
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_
diff --git a/ios/chrome/browser/invalidation/BUILD.gn b/ios/chrome/browser/invalidation/BUILD.gn
index 7b6b606..34fb669 100644
--- a/ios/chrome/browser/invalidation/BUILD.gn
+++ b/ios/chrome/browser/invalidation/BUILD.gn
@@ -17,7 +17,7 @@
"//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",
diff --git a/ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.mm b/ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.mm
index 5a3fef1..3a62c715 100644
--- a/ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.mm
+++ b/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"
diff --git a/ios/chrome/browser/services/OWNERS b/ios/chrome/browser/services/OWNERS
deleted file mode 100644
index f0db296d..0000000
--- a/ios/chrome/browser/services/OWNERS
+++ /dev/null
@@ -1,6 +0,0 @@
[email protected]
-
-# COMPONENT: Services>CloudMessaging
-
-# TEAM: [email protected]
-# OS: iOS
diff --git a/ios/chrome/browser/sync/BUILD.gn b/ios/chrome/browser/sync/BUILD.gn
index 71c46c0..4ed2cdf 100644
--- a/ios/chrome/browser/sync/BUILD.gn
+++ b/ios/chrome/browser/sync/BUILD.gn
@@ -49,12 +49,12 @@
"//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",
diff --git a/ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.cc b/ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.cc
index 794b6d5..ca2f8cc 100644
--- a/ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.cc
+++ b/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"
diff --git a/ios/chrome/browser/ui/webui/gcm/BUILD.gn b/ios/chrome/browser/ui/webui/gcm/BUILD.gn
index 42d40dac..12db264 100644
--- a/ios/chrome/browser/ui/webui/gcm/BUILD.gn
+++ b/ios/chrome/browser/ui/webui/gcm/BUILD.gn
@@ -13,7 +13,7 @@
"//components/resources",
"//ios/chrome/browser",
"//ios/chrome/browser/browser_state",
- "//ios/chrome/browser/services/gcm",
+ "//ios/chrome/browser/gcm",
"//ios/web",
]
}
diff --git a/ios/chrome/browser/ui/webui/gcm/gcm_internals_ui.cc b/ios/chrome/browser/ui/webui/gcm/gcm_internals_ui.cc
index 439eb82..8fcc2f0 100644
--- a/ios/chrome/browser/ui/webui/gcm/gcm_internals_ui.cc
+++ b/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"
