Move //c/b/services/gcm/ to //c/b/gcm/
The `services` directory contains exactly one child directory.
BUG=
Review-Url: https://codereview.chromium.org/2657823005
Cr-Commit-Position: refs/heads/master@{#446509}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index da403fc..7f4542b 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -400,6 +400,14 @@
"fullscreen_chromeos.cc",
"fullscreen_mac.mm",
"fullscreen_win.cc",
+ "gcm/gcm_product_util.cc",
+ "gcm/gcm_product_util.h",
+ "gcm/gcm_profile_service_factory.cc",
+ "gcm/gcm_profile_service_factory.h",
+ "gcm/instance_id/instance_id_profile_service.cc",
+ "gcm/instance_id/instance_id_profile_service.h",
+ "gcm/instance_id/instance_id_profile_service_factory.cc",
+ "gcm/instance_id/instance_id_profile_service_factory.h",
"geolocation/chrome_access_token_store.cc",
"geolocation/chrome_access_token_store.h",
"geolocation/geolocation_permission_context.cc",
@@ -1130,14 +1138,6 @@
"search_engines/ui_thread_search_terms_data.h",
"search_engines/ui_thread_search_terms_data_android.cc",
"search_engines/ui_thread_search_terms_data_android.h",
- "services/gcm/gcm_product_util.cc",
- "services/gcm/gcm_product_util.h",
- "services/gcm/gcm_profile_service_factory.cc",
- "services/gcm/gcm_profile_service_factory.h",
- "services/gcm/instance_id/instance_id_profile_service.cc",
- "services/gcm/instance_id/instance_id_profile_service.h",
- "services/gcm/instance_id/instance_id_profile_service_factory.cc",
- "services/gcm/instance_id/instance_id_profile_service_factory.h",
"sessions/chrome_tab_restore_service_client.cc",
"sessions/chrome_tab_restore_service_client.h",
"sessions/restore_on_startup_policy_handler.cc",
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index f69f9b8..6a594b70 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -138,8 +138,8 @@
#endif
#if !defined(OS_ANDROID)
+#include "chrome/browser/gcm/gcm_product_util.h"
#include "chrome/browser/lifetime/keep_alive_registry.h"
-#include "chrome/browser/services/gcm/gcm_product_util.h"
#include "chrome/browser/ui/user_manager.h"
#include "components/gcm_driver/gcm_client_factory.h"
#include "components/gcm_driver/gcm_desktop_utils.h"
diff --git a/chrome/browser/chromeos/net/wake_on_wifi_connection_observer.cc b/chrome/browser/chromeos/net/wake_on_wifi_connection_observer.cc
index 47c42da..f947420 100644
--- a/chrome/browser/chromeos/net/wake_on_wifi_connection_observer.cc
+++ b/chrome/browser/chromeos/net/wake_on_wifi_connection_observer.cc
@@ -7,8 +7,8 @@
#include "base/logging.h"
#include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chromeos/network/network_device_handler.h"
#include "components/gcm_driver/gcm_driver.h"
#include "components/gcm_driver/gcm_profile_service.h"
diff --git a/chrome/browser/chromeos/net/wake_on_wifi_manager.cc b/chrome/browser/chromeos/net/wake_on_wifi_manager.cc
index 70a3f7d8..b982663 100644
--- a/chrome/browser/chromeos/net/wake_on_wifi_manager.cc
+++ b/chrome/browser/chromeos/net/wake_on_wifi_manager.cc
@@ -13,8 +13,8 @@
#include "base/values.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/net/wake_on_wifi_connection_observer.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/login/login_state.h"
#include "chromeos/network/device_state.h"
diff --git a/chrome/browser/chromeos/net/wake_on_wifi_manager_unittest.cc b/chrome/browser/chromeos/net/wake_on_wifi_manager_unittest.cc
index b5b4a15..687cfb1b 100644
--- a/chrome/browser/chromeos/net/wake_on_wifi_manager_unittest.cc
+++ b/chrome/browser/chromeos/net/wake_on_wifi_manager_unittest.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "chrome/browser/chromeos/net/wake_on_wifi_connection_observer.h"
-#include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
+#include "chrome/browser/gcm/fake_gcm_profile_service.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/test/base/testing_profile.h"
#include "chromeos/network/mock_network_device_handler.h"
#include "content/public/test/test_browser_thread_bundle.h"
diff --git a/chrome/browser/extensions/api/gcm/gcm_api.cc b/chrome/browser/extensions/api/gcm/gcm_api.cc
index 3cc048c..dab66217 100644
--- a/chrome/browser/extensions/api/gcm/gcm_api.cc
+++ b/chrome/browser/extensions/api/gcm/gcm_api.cc
@@ -15,9 +15,9 @@
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chrome/common/extensions/api/gcm.h"
#include "components/gcm_driver/common/gcm_messages.h"
#include "components/gcm_driver/gcm_driver.h"
diff --git a/chrome/browser/extensions/api/gcm/gcm_apitest.cc b/chrome/browser/extensions/api/gcm/gcm_apitest.cc
index f2379ca..c3951ad0 100644
--- a/chrome/browser/extensions/api/gcm/gcm_apitest.cc
+++ b/chrome/browser/extensions/api/gcm/gcm_apitest.cc
@@ -6,9 +6,9 @@
#include "chrome/browser/extensions/api/gcm/gcm_api.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_gcm_app_handler.h"
+#include "chrome/browser/gcm/fake_gcm_profile_service.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/ui_test_utils.h"
#include "components/browser_sync/browser_sync_switches.h"
diff --git a/chrome/browser/extensions/api/instance_id/instance_id_api.cc b/chrome/browser/extensions/api/instance_id/instance_id_api.cc
index 3baab243..f811fde 100644
--- a/chrome/browser/extensions/api/instance_id/instance_id_api.cc
+++ b/chrome/browser/extensions/api/instance_id/instance_id_api.cc
@@ -7,9 +7,9 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
+#include "chrome/browser/gcm/instance_id/instance_id_profile_service.h"
+#include "chrome/browser/gcm/instance_id/instance_id_profile_service_factory.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/instance_id/instance_id_profile_service.h"
-#include "chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h"
#include "chrome/common/extensions/api/instance_id.h"
#include "components/gcm_driver/instance_id/instance_id_driver.h"
#include "extensions/common/extension.h"
diff --git a/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc b/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc
index 26fcb68..66ae3c6 100644
--- a/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc
+++ b/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc
@@ -10,10 +10,10 @@
#include "chrome/browser/extensions/api/instance_id/instance_id_api.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_gcm_app_handler.h"
+#include "chrome/browser/gcm/fake_gcm_profile_service.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
+#include "chrome/browser/gcm/instance_id/instance_id_profile_service_factory.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
-#include "chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h"
#include "chrome/test/base/ui_test_utils.h"
#include "components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h"
#include "components/version_info/version_info.h"
diff --git a/chrome/browser/extensions/extension_gcm_app_handler.cc b/chrome/browser/extensions/extension_gcm_app_handler.cc
index c4526cd..75ebade5 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler.cc
+++ b/chrome/browser/extensions/extension_gcm_app_handler.cc
@@ -11,10 +11,10 @@
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/api/gcm/gcm_api.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
+#include "chrome/browser/gcm/instance_id/instance_id_profile_service.h"
+#include "chrome/browser/gcm/instance_id/instance_id_profile_service_factory.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
-#include "chrome/browser/services/gcm/instance_id/instance_id_profile_service.h"
-#include "chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h"
#include "components/gcm_driver/gcm_driver.h"
#include "components/gcm_driver/gcm_profile_service.h"
#include "components/gcm_driver/instance_id/instance_id_driver.h"
diff --git a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
index c5ba9db..e9c4478 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
+++ b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
@@ -27,9 +27,9 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/test_extension_service.h"
#include "chrome/browser/extensions/test_extension_system.h"
+#include "chrome/browser/gcm/gcm_product_util.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_product_util.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
diff --git a/chrome/browser/extensions/service_worker_apitest.cc b/chrome/browser/extensions/service_worker_apitest.cc
index 9db618f..6ca009a5 100644
--- a/chrome/browser/extensions/service_worker_apitest.cc
+++ b/chrome/browser/extensions/service_worker_apitest.cc
@@ -10,13 +10,13 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/gcm/fake_gcm_profile_service.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/notifications/desktop_notification_profile_util.h"
#include "chrome/browser/permissions/permission_manager.h"
#include "chrome/browser/push_messaging/push_messaging_app_identifier.h"
#include "chrome/browser/push_messaging/push_messaging_service_factory.h"
#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
-#include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/test/base/ui_test_utils.h"
#include "components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h"
diff --git a/chrome/browser/services/gcm/OWNERS b/chrome/browser/gcm/OWNERS
similarity index 100%
rename from chrome/browser/services/gcm/OWNERS
rename to chrome/browser/gcm/OWNERS
diff --git a/chrome/browser/services/gcm/fake_gcm_profile_service.cc b/chrome/browser/gcm/fake_gcm_profile_service.cc
similarity index 98%
rename from chrome/browser/services/gcm/fake_gcm_profile_service.cc
rename to chrome/browser/gcm/fake_gcm_profile_service.cc
index 185d8245..f2db5fb 100644
--- a/chrome/browser/services/gcm/fake_gcm_profile_service.cc
+++ b/chrome/browser/gcm/fake_gcm_profile_service.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 "chrome/browser/services/gcm/fake_gcm_profile_service.h"
+#include "chrome/browser/gcm/fake_gcm_profile_service.h"
#include <utility>
diff --git a/chrome/browser/services/gcm/fake_gcm_profile_service.h b/chrome/browser/gcm/fake_gcm_profile_service.h
similarity index 92%
rename from chrome/browser/services/gcm/fake_gcm_profile_service.h
rename to chrome/browser/gcm/fake_gcm_profile_service.h
index aabba5e5..7b4db7b8 100644
--- a/chrome/browser/services/gcm/fake_gcm_profile_service.h
+++ b/chrome/browser/gcm/fake_gcm_profile_service.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 CHROME_BROWSER_SERVICES_GCM_FAKE_GCM_PROFILE_SERVICE_H_
-#define CHROME_BROWSER_SERVICES_GCM_FAKE_GCM_PROFILE_SERVICE_H_
+#ifndef CHROME_BROWSER_GCM_FAKE_GCM_PROFILE_SERVICE_H_
+#define CHROME_BROWSER_GCM_FAKE_GCM_PROFILE_SERVICE_H_
#include <list>
#include <memory>
@@ -86,4 +86,4 @@
} // namespace gcm
-#endif // CHROME_BROWSER_SERVICES_GCM_FAKE_GCM_PROFILE_SERVICE_H_
+#endif // CHROME_BROWSER_GCM_FAKE_GCM_PROFILE_SERVICE_H_
diff --git a/chrome/browser/services/gcm/gcm_product_util.cc b/chrome/browser/gcm/gcm_product_util.cc
similarity index 96%
rename from chrome/browser/services/gcm/gcm_product_util.cc
rename to chrome/browser/gcm/gcm_product_util.cc
index 32bc44b..cb2fa48 100644
--- a/chrome/browser/services/gcm/gcm_product_util.cc
+++ b/chrome/browser/gcm/gcm_product_util.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 "chrome/browser/services/gcm/gcm_product_util.h"
+#include "chrome/browser/gcm/gcm_product_util.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
diff --git a/chrome/browser/services/gcm/gcm_product_util.h b/chrome/browser/gcm/gcm_product_util.h
similarity index 82%
rename from chrome/browser/services/gcm/gcm_product_util.h
rename to chrome/browser/gcm/gcm_product_util.h
index 59a7ee52..f91c869 100644
--- a/chrome/browser/services/gcm/gcm_product_util.h
+++ b/chrome/browser/gcm/gcm_product_util.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 CHROME_BROWSER_SERVICES_GCM_GCM_PRODUCT_UTIL_H_
-#define CHROME_BROWSER_SERVICES_GCM_GCM_PRODUCT_UTIL_H_
+#ifndef CHROME_BROWSER_GCM_GCM_PRODUCT_UTIL_H_
+#define CHROME_BROWSER_GCM_GCM_PRODUCT_UTIL_H_
#include <string>
@@ -27,4 +27,4 @@
} // namespace gcm
-#endif // CHROME_BROWSER_SERVICES_GCM_GCM_PRODUCT_UTIL_H_
+#endif // CHROME_BROWSER_GCM_GCM_PRODUCT_UTIL_H_
diff --git a/chrome/browser/services/gcm/gcm_profile_service_factory.cc b/chrome/browser/gcm/gcm_profile_service_factory.cc
similarity index 96%
rename from chrome/browser/services/gcm/gcm_profile_service_factory.cc
rename to chrome/browser/gcm/gcm_profile_service_factory.cc
index 98d57d3..1edcd5b 100644
--- a/chrome/browser/services/gcm/gcm_profile_service_factory.cc
+++ b/chrome/browser/gcm/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 "chrome/browser/services/gcm/gcm_profile_service_factory.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include <memory>
@@ -18,7 +18,7 @@
#include "content/public/browser/browser_thread.h"
#if !defined(OS_ANDROID)
-#include "chrome/browser/services/gcm/gcm_product_util.h"
+#include "chrome/browser/gcm/gcm_product_util.h"
#include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
#include "chrome/common/channel_info.h"
#include "components/gcm_driver/gcm_client_factory.h"
diff --git a/chrome/browser/services/gcm/gcm_profile_service_factory.h b/chrome/browser/gcm/gcm_profile_service_factory.h
similarity index 85%
rename from chrome/browser/services/gcm/gcm_profile_service_factory.h
rename to chrome/browser/gcm/gcm_profile_service_factory.h
index 4a6197a..d94b0539 100644
--- a/chrome/browser/services/gcm/gcm_profile_service_factory.h
+++ b/chrome/browser/gcm/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 CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_FACTORY_H_
-#define CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_FACTORY_H_
+#ifndef CHROME_BROWSER_GCM_GCM_PROFILE_SERVICE_FACTORY_H_
+#define CHROME_BROWSER_GCM_GCM_PROFILE_SERVICE_FACTORY_H_
#include "base/compiler_specific.h"
#include "base/macros.h"
@@ -39,4 +39,4 @@
} // namespace gcm
-#endif // CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_FACTORY_H_
+#endif // CHROME_BROWSER_GCM_GCM_PROFILE_SERVICE_FACTORY_H_
diff --git a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc b/chrome/browser/gcm/gcm_profile_service_unittest.cc
similarity index 98%
rename from chrome/browser/services/gcm/gcm_profile_service_unittest.cc
rename to chrome/browser/gcm/gcm_profile_service_unittest.cc
index 534d349..5806af4 100644
--- a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
+++ b/chrome/browser/gcm/gcm_profile_service_unittest.cc
@@ -12,8 +12,8 @@
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "build/build_config.h"
-#include "chrome/browser/services/gcm/gcm_product_util.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
+#include "chrome/browser/gcm/gcm_product_util.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
diff --git a/chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc b/chrome/browser/gcm/instance_id/instance_id_profile_service.cc
similarity index 86%
rename from chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc
rename to chrome/browser/gcm/instance_id/instance_id_profile_service.cc
index 635577f..445af48 100644
--- a/chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc
+++ b/chrome/browser/gcm/instance_id/instance_id_profile_service.cc
@@ -2,11 +2,11 @@
// 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/instance_id/instance_id_profile_service.h"
+#include "chrome/browser/gcm/instance_id/instance_id_profile_service.h"
#include "base/logging.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "components/gcm_driver/gcm_profile_service.h"
#include "components/gcm_driver/instance_id/instance_id_driver.h"
diff --git a/chrome/browser/services/gcm/instance_id/instance_id_profile_service.h b/chrome/browser/gcm/instance_id/instance_id_profile_service.h
similarity index 78%
rename from chrome/browser/services/gcm/instance_id/instance_id_profile_service.h
rename to chrome/browser/gcm/instance_id/instance_id_profile_service.h
index ff83531..2c5d1f8 100644
--- a/chrome/browser/services/gcm/instance_id/instance_id_profile_service.h
+++ b/chrome/browser/gcm/instance_id/instance_id_profile_service.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 CHROME_BROWSER_SERVICES_GCM_INSTANCE_ID_INSTANCE_ID_PROFILE_SERVICE_H_
-#define CHROME_BROWSER_SERVICES_GCM_INSTANCE_ID_INSTANCE_ID_PROFILE_SERVICE_H_
+#ifndef CHROME_BROWSER_GCM_INSTANCE_ID_INSTANCE_ID_PROFILE_SERVICE_H_
+#define CHROME_BROWSER_GCM_INSTANCE_ID_INSTANCE_ID_PROFILE_SERVICE_H_
#include <memory>
@@ -35,4 +35,4 @@
} // namespace instance_id
-#endif // CHROME_BROWSER_SERVICES_GCM_INSTANCE_ID_INSTANCE_ID_PROFILE_SERVICE_H_
+#endif // CHROME_BROWSER_GCM_INSTANCE_ID_INSTANCE_ID_PROFILE_SERVICE_H_
diff --git a/chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.cc b/chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc
similarity index 87%
rename from chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.cc
rename to chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc
index 408c1e9..2d3e51b 100644
--- a/chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.cc
+++ b/chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc
@@ -2,14 +2,14 @@
// 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/instance_id/instance_id_profile_service_factory.h"
+#include "chrome/browser/gcm/instance_id/instance_id_profile_service_factory.h"
#include <memory>
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
+#include "chrome/browser/gcm/instance_id/instance_id_profile_service.h"
#include "chrome/browser/profiles/incognito_helpers.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
-#include "chrome/browser/services/gcm/instance_id/instance_id_profile_service.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
namespace instance_id {
diff --git a/chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h b/chrome/browser/gcm/instance_id/instance_id_profile_service_factory.h
similarity index 82%
rename from chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h
rename to chrome/browser/gcm/instance_id/instance_id_profile_service_factory.h
index 885e2a6..8b2dd73 100644
--- a/chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h
+++ b/chrome/browser/gcm/instance_id/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 CHROME_BROWSER_SERVICES_GCM_INSTANCE_ID_INSTANCE_ID_PROFILE_SERVICE_FACTORY_H_
-#define CHROME_BROWSER_SERVICES_GCM_INSTANCE_ID_INSTANCE_ID_PROFILE_SERVICE_FACTORY_H_
+#ifndef CHROME_BROWSER_GCM_INSTANCE_ID_INSTANCE_ID_PROFILE_SERVICE_FACTORY_H_
+#define CHROME_BROWSER_GCM_INSTANCE_ID_INSTANCE_ID_PROFILE_SERVICE_FACTORY_H_
#include "base/macros.h"
#include "base/memory/singleton.h"
@@ -39,4 +39,4 @@
} // namespace instance_id
-#endif // CHROME_BROWSER_SERVICES_GCM_INSTANCE_ID_INSTANCE_ID_PROFILE_SERVICE_FACTORY_H_
+#endif // CHROME_BROWSER_GCM_INSTANCE_ID_INSTANCE_ID_PROFILE_SERVICE_FACTORY_H_
diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
index f561650..fb31980 100644
--- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
+++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
@@ -9,8 +9,8 @@
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 263632c..f28f1ce5 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -165,7 +165,7 @@
#include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider.h"
#include "components/ntp_tiles/popular_sites_impl.h"
#else
-#include "chrome/browser/services/gcm/gcm_product_util.h"
+#include "chrome/browser/gcm/gcm_product_util.h"
#include "chrome/browser/signin/signin_promo.h"
#include "chrome/browser/ui/startup/startup_browser_creator.h"
#include "chrome/browser/ui/webui/foreign_session_handler.h"
diff --git a/chrome/browser/push_messaging/push_messaging_browsertest.cc b/chrome/browser/push_messaging/push_messaging_browsertest.cc
index 90a6a56..5112e20 100644
--- a/chrome/browser/push_messaging/push_messaging_browsertest.cc
+++ b/chrome/browser/push_messaging/push_messaging_browsertest.cc
@@ -24,6 +24,8 @@
#include "chrome/browser/browsing_data/browsing_data_remover_test_util.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/engagement/site_engagement_service.h"
+#include "chrome/browser/gcm/fake_gcm_profile_service.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/lifetime/keep_alive_registry.h"
#include "chrome/browser/lifetime/keep_alive_types.h"
#include "chrome/browser/notifications/message_center_display_service.h"
@@ -35,8 +37,6 @@
#include "chrome/browser/push_messaging/push_messaging_constants.h"
#include "chrome/browser/push_messaging/push_messaging_service_factory.h"
#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
-#include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.cc b/chrome/browser/push_messaging/push_messaging_service_factory.cc
index 711294e..369a3dee 100644
--- a/chrome/browser/push_messaging/push_messaging_service_factory.cc
+++ b/chrome/browser/push_messaging/push_messaging_service_factory.cc
@@ -8,13 +8,13 @@
#include "chrome/browser/budget_service/budget_manager_factory.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
+#include "chrome/browser/gcm/instance_id/instance_id_profile_service.h"
+#include "chrome/browser/gcm/instance_id/instance_id_profile_service_factory.h"
#include "chrome/browser/permissions/permission_manager_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 "chrome/browser/services/gcm/instance_id/instance_id_profile_service.h"
-#include "chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
// static
diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chrome/browser/push_messaging/push_messaging_service_impl.cc
index 842ef00..1abf01d 100644
--- a/chrome/browser/push_messaging/push_messaging_service_impl.cc
+++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc
@@ -20,15 +20,15 @@
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
+#include "chrome/browser/gcm/instance_id/instance_id_profile_service.h"
+#include "chrome/browser/gcm/instance_id/instance_id_profile_service_factory.h"
#include "chrome/browser/permissions/permission_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/push_messaging/push_messaging_app_identifier.h"
#include "chrome/browser/push_messaging/push_messaging_constants.h"
#include "chrome/browser/push_messaging/push_messaging_service_factory.h"
#include "chrome/browser/push_messaging/push_messaging_service_observer.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
-#include "chrome/browser/services/gcm/instance_id/instance_id_profile_service.h"
-#include "chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h"
#include "chrome/browser/ui/chrome_pages.h"
#include "chrome/common/chrome_features.h"
#include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/push_messaging/push_messaging_service_unittest.cc b/chrome/browser/push_messaging/push_messaging_service_unittest.cc
index e17bf35..ca9e35c 100644
--- a/chrome/browser/push_messaging/push_messaging_service_unittest.cc
+++ b/chrome/browser/push_messaging/push_messaging_service_unittest.cc
@@ -14,13 +14,13 @@
#include "base/run_loop.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/gcm/fake_gcm_profile_service.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/permissions/permission_manager.h"
#include "chrome/browser/permissions/permission_manager_factory.h"
#include "chrome/browser/push_messaging/push_messaging_app_identifier.h"
#include "chrome/browser/push_messaging/push_messaging_service_factory.h"
#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
-#include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chrome/test/base/testing_profile.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/gcm_driver/crypto/gcm_crypto_test_helpers.h"
diff --git a/chrome/browser/services/OWNERS b/chrome/browser/services/OWNERS
deleted file mode 100644
index e42d91c7..0000000
--- a/chrome/browser/services/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
[email protected]
diff --git a/chrome/browser/signin/easy_unlock_service_factory.cc b/chrome/browser/signin/easy_unlock_service_factory.cc
index b699e1f..41839d95 100644
--- a/chrome/browser/signin/easy_unlock_service_factory.cc
+++ b/chrome/browser/signin/easy_unlock_service_factory.cc
@@ -7,9 +7,9 @@
#include "base/command_line.h"
#include "base/memory/singleton.h"
#include "build/build_config.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/profiles/incognito_helpers.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/signin/easy_unlock_app_manager.h"
#include "chrome/browser/signin/easy_unlock_service.h"
#include "chrome/browser/signin/easy_unlock_service_regular.h"
diff --git a/chrome/browser/signin/easy_unlock_service_regular.cc b/chrome/browser/signin/easy_unlock_service_regular.cc
index 34e099c..57b2d928 100644
--- a/chrome/browser/signin/easy_unlock_service_regular.cc
+++ b/chrome/browser/signin/easy_unlock_service_regular.cc
@@ -18,8 +18,8 @@
#include "base/values.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/signin/chrome_proximity_auth_client.h"
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
#include "chrome/browser/signin/signin_manager_factory.h"
diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc
index 10671f8..34f5106 100644
--- a/chrome/browser/sync/profile_sync_service_factory.cc
+++ b/chrome/browser/sync/profile_sync_service_factory.cc
@@ -14,13 +14,13 @@
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/defaults.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/history/history_service_factory.h"
#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
#include "chrome/browser/password_manager/password_store_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/signin/about_signin_internals_factory.h"
#include "chrome/browser/signin/chrome_signin_client_factory.h"
#include "chrome/browser/signin/gaia_cookie_manager_service_factory.h"
diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
index b8ab55dc..4c5db4f0 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
@@ -12,11 +12,11 @@
#include "base/macros.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/gcm/fake_gcm_profile_service.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/profiles/avatar_menu.h"
#include "chrome/browser/profiles/profile_attributes_entry.h"
#include "chrome/browser/profiles/profile_attributes_storage.h"
-#include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/signin/account_fetcher_service_factory.h"
#include "chrome/browser/signin/account_tracker_service_factory.h"
#include "chrome/browser/signin/chrome_signin_helper.h"
diff --git a/chrome/browser/ui/webui/gcm_internals_ui.cc b/chrome/browser/ui/webui/gcm_internals_ui.cc
index c0895e0..310e5c8 100644
--- a/chrome/browser/ui/webui/gcm_internals_ui.cc
+++ b/chrome/browser/ui/webui/gcm_internals_ui.cc
@@ -12,8 +12,8 @@
#include "base/memory/ptr_util.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
+#include "chrome/browser/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chrome/common/url_constants.h"
#include "components/gcm_driver/gcm_client.h"
#include "components/gcm_driver/gcm_driver.h"
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index c6378c0..953993d 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1564,6 +1564,8 @@
"../browser/favicon/content_favicon_driver_browsertest.cc",
"../browser/first_run/first_run_browsertest.cc",
"../browser/first_run/try_chrome_dialog_view_browsertest.cc",
+ "../browser/gcm/fake_gcm_profile_service.cc",
+ "../browser/gcm/fake_gcm_profile_service.h",
"../browser/geolocation/access_token_store_browsertest.cc",
"../browser/geolocation/geolocation_browsertest.cc",
"../browser/global_keyboard_shortcuts_mac_browsertest.mm",
@@ -1707,8 +1709,6 @@
"../browser/search/suggestions/image_fetcher_impl_browsertest.cc",
"../browser/search_engines/template_url_scraper_browsertest.cc",
"../browser/service_process/service_process_control_browsertest.cc",
- "../browser/services/gcm/fake_gcm_profile_service.cc",
- "../browser/services/gcm/fake_gcm_profile_service.h",
"../browser/sessions/better_session_restore_browsertest.cc",
"../browser/sessions/persistent_tab_restore_service_browsertest.cc",
"../browser/sessions/session_restore_browsertest.cc",
@@ -3154,6 +3154,8 @@
"../browser/external_protocol/external_protocol_handler_unittest.cc",
"../browser/favicon/chrome_fallback_icon_client_unittest.cc",
"../browser/file_select_helper_unittest.cc",
+ "../browser/gcm/fake_gcm_profile_service.cc",
+ "../browser/gcm/fake_gcm_profile_service.h",
"../browser/geolocation/geolocation_permission_context_unittest.cc",
"../browser/global_keyboard_shortcuts_mac_unittest.mm",
"../browser/google/google_update_settings_unittest.cc",
@@ -3306,8 +3308,6 @@
"../browser/search_engines/template_url_service_sync_unittest.cc",
"../browser/search_engines/template_url_service_unittest.cc",
"../browser/service_process/service_process_control_mac_unittest.mm",
- "../browser/services/gcm/fake_gcm_profile_service.cc",
- "../browser/services/gcm/fake_gcm_profile_service.h",
"../browser/sessions/restore_on_startup_policy_handler_unittest.cc",
"../browser/sessions/session_common_utils_unittest.cc",
"../browser/shell_integration_win_unittest.cc",
@@ -3585,6 +3585,9 @@
"../browser/download/download_shelf_unittest.cc",
"../browser/first_run/first_run_unittest.cc",
"../browser/font_family_cache_unittest.cc",
+
+ # GCMDriverAndroid is not yet implemented.
+ "../browser/gcm/gcm_profile_service_unittest.cc",
"../browser/importer/firefox_profile_lock_unittest.cc",
"../browser/importer/profile_writer_unittest.cc",
"../browser/media/webrtc/tab_desktop_media_list_unittest.cc",
@@ -3621,9 +3624,6 @@
"../browser/search/instant_unittest_base.cc",
"../browser/search/instant_unittest_base.h",
"../browser/search/search_unittest.cc",
-
- # GCMDriverAndroid is not yet implemented.
- "../browser/services/gcm/gcm_profile_service_unittest.cc",
"../browser/sessions/persistent_tab_restore_service_unittest.cc",
"../browser/speech/extension_api/extension_manifests_tts_unittest.cc",
"../browser/speech/tts_controller_unittest.cc",
