Remove "GData" prefix from non-GData specific classes

chrome/browser/chromeos/gdata/gdata_contacts_service.cc

 // Copyright (c) 2012 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/chromeos/gdata/gdata_contacts_service.h"
 
 #include <cstring>
 #include <string>
 #include <map>
 #include <utility>
 
 #include "base/json/json_value_converter.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/contacts/contact.pb.h"
-#include "chrome/browser/chromeos/gdata/gdata_operation_registry.h"
-#include "chrome/browser/chromeos/gdata/gdata_operation_runner.h"
 #include "chrome/browser/chromeos/gdata/gdata_operations.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
+#include "chrome/browser/chromeos/gdata/operation_registry.h"
+#include "chrome/browser/chromeos/gdata/operation_runner.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace gdata {
 
 namespace {
 
 // Maximum number of profile photos that we'll download per second.
 // At values above 10, Google starts returning 503 errors.
@@ skipping 375 matching lines @@
 // Next, the contacts feed is downloaded via GetContactsOperation and parsed.
 // Individual contacts::Contact objects are created using the data from the
 // feed.
 //
 // Finally, GetContactPhotoOperations are created and used to start downloading
 // contacts' photos in parallel.  When all photos have been downloaded, the
 // contacts are passed to the passed-in callback.
 class GDataContactsService::DownloadContactsRequest {
  public:
   DownloadContactsRequest(GDataContactsService* service,
-                          GDataOperationRunner* runner,
+                          OperationRunner* runner,
                           SuccessCallback success_callback,
                           FailureCallback failure_callback,
                           const base::Time& min_update_time)
       : service_(service),
         runner_(runner),
         success_callback_(success_callback),
         failure_callback_(failure_callback),
         min_update_time_(min_update_time),
         contacts_(new ScopedVector<contacts::Contact>),
         my_contacts_group_id_(service->cached_my_contacts_group_id_),
@@ skipping 283 matching lines @@
       return;
     }
 
     contact->set_raw_untrusted_photo(*download_data);
     CheckCompletion();
   }
 
   typedef std::map<contacts::Contact*, std::string> ContactPhotoUrls;
 
   GDataContactsService* service_;  // not owned
-  GDataOperationRunner* runner_;  // not owned
+  OperationRunner* runner_;  // not owned
 
   SuccessCallback success_callback_;
   FailureCallback failure_callback_;
 
   base::Time min_update_time_;
 
   scoped_ptr<ScopedVector<contacts::Contact> > contacts_;
 
   // ID of the "My Contacts" contacts group.
   std::string my_contacts_group_id_;
@@ skipping 22 matching lines @@
   bool photo_download_failed_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<DownloadContactsRequest> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadContactsRequest);
 };
 
 GDataContactsService::GDataContactsService(Profile* profile)
-    : runner_(new GDataOperationRunner(profile)),
+    : runner_(new OperationRunner(profile)),
       max_photo_downloads_per_second_(kMaxPhotoDownloadsPerSecond),
       photo_download_timer_interval_(base::TimeDelta::FromSeconds(1)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 GDataContactsService::~GDataContactsService() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   runner_->CancelAll();
   STLDeleteContainerPointers(requests_.begin(), requests_.end());
   requests_.clear();
 }
 
-GDataAuthService* GDataContactsService::auth_service_for_testing() {
+AuthService* GDataContactsService::auth_service_for_testing() {
   return runner_->auth_service();
 }
 
 void GDataContactsService::Initialize() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   runner_->Initialize();
 }
 
 void GDataContactsService::DownloadContacts(SuccessCallback success_callback,
                                             FailureCallback failure_callback,
@@ skipping 14 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(request);
   VLOG(1) << "Download request " << request << " complete";
   if (!request->my_contacts_group_id().empty())
     cached_my_contacts_group_id_ = request->my_contacts_group_id();
   requests_.erase(request);
   delete request;
 }
 
 }  // namespace contacts