Remove google_apis:: prefix from chrome/browser/google_apis

This CL just removes "google_apis::" prefixes from the code.

BUG=163074
TEST=compile chrome, unit_tests, and browser_tests as linux-chromeos

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

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

8 files changed, 29 insertions, 29 deletions

diff --git a/chrome/browser/google_apis/auth_service.cc b/chrome/browser/google_apis/auth_service.cc
index 2caecfd..45bc160 100644
--- a/chrome/browser/google_apis/auth_service.cc
+++ b/chrome/browser/google_apis/auth_service.cc
@@ -177,7 +177,7 @@ void AuthService::StartAuthentication(OperationRegistry* registry,
 
   if (HasAccessToken()) {
     relay_proxy->PostTask(FROM_HERE,
-         base::Bind(callback, google_apis::HTTP_SUCCESS, access_token_));
+         base::Bind(callback, HTTP_SUCCESS, access_token_));
   } else if (HasRefreshToken()) {
     BrowserThread::PostTask(
         BrowserThread::UI,
@@ -191,7 +191,7 @@ void AuthService::StartAuthentication(OperationRegistry* registry,
                                   callback))));
   } else {
     relay_proxy->PostTask(FROM_HERE,
-        base::Bind(callback, google_apis::GDATA_NOT_READY, std::string()));
+        base::Bind(callback, GDATA_NOT_READY, std::string()));
   }
 }
 
diff --git a/chrome/browser/google_apis/base_operations.cc b/chrome/browser/google_apis/base_operations.cc
index afc4565..f7b91a7 100644
--- a/chrome/browser/google_apis/base_operations.cc
+++ b/chrome/browser/google_apis/base_operations.cc
@@ -320,13 +320,13 @@ void GetDataOperation::ParseResponse(GDataErrorCode fetch_error_code,
 }
 
 void GetDataOperation::OnDataParsed(
-    google_apis::GDataErrorCode fetch_error_code,
+    GDataErrorCode fetch_error_code,
     scoped_ptr<base::Value> value) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   bool success = true;
   if (!value.get()) {
-    fetch_error_code = google_apis::GDATA_PARSE_ERROR;
+    fetch_error_code = GDATA_PARSE_ERROR;
     success = false;
   }
 
diff --git a/chrome/browser/google_apis/base_operations.h b/chrome/browser/google_apis/base_operations.h
index 6a12c4e..17e44ff 100644
--- a/chrome/browser/google_apis/base_operations.h
+++ b/chrome/browser/google_apis/base_operations.h
@@ -230,7 +230,7 @@ class GetDataOperation : public UrlFetchOperationBase {
 
  private:
   // Called when ParseJsonOnBlockingPool() is completed.
-  void OnDataParsed(google_apis::GDataErrorCode fetch_error_code,
+  void OnDataParsed(GDataErrorCode fetch_error_code,
                     scoped_ptr<base::Value> value);
 
   const GetDataCallback callback_;
diff --git a/chrome/browser/google_apis/drive_api_parser_unittest.cc b/chrome/browser/google_apis/drive_api_parser_unittest.cc
index 4facd44..eb1ea5b 100644
--- a/chrome/browser/google_apis/drive_api_parser_unittest.cc
+++ b/chrome/browser/google_apis/drive_api_parser_unittest.cc
@@ -162,12 +162,12 @@ TEST(DriveAPIParserTest, FileListParser) {
   EXPECT_TRUE(file1.labels().is_viewed());
 
   base::Time created_time;
-  ASSERT_TRUE(google_apis::util::GetTimeFromString("2012-07-24T08:51:16.570Z",
+  ASSERT_TRUE(util::GetTimeFromString("2012-07-24T08:51:16.570Z",
                                                    &created_time));
   EXPECT_EQ(created_time, file1.created_date());
 
   base::Time modified_time;
-  ASSERT_TRUE(google_apis::util::GetTimeFromString("2012-07-27T05:43:20.269Z",
+  ASSERT_TRUE(util::GetTimeFromString("2012-07-27T05:43:20.269Z",
                                                    &modified_time));
   EXPECT_EQ(modified_time, file1.modified_by_me_date());
 
diff --git a/chrome/browser/google_apis/drive_uploader.h b/chrome/browser/google_apis/drive_uploader.h
index efcac75..4b7d6ea 100644
--- a/chrome/browser/google_apis/drive_uploader.h
+++ b/chrome/browser/google_apis/drive_uploader.h
@@ -31,10 +31,10 @@ struct ResumeUploadResponse;
 
 // Callback to be invoked once the upload has completed.
 typedef base::Callback<void(
-    google_apis::DriveUploadError error,
+    DriveUploadError error,
     const FilePath& drive_path,
     const FilePath& file_path,
-    scoped_ptr<google_apis::DocumentEntry> document_entry)>
+    scoped_ptr<DocumentEntry> document_entry)>
     UploadCompletionCallback;
 
 // Callback to be invoked once the uploader is ready to upload.
@@ -126,7 +126,7 @@ class DriveUploaderInterface {
 
 class DriveUploader : public DriveUploaderInterface {
  public:
-  explicit DriveUploader(google_apis::DriveServiceInterface* drive_service);
+  explicit DriveUploader(DriveServiceInterface* drive_service);
   virtual ~DriveUploader();
 
   // DriveUploaderInterface overrides.
@@ -183,7 +183,7 @@ class DriveUploader : public DriveUploaderInterface {
     std::string content_type;  // Content-Type of file.
     int64 content_length;  // Header content-Length.
 
-    google_apis::UploadMode upload_mode;
+    UploadMode upload_mode;
 
     // Location URL used to get |upload_location| with InitiateUpload.
     GURL initial_upload_location;
@@ -227,7 +227,7 @@ class DriveUploader : public DriveUploaderInterface {
     int num_file_open_tries;  // Number of times we've tried to open this file.
 
     // Will be set once the upload is complete.
-    scoped_ptr<google_apis::DocumentEntry> entry;
+    scoped_ptr<DocumentEntry> entry;
 
     // Callback to be invoked once the uploader is ready to upload.
     UploaderReadyCallback ready_callback;
@@ -257,7 +257,7 @@ class DriveUploader : public DriveUploaderInterface {
 
   // DriveService callback for InitiateUpload.
   void OnUploadLocationReceived(int upload_id,
-                                google_apis::GDataErrorCode code,
+                                GDataErrorCode code,
                                 const GURL& upload_location);
 
   // Uploads the next chunk of data from the file.
@@ -274,15 +274,15 @@ class DriveUploader : public DriveUploaderInterface {
   // DriveService callback for ResumeUpload.
   void OnResumeUploadResponseReceived(
       int upload_id,
-      const google_apis::ResumeUploadResponse& response,
-      scoped_ptr<google_apis::DocumentEntry> entry);
+      const ResumeUploadResponse& response,
+      scoped_ptr<DocumentEntry> entry);
 
   // Initiate the upload.
   void InitiateUpload(UploadFileInfo* uploader_file_info);
 
   // Handle failed uploads.
   void UploadFailed(UploadFileInfo* upload_file_info,
-                    google_apis::DriveUploadError error);
+                    DriveUploadError error);
 
   // Removes |upload_file_info| from UploadFileInfoMap |pending_uploads_|.
   // After its removal from the map, |upload_file_info| is deleted.
@@ -296,7 +296,7 @@ class DriveUploader : public DriveUploaderInterface {
   // Pointers to DriveServiceInterface object owned by DriveSystemService.
   // The lifetime of this object is guaranteed to exceed that of the
   // DriveUploader instance.
-  google_apis::DriveServiceInterface* drive_service_;
+  DriveServiceInterface* drive_service_;
 
   int next_upload_id_;  // id counter.
 
diff --git a/chrome/browser/google_apis/gdata_wapi_operations.h b/chrome/browser/google_apis/gdata_wapi_operations.h
index 3062bd4..4a21484 100644
--- a/chrome/browser/google_apis/gdata_wapi_operations.h
+++ b/chrome/browser/google_apis/gdata_wapi_operations.h
@@ -526,7 +526,7 @@ struct ResumeUploadParams {
 // Callback type for DocumentServiceInterface::ResumeUpload.
 typedef base::Callback<void(
     const ResumeUploadResponse& response,
-    scoped_ptr<google_apis::DocumentEntry> new_entry)> ResumeUploadCallback;
+    scoped_ptr<DocumentEntry> new_entry)> ResumeUploadCallback;
 
 // This class performs the operation for resuming the upload of a file.
 // More specifically, this operation uploads a chunk of data carried in |buf|
diff --git a/chrome/browser/google_apis/gdata_wapi_parser.cc b/chrome/browser/google_apis/gdata_wapi_parser.cc
index c6f649f..527df9b 100644
--- a/chrome/browser/google_apis/gdata_wapi_parser.cc
+++ b/chrome/browser/google_apis/gdata_wapi_parser.cc
@@ -584,7 +584,7 @@ void FeedEntry::RegisterJSONConverter(
   converter->RegisterCustomField<base::Time>(
       kUpdatedField,
       &FeedEntry::updated_time_,
-      &google_apis::util::GetTimeFromString);
+      &util::GetTimeFromString);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -635,10 +635,10 @@ void DocumentEntry::RegisterJSONConverter(
   converter->RegisterStringField(kTitleTField, &DocumentEntry::title_);
   converter->RegisterCustomField<base::Time>(
       kPublishedField, &DocumentEntry::published_time_,
-      &google_apis::util::GetTimeFromString);
+      &util::GetTimeFromString);
   converter->RegisterCustomField<base::Time>(
       kLastViewedField, &DocumentEntry::last_viewed_time_,
-      &google_apis::util::GetTimeFromString);
+      &util::GetTimeFromString);
   converter->RegisterRepeatedMessage(
       kFeedLinkField, &DocumentEntry::feed_links_);
   converter->RegisterNestedField(kContentField, &DocumentEntry::content_);
@@ -832,12 +832,12 @@ scoped_ptr<DocumentEntry> DocumentEntry::CreateFromXml(XmlReader* xml_reader) {
     } else if (xml_reader->NodeName() == kUpdatedNode) {
       std::string time;
       if (xml_reader->ReadElementContent(&time))
-        google_apis::util::GetTimeFromString(time, &entry->updated_time_);
+        util::GetTimeFromString(time, &entry->updated_time_);
       skip_read = true;
     } else if (xml_reader->NodeName() == kPublishedNode) {
       std::string time;
       if (xml_reader->ReadElementContent(&time))
-        google_apis::util::GetTimeFromString(time, &entry->published_time_);
+        util::GetTimeFromString(time, &entry->published_time_);
       skip_read = true;
     } else if (xml_reader->NodeName() == kIDNode) {
       xml_reader->ReadElementContent(&entry->id_);
@@ -871,7 +871,7 @@ scoped_ptr<DocumentEntry> DocumentEntry::CreateFromXml(XmlReader* xml_reader) {
     } else if (xml_reader->NodeName() == kLastViewedNode) {
       std::string time;
       if (xml_reader->ReadElementContent(&time))
-        google_apis::util::GetTimeFromString(time, &entry->last_viewed_time_);
+        util::GetTimeFromString(time, &entry->last_viewed_time_);
       skip_read = true;
     } else {
       DVLOG(1) << "Unknown node " << xml_reader->NodeName();
diff --git a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
index c7decea..006cb96 100644
--- a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
+++ b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
@@ -67,7 +67,7 @@ TEST_F(GDataWAPIParserTest, DocumentFeedJsonParser) {
   ASSERT_TRUE(feed.get());
 
   base::Time update_time;
-  ASSERT_TRUE(google_apis::util::GetTimeFromString("2011-12-14T01:03:21.151Z",
+  ASSERT_TRUE(util::GetTimeFromString("2011-12-14T01:03:21.151Z",
                                                    &update_time));
 
   EXPECT_EQ(1, feed->start_index());
@@ -107,9 +107,9 @@ TEST_F(GDataWAPIParserTest, DocumentFeedJsonParser) {
   EXPECT_EQ(ASCIIToUTF16("Entry 1 Title"), folder_entry->title());
   base::Time entry1_update_time;
   base::Time entry1_publish_time;
-  ASSERT_TRUE(google_apis::util::GetTimeFromString("2011-04-01T18:34:08.234Z",
+  ASSERT_TRUE(util::GetTimeFromString("2011-04-01T18:34:08.234Z",
                                                    &entry1_update_time));
-  ASSERT_TRUE(google_apis::util::GetTimeFromString("2010-11-07T05:03:54.719Z",
+  ASSERT_TRUE(util::GetTimeFromString("2010-11-07T05:03:54.719Z",
                                                    &entry1_publish_time));
   EXPECT_EQ(entry1_update_time, folder_entry->updated_time());
   EXPECT_EQ(entry1_publish_time, folder_entry->published_time());
@@ -199,9 +199,9 @@ TEST_F(GDataWAPIParserTest, DocumentEntryXmlParser) {
   EXPECT_EQ(ASCIIToUTF16("Xml Entry File Title.tar"), entry->title());
   base::Time entry1_update_time;
   base::Time entry1_publish_time;
-  ASSERT_TRUE(google_apis::util::GetTimeFromString("2011-04-01T18:34:08.234Z",
+  ASSERT_TRUE(util::GetTimeFromString("2011-04-01T18:34:08.234Z",
                                                    &entry1_update_time));
-  ASSERT_TRUE(google_apis::util::GetTimeFromString("2010-11-07T05:03:54.719Z",
+  ASSERT_TRUE(util::GetTimeFromString("2010-11-07T05:03:54.719Z",
                                                    &entry1_publish_time));
   EXPECT_EQ(entry1_update_time, entry->updated_time());
   EXPECT_EQ(entry1_publish_time, entry->published_time());