Rename GCMClientMock to FakeGCMClient

chrome/browser/services/gcm/fake_gcm_client.h

Index: chrome/browser/services/gcm/fake_gcm_client.h
diff --git a/chrome/browser/services/gcm/gcm_client_mock.h b/chrome/browser/services/gcm/fake_gcm_client.h
similarity index 83%
rename from chrome/browser/services/gcm/gcm_client_mock.h
rename to chrome/browser/services/gcm/fake_gcm_client.h
index a878a88bb06bd67f833488b67357af354afa71ed..c91d257fe86b5d68d5470a5a43b301424bdf7eda 100644
--- a/chrome/browser/services/gcm/gcm_client_mock.h
+++ b/chrome/browser/services/gcm/fake_gcm_client.h
@@ -1,94 +1,94 @@
-// Copyright 2013 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.
-
-#ifndef CHROME_BROWSER_SERVICES_GCM_GCM_CLIENT_MOCK_H_
-#define CHROME_BROWSER_SERVICES_GCM_GCM_CLIENT_MOCK_H_
-
-#include "base/compiler_specific.h"
-#include "base/memory/weak_ptr.h"
-#include "google_apis/gcm/gcm_client.h"
-
-namespace gcm {
-
-class GCMClientMock : public GCMClient {
- public:
-  enum Status {
-    UNINITIALIZED,
-    STARTED,
-    STOPPED,
-    CHECKED_OUT
-  };
-
-  enum StartMode {
-    NO_DELAY_START,
-    DELAY_START,
-  };
-
-  explicit GCMClientMock(StartMode start_mode);
-  virtual ~GCMClientMock();
-
-  // Overridden from GCMClient:
-  // Called on IO thread.
-  virtual void Initialize(
-      const checkin_proto::ChromeBuildProto& chrome_build_proto,
-      const base::FilePath& store_path,
-      const std::vector<std::string>& account_ids,
-      const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner,
-      const scoped_refptr<net::URLRequestContextGetter>&
-          url_request_context_getter,
-      scoped_ptr<Encryptor> encryptor,
-      Delegate* delegate) OVERRIDE;
-  virtual void Start() OVERRIDE;
-  virtual void Stop() OVERRIDE;
-  virtual void CheckOut() OVERRIDE;
-  virtual void Register(const std::string& app_id,
-                        const std::vector<std::string>& sender_ids) OVERRIDE;
-  virtual void Unregister(const std::string& app_id) OVERRIDE;
-  virtual void Send(const std::string& app_id,
-                    const std::string& receiver_id,
-                    const OutgoingMessage& message) OVERRIDE;
-  virtual void SetRecording(bool recording) OVERRIDE;
-  virtual void ClearActivityLogs() OVERRIDE;
-  virtual GCMStatistics GetStatistics() const OVERRIDE;
-
-  // Initiate the loading that has been delayed.
-  // Called on UI thread.
-  void PerformDelayedLoading();
-
-  // Simulate receiving something from the server.
-  // Called on UI thread.
-  void ReceiveMessage(const std::string& app_id,
-                      const IncomingMessage& message);
-  void DeleteMessages(const std::string& app_id);
-
-  static std::string GetRegistrationIdFromSenderIds(
-      const std::vector<std::string>& sender_ids);
-
-  Status status() const { return status_; }
-
- private:
-  // Called on IO thread.
-  void DoLoading();
-  void CheckinFinished();
-  void RegisterFinished(const std::string& app_id,
-                        const std::string& registrion_id);
-  void UnregisterFinished(const std::string& app_id);
-  void SendFinished(const std::string& app_id, const OutgoingMessage& message);
-  void MessageReceived(const std::string& app_id,
-                       const IncomingMessage& message);
-  void MessagesDeleted(const std::string& app_id);
-  void MessageSendError(const std::string& app_id,
-                        const SendErrorDetails& send_error_details);
-
-  Delegate* delegate_;
-  Status status_;
-  StartMode start_mode_;
-  base::WeakPtrFactory<GCMClientMock> weak_ptr_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(GCMClientMock);
-};
-
-}  // namespace gcm
-
-#endif  // CHROME_BROWSER_SERVICES_GCM_GCM_CLIENT_MOCK_H_
+// Copyright (c) 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.
+
+#ifndef CHROME_BROWSER_SERVICES_GCM_FAKE_GCM_CLIENT_H_
+#define CHROME_BROWSER_SERVICES_GCM_FAKE_GCM_CLIENT_H_
+
+#include "base/compiler_specific.h"
+#include "base/memory/weak_ptr.h"
+#include "google_apis/gcm/gcm_client.h"
+
+namespace gcm {
+
+class FakeGCMClient : public GCMClient {
+ public:
+  enum Status {
+    UNINITIALIZED,
+    STARTED,
+    STOPPED,
+    CHECKED_OUT
+  };
+
+  enum StartMode {
+    NO_DELAY_START,
+    DELAY_START,
+  };
+
+  explicit FakeGCMClient(StartMode start_mode);
+  virtual ~FakeGCMClient();
+
+  // Overridden from GCMClient:
+  // Called on IO thread.
+  virtual void Initialize(
+      const checkin_proto::ChromeBuildProto& chrome_build_proto,
+      const base::FilePath& store_path,
+      const std::vector<std::string>& account_ids,
+      const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner,
+      const scoped_refptr<net::URLRequestContextGetter>&
+          url_request_context_getter,
+      scoped_ptr<Encryptor> encryptor,
+      Delegate* delegate) OVERRIDE;
+  virtual void Start() OVERRIDE;
+  virtual void Stop() OVERRIDE;
+  virtual void CheckOut() OVERRIDE;
+  virtual void Register(const std::string& app_id,
+                        const std::vector<std::string>& sender_ids) OVERRIDE;
+  virtual void Unregister(const std::string& app_id) OVERRIDE;
+  virtual void Send(const std::string& app_id,
+                    const std::string& receiver_id,
+                    const OutgoingMessage& message) OVERRIDE;
+  virtual void SetRecording(bool recording) OVERRIDE;
+  virtual void ClearActivityLogs() OVERRIDE;
+  virtual GCMStatistics GetStatistics() const OVERRIDE;
+
+  // Initiate the loading that has been delayed.
+  // Called on UI thread.
+  void PerformDelayedLoading();
+
+  // Simulate receiving something from the server.
+  // Called on UI thread.
+  void ReceiveMessage(const std::string& app_id,
+                      const IncomingMessage& message);
+  void DeleteMessages(const std::string& app_id);
+
+  static std::string GetRegistrationIdFromSenderIds(
+      const std::vector<std::string>& sender_ids);
+
+  Status status() const { return status_; }
+
+ private:
+  // Called on IO thread.
+  void DoLoading();
+  void CheckinFinished();
+  void RegisterFinished(const std::string& app_id,
+                        const std::string& registrion_id);
+  void UnregisterFinished(const std::string& app_id);
+  void SendFinished(const std::string& app_id, const OutgoingMessage& message);
+  void MessageReceived(const std::string& app_id,
+                       const IncomingMessage& message);
+  void MessagesDeleted(const std::string& app_id);
+  void MessageSendError(const std::string& app_id,
+                        const SendErrorDetails& send_error_details);
+
+  Delegate* delegate_;
+  Status status_;
+  StartMode start_mode_;
+  base::WeakPtrFactory<FakeGCMClient> weak_ptr_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(FakeGCMClient);
+};
+
+}  // namespace gcm
+
+#endif  // CHROME_BROWSER_SERVICES_GCM_FAKE_GCM_CLIENT_H_