Remove unnecessary gdata::, fix typos.

BUG=none
TEST=compile succeeds.

Review URL: https://chromiumcodereview.appspot.com/10831363

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152069 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/gdata/drive_task_executor.cc

@@ -61,12 +61,12 @@ bool DriveTaskExecutor::ExecuteAndNotify(
     raw_paths.push_back(raw_path);
   }
 
-  gdata::GDataSystemService* system_service =
-      gdata::GDataSystemServiceFactory::GetForProfile(profile());
+  GDataSystemService* system_service =
+      GDataSystemServiceFactory::GetForProfile(profile());
   DCHECK(current_index_ == 0);
   if (!system_service || !system_service->file_system())
     return false;
-  gdata::GDataFileSystemInterface* file_system = system_service->file_system();
+  GDataFileSystemInterface* file_system = system_service->file_system();
 
   // Reset the index, so we know when we're done.
   current_index_ = raw_paths.size();
@@ -82,24 +82,24 @@ bool DriveTaskExecutor::ExecuteAndNotify(
 
 void DriveTaskExecutor::OnFileEntryFetched(
     GDataFileError error,
-    scoped_ptr<gdata::GDataEntryProto> entry_proto) {
+    scoped_ptr<GDataEntryProto> entry_proto) {
   // If we aborted, then this will be zero.
   if (!current_index_)
     return;
 
-  gdata::GDataSystemService* system_service =
-      gdata::GDataSystemServiceFactory::GetForProfile(profile());
+  GDataSystemService* system_service =
+      GDataSystemServiceFactory::GetForProfile(profile());
 
   // Here, we are only insterested in files.
   if (entry_proto.get() && !entry_proto->has_file_specific_info())
-    error = gdata::GDATA_FILE_ERROR_NOT_FOUND;
+    error = GDATA_FILE_ERROR_NOT_FOUND;
 
   if (!system_service || error != GDATA_FILE_OK) {
     Done(false);
     return;
   }
 
-  gdata::DocumentsServiceInterface* docs_service =
+  DocumentsServiceInterface* docs_service =
       system_service->docs_service();
 
   // Send off a request for the document service to authorize the apps for the
@@ -115,7 +115,7 @@ void DriveTaskExecutor::OnFileEntryFetched(
 
 void DriveTaskExecutor::OnAppAuthorized(
     const std::string& resource_id,
-    gdata::GDataErrorCode error,
+    GDataErrorCode error,
     scoped_ptr<base::Value> feed_data) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
@@ -123,10 +123,10 @@ void DriveTaskExecutor::OnAppAuthorized(
   if (!current_index_)
     return;
 
-  gdata::GDataSystemService* system_service =
-      gdata::GDataSystemServiceFactory::GetForProfile(profile());
+  GDataSystemService* system_service =
+      GDataSystemServiceFactory::GetForProfile(profile());
 
-  if (!system_service || error != gdata::HTTP_SUCCESS) {
+  if (!system_service || error != HTTP_SUCCESS) {
     Done(false);
     return;
   }

chrome/browser/chromeos/gdata/gdata_download_observer.cc

@@ -89,9 +89,9 @@ void RunSubstituteGDataDownloadCallback(
   callback.Run(*file_path);
 }
 
-gdata::GDataSystemService* GetSystemService(Profile* profile) {
-  gdata::GDataSystemService* system_service =
-      gdata::GDataSystemServiceFactory::GetForProfile(
+GDataSystemService* GetSystemService(Profile* profile) {
+  GDataSystemService* system_service =
+      GDataSystemServiceFactory::GetForProfile(
         profile ? profile : ProfileManager::GetDefaultProfile());
   DCHECK(system_service);
   return system_service;
@@ -104,13 +104,14 @@ void SubstituteGDataDownloadPathInternal(Profile* profile,
   DVLOG(1) << "SubstituteGDataDownloadPathInternal";
 
   const FilePath gdata_tmp_download_dir = GetSystemService(profile)->cache()->
-      GetCacheDirectoryPath(gdata::GDataCache::CACHE_TYPE_TMP_DOWNLOADS);
+      GetCacheDirectoryPath(GDataCache::CACHE_TYPE_TMP_DOWNLOADS);
 
   // Swap the gdata path with a local path. Local path must be created
   // on a blocking thread.
   FilePath* gdata_tmp_download_path(new FilePath());
-  BrowserThread::GetBlockingPool()->PostTaskAndReply(FROM_HERE,
-      base::Bind(&gdata::GDataDownloadObserver::GetGDataTempDownloadPath,
+  BrowserThread::GetBlockingPool()->PostTaskAndReply(
+      FROM_HERE,
+      base::Bind(&GDataDownloadObserver::GetGDataTempDownloadPath,
                  gdata_tmp_download_dir,
                  gdata_tmp_download_path),
       base::Bind(&RunSubstituteGDataDownloadCallback,
@@ -135,7 +136,7 @@ void OnEntryFound(Profile* profile,
     const FilePath& gdata_dir_path,
     const base::Closure& substitute_callback,
     GDataFileError error,
-    scoped_ptr<gdata::GDataEntryProto> entry_proto) {
+    scoped_ptr<GDataEntryProto> entry_proto) {
   if (error == GDATA_FILE_ERROR_NOT_FOUND) {
     // Destination gdata directory doesn't exist, so create it.
     const bool is_exclusive = false, is_recursive = true;
@@ -212,7 +213,7 @@ void GDataDownloadObserver::SubstituteGDataDownloadPath(Profile* profile,
 
   SetDownloadParams(gdata_path, download);
 
-  if (gdata::util::IsUnderGDataMountPoint(gdata_path)) {
+  if (util::IsUnderGDataMountPoint(gdata_path)) {
     // Can't access drive if we're not authenticated.
     // We set off a chain of callbacks as follows:
     // DocumentsService::Authenticate
@@ -234,7 +235,7 @@ void GDataDownloadObserver::SetDownloadParams(const FilePath& gdata_path,
   if (!download)
     return;
 
-  if (gdata::util::IsUnderGDataMountPoint(gdata_path)) {
+  if (util::IsUnderGDataMountPoint(gdata_path)) {
     download->SetUserData(&kGDataPathKey,
                           new GDataUserData(gdata_path));
     download->SetDisplayName(gdata_path.BaseName());

chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.cc

@@ -623,7 +623,7 @@ void GDataWapiFeedLoader::OnGetDocuments(
     ui_state->num_fetched_documents = num_accumulated_entries;
     ui_state->feed_fetching_elapsed_time = base::TimeTicks::Now() - start_time;
 
-    // Kick of the remaining part of the feeds.
+    // Kick off the remaining part of the feeds.
     documents_service_->GetDocuments(
         next_feed_url,
         params->start_changestamp,
@@ -740,7 +740,7 @@ void GDataWapiFeedLoader::OnGetChangelist(
     ui_state->num_fetched_documents = num_accumulated_entries;
     ui_state->feed_fetching_elapsed_time = base::TimeTicks::Now() - start_time;
 
-    // Kick of the remaining part of the feeds.
+    // Kick off the remaining part of the feeds.
     documents_service_->GetChangelist(
         current_feed->next_link(),
         params->start_changestamp,
@@ -894,7 +894,7 @@ void GDataWapiFeedLoader::ContinueWithInitializedDirectoryService(
     directory_service_->set_origin(REFRESHING);
   }
 
-  // Kick of the retrieval of the feed from server. If we have previously
+  // Kick off the retrieval of the feed from server. If we have previously
   // |reported| to the original callback, then we just need to refresh the
   // content without continuing search upon operation completion.
   ReloadFromServerIfNeeded(initial_origin,