Extract Profile-independent GCMService from GCMProfileService

chrome/browser/services/gcm/gcm_client_mock.cc

 // 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.
 
 #include "chrome/browser/services/gcm/gcm_client_mock.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/sys_byteorder.h"
@@ skipping 125 matching lines @@
       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(&GCMClientMock::MessagesDeleted,
                  weak_ptr_factory_.GetWeakPtr(),
                  app_id));
 }
 
 // static
 std::string GCMClientMock::GetRegistrationIdFromSenderIds(
     const std::vector<std::string>& sender_ids) {
-  // GCMProfileService normalizes the sender IDs by making them sorted.
+  // GCMService normalizes the sender IDs by making them sorted.
   std::vector<std::string> normalized_sender_ids = sender_ids;
   std::sort(normalized_sender_ids.begin(), normalized_sender_ids.end());
 
   // Simulate the registration_id by concaternating all sender IDs.
   // Set registration_id to empty to denote an error if sender_ids contains a
   // hint.
   std::string registration_id;
   if (sender_ids.size() != 1 ||
       sender_ids[0].find("error") == std::string::npos) {
     for (size_t i = 0; i < normalized_sender_ids.size(); ++i) {
@@ skipping 51 matching lines @@
 }
 
 void GCMClientMock::MessageSendError(
     const std::string& app_id,
     const GCMClient::SendErrorDetails& send_error_details) {
   if (delegate_)
     delegate_->OnMessageSendError(app_id, send_error_details);
 }
 
 }  // namespace gcm