Rename GData* to Drive* in gdata.proto

chrome/browser/chromeos/gdata/gdata_sync_client.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_sync_client.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop_proxy.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/gdata/gdata.pb.h"
+#include "chrome/browser/chromeos/gdata/drive.pb.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace gdata {
 
@@ skipping 286 matching lines @@
         base::Bind(&GDataSyncClient::OnGetEntryInfoByResourceId,
                    weak_ptr_factory_.GetWeakPtr(),
                    resource_id));
   }
 }
 
 void GDataSyncClient::OnGetEntryInfoByResourceId(
     const std::string& resource_id,
     GDataFileError error,
     const FilePath& /* gdata_file_path */,
-    scoped_ptr<GDataEntryProto> entry_proto) {
+    scoped_ptr<DriveEntryProto> entry_proto) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (entry_proto.get() && !entry_proto->has_file_specific_info())
     error = GDATA_FILE_ERROR_NOT_FOUND;
 
   if (error != GDATA_FILE_OK) {
     LOG(WARNING) << "Entry not found: " << resource_id;
     return;
   }
 
   cache_->GetCacheEntryOnUIThread(
       resource_id,
       "" /* don't check MD5 */,
       base::Bind(&GDataSyncClient::OnGetCacheEntry,
                  weak_ptr_factory_.GetWeakPtr(),
                  resource_id,
                  entry_proto->file_specific_info().file_md5()));
 }
 
 void GDataSyncClient::OnGetCacheEntry(
     const std::string& resource_id,
     const std::string& latest_md5,
     bool success,
-    const GDataCacheEntry& cache_entry) {
+    const DriveCacheEntry& cache_entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!success) {
     LOG(WARNING) << "Cache entry not found: " << resource_id;
     return;
   }
 
   // If MD5s don't match, it indicates the local cache file is stale, unless
   // the file is dirty (the MD5 is "local"). We should never re-fetch the
   // file when we have a locally modified version.
@@ skipping 96 matching lines @@
                               const content::NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Resume the sync loop if gdata preferences are changed. Note that we
   // don't need to check the new values here as these will be checked in
   // ShouldStopSyncLoop() as soon as the loop is resumed.
   StartSyncLoop();
 }
 
 }  // namespace gdata