Extract GCMClient data types into separate gcm_types.h

chrome/browser/extensions/extension_gcm_app_handler_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_gcm_app_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 109 matching lines @@
   scoped_ptr<base::RunLoop> run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(Waiter);
 };
 
 class FakeExtensionGCMAppHandler : public ExtensionGCMAppHandler {
  public:
   FakeExtensionGCMAppHandler(Profile* profile, Waiter* waiter)
       : ExtensionGCMAppHandler(profile),
         waiter_(waiter),
-        unregistration_result_(gcm::GCMClient::UNKNOWN_ERROR) {
+        unregistration_result_(gcm::RESULT_UNKNOWN_ERROR) {
   }
 
   virtual ~FakeExtensionGCMAppHandler() {
   }
 
   virtual void OnMessage(
       const std::string& app_id,
-      const gcm::GCMClient::IncomingMessage& message) OVERRIDE {
+      const gcm::IncomingMessage& message) OVERRIDE {
   }
 
   virtual void OnMessagesDeleted(const std::string& app_id) OVERRIDE {
   }
 
   virtual void OnSendError(
       const std::string& app_id,
-      const gcm::GCMClient::SendErrorDetails& send_error_details) OVERRIDE {
+      const gcm::SendErrorDetails& send_error_details) OVERRIDE {
   }
 
   virtual void OnUnregisterCompleted(const std::string& app_id,
-                                     gcm::GCMClient::Result result) OVERRIDE {
+                                     gcm::Result result) OVERRIDE {
     unregistration_result_ = result;
     waiter_->SignalCompleted();
   }
 
-  gcm::GCMClient::Result unregistration_result() const {
+  gcm::Result unregistration_result() const {
     return unregistration_result_;
   }
 
  private:
   Waiter* waiter_;
-  gcm::GCMClient::Result unregistration_result_;
+  gcm::Result unregistration_result_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeExtensionGCMAppHandler);
 };
 
 class ExtensionGCMAppHandlerTest : public testing::Test {
  public:
   static KeyedService* BuildGCMProfileService(
       content::BrowserContext* context) {
     return new gcm::GCMProfileService(static_cast<Profile*>(context));
   }
 
   ExtensionGCMAppHandlerTest()
       : extension_service_(NULL),
-        registration_result_(gcm::GCMClient::UNKNOWN_ERROR),
-        unregistration_result_(gcm::GCMClient::UNKNOWN_ERROR) {
+        registration_result_(gcm::RESULT_UNKNOWN_ERROR),
+        unregistration_result_(gcm::RESULT_UNKNOWN_ERROR) {
   }
 
   virtual ~ExtensionGCMAppHandlerTest() {
   }
 
   // Overridden from test::Test:
   virtual void SetUp() OVERRIDE {
     // Make BrowserThread work in unittest.
     thread_bundle_.reset(new content::TestBrowserThreadBundle(
         content::TestBrowserThreadBundle::REAL_IO_THREAD));
@@ skipping 102 matching lines @@
   void Register(const std::string& app_id,
                 const std::vector<std::string>& sender_ids) {
     GetGCMProfileService()->Register(
         app_id,
         sender_ids,
         base::Bind(&ExtensionGCMAppHandlerTest::RegisterCompleted,
                    base::Unretained(this)));
   }
 
   void RegisterCompleted(const std::string& registration_id,
-                         gcm::GCMClient::Result result) {
+                         gcm::Result result) {
     registration_result_ = result;
     waiter_.SignalCompleted();
   }
 
   gcm::GCMProfileService* GetGCMProfileService() const {
     return gcm::GCMProfileServiceFactory::GetForProfile(profile());
   }
 
   bool HasAppHandlers(const std::string& app_id) const {
     return GetGCMProfileService()->app_handlers_.count(app_id);
   }
 
   Profile* profile() const { return profile_.get(); }
   Waiter* waiter() { return &waiter_; }
   FakeExtensionGCMAppHandler* gcm_app_handler() const {
     return gcm_app_handler_.get();
   }
-  gcm::GCMClient::Result registration_result() const {
+  gcm::Result registration_result() const {
     return registration_result_;
   }
-  gcm::GCMClient::Result unregistration_result() const {
+  gcm::Result unregistration_result() const {
     return unregistration_result_;
   }
 
  private:
   scoped_ptr<content::TestBrowserThreadBundle> thread_bundle_;
   scoped_ptr<TestingProfile> profile_;
   ExtensionService* extension_service_;  // Not owned.
   gcm::FakeSigninManager* signin_manager_;  // Not owned.
 
   // This is needed to create extension service under CrOS.
 #if defined(OS_CHROMEOS)
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
   scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
 #endif
 
   Waiter waiter_;
   scoped_ptr<FakeExtensionGCMAppHandler> gcm_app_handler_;
-  gcm::GCMClient::Result registration_result_;
-  gcm::GCMClient::Result unregistration_result_;
+  gcm::Result registration_result_;
+  gcm::Result unregistration_result_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionGCMAppHandlerTest);
 };
 
 TEST_F(ExtensionGCMAppHandlerTest, AddAndRemoveAppHandler) {
   scoped_refptr<Extension> extension(CreateExtension());
 
   // App handler is added when extension is loaded.
   LoadExtension(extension);
   waiter()->PumpUILoop();
@@ skipping 20 matching lines @@
   LoadExtension(extension);
 
   // Sign-in is needed for registration.
   SignIn(kTestingUsername);
 
   // Kick off registration.
   std::vector<std::string> sender_ids;
   sender_ids.push_back("sender1");
   Register(extension->id(), sender_ids);
   waiter()->WaitUntilCompleted();
-  EXPECT_EQ(gcm::GCMClient::SUCCESS, registration_result());
+  EXPECT_EQ(gcm::RESULT_SUCCESS, registration_result());
 
   // Unregistration should be triggered when the extension is uninstalled.
   UninstallExtension(extension);
   waiter()->WaitUntilCompleted();
-  EXPECT_EQ(gcm::GCMClient::SUCCESS,
+  EXPECT_EQ(gcm::RESULT_SUCCESS,
             gcm_app_handler()->unregistration_result());
 }
 
 }  // namespace extensions