Move all remaining files to gcm_driver component

BUG=356716
TEST=existing tests
TBR=pavely@chromium.org,kalman@chromium.org,arv@chromium.org

Review URL: https://codereview.chromium.org/290013011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273140 0039d316-1c4b-4281-b951-d872f2087c98

28 files changed, 75 insertions, 54 deletions

diff --git a/chrome/browser/extensions/api/gcm/gcm_api.cc b/chrome/browser/extensions/api/gcm/gcm_api.cc
index 6fd12ec..383fc1d 100644
--- a/chrome/browser/extensions/api/gcm/gcm_api.cc
+++ b/chrome/browser/extensions/api/gcm/gcm_api.cc
@@ -13,10 +13,10 @@
 #include "base/strings/string_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_driver.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/common/extensions/api/gcm.h"
+#include "components/gcm_driver/gcm_driver.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/common/extension.h"
 
diff --git a/chrome/browser/extensions/extension_gcm_app_handler.cc b/chrome/browser/extensions/extension_gcm_app_handler.cc
index 505271a..ee25c52 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler.cc
+++ b/chrome/browser/extensions/extension_gcm_app_handler.cc
@@ -9,9 +9,9 @@
 #include "base/location.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_driver.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
+#include "components/gcm_driver/gcm_driver.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/extension_registry.h"
diff --git a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
index 677c7e7..ed58a0c 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
+++ b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
@@ -20,17 +20,17 @@
 #include "chrome/browser/extensions/test_extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/fake_gcm_app_handler.h"
-#include "chrome/browser/services/gcm/fake_gcm_client.h"
-#include "chrome/browser/services/gcm/fake_gcm_client_factory.h"
 #include "chrome/browser/services/gcm/fake_signin_manager.h"
-#include "chrome/browser/services/gcm/gcm_driver.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/gcm_driver/fake_gcm_app_handler.h"
+#include "components/gcm_driver/fake_gcm_client.h"
+#include "components/gcm_driver/fake_gcm_client_factory.h"
 #include "components/gcm_driver/gcm_client_factory.h"
+#include "components/gcm_driver/gcm_driver.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/invalidation/gcm_invalidation_bridge.cc b/chrome/browser/invalidation/gcm_invalidation_bridge.cc
index 26c4c8d..9ef29f3 100644
--- a/chrome/browser/invalidation/gcm_invalidation_bridge.cc
+++ b/chrome/browser/invalidation/gcm_invalidation_bridge.cc
@@ -7,8 +7,8 @@
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/invalidation/gcm_invalidation_bridge.h"
-#include "chrome/browser/services/gcm/gcm_driver.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
+#include "components/gcm_driver/gcm_driver.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "google_apis/gaia/gaia_constants.h"
diff --git a/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc b/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc
index a16ddee..e6e97cc 100644
--- a/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc
+++ b/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc
@@ -4,11 +4,11 @@
 
 #include "base/run_loop.h"
 #include "chrome/browser/invalidation/gcm_invalidation_bridge.h"
-#include "chrome/browser/services/gcm/gcm_driver.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/gcm_driver/gcm_driver.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/fake_identity_provider.h"
 #include "google_apis/gaia/google_service_auth_error.h"
diff --git a/chrome/browser/invalidation/ticl_invalidation_service.cc b/chrome/browser/invalidation/ticl_invalidation_service.cc
index d2bb8e7..f2f5cf3c 100644
--- a/chrome/browser/invalidation/ticl_invalidation_service.cc
+++ b/chrome/browser/invalidation/ticl_invalidation_service.cc
@@ -7,8 +7,8 @@
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/invalidation/gcm_invalidation_bridge.h"
-#include "chrome/browser/services/gcm/gcm_driver.h"
 #include "chrome/common/chrome_content_client.h"
+#include "components/gcm_driver/gcm_driver.h"
 #include "components/invalidation/invalidation_service_util.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "net/url_request/url_request_context_getter.h"
diff --git a/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc b/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc
index 9259199..948e05b 100644
--- a/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc
+++ b/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/invalidation/gcm_invalidation_bridge.h"
 #include "chrome/browser/invalidation/invalidation_service_test_template.h"
-#include "chrome/browser/services/gcm/gcm_driver.h"
+#include "components/gcm_driver/gcm_driver.h"
 #include "google_apis/gaia/fake_identity_provider.h"
 #include "google_apis/gaia/fake_oauth2_token_service.h"
 #include "net/url_request/url_request_context_getter.h"
diff --git a/chrome/browser/services/gcm/fake_gcm_profile_service.cc b/chrome/browser/services/gcm/fake_gcm_profile_service.cc
index b4c7eee..cbcf74d 100644
--- a/chrome/browser/services/gcm/fake_gcm_profile_service.cc
+++ b/chrome/browser/services/gcm/fake_gcm_profile_service.cc
@@ -8,7 +8,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/fake_gcm_client_factory.h"
+#include "components/gcm_driver/fake_gcm_client_factory.h"
 #include "content/public/browser/browser_context.h"
 
 namespace gcm {
diff --git a/chrome/browser/services/gcm/fake_gcm_profile_service.h b/chrome/browser/services/gcm/fake_gcm_profile_service.h
index ee1fe13..d9350138 100644
--- a/chrome/browser/services/gcm/fake_gcm_profile_service.h
+++ b/chrome/browser/services/gcm/fake_gcm_profile_service.h
@@ -8,8 +8,8 @@
 #include <list>
 #include <vector>
 
-#include "chrome/browser/services/gcm/gcm_driver.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
+#include "components/gcm_driver/gcm_driver.h"
 
 namespace content {
 class BrowserContext;
diff --git a/chrome/browser/services/gcm/gcm_profile_service.cc b/chrome/browser/services/gcm/gcm_profile_service.cc
index aa90f71..95bf473 100644
--- a/chrome/browser/services/gcm/gcm_profile_service.cc
+++ b/chrome/browser/services/gcm/gcm_profile_service.cc
@@ -9,7 +9,6 @@
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_driver.h"
 #include "chrome/browser/services/gcm/gcm_utils.h"
 #include "chrome/browser/signin/profile_identity_provider.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
@@ -17,6 +16,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "components/gcm_driver/gcm_client_factory.h"
+#include "components/gcm_driver/gcm_driver.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/services/gcm/gcm_profile_service.h b/chrome/browser/services/gcm/gcm_profile_service.h
index d68c65d..23269e0 100644
--- a/chrome/browser/services/gcm/gcm_profile_service.h
+++ b/chrome/browser/services/gcm/gcm_profile_service.h
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 // TODO(jianli): include needed for obsolete methods that are going to be
 // removed soon.
-#include "chrome/browser/services/gcm/gcm_driver.h"
+#include "components/gcm_driver/gcm_driver.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 class Profile;
diff --git a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
index 7a6f260..cb7f1e0 100644
--- a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
+++ b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
@@ -11,15 +11,15 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
-#include "chrome/browser/services/gcm/fake_gcm_app_handler.h"
-#include "chrome/browser/services/gcm/fake_gcm_client.h"
-#include "chrome/browser/services/gcm/fake_gcm_client_factory.h"
 #include "chrome/browser/services/gcm/fake_signin_manager.h"
-#include "chrome/browser/services/gcm/gcm_driver.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/gcm_driver/fake_gcm_app_handler.h"
+#include "components/gcm_driver/fake_gcm_client.h"
+#include "components/gcm_driver/fake_gcm_client_factory.h"
 #include "components/gcm_driver/gcm_client_factory.h"
+#include "components/gcm_driver/gcm_driver.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index ec21827..4c3d6bd 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -30,7 +30,6 @@
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_driver.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/signin/about_signin_internals_factory.h"
@@ -59,6 +58,7 @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "components/gcm_driver/gcm_driver.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/signin/core/browser/about_signin_internals.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
diff --git a/chrome/browser/ui/webui/gcm_internals_ui.cc b/chrome/browser/ui/webui/gcm_internals_ui.cc
index 84a6ec8..2734ff4 100644
--- a/chrome/browser/ui/webui/gcm_internals_ui.cc
+++ b/chrome/browser/ui/webui/gcm_internals_ui.cc
@@ -14,10 +14,10 @@
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_driver.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/common/url_constants.h"
+#include "components/gcm_driver/gcm_driver.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "content/public/browser/web_ui_data_source.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 29822ea..f7f36f0 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2014,8 +2014,6 @@
         'browser/search_engines/template_url_service_observer.h',
         'browser/search_engines/util.cc',
         'browser/search_engines/util.h',
-        'browser/services/gcm/gcm_driver.cc',
-        'browser/services/gcm/gcm_driver.h',
         'browser/services/gcm/gcm_profile_service.cc',
         'browser/services/gcm/gcm_profile_service.h',
         'browser/services/gcm/gcm_profile_service_factory.cc',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index d7faecf..bd08b3c0 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -19,6 +19,7 @@
         '../base/base.gyp:base_prefs_test_support',
         '../base/base.gyp:test_support_base',
         '../components/components.gyp:bookmarks_test_support',
+        '../components/components.gyp:gcm_driver_test_support',
         '../components/components.gyp:metrics_test_support',
         '../components/components.gyp:password_manager_core_browser_test_support',
         '../components/components.gyp:signin_core_browser_test_support',
@@ -1272,15 +1273,8 @@
         'browser/search_engines/template_url_prepopulate_data_unittest.cc',
         'browser/search_engines/template_url_scraper_unittest.cc',
         'browser/search_engines/template_url_unittest.cc',
-        'browser/services/gcm/fake_gcm_app_handler.cc',
-        'browser/services/gcm/fake_gcm_app_handler.h',
-        'browser/services/gcm/fake_gcm_client_factory.cc',
-        'browser/services/gcm/fake_gcm_client_factory.h',
         'browser/services/gcm/fake_signin_manager.cc',
         'browser/services/gcm/fake_signin_manager.h',
-        'browser/services/gcm/fake_gcm_client.cc',
-        'browser/services/gcm/fake_gcm_client.h',
-        'browser/services/gcm/gcm_driver_unittest.cc',
         'browser/services/gcm/gcm_profile_service_unittest.cc',
         'browser/sessions/persistent_tab_restore_service_unittest.cc',
         'browser/sessions/restore_on_startup_policy_handler_unittest.cc',
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index c6928eb..0d9faa2 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -97,6 +97,7 @@
             'domain_reliability/util_unittest.cc',
             'enhanced_bookmarks/image_store_unittest.cc',
             'feedback/feedback_uploader_unittest.cc',
+            'gcm_driver/gcm_driver_unittest.cc',
             'invalidation/invalidation_logger_unittest.cc',
             'json_schema/json_schema_validator_unittest.cc',
             'json_schema/json_schema_validator_unittest_base.cc',
@@ -243,6 +244,10 @@
 
             # Dependencies of feedback
             'components.gyp:feedback_component',
+            
+            # Dependencies of gcm
+            'components.gyp:gcm_driver',
+            'components.gyp:gcm_driver_test_support',
 
             # Dependencies of invalidation
             'components.gyp:invalidation',
@@ -360,6 +365,7 @@
                 ['include', '^bookmarks/'],
                 ['include', '^data_reduction_proxy/'],
                 ['include', '^dom_distiller/'],
+                ['include', '^gcm_driver/'],
                 ['include', '^invalidation/'],
                 ['include', '^json_schema/'],
                 ['include', '^keyed_service/core/'],
diff --git a/components/gcm_driver.gypi b/components/gcm_driver.gypi
index 4d42b6a..a2e5455 100644
--- a/components/gcm_driver.gypi
+++ b/components/gcm_driver.gypi
@@ -8,9 +8,10 @@
       'target_name': 'gcm_driver',
       'type': 'static_library',
       'dependencies': [
+        'os_crypt',
         '../base/base.gyp:base',
         '../google_apis/gcm/gcm.gyp:gcm',
-        'os_crypt',
+        '../net/net.gyp:net',
       ],
       'include_dirs': [
         '..',
@@ -23,6 +24,8 @@
         'gcm_driver/gcm_app_handler.h',
         'gcm_driver/gcm_client_factory.cc',
         'gcm_driver/gcm_client_factory.h',
+        'gcm_driver/gcm_driver.cc',
+        'gcm_driver/gcm_driver.h',
         'gcm_driver/gcm_driver_android.cc',
         'gcm_driver/gcm_driver_android.h',
         'gcm_driver/system_encryptor.cc',
@@ -36,6 +39,26 @@
         }],
       ],
     },
+    {
+      'target_name': 'gcm_driver_test_support',
+      'type': 'static_library',
+      'dependencies': [
+        'gcm_driver',
+        '../base/base.gyp:base',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'gcm_driver/fake_gcm_app_handler.cc',
+        'gcm_driver/fake_gcm_app_handler.h',
+        'gcm_driver/fake_gcm_client.cc',
+        'gcm_driver/fake_gcm_client.h',
+        'gcm_driver/fake_gcm_client_factory.cc',
+        'gcm_driver/fake_gcm_client_factory.h',
+      ],
+    },    
   ],
   'conditions': [
     ['OS == "android"', {
diff --git a/components/gcm_driver/DEPS b/components/gcm_driver/DEPS
index b8c50da..1004e94 100644
--- a/components/gcm_driver/DEPS
+++ b/components/gcm_driver/DEPS
@@ -1,5 +1,7 @@
 include_rules = [
   "+components/os_crypt",
+  "+google_apis/gaia",
   "+google_apis/gcm",
   "+jni",
+  "+net",
 ]
diff --git a/chrome/browser/services/gcm/fake_gcm_app_handler.cc b/components/gcm_driver/fake_gcm_app_handler.cc
index 4e6c054..632572b 100644
--- a/chrome/browser/services/gcm/fake_gcm_app_handler.cc
+++ b/components/gcm_driver/fake_gcm_app_handler.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_app_handler.h"
+#include "components/gcm_driver/fake_gcm_app_handler.h"
 
 #include "base/run_loop.h"
 
diff --git a/chrome/browser/services/gcm/fake_gcm_app_handler.h b/components/gcm_driver/fake_gcm_app_handler.h
index d422214..fb98957 100644
--- a/chrome/browser/services/gcm/fake_gcm_app_handler.h
+++ b/components/gcm_driver/fake_gcm_app_handler.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_APP_HANDLER_H_
-#define CHROME_BROWSER_SERVICES_GCM_FAKE_GCM_APP_HANDLER_H_
+#ifndef COMPONENTS_GCM_DRIVER_FAKE_GCM_APP_HANDLER_H_
+#define COMPONENTS_GCM_DRIVER_FAKE_GCM_APP_HANDLER_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ -60,4 +60,4 @@ class FakeGCMAppHandler : public GCMAppHandler {
 
 }  // namespace gcm
 
-#endif  // CHROME_BROWSER_SERVICES_GCM_FAKE_GCM_APP_HANDLER_H_
+#endif  // COMPONENTS_GCM_DRIVER_FAKE_GCM_APP_HANDLER_H_
diff --git a/chrome/browser/services/gcm/fake_gcm_client.cc b/components/gcm_driver/fake_gcm_client.cc
index 679d366..9898124 100644
--- a/chrome/browser/services/gcm/fake_gcm_client.cc
+++ b/components/gcm_driver/fake_gcm_client.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_client.h"
+#include "components/gcm_driver/fake_gcm_client.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
diff --git a/chrome/browser/services/gcm/fake_gcm_client.h b/components/gcm_driver/fake_gcm_client.h
index a059046..a1d4f2b 100644
--- a/chrome/browser/services/gcm/fake_gcm_client.h
+++ b/components/gcm_driver/fake_gcm_client.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_CLIENT_H_
-#define CHROME_BROWSER_SERVICES_GCM_FAKE_GCM_CLIENT_H_
+#ifndef COMPONENTS_GCM_DRIVER_FAKE_GCM_CLIENT_H_
+#define COMPONENTS_GCM_DRIVER_FAKE_GCM_CLIENT_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
@@ -99,4 +99,4 @@ class FakeGCMClient : public GCMClient {
 
 }  // namespace gcm
 
-#endif  // CHROME_BROWSER_SERVICES_GCM_FAKE_GCM_CLIENT_H_
+#endif  // COMPONENTS_GCM_DRIVER_FAKE_GCM_CLIENT_H_
diff --git a/chrome/browser/services/gcm/fake_gcm_client_factory.cc b/components/gcm_driver/fake_gcm_client_factory.cc
index c565616..e071302 100644
--- a/chrome/browser/services/gcm/fake_gcm_client_factory.cc
+++ b/components/gcm_driver/fake_gcm_client_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/fake_gcm_client_factory.h"
+#include "components/gcm_driver/fake_gcm_client_factory.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/sequenced_task_runner.h"
diff --git a/chrome/browser/services/gcm/fake_gcm_client_factory.h b/components/gcm_driver/fake_gcm_client_factory.h
index f02bc7b..a4b2d84 100644
--- a/chrome/browser/services/gcm/fake_gcm_client_factory.h
+++ b/components/gcm_driver/fake_gcm_client_factory.h
@@ -2,12 +2,12 @@
 // 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_CLIENT_FACTORY_H_
-#define CHROME_BROWSER_SERVICES_GCM_FAKE_GCM_CLIENT_FACTORY_H_
+#ifndef COMPONENTS_GCM_DRIVER_FAKE_GCM_CLIENT_FACTORY_H_
+#define COMPONENTS_GCM_DRIVER_FAKE_GCM_CLIENT_FACTORY_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "chrome/browser/services/gcm/fake_gcm_client.h"
+#include "components/gcm_driver/fake_gcm_client.h"
 #include "components/gcm_driver/gcm_client_factory.h"
 
 namespace base {
@@ -39,4 +39,4 @@ class FakeGCMClientFactory : public GCMClientFactory {
 
 }  // namespace gcm
 
-#endif  // CHROME_BROWSER_SERVICES_GCM_FAKE_GCM_CLIENT_FACTORY_H_
+#endif  // COMPONENTS_GCM_DRIVER_FAKE_GCM_CLIENT_FACTORY_H_
diff --git a/chrome/browser/services/gcm/gcm_driver.cc b/components/gcm_driver/gcm_driver.cc
index 3578042..e41972e 100644
--- a/chrome/browser/services/gcm/gcm_driver.cc
+++ b/components/gcm_driver/gcm_driver.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_driver.h"
+#include "components/gcm_driver/gcm_driver.h"
 
 #include <algorithm>
 #include <utility>
@@ -14,7 +14,6 @@
 #include "base/logging.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/common/chrome_version_info.h"
 #include "components/gcm_driver/gcm_app_handler.h"
 #include "components/gcm_driver/gcm_client_factory.h"
 #include "components/gcm_driver/system_encryptor.h"
diff --git a/chrome/browser/services/gcm/gcm_driver.h b/components/gcm_driver/gcm_driver.h
index b7ae229..897dbfa 100644
--- a/chrome/browser/services/gcm/gcm_driver.h
+++ b/components/gcm_driver/gcm_driver.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_DRIVER_H_
-#define CHROME_BROWSER_SERVICES_GCM_GCM_DRIVER_H_
+#ifndef COMPONENTS_GCM_DRIVER_GCM_DRIVER_H_
+#define COMPONENTS_GCM_DRIVER_GCM_DRIVER_H_
 
 #include <map>
 #include <string>
@@ -230,4 +230,4 @@ class GCMDriver : public IdentityProvider::Observer {
 
 }  // namespace gcm
 
-#endif  // CHROME_BROWSER_SERVICES_GCM_GCM_DRIVER_H_
+#endif  // COMPONENTS_GCM_DRIVER_GCM_DRIVER_H_
diff --git a/chrome/browser/services/gcm/gcm_driver_unittest.cc b/components/gcm_driver/gcm_driver_unittest.cc
index 420e8dd..52f6abb 100644
--- a/chrome/browser/services/gcm/gcm_driver_unittest.cc
+++ b/components/gcm_driver/gcm_driver_unittest.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_driver.h"
+#include "components/gcm_driver/gcm_driver.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -14,12 +14,11 @@
 #include "base/strings/string_util.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread.h"
-#include "chrome/browser/services/gcm/fake_gcm_app_handler.h"
-#include "chrome/browser/services/gcm/fake_gcm_client.h"
-#include "chrome/browser/services/gcm/fake_gcm_client_factory.h"
-#include "chrome/browser/services/gcm/gcm_app_handler.h"
+#include "components/gcm_driver/fake_gcm_app_handler.h"
+#include "components/gcm_driver/fake_gcm_client.h"
+#include "components/gcm_driver/fake_gcm_client_factory.h"
+#include "components/gcm_driver/gcm_app_handler.h"
 #include "components/gcm_driver/gcm_client_factory.h"
-#include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/fake_identity_provider.h"
 #include "google_apis/gaia/fake_oauth2_token_service.h"
 #include "net/url_request/url_request_context_getter.h"