gdata: Replace "gdata" with "drive" for everything visible in UI.

Note: The scope of this CL is limited to the replacement of
"gdata" with "drive" in string literals that may appear in
URL paths. It is not intended to rename Javascript/C++
namespaces, attributes, enums, structs and classes, or
to relocate header files, source files and test data files.

BUG=126985
TEST=locally tested on lumpy, plus passed try tests

Review URL: https://chromiumcodereview.appspot.com/10386058
Patch from Haixia Shi <hshi@chromium.org>.

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

15 files changed, 294 insertions, 294 deletions

diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
index 11b1254..d3444a9 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
@@ -361,7 +361,7 @@ void RequestLocalFileSystemFunction::AddGDataMountPoint() {
   // We check permissions for raw cache file paths only for read-only
   // operations (when fileEntry.file() is called), so read only permissions
   // should be sufficient for all cache paths. For the rest of supported
-  // operations the file access check is done for gdata/ paths.
+  // operations the file access check is done for drive/ paths.
   GrantFilePermissionsToHost(render_view_host(),
                              gdata_file_system->GetCacheDirectoryPath(
                                  gdata::GDataRootDirectory::CACHE_TYPE_TMP),
@@ -1749,7 +1749,7 @@ void GetFileLocationsFunction::GetLocalPathsResponseOnUIThread(
   ListValue* locations = new ListValue;
   for (size_t i = 0; i < files.size(); ++i) {
     if (gdata::util::IsUnderGDataMountPoint(files[i].path)) {
-      locations->Append(Value::CreateStringValue("gdata"));
+      locations->Append(Value::CreateStringValue("drive"));
     } else {
       locations->Append(Value::CreateStringValue("local"));
     }
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.h b/chrome/browser/chromeos/extensions/file_browser_private_api.h
index 330a607..2a490bb 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.h
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.h
@@ -463,7 +463,7 @@ class PinGDataFileFunction : public GetGDataFilePropertiesFunction {
 };
 
 // Get file locations for the given list of file URLs. Returns a list of
-// location idenfitiers, like ['gdata', 'local'], where 'gdata' means the
+// location idenfitiers, like ['drive', 'local'], where 'drive' means the
 // file is on gdata, and 'local' means the file is on the local drive.
 class GetFileLocationsFunction : public FileBrowserFunction {
  public:
diff --git a/chrome/browser/chromeos/gdata/gdata_db_unittest.cc b/chrome/browser/chromeos/gdata/gdata_db_unittest.cc
index c42c9f5..0d8b40f 100644
--- a/chrome/browser/chromeos/gdata/gdata_db_unittest.cc
+++ b/chrome/browser/chromeos/gdata/gdata_db_unittest.cc
@@ -34,16 +34,16 @@ class GDataDBTest : public testing::Test {
   void TestGetFound(const GDataEntry& source);
 
   // Initialize the database with the following entries:
-  // gdata/dir1
-  // gdata/dir2
-  // gdata/dir1/dir3
-  // gdata/dir1/file4
-  // gdata/dir1/file5
-  // gdata/dir2/file6
-  // gdata/dir2/file7
-  // gdata/dir2/file8
-  // gdata/dir1/dir3/file9
-  // gdata/dir1/dir3/file10
+  // drive/dir1
+  // drive/dir2
+  // drive/dir1/dir3
+  // drive/dir1/file4
+  // drive/dir1/file5
+  // drive/dir2/file6
+  // drive/dir2/file7
+  // drive/dir2/file8
+  // drive/dir1/dir3/file9
+  // drive/dir1/dir3/file10
   void InitDB();
 
   // Helper functions to add a directory/file, incrementing index.
@@ -231,46 +231,46 @@ TEST_F(GDataDBTest, IterTest) {
   InitDB();
 
   const char* dir1_children[] = {
-    "gdata/dir1",
-    "gdata/dir1/dir3",
-    "gdata/dir1/dir3/file10",
-    "gdata/dir1/dir3/file9",
-    "gdata/dir1/file4",
-    "gdata/dir1/file5",
+    "drive/dir1",
+    "drive/dir1/dir3",
+    "drive/dir1/dir3/file10",
+    "drive/dir1/dir3/file9",
+    "drive/dir1/file4",
+    "drive/dir1/file5",
   };
-  TestIter("gdata/dir1", dir1_children, arraysize(dir1_children));
+  TestIter("drive/dir1", dir1_children, arraysize(dir1_children));
 
   const char* dir2_children[] = {
-    "gdata/dir2",
-    "gdata/dir2/file6",
-    "gdata/dir2/file7",
-    "gdata/dir2/file8",
+    "drive/dir2",
+    "drive/dir2/file6",
+    "drive/dir2/file7",
+    "drive/dir2/file8",
   };
-  TestIter("gdata/dir2", dir2_children, arraysize(dir2_children));
+  TestIter("drive/dir2", dir2_children, arraysize(dir2_children));
 
   const char* dir3_children[] = {
-    "gdata/dir1/dir3",
-    "gdata/dir1/dir3/file10",
-    "gdata/dir1/dir3/file9",
+    "drive/dir1/dir3",
+    "drive/dir1/dir3/file10",
+    "drive/dir1/dir3/file9",
   };
-  TestIter("gdata/dir1/dir3", dir3_children, arraysize(dir3_children));
+  TestIter("drive/dir1/dir3", dir3_children, arraysize(dir3_children));
 
   const char* file10[] = {
-    "gdata/dir1/dir3/file10",
+    "drive/dir1/dir3/file10",
   };
   TestIter(file10[0], file10, arraysize(file10));
 
   const char* all_entries[] = {
-    "gdata/dir1",
-    "gdata/dir1/dir3",
-    "gdata/dir1/dir3/file10",
-    "gdata/dir1/dir3/file9",
-    "gdata/dir1/file4",
-    "gdata/dir1/file5",
-    "gdata/dir2",
-    "gdata/dir2/file6",
-    "gdata/dir2/file7",
-    "gdata/dir2/file8",
+    "drive/dir1",
+    "drive/dir1/dir3",
+    "drive/dir1/dir3/file10",
+    "drive/dir1/dir3/file9",
+    "drive/dir1/file4",
+    "drive/dir1/file5",
+    "drive/dir2",
+    "drive/dir2/file6",
+    "drive/dir2/file7",
+    "drive/dir2/file8",
   };
   TestIter("", all_entries, arraysize(all_entries));
 
diff --git a/chrome/browser/chromeos/gdata/gdata_download_observer.h b/chrome/browser/chromeos/gdata/gdata_download_observer.h
index 3701c72..7c69877 100644
--- a/chrome/browser/chromeos/gdata/gdata_download_observer.h
+++ b/chrome/browser/chromeos/gdata/gdata_download_observer.h
@@ -33,7 +33,7 @@ class GDataDownloadObserver : public content::DownloadManager::Observer,
                   content::DownloadManager* download_manager,
                   const FilePath& gdata_tmp_download_path);
 
-  // Sets gdata path, for example, '/special/gdata/MyFolder/MyFile',
+  // Sets gdata path, for example, '/special/drive/MyFolder/MyFile',
   // to external data in |download|.
   static void SetGDataPath(content::DownloadItem* download,
                            const FilePath& gdata_path);
diff --git a/chrome/browser/chromeos/gdata/gdata_file_system_proxy.cc b/chrome/browser/chromeos/gdata/gdata_file_system_proxy.cc
index 1ef0935..2577a7e 100644
--- a/chrome/browser/chromeos/gdata/gdata_file_system_proxy.cc
+++ b/chrome/browser/chromeos/gdata/gdata_file_system_proxy.cc
@@ -28,7 +28,7 @@ using webkit_blob::ShareableFileReference;
 
 namespace {
 
-const char kGDataRootDirectory[] = "gdata";
+const char kGDataRootDirectory[] = "drive";
 const char kFeedField[] = "feed";
 
 // Helper function to run SnapshotFileCallback from
diff --git a/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc b/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc
index 0daf9a1..66915ac 100644
--- a/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc
+++ b/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc
@@ -219,7 +219,7 @@ class GDataFileSystemTest : public testing::Test {
     chromeos::CrosLibrary::Shutdown();
   }
 
-  // Loads test json file as root ("/gdata") element.
+  // Loads test json file as root ("/drive") element.
   void LoadRootFeedDocument(const std::string& filename) {
     LoadChangeFeed(filename, 0);
   }
@@ -944,13 +944,13 @@ class GDataFileSystemTest : public testing::Test {
   }
 
   // Loads serialized proto file from GCache, and makes sure the root
-  // filesystem has a root at 'gdata'
+  // filesystem has a root at 'drive'
   void TestLoadMetadataFromCache() {
     file_system_->LoadRootFeedFromCache(
         false,     // load_from_server
-        FilePath(FILE_PATH_LITERAL("gdata")),
+        FilePath(FILE_PATH_LITERAL("drive")),
         base::Bind(&GDataFileSystemTest::OnExpectToFindEntry,
-                   FilePath(FILE_PATH_LITERAL("gdata"))));
+                   FilePath(FILE_PATH_LITERAL("drive"))));
     BrowserThread::GetBlockingPool()->FlushForTesting();
     message_loop_.RunAllPending();
   }
@@ -990,18 +990,18 @@ class GDataFileSystemTest : public testing::Test {
   }
 
   // Creates a proto file representing a filesystem with directories:
-  // gdata, gdata/Dir1, gdata/Dir1/SubDir2
+  // drive, drive/Dir1, drive/Dir1/SubDir2
   // and files
-  // gdata/File1, gdata/Dir1/File2, gdata/Dir1/SubDir2/File3
+  // drive/File1, drive/Dir1/File2, drive/Dir1/SubDir2/File3
   void SaveTestFileSystem() {
     GDataRootDirectoryProto root;
     GDataDirectoryProto* root_dir = root.mutable_gdata_directory();
     GDataEntryProto* file_base = root_dir->mutable_gdata_entry();
     PlatformFileInfoProto* platform_info = file_base->mutable_file_info();
-    file_base->set_title("gdata");
+    file_base->set_title("drive");
     platform_info->set_is_directory(true);
 
-    // gdata/File1
+    // drive/File1
     GDataFileProto* file = root_dir->add_child_files();
     file_base = file->mutable_gdata_entry();
     platform_info = file_base->mutable_file_info();
@@ -1009,14 +1009,14 @@ class GDataFileSystemTest : public testing::Test {
     platform_info->set_is_directory(false);
     platform_info->set_size(1048576);
 
-    // gdata/Dir1
+    // drive/Dir1
     GDataDirectoryProto* dir1 = root_dir->add_child_directories();
     file_base = dir1->mutable_gdata_entry();
     platform_info = file_base->mutable_file_info();
     file_base->set_title("Dir1");
     platform_info->set_is_directory(true);
 
-    // gdata/Dir1/File2
+    // drive/Dir1/File2
     file = dir1->add_child_files();
     file_base = file->mutable_gdata_entry();
     platform_info = file_base->mutable_file_info();
@@ -1024,14 +1024,14 @@ class GDataFileSystemTest : public testing::Test {
     platform_info->set_is_directory(false);
     platform_info->set_size(555);
 
-    // gdata/Dir1/SubDir2
+    // drive/Dir1/SubDir2
     GDataDirectoryProto* dir2 = dir1->add_child_directories();
     file_base = dir2->mutable_gdata_entry();
     platform_info = file_base->mutable_file_info();
     file_base->set_title("SubDir2");
     platform_info->set_is_directory(true);
 
-    // gdata/Dir1/SubDir2/File3
+    // drive/Dir1/SubDir2/File3
     file = dir2->add_child_files();
     file_base = file->mutable_gdata_entry();
     platform_info = file_base->mutable_file_info();
@@ -1192,16 +1192,16 @@ TEST_F(GDataFileSystemTest, DuplicatedAsyncInitialization) {
       &AsyncInitializationCallback,
       &counter,
       2,
-      FilePath(FILE_PATH_LITERAL("gdata")),
+      FilePath(FILE_PATH_LITERAL("drive")),
       &message_loop_);
 
   EXPECT_CALL(*mock_doc_service_, GetAccountMetadata(_)).Times(1);
   EXPECT_CALL(*mock_doc_service_, GetDocuments(Eq(GURL()), _, _, _)).Times(1);
 
   file_system_->ReadDirectoryByPathAsync(
-      FilePath(FILE_PATH_LITERAL("gdata")), callback);
+      FilePath(FILE_PATH_LITERAL("drive")), callback);
   file_system_->ReadDirectoryByPathAsync(
-      FilePath(FILE_PATH_LITERAL("gdata")), callback);
+      FilePath(FILE_PATH_LITERAL("drive")), callback);
   message_loop_.Run();  // Wait to get our result
   EXPECT_EQ(2, counter);
 }
@@ -1209,7 +1209,7 @@ TEST_F(GDataFileSystemTest, DuplicatedAsyncInitialization) {
 TEST_F(GDataFileSystemTest, SearchRootDirectory) {
   LoadRootFeedDocument("root_feed.json");
 
-  const FilePath kFilePath = FilePath(FILE_PATH_LITERAL("gdata"));
+  const FilePath kFilePath = FilePath(FILE_PATH_LITERAL("drive"));
   GDataEntry* entry = FindEntry(FilePath(FILE_PATH_LITERAL(kFilePath)));
   ASSERT_TRUE(entry);
   EXPECT_EQ(kFilePath, entry->GetFilePath());
@@ -1221,7 +1221,7 @@ TEST_F(GDataFileSystemTest, SearchExistingFile) {
   LoadRootFeedDocument("root_feed.json");
 
   const FilePath kFilePath = FilePath(
-      FILE_PATH_LITERAL("gdata/File 1.txt"));
+      FILE_PATH_LITERAL("drive/File 1.txt"));
   GDataEntry* entry = FindEntry(kFilePath);
   ASSERT_TRUE(entry);
   EXPECT_EQ(kFilePath, entry->GetFilePath());
@@ -1233,7 +1233,7 @@ TEST_F(GDataFileSystemTest, SearchExistingDocument) {
   LoadRootFeedDocument("root_feed.json");
 
   const FilePath kFilePath = FilePath(
-      FILE_PATH_LITERAL("gdata/Document 1.gdoc"));
+      FILE_PATH_LITERAL("drive/Document 1.gdoc"));
   GDataEntry* entry = FindEntry(kFilePath);
   ASSERT_TRUE(entry);
   EXPECT_EQ(kFilePath, entry->GetFilePath());
@@ -1245,7 +1245,7 @@ TEST_F(GDataFileSystemTest, SearchNonExistingFile) {
   LoadRootFeedDocument("root_feed.json");
 
   const FilePath kFilePath = FilePath(
-      FILE_PATH_LITERAL("gdata/nonexisting.file"));
+      FILE_PATH_LITERAL("drive/nonexisting.file"));
   GDataEntry* entry = FindEntry(kFilePath);
   ASSERT_FALSE(entry);
   EXPECT_TRUE(GetEntryInfoAndCompare(kFilePath, entry));
@@ -1256,14 +1256,14 @@ TEST_F(GDataFileSystemTest, SearchEncodedFileNames) {
   LoadRootFeedDocument("root_feed.json");
 
   const FilePath kFilePath1 = FilePath(
-      FILE_PATH_LITERAL("gdata/Slash / in file 1.txt"));
+      FILE_PATH_LITERAL("drive/Slash / in file 1.txt"));
   GDataEntry* entry = FindEntry(kFilePath1);
   ASSERT_FALSE(entry);
   EXPECT_TRUE(GetEntryInfoAndCompare(kFilePath1, NULL));
   EXPECT_TRUE(GetFileInfoAndCompare(kFilePath1, NULL));
 
   const FilePath kFilePath2 = FilePath::FromUTF8Unsafe(
-      "gdata/Slash \xE2\x88\x95 in file 1.txt");
+      "drive/Slash \xE2\x88\x95 in file 1.txt");
   entry = FindEntry(kFilePath2);
   ASSERT_TRUE(entry);
   EXPECT_EQ(kFilePath2, entry->GetFilePath());
@@ -1271,7 +1271,7 @@ TEST_F(GDataFileSystemTest, SearchEncodedFileNames) {
   EXPECT_TRUE(GetFileInfoAndCompare(kFilePath2, entry->AsGDataFile()));
 
   const FilePath kFilePath3 = FilePath::FromUTF8Unsafe(
-      "gdata/Slash \xE2\x88\x95 in directory/Slash SubDir File.txt");
+      "drive/Slash \xE2\x88\x95 in directory/Slash SubDir File.txt");
   entry = FindEntry(kFilePath3);
   ASSERT_TRUE(entry);
   EXPECT_EQ(kFilePath3, entry->GetFilePath());
@@ -1283,14 +1283,14 @@ TEST_F(GDataFileSystemTest, SearchEncodedFileNamesLoadingRoot) {
   LoadRootFeedDocument("root_feed.json");
 
   const FilePath kFilePath1 = FilePath(
-      FILE_PATH_LITERAL("gdata/Slash / in file 1.txt"));
+      FILE_PATH_LITERAL("drive/Slash / in file 1.txt"));
   GDataEntry* entry = FindEntry(kFilePath1);
   ASSERT_FALSE(entry);
   EXPECT_TRUE(GetEntryInfoAndCompare(kFilePath1, NULL));
   EXPECT_TRUE(GetFileInfoAndCompare(kFilePath1, NULL));
 
   const FilePath kFilePath2 = FilePath::FromUTF8Unsafe(
-      "gdata/Slash \xE2\x88\x95 in file 1.txt");
+      "drive/Slash \xE2\x88\x95 in file 1.txt");
   entry = FindEntry(kFilePath2);
   ASSERT_TRUE(entry);
   EXPECT_EQ(kFilePath2, entry->GetFilePath());
@@ -1298,7 +1298,7 @@ TEST_F(GDataFileSystemTest, SearchEncodedFileNamesLoadingRoot) {
   EXPECT_TRUE(GetFileInfoAndCompare(kFilePath2, entry->AsGDataFile()));
 
   const FilePath kFilePath3 = FilePath::FromUTF8Unsafe(
-      "gdata/Slash \xE2\x88\x95 in directory/Slash SubDir File.txt");
+      "drive/Slash \xE2\x88\x95 in directory/Slash SubDir File.txt");
   entry = FindEntry(kFilePath3);
   ASSERT_TRUE(entry);
   EXPECT_EQ(kFilePath3, entry->GetFilePath());
@@ -1310,7 +1310,7 @@ TEST_F(GDataFileSystemTest, SearchDuplicateNames) {
   LoadRootFeedDocument("root_feed.json");
 
   const FilePath kFilePath1 = FilePath(
-      FILE_PATH_LITERAL("gdata/Duplicate Name.txt"));
+      FILE_PATH_LITERAL("drive/Duplicate Name.txt"));
   GDataEntry* entry = FindEntry(kFilePath1);
   ASSERT_TRUE(entry);
   EXPECT_EQ(kFilePath1, entry->GetFilePath());
@@ -1318,7 +1318,7 @@ TEST_F(GDataFileSystemTest, SearchDuplicateNames) {
   EXPECT_TRUE(GetFileInfoAndCompare(kFilePath1, entry->AsGDataFile()));
 
   const FilePath kFilePath2 = FilePath(
-      FILE_PATH_LITERAL("gdata/Duplicate Name (2).txt"));
+      FILE_PATH_LITERAL("drive/Duplicate Name (2).txt"));
   entry = FindEntry(kFilePath2);
   ASSERT_TRUE(entry);
   EXPECT_EQ(kFilePath2, entry->GetFilePath());
@@ -1330,7 +1330,7 @@ TEST_F(GDataFileSystemTest, SearchExistingDirectory) {
   LoadRootFeedDocument("root_feed.json");
 
   const FilePath kFilePath = FilePath(
-      FILE_PATH_LITERAL("gdata/Directory 1"));
+      FILE_PATH_LITERAL("drive/Directory 1"));
   GDataEntry* entry = FindEntry(kFilePath);
   ASSERT_TRUE(entry);
   EXPECT_EQ(kFilePath, entry->GetFilePath());
@@ -1342,7 +1342,7 @@ TEST_F(GDataFileSystemTest, SearchInSubdir) {
   LoadRootFeedDocument("root_feed.json");
 
   const FilePath kFilePath = FilePath(
-      FILE_PATH_LITERAL("gdata/Directory 1/SubDirectory File 1.txt"));
+      FILE_PATH_LITERAL("drive/Directory 1/SubDirectory File 1.txt"));
   GDataEntry* entry = FindEntry(kFilePath);
   ASSERT_TRUE(entry);
   EXPECT_EQ(kFilePath, entry->GetFilePath());
@@ -1355,7 +1355,7 @@ TEST_F(GDataFileSystemTest, SearchInSubSubdir) {
   LoadRootFeedDocument("root_feed.json");
 
   const FilePath kFilePath = FilePath(
-      FILE_PATH_LITERAL("gdata/Directory 1/Sub Directory Folder/"
+      FILE_PATH_LITERAL("drive/Directory 1/Sub Directory Folder/"
                         "Sub Sub Directory Folder"));
   GDataEntry* entry = FindEntry(kFilePath);
   ASSERT_TRUE(entry);
@@ -1367,10 +1367,10 @@ TEST_F(GDataFileSystemTest, SearchInSubSubdir) {
 TEST_F(GDataFileSystemTest, FilePathTests) {
   LoadRootFeedDocument("root_feed.json");
 
-  FindAndTestFilePath(FilePath(FILE_PATH_LITERAL("gdata/File 1.txt")));
-  FindAndTestFilePath(FilePath(FILE_PATH_LITERAL("gdata/Directory 1")));
+  FindAndTestFilePath(FilePath(FILE_PATH_LITERAL("drive/File 1.txt")));
+  FindAndTestFilePath(FilePath(FILE_PATH_LITERAL("drive/Directory 1")));
   FindAndTestFilePath(
-      FilePath(FILE_PATH_LITERAL("gdata/Directory 1/SubDirectory File 1.txt")));
+      FilePath(FILE_PATH_LITERAL("drive/Directory 1/SubDirectory File 1.txt")));
 }
 
 TEST_F(GDataFileSystemTest, ChangeFeed_AddAndDeleteFileInRoot) {
@@ -1378,13 +1378,13 @@ TEST_F(GDataFileSystemTest, ChangeFeed_AddAndDeleteFileInRoot) {
   LoadRootFeedDocument("root_feed.json");
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(2);
+      Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(2);
 
   LoadChangeFeed("delta_file_added_in_root.json", ++latest_changelog);
-  EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL("gdata/Added file.gdoc"))));
+  EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL("drive/Added file.gdoc"))));
 
   LoadChangeFeed("delta_file_deleted_in_root.json", ++latest_changelog);
-  EXPECT_FALSE(FindEntry(FilePath(FILE_PATH_LITERAL("gdata/Added file.gdoc"))));
+  EXPECT_FALSE(FindEntry(FilePath(FILE_PATH_LITERAL("drive/Added file.gdoc"))));
 }
 
 
@@ -1393,25 +1393,25 @@ TEST_F(GDataFileSystemTest, ChangeFeed_AddAndDeleteFileFromExistingDirectory) {
   LoadRootFeedDocument("root_feed.json");
 
   EXPECT_TRUE(FindEntry(FilePath(
-      FILE_PATH_LITERAL("gdata/Directory 1"))));
+      FILE_PATH_LITERAL("drive/Directory 1"))));
 
   // Add file to an existing directory.
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
   LoadChangeFeed("delta_file_added_in_directory.json", ++latest_changelog);
   EXPECT_TRUE(FindEntry(FilePath(
-      FILE_PATH_LITERAL("gdata/Directory 1/Added file.gdoc"))));
+      FILE_PATH_LITERAL("drive/Directory 1/Added file.gdoc"))));
 
   // Remove that file from the directory.
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
   LoadChangeFeed("delta_file_deleted_in_directory.json", ++latest_changelog);
   EXPECT_TRUE(FindEntry(FilePath(
-      FILE_PATH_LITERAL("gdata/Directory 1"))));
+      FILE_PATH_LITERAL("drive/Directory 1"))));
   EXPECT_FALSE(FindEntry(FilePath(
-      FILE_PATH_LITERAL("gdata/Directory 1/Added file.gdoc"))));
+      FILE_PATH_LITERAL("drive/Directory 1/Added file.gdoc"))));
 }
 
 TEST_F(GDataFileSystemTest, ChangeFeed_AddFileToNewDirectory) {
@@ -1419,16 +1419,16 @@ TEST_F(GDataFileSystemTest, ChangeFeed_AddFileToNewDirectory) {
   LoadRootFeedDocument("root_feed.json");
   // Add file to a new directory.
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/New Directory"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/New Directory"))))).Times(1);
 
   LoadChangeFeed("delta_file_added_in_new_directory.json", ++latest_changelog);
 
   EXPECT_TRUE(FindEntry(FilePath(
-      FILE_PATH_LITERAL("gdata/New Directory"))));
+      FILE_PATH_LITERAL("drive/New Directory"))));
   EXPECT_TRUE(FindEntry(FilePath(
-      FILE_PATH_LITERAL("gdata/New Directory/File in new dir.gdoc"))));
+      FILE_PATH_LITERAL("drive/New Directory/File in new dir.gdoc"))));
 }
 
 TEST_F(GDataFileSystemTest, ChangeFeed_DirectoryMovedFromRootToDirectory) {
@@ -1436,38 +1436,38 @@ TEST_F(GDataFileSystemTest, ChangeFeed_DirectoryMovedFromRootToDirectory) {
   LoadRootFeedDocument("root_feed.json");
 
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 2"))));
+      "drive/Directory 2"))));
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1"))));
+      "drive/Directory 1"))));
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1/SubDirectory File 1.txt"))));
+      "drive/Directory 1/SubDirectory File 1.txt"))));
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1/Sub Directory Folder"))));
+      "drive/Directory 1/Sub Directory Folder"))));
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1/Sub Directory Folder/Sub Sub Directory Folder"))));
+      "drive/Directory 1/Sub Directory Folder/Sub Sub Directory Folder"))));
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 2"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 2"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 2/Directory 1")))))
+      Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 2/Directory 1")))))
       .Times(1);
   LoadChangeFeed("delta_dir_moved_from_root_to_directory.json",
                  ++latest_changelog);
 
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 2"))));
+      "drive/Directory 2"))));
   EXPECT_FALSE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1"))));
+      "drive/Directory 1"))));
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 2/Directory 1"))));
+      "drive/Directory 2/Directory 1"))));
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 2/Directory 1/SubDirectory File 1.txt"))));
+      "drive/Directory 2/Directory 1/SubDirectory File 1.txt"))));
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 2/Directory 1/Sub Directory Folder"))));
+      "drive/Directory 2/Directory 1/Sub Directory Folder"))));
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 2/Directory 1/Sub Directory Folder/"
+      "drive/Directory 2/Directory 1/Sub Directory Folder/"
       "Sub Sub Directory Folder"))));
 }
 
@@ -1476,31 +1476,31 @@ TEST_F(GDataFileSystemTest, ChangeFeed_FileMovedFromDirectoryToRoot) {
   LoadRootFeedDocument("root_feed.json");
 
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1"))));
+      "drive/Directory 1"))));
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1/Sub Directory Folder"))));
+      "drive/Directory 1/Sub Directory Folder"))));
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1/Sub Directory Folder/Sub Sub Directory Folder"))));
+      "drive/Directory 1/Sub Directory Folder/Sub Sub Directory Folder"))));
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1/SubDirectory File 1.txt"))));
+      "drive/Directory 1/SubDirectory File 1.txt"))));
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
   LoadChangeFeed("delta_file_moved_from_directory_to_root.json",
                  ++latest_changelog);
 
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1"))));
+      "drive/Directory 1"))));
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1/Sub Directory Folder"))));
+      "drive/Directory 1/Sub Directory Folder"))));
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1/Sub Directory Folder/Sub Sub Directory Folder"))));
+      "drive/Directory 1/Sub Directory Folder/Sub Sub Directory Folder"))));
   EXPECT_FALSE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1/SubDirectory File 1.txt"))));
+      "drive/Directory 1/SubDirectory File 1.txt"))));
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/SubDirectory File 1.txt"))));
+      "drive/SubDirectory File 1.txt"))));
 }
 
 TEST_F(GDataFileSystemTest, ChangeFeed_FileRenamedInDirectory) {
@@ -1508,34 +1508,34 @@ TEST_F(GDataFileSystemTest, ChangeFeed_FileRenamedInDirectory) {
   LoadRootFeedDocument("root_feed.json");
 
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1"))));
+      "drive/Directory 1"))));
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1/SubDirectory File 1.txt"))));
+      "drive/Directory 1/SubDirectory File 1.txt"))));
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
   LoadChangeFeed("delta_file_renamed_in_directory.json",
                  ++latest_changelog);
 
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1"))));
+      "drive/Directory 1"))));
   EXPECT_FALSE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1/SubDirectory File 1.txt"))));
+      "drive/Directory 1/SubDirectory File 1.txt"))));
   EXPECT_TRUE(FindEntry(FilePath(FILE_PATH_LITERAL(
-      "gdata/Directory 1/New SubDirectory File 1.txt"))));
+      "drive/Directory 1/New SubDirectory File 1.txt"))));
 }
 
 TEST_F(GDataFileSystemTest, CachedFeedLoading) {
   SaveTestFileSystem();
   TestLoadMetadataFromCache();
 
-  FindAndTestFilePath(FilePath(FILE_PATH_LITERAL("gdata/File1")));
-  FindAndTestFilePath(FilePath(FILE_PATH_LITERAL("gdata/Dir1")));
-  FindAndTestFilePath(FilePath(FILE_PATH_LITERAL("gdata/Dir1/File2")));
-  FindAndTestFilePath(FilePath(FILE_PATH_LITERAL("gdata/Dir1/SubDir2")));
-  FindAndTestFilePath(FilePath(FILE_PATH_LITERAL("gdata/Dir1/SubDir2/File3")));
+  FindAndTestFilePath(FilePath(FILE_PATH_LITERAL("drive/File1")));
+  FindAndTestFilePath(FilePath(FILE_PATH_LITERAL("drive/Dir1")));
+  FindAndTestFilePath(FilePath(FILE_PATH_LITERAL("drive/Dir1/File2")));
+  FindAndTestFilePath(FilePath(FILE_PATH_LITERAL("drive/Dir1/SubDir2")));
+  FindAndTestFilePath(FilePath(FILE_PATH_LITERAL("drive/Dir1/SubDir2/File3")));
 }
 
 TEST_F(GDataFileSystemTest, TransferFileFromRemoteToLocal_RegularFile) {
@@ -1551,7 +1551,7 @@ TEST_F(GDataFileSystemTest, TransferFileFromRemoteToLocal_RegularFile) {
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   FilePath local_dest_file_path = temp_dir.path().Append("local_copy.txt");
 
-  FilePath remote_src_file_path(FILE_PATH_LITERAL("gdata/File 1.txt"));
+  FilePath remote_src_file_path(FILE_PATH_LITERAL("drive/File 1.txt"));
   GDataEntry* entry = FindEntry(remote_src_file_path);
   GDataFile* file = entry->AsGDataFile();
   FilePath cache_file = GetCachePathForFile(file);
@@ -1602,7 +1602,7 @@ TEST_F(GDataFileSystemTest, TransferFileFromRemoteToLocal_HostedDocument) {
   ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   FilePath local_dest_file_path = temp_dir.path().Append("local_copy.txt");
-  FilePath remote_src_file_path(FILE_PATH_LITERAL("gdata/Document 1.gdoc"));
+  FilePath remote_src_file_path(FILE_PATH_LITERAL("drive/Document 1.gdoc"));
   file_system_->TransferFileFromRemoteToLocal(
       remote_src_file_path, local_dest_file_path, callback);
   RunAllPendingForIO();  // Try to get from the cache.
@@ -1615,8 +1615,8 @@ TEST_F(GDataFileSystemTest, TransferFileFromRemoteToLocal_HostedDocument) {
 }
 
 TEST_F(GDataFileSystemTest, CopyNotExistingFile) {
-  FilePath src_file_path(FILE_PATH_LITERAL("gdata/Dummy file.txt"));
-  FilePath dest_file_path(FILE_PATH_LITERAL("gdata/Test.log"));
+  FilePath src_file_path(FILE_PATH_LITERAL("drive/Dummy file.txt"));
+  FilePath dest_file_path(FILE_PATH_LITERAL("drive/Test.log"));
 
   LoadRootFeedDocument("root_feed.json");
 
@@ -1636,9 +1636,9 @@ TEST_F(GDataFileSystemTest, CopyNotExistingFile) {
 }
 
 TEST_F(GDataFileSystemTest, CopyFileToNonExistingDirectory) {
-  FilePath src_file_path(FILE_PATH_LITERAL("gdata/File 1.txt"));
-  FilePath dest_parent_path(FILE_PATH_LITERAL("gdata/Dummy"));
-  FilePath dest_file_path(FILE_PATH_LITERAL("gdata/Dummy/Test.log"));
+  FilePath src_file_path(FILE_PATH_LITERAL("drive/File 1.txt"));
+  FilePath dest_parent_path(FILE_PATH_LITERAL("drive/Dummy"));
+  FilePath dest_file_path(FILE_PATH_LITERAL("drive/Dummy/Test.log"));
 
   LoadRootFeedDocument("root_feed.json");
 
@@ -1669,10 +1669,10 @@ TEST_F(GDataFileSystemTest, CopyFileToNonExistingDirectory) {
 // Test the case where the parent of |dest_file_path| is a existing file,
 // not a directory.
 TEST_F(GDataFileSystemTest, CopyFileToInvalidPath) {
-  FilePath src_file_path(FILE_PATH_LITERAL("gdata/Document 1.gdoc"));
-  FilePath dest_parent_path(FILE_PATH_LITERAL("gdata/Duplicate Name.txt"));
+  FilePath src_file_path(FILE_PATH_LITERAL("drive/Document 1.gdoc"));
+  FilePath dest_parent_path(FILE_PATH_LITERAL("drive/Duplicate Name.txt"));
   FilePath dest_file_path(FILE_PATH_LITERAL(
-      "gdata/Duplicate Name.txt/Document 1.gdoc"));
+      "drive/Duplicate Name.txt/Document 1.gdoc"));
 
   LoadRootFeedDocument("root_feed.json");
 
@@ -1705,10 +1705,10 @@ TEST_F(GDataFileSystemTest, CopyFileToInvalidPath) {
 
 TEST_F(GDataFileSystemTest, RenameFile) {
   const FilePath src_file_path(
-      FILE_PATH_LITERAL("gdata/Directory 1/SubDirectory File 1.txt"));
-  const FilePath src_parent_path(FILE_PATH_LITERAL("gdata/Directory 1"));
+      FILE_PATH_LITERAL("drive/Directory 1/SubDirectory File 1.txt"));
+  const FilePath src_parent_path(FILE_PATH_LITERAL("drive/Directory 1"));
   const FilePath dest_file_path(
-      FILE_PATH_LITERAL("gdata/Directory 1/Test.log"));
+      FILE_PATH_LITERAL("drive/Directory 1/Test.log"));
 
   LoadRootFeedDocument("root_feed.json");
 
@@ -1727,7 +1727,7 @@ TEST_F(GDataFileSystemTest, RenameFile) {
                  callback_helper_.get());
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
 
   file_system_->Move(src_file_path, dest_file_path, callback);
   message_loop_.RunAllPending();
@@ -1742,9 +1742,9 @@ TEST_F(GDataFileSystemTest, RenameFile) {
 }
 
 TEST_F(GDataFileSystemTest, MoveFileFromRootToSubDirectory) {
-  FilePath src_file_path(FILE_PATH_LITERAL("gdata/File 1.txt"));
-  FilePath dest_parent_path(FILE_PATH_LITERAL("gdata/Directory 1"));
-  FilePath dest_file_path(FILE_PATH_LITERAL("gdata/Directory 1/Test.log"));
+  FilePath src_file_path(FILE_PATH_LITERAL("drive/File 1.txt"));
+  FilePath dest_parent_path(FILE_PATH_LITERAL("drive/Directory 1"));
+  FilePath dest_file_path(FILE_PATH_LITERAL("drive/Directory 1/Test.log"));
 
   LoadRootFeedDocument("root_feed.json");
 
@@ -1773,9 +1773,9 @@ TEST_F(GDataFileSystemTest, MoveFileFromRootToSubDirectory) {
 
   // Expect notification for both source and destination directories.
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
 
   file_system_->Move(src_file_path, dest_file_path, callback);
   message_loop_.RunAllPending();
@@ -1790,10 +1790,10 @@ TEST_F(GDataFileSystemTest, MoveFileFromRootToSubDirectory) {
 }
 
 TEST_F(GDataFileSystemTest, MoveFileFromSubDirectoryToRoot) {
-  FilePath src_parent_path(FILE_PATH_LITERAL("gdata/Directory 1"));
+  FilePath src_parent_path(FILE_PATH_LITERAL("drive/Directory 1"));
   FilePath src_file_path(
-      FILE_PATH_LITERAL("gdata/Directory 1/SubDirectory File 1.txt"));
-  FilePath dest_file_path(FILE_PATH_LITERAL("gdata/Test.log"));
+      FILE_PATH_LITERAL("drive/Directory 1/SubDirectory File 1.txt"));
+  FilePath dest_file_path(FILE_PATH_LITERAL("drive/Test.log"));
 
   LoadRootFeedDocument("root_feed.json");
 
@@ -1823,9 +1823,9 @@ TEST_F(GDataFileSystemTest, MoveFileFromSubDirectoryToRoot) {
 
   // Expect notification for both source and destination directories.
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
 
   file_system_->Move(src_file_path, dest_file_path, callback);
   message_loop_.RunAllPending();
@@ -1840,17 +1840,17 @@ TEST_F(GDataFileSystemTest, MoveFileFromSubDirectoryToRoot) {
 }
 
 TEST_F(GDataFileSystemTest, MoveFileBetweenSubDirectories) {
-  FilePath src_parent_path(FILE_PATH_LITERAL("gdata/Directory 1"));
+  FilePath src_parent_path(FILE_PATH_LITERAL("drive/Directory 1"));
   FilePath src_file_path(
-      FILE_PATH_LITERAL("gdata/Directory 1/SubDirectory File 1.txt"));
-  FilePath dest_parent_path(FILE_PATH_LITERAL("gdata/New Folder 1"));
-  FilePath dest_file_path(FILE_PATH_LITERAL("gdata/New Folder 1/Test.log"));
-  FilePath interim_file_path(FILE_PATH_LITERAL("gdata/Test.log"));
+      FILE_PATH_LITERAL("drive/Directory 1/SubDirectory File 1.txt"));
+  FilePath dest_parent_path(FILE_PATH_LITERAL("drive/New Folder 1"));
+  FilePath dest_file_path(FILE_PATH_LITERAL("drive/New Folder 1/Test.log"));
+  FilePath interim_file_path(FILE_PATH_LITERAL("drive/Test.log"));
 
   LoadRootFeedDocument("root_feed.json");
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
 
   AddDirectoryFromFile(dest_parent_path, "directory_entry_atom.json");
 
@@ -1891,11 +1891,11 @@ TEST_F(GDataFileSystemTest, MoveFileBetweenSubDirectories) {
   // Expect notification for both source and destination directories plus
   // interim file path.
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/New Folder 1"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/New Folder 1"))))).Times(1);
 
   file_system_->Move(src_file_path, dest_file_path, callback);
   message_loop_.RunAllPending();
@@ -1911,8 +1911,8 @@ TEST_F(GDataFileSystemTest, MoveFileBetweenSubDirectories) {
 }
 
 TEST_F(GDataFileSystemTest, MoveNotExistingFile) {
-  FilePath src_file_path(FILE_PATH_LITERAL("gdata/Dummy file.txt"));
-  FilePath dest_file_path(FILE_PATH_LITERAL("gdata/Test.log"));
+  FilePath src_file_path(FILE_PATH_LITERAL("drive/Dummy file.txt"));
+  FilePath dest_file_path(FILE_PATH_LITERAL("drive/Test.log"));
 
   LoadRootFeedDocument("root_feed.json");
 
@@ -1932,9 +1932,9 @@ TEST_F(GDataFileSystemTest, MoveNotExistingFile) {
 }
 
 TEST_F(GDataFileSystemTest, MoveFileToNonExistingDirectory) {
-  FilePath src_file_path(FILE_PATH_LITERAL("gdata/File 1.txt"));
-  FilePath dest_parent_path(FILE_PATH_LITERAL("gdata/Dummy"));
-  FilePath dest_file_path(FILE_PATH_LITERAL("gdata/Dummy/Test.log"));
+  FilePath src_file_path(FILE_PATH_LITERAL("drive/File 1.txt"));
+  FilePath dest_parent_path(FILE_PATH_LITERAL("drive/Dummy"));
+  FilePath dest_file_path(FILE_PATH_LITERAL("drive/Dummy/Test.log"));
 
   LoadRootFeedDocument("root_feed.json");
 
@@ -1965,10 +1965,10 @@ TEST_F(GDataFileSystemTest, MoveFileToNonExistingDirectory) {
 // Test the case where the parent of |dest_file_path| is a existing file,
 // not a directory.
 TEST_F(GDataFileSystemTest, MoveFileToInvalidPath) {
-  FilePath src_file_path(FILE_PATH_LITERAL("gdata/File 1.txt"));
-  FilePath dest_parent_path(FILE_PATH_LITERAL("gdata/Duplicate Name.txt"));
+  FilePath src_file_path(FILE_PATH_LITERAL("drive/File 1.txt"));
+  FilePath dest_parent_path(FILE_PATH_LITERAL("drive/Duplicate Name.txt"));
   FilePath dest_file_path(FILE_PATH_LITERAL(
-      "gdata/Duplicate Name.txt/Test.log"));
+      "drive/Duplicate Name.txt/Test.log"));
 
   LoadRootFeedDocument("root_feed.json");
 
@@ -2004,11 +2004,11 @@ TEST_F(GDataFileSystemTest, RemoveEntries) {
 
   LoadRootFeedDocument("root_feed.json");
 
-  FilePath nonexisting_file(FILE_PATH_LITERAL("gdata/Dummy file.txt"));
-  FilePath file_in_root(FILE_PATH_LITERAL("gdata/File 1.txt"));
-  FilePath dir_in_root(FILE_PATH_LITERAL("gdata/Directory 1"));
+  FilePath nonexisting_file(FILE_PATH_LITERAL("drive/Dummy file.txt"));
+  FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt"));
+  FilePath dir_in_root(FILE_PATH_LITERAL("drive/Directory 1"));
   FilePath file_in_subdir(
-      FILE_PATH_LITERAL("gdata/Directory 1/SubDirectory File 1.txt"));
+      FILE_PATH_LITERAL("drive/Directory 1/SubDirectory File 1.txt"));
 
   GDataEntry* entry = NULL;
   EXPECT_TRUE((entry = FindEntry(file_in_root)) != NULL);
@@ -2025,7 +2025,7 @@ TEST_F(GDataFileSystemTest, RemoveEntries) {
 
   // Once for file in root and once for file...
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(2);
+      Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(2);
 
   // Remove first file in root.
   EXPECT_TRUE(RemoveEntry(file_in_root));
@@ -2050,7 +2050,7 @@ TEST_F(GDataFileSystemTest, RemoveEntries) {
   EXPECT_FALSE(RemoveEntry(nonexisting_file));
 
   // Try removing root file element.
-  EXPECT_FALSE(RemoveEntry(FilePath(FILE_PATH_LITERAL("gdata"))));
+  EXPECT_FALSE(RemoveEntry(FilePath(FILE_PATH_LITERAL("drive"))));
 
   // Need this to ensure OnDirectoryChanged() is run.
   RunAllPendingForIO();
@@ -2060,19 +2060,19 @@ TEST_F(GDataFileSystemTest, CreateDirectory) {
   LoadRootFeedDocument("root_feed.json");
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
 
   // Create directory in root.
-  FilePath dir_path(FILE_PATH_LITERAL("gdata/New Folder 1"));
+  FilePath dir_path(FILE_PATH_LITERAL("drive/New Folder 1"));
   EXPECT_TRUE(FindEntry(dir_path) == NULL);
   AddDirectoryFromFile(dir_path, "directory_entry_atom.json");
   EXPECT_TRUE(FindEntry(dir_path) != NULL);
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/New Folder 1"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/New Folder 1"))))).Times(1);
 
   // Create directory in a sub dirrectory.
-  FilePath subdir_path(FILE_PATH_LITERAL("gdata/New Folder 1/New Folder 2"));
+  FilePath subdir_path(FILE_PATH_LITERAL("drive/New Folder 1/New Folder 2"));
   EXPECT_TRUE(FindEntry(subdir_path) == NULL);
   AddDirectoryFromFile(subdir_path, "directory_entry_atom.json");
   EXPECT_TRUE(FindEntry(subdir_path) != NULL);
@@ -2085,24 +2085,24 @@ TEST_F(GDataFileSystemTest, FindFirstMissingParentDirectory) {
   FilePath first_missing_parent_path;
 
   // Create directory in root.
-  FilePath dir_path(FILE_PATH_LITERAL("gdata/New Folder 1"));
+  FilePath dir_path(FILE_PATH_LITERAL("drive/New Folder 1"));
   EXPECT_EQ(
       GDataFileSystem::FOUND_MISSING,
       file_system_->FindFirstMissingParentDirectory(dir_path,
           &last_dir_content_url,
           &first_missing_parent_path));
-  EXPECT_EQ(FilePath(FILE_PATH_LITERAL("gdata/New Folder 1")),
+  EXPECT_EQ(FilePath(FILE_PATH_LITERAL("drive/New Folder 1")),
             first_missing_parent_path);
   EXPECT_TRUE(last_dir_content_url.is_empty());    // root directory.
 
   // Missing folders in subdir of an existing folder.
-  FilePath dir_path2(FILE_PATH_LITERAL("gdata/Directory 1/New Folder 2"));
+  FilePath dir_path2(FILE_PATH_LITERAL("drive/Directory 1/New Folder 2"));
   EXPECT_EQ(
       GDataFileSystem::FOUND_MISSING,
       file_system_->FindFirstMissingParentDirectory(dir_path2,
           &last_dir_content_url,
           &first_missing_parent_path));
-  EXPECT_EQ(FilePath(FILE_PATH_LITERAL("gdata/Directory 1/New Folder 2")),
+  EXPECT_EQ(FilePath(FILE_PATH_LITERAL("drive/Directory 1/New Folder 2")),
             first_missing_parent_path);
   EXPECT_FALSE(last_dir_content_url.is_empty());    // non-root directory.
 
@@ -2113,7 +2113,7 @@ TEST_F(GDataFileSystemTest, FindFirstMissingParentDirectory) {
       file_system_->FindFirstMissingParentDirectory(dir_path3,
           &last_dir_content_url,
           &first_missing_parent_path));
-  EXPECT_EQ(FilePath(FILE_PATH_LITERAL("gdata/Directory 1/New Folder 2")),
+  EXPECT_EQ(FilePath(FILE_PATH_LITERAL("drive/Directory 1/New Folder 2")),
             first_missing_parent_path);
   EXPECT_FALSE(last_dir_content_url.is_empty());    // non-root directory.
 
@@ -2121,7 +2121,7 @@ TEST_F(GDataFileSystemTest, FindFirstMissingParentDirectory) {
   EXPECT_EQ(
       GDataFileSystem::FOUND_INVALID,
       file_system_->FindFirstMissingParentDirectory(
-          FilePath(FILE_PATH_LITERAL("gdata/File 1.txt/BadDir")),
+          FilePath(FILE_PATH_LITERAL("drive/File 1.txt/BadDir")),
           &last_dir_content_url,
           &first_missing_parent_path));
 
@@ -2129,7 +2129,7 @@ TEST_F(GDataFileSystemTest, FindFirstMissingParentDirectory) {
   EXPECT_EQ(
       GDataFileSystem::DIRECTORY_ALREADY_PRESENT,
       file_system_->FindFirstMissingParentDirectory(
-          FilePath(FILE_PATH_LITERAL("gdata/Directory 1")),
+          FilePath(FILE_PATH_LITERAL("drive/Directory 1")),
           &last_dir_content_url,
           &first_missing_parent_path));
 }
@@ -2787,7 +2787,7 @@ TEST_F(GDataFileSystemTest, GetCacheState) {
 
   {  // Test cache state of an existing normal file.
     // Retrieve resource id and md5 of a file from file system.
-    FilePath file_path(FILE_PATH_LITERAL("gdata/File 1.txt"));
+    FilePath file_path(FILE_PATH_LITERAL("drive/File 1.txt"));
     GDataEntry* entry = FindEntry(file_path);
     ASSERT_TRUE(entry != NULL);
     GDataFile* file = entry->AsGDataFile();
@@ -2810,7 +2810,7 @@ TEST_F(GDataFileSystemTest, GetCacheState) {
   {  // Test cache state of an existing pinned file.
     // Retrieve resource id and md5 of a file from file system.
     FilePath file_path(
-        FILE_PATH_LITERAL("gdata/Directory 1/SubDirectory File 1.txt"));
+        FILE_PATH_LITERAL("drive/Directory 1/SubDirectory File 1.txt"));
     GDataEntry* entry = FindEntry(file_path);
     ASSERT_TRUE(entry != NULL);
     GDataFile* file = entry->AsGDataFile();
@@ -2858,14 +2858,14 @@ TEST_F(GDataFileSystemTest, GetGDataEntryByPath) {
   // Lock to call GetGDataEntryByPath.
   base::AutoLock lock(file_system_->lock_);
   GDataEntry* entry = file_system_->GetGDataEntryByPath(
-      FilePath(FILE_PATH_LITERAL("gdata/File 1.txt")));
+      FilePath(FILE_PATH_LITERAL("drive/File 1.txt")));
   ASSERT_TRUE(entry != NULL);
   EXPECT_EQ("https://file1_link_self/file:2_file_resource_id",
             entry->edit_url().spec());
   EXPECT_EQ("https://file_content_url/", entry->content_url().spec());
 
   GDataEntry* non_existent = file_system_->GetGDataEntryByPath(
-      FilePath(FILE_PATH_LITERAL("gdata/Nonexistent.txt")));
+      FilePath(FILE_PATH_LITERAL("drive/Nonexistent.txt")));
   ASSERT_TRUE(non_existent == NULL);
 }
 
@@ -2878,7 +2878,7 @@ TEST_F(GDataFileSystemTest, CreateDirectoryWithService) {
   // Set last error so it's not a valid error code.
   callback_helper_->last_error_ = static_cast<base::PlatformFileError>(1);
   file_system_->CreateDirectory(
-      FilePath(FILE_PATH_LITERAL("gdata/Sample Directory Title")),
+      FilePath(FILE_PATH_LITERAL("drive/Sample Directory Title")),
       false,  // is_exclusive
       true,  // is_recursive
       base::Bind(&CallbackHelper::FileOperationCallback,
@@ -2898,7 +2898,7 @@ TEST_F(GDataFileSystemTest, GetFileByPath_FromGData_EnoughSpace) {
       base::Bind(&CallbackHelper::GetFileCallback,
                  callback_helper_.get());
 
-  FilePath file_in_root(FILE_PATH_LITERAL("gdata/File 1.txt"));
+  FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt"));
   GDataEntry* entry = FindEntry(file_in_root);
   GDataFile* file = entry->AsGDataFile();
   FilePath downloaded_file = GetCachePathForFile(file);
@@ -2937,7 +2937,7 @@ TEST_F(GDataFileSystemTest, GetFileByPath_FromGData_NoSpaceAtAll) {
       base::Bind(&CallbackHelper::GetFileCallback,
                  callback_helper_.get());
 
-  FilePath file_in_root(FILE_PATH_LITERAL("gdata/File 1.txt"));
+  FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt"));
   GDataEntry* entry = FindEntry(file_in_root);
   GDataFile* file = entry->AsGDataFile();
   FilePath downloaded_file = GetCachePathForFile(file);
@@ -2973,7 +2973,7 @@ TEST_F(GDataFileSystemTest, GetFileByPath_FromGData_NoEnoughSpaceButCanFreeUp) {
       base::Bind(&CallbackHelper::GetFileCallback,
                  callback_helper_.get());
 
-  FilePath file_in_root(FILE_PATH_LITERAL("gdata/File 1.txt"));
+  FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt"));
   GDataEntry* entry = FindEntry(file_in_root);
   GDataFile* file = entry->AsGDataFile();
   FilePath downloaded_file = GetCachePathForFile(file);
@@ -3032,7 +3032,7 @@ TEST_F(GDataFileSystemTest, GetFileByPath_FromGData_EnoughSpaceButBecomeFull) {
       base::Bind(&CallbackHelper::GetFileCallback,
                  callback_helper_.get());
 
-  FilePath file_in_root(FILE_PATH_LITERAL("gdata/File 1.txt"));
+  FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt"));
   GDataEntry* entry = FindEntry(file_in_root);
   GDataFile* file = entry->AsGDataFile();
   FilePath downloaded_file = GetCachePathForFile(file);
@@ -3074,7 +3074,7 @@ TEST_F(GDataFileSystemTest, GetFileByPath_FromCache) {
       base::Bind(&CallbackHelper::GetFileCallback,
                  callback_helper_.get());
 
-  FilePath file_in_root(FILE_PATH_LITERAL("gdata/File 1.txt"));
+  FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt"));
   GDataEntry* entry = FindEntry(file_in_root);
   GDataFile* file = entry->AsGDataFile();
   FilePath downloaded_file = GetCachePathForFile(file);
@@ -3113,7 +3113,7 @@ TEST_F(GDataFileSystemTest, GetFileByPath_HostedDocument) {
       base::Bind(&CallbackHelper::GetFileCallback,
                  callback_helper_.get());
 
-  FilePath file_in_root(FILE_PATH_LITERAL("gdata/Document 1.gdoc"));
+  FilePath file_in_root(FILE_PATH_LITERAL("drive/Document 1.gdoc"));
   GDataEntry* entry = NULL;
   EXPECT_TRUE((entry = FindEntry(file_in_root)) != NULL);
 
@@ -3139,7 +3139,7 @@ TEST_F(GDataFileSystemTest, GetFileByResourceId) {
       base::Bind(&CallbackHelper::GetFileCallback,
                  callback_helper_.get());
 
-  FilePath file_in_root(FILE_PATH_LITERAL("gdata/File 1.txt"));
+  FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt"));
   GDataEntry* entry = FindEntry(file_in_root);
   GDataFile* file = entry->AsGDataFile();
   FilePath downloaded_file = GetCachePathForFile(file);
@@ -3173,7 +3173,7 @@ TEST_F(GDataFileSystemTest, GetFileByResourceId_FromCache) {
       base::Bind(&CallbackHelper::GetFileCallback,
                  callback_helper_.get());
 
-  FilePath file_in_root(FILE_PATH_LITERAL("gdata/File 1.txt"));
+  FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt"));
   GDataEntry* entry = FindEntry(file_in_root);
   GDataFile* file = entry->AsGDataFile();
   FilePath downloaded_file = GetCachePathForFile(file);
@@ -3214,13 +3214,13 @@ TEST_F(GDataFileSystemTest, ContentSearch) {
   message_loop_.Run();  // Wait to get our result
 
   const SearchResultPair kSearchResultPairs[] = {
-    { "gdata/.search/foo/file:2_file_resouce_id.SubDirectory File 1.txt",
-      "gdata/Directory 1/SubDirectory File 1.txt" },
-    { "gdata/.search/foo/folder:1_folder_resource_id.Directory 1",
-      "gdata/Directory 1" },
-    { "gdata/.search/foo/folder:1_folder_resource_id.Directory 1/"
+    { "drive/.search/foo/file:2_file_resouce_id.SubDirectory File 1.txt",
+      "drive/Directory 1/SubDirectory File 1.txt" },
+    { "drive/.search/foo/folder:1_folder_resource_id.Directory 1",
+      "drive/Directory 1" },
+    { "drive/.search/foo/folder:1_folder_resource_id.Directory 1/"
       "SubDirectory File 1.txt",
-      "gdata/Directory 1/SubDirectory File 1.txt" }
+      "drive/Directory 1/SubDirectory File 1.txt" }
   };
 
   for (size_t i = 0; i < arraysize(kSearchResultPairs); ++i) {
@@ -3246,12 +3246,12 @@ TEST_F(GDataFileSystemTest, ContentSearch_Delete) {
 
   EXPECT_CALL(*mock_doc_service_, DeleteDocument(_, _)).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
 
   FilePath search_file_path(FILE_PATH_LITERAL(
-      "gdata/.search/foo/file:2_file_resouce_id.SubDirectory File 1.txt"));
+      "drive/.search/foo/file:2_file_resouce_id.SubDirectory File 1.txt"));
   FilePath real_file_path(FILE_PATH_LITERAL(
-      "gdata/Directory 1/SubDirectory File 1.txt"));
+      "drive/Directory 1/SubDirectory File 1.txt"));
 
   ASSERT_TRUE(FindEntry(real_file_path));
   ASSERT_TRUE(FindEntry(search_file_path));
@@ -3273,7 +3273,7 @@ TEST_F(GDataFileSystemTest, ContentSearch_RenameResult) {
   LoadRootFeedDocument("root_feed.json");
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
 
   EXPECT_CALL(*mock_doc_service_, RenameResource(
       Eq(GURL("https://dir1_file_link_self/file:2_file_resouce_id")),
@@ -3281,15 +3281,15 @@ TEST_F(GDataFileSystemTest, ContentSearch_RenameResult) {
       .Times(1);
 
   FilePath source_path_search(FILE_PATH_LITERAL(
-      "gdata/.search/foo/file:2_file_resouce_id.SubDirectory File 1.txt"));
+      "drive/.search/foo/file:2_file_resouce_id.SubDirectory File 1.txt"));
   FilePath source_path_real(FILE_PATH_LITERAL(
-      "gdata/Directory 1/SubDirectory File 1.txt"));
+      "drive/Directory 1/SubDirectory File 1.txt"));
 
   FilePath renamed_path_search(FILE_PATH_LITERAL(
-      "gdata/.search/foo/"
+      "drive/.search/foo/"
       "file:2_file_resouce_id.SubDirectory File 1.txt.renamed"));
   FilePath renamed_path_real(FILE_PATH_LITERAL(
-      "gdata/Directory 1/SubDirectory File 1.txt.renamed"));
+      "drive/Directory 1/SubDirectory File 1.txt.renamed"));
 
   FileOperationCallback callback =
       base::Bind(&CallbackHelper::FileOperationCallback,
@@ -3312,13 +3312,13 @@ TEST_F(GDataFileSystemTest, ContentSearch_Move) {
 
   // Setup directory observer mocks.
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(FilePath(FILE_PATH_LITERAL(
-             "gdata/Directory 1/Sub Directory Folder")))))
+             "drive/Directory 1/Sub Directory Folder")))))
       .Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
 
   // Setup documents service mocks.
   EXPECT_CALL(*mock_doc_service_, RenameResource(
@@ -3337,16 +3337,16 @@ TEST_F(GDataFileSystemTest, ContentSearch_Move) {
 
   // Start the test.
   FilePath source_path_search(FILE_PATH_LITERAL(
-      "gdata/.search/foo/folder:1_folder_resource_id.Directory 1/"
+      "drive/.search/foo/folder:1_folder_resource_id.Directory 1/"
       "SubDirectory File 1.txt"));
   FilePath source_path_real(FILE_PATH_LITERAL(
-      "gdata/Directory 1/SubDirectory File 1.txt"));
+      "drive/Directory 1/SubDirectory File 1.txt"));
 
   FilePath destination_path_search(FILE_PATH_LITERAL(
-      "gdata/.search/foo/folder:1_folder_resource_id.Directory 1/"
+      "drive/.search/foo/folder:1_folder_resource_id.Directory 1/"
       "Sub Directory Folder/SubDirectory File 1.txt.dest"));
   FilePath destination_path_real(FILE_PATH_LITERAL(
-      "gdata/Directory 1/Sub Directory Folder/SubDirectory File 1.txt.dest"));
+      "drive/Directory 1/Sub Directory Folder/SubDirectory File 1.txt.dest"));
 
   ASSERT_TRUE(FindEntry(source_path_search));
   ASSERT_TRUE(FindEntry(source_path_real));
@@ -3373,13 +3373,13 @@ TEST_F(GDataFileSystemTest, ContentSearch_MoveToGData) {
 
   // Setup directory observer mocks.
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(FilePath(FILE_PATH_LITERAL(
-                      "gdata/Directory 1/Sub Directory Folder")))))
+                      "drive/Directory 1/Sub Directory Folder")))))
       .Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
 
   // Setup documents service mocks.
   EXPECT_CALL(*mock_doc_service_, RenameResource(
@@ -3398,16 +3398,16 @@ TEST_F(GDataFileSystemTest, ContentSearch_MoveToGData) {
 
   // Statr the test.
   FilePath source_path_search(FILE_PATH_LITERAL(
-      "gdata/.search/foo/folder:1_folder_resource_id.Directory 1/"
+      "drive/.search/foo/folder:1_folder_resource_id.Directory 1/"
       "SubDirectory File 1.txt"));
   FilePath source_path_real(FILE_PATH_LITERAL(
-      "gdata/Directory 1/SubDirectory File 1.txt"));
+      "drive/Directory 1/SubDirectory File 1.txt"));
 
   FilePath destination_path_search(FILE_PATH_LITERAL(
-      "gdata/.search/foo/folder:1_folder_resource_id.Directory 1/"
+      "drive/.search/foo/folder:1_folder_resource_id.Directory 1/"
       "Sub Directory Folder/SubDirectory File 1.txt.dest"));
   FilePath destination_path_real(FILE_PATH_LITERAL(
-      "gdata/Directory 1/Sub Directory Folder/SubDirectory File 1.txt.dest"));
+      "drive/Directory 1/Sub Directory Folder/SubDirectory File 1.txt.dest"));
 
   ASSERT_TRUE(FindEntry(source_path_search));
   ASSERT_TRUE(FindEntry(source_path_real));
@@ -3433,13 +3433,13 @@ TEST_F(GDataFileSystemTest, ContentSearch_MoveToSearch) {
 
   // Setup directory observer mocks.
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(FilePath(FILE_PATH_LITERAL(
-             "gdata/Directory 1/Sub Directory Folder")))))
+             "drive/Directory 1/Sub Directory Folder")))))
       .Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
 
   // Setup documents service mocks.
   EXPECT_CALL(*mock_doc_service_, RenameResource(
@@ -3458,16 +3458,16 @@ TEST_F(GDataFileSystemTest, ContentSearch_MoveToSearch) {
 
   // Statr the test.
   FilePath source_path_search(FILE_PATH_LITERAL(
-      "gdata/.search/foo/folder:1_folder_resource_id.Directory 1/"
+      "drive/.search/foo/folder:1_folder_resource_id.Directory 1/"
       "SubDirectory File 1.txt"));
   FilePath source_path_real(FILE_PATH_LITERAL(
-      "gdata/Directory 1/SubDirectory File 1.txt"));
+      "drive/Directory 1/SubDirectory File 1.txt"));
 
   FilePath destination_path_search(FILE_PATH_LITERAL(
-      "gdata/.search/foo/folder:1_folder_resource_id.Directory 1/"
+      "drive/.search/foo/folder:1_folder_resource_id.Directory 1/"
       "Sub Directory Folder/SubDirectory File 1.txt.dest"));
   FilePath destination_path_real(FILE_PATH_LITERAL(
-      "gdata/Directory 1/Sub Directory Folder/SubDirectory File 1.txt.dest"));
+      "drive/Directory 1/Sub Directory Folder/SubDirectory File 1.txt.dest"));
 
   ASSERT_TRUE(FindEntry(source_path_search));
   ASSERT_TRUE(FindEntry(source_path_real));
@@ -3492,9 +3492,9 @@ TEST_F(GDataFileSystemTest, ContentSearch_CopyToSearchDirectory) {
   LoadRootFeedDocument("root_feed.json");
 
   FilePath src_file_path(FILE_PATH_LITERAL(
-      "gdata/Directory 1/SubDirectory File 1.txt"));
+      "drive/Directory 1/SubDirectory File 1.txt"));
   FilePath dest_file_path(FILE_PATH_LITERAL(
-      "gdata/.search/Directory 1"));
+      "drive/.search/Directory 1"));
 
   FileOperationCallback callback =
       base::Bind(&CallbackHelper::FileOperationCallback,
@@ -3512,9 +3512,9 @@ TEST_F(GDataFileSystemTest, ContentSearch_CopyToSearchResultDirectory) {
   LoadRootFeedDocument("root_feed.json");
 
   FilePath src_file_path(FILE_PATH_LITERAL(
-      "gdata/Directory 1/SubDirectory File 1.txt"));
+      "drive/Directory 1/SubDirectory File 1.txt"));
   FilePath dest_file_path(FILE_PATH_LITERAL(
-      "gdata/.search/foo/Directory 1"));
+      "drive/.search/foo/Directory 1"));
 
   FileOperationCallback callback =
       base::Bind(&CallbackHelper::FileOperationCallback,
@@ -3533,7 +3533,7 @@ TEST_F(GDataFileSystemTest, ContentSearch_CreateDirInSearchResultDirectory) {
   LoadRootFeedDocument("root_feed.json");
 
   FilePath dest_file_path(FILE_PATH_LITERAL(
-      "gdata/.search/foo/New Folder"));
+      "drive/.search/foo/New Folder"));
 
   FileOperationCallback callback =
       base::Bind(&CallbackHelper::FileOperationCallback,
@@ -3550,7 +3550,7 @@ TEST_F(GDataFileSystemTest, ContentSearch_CreateDirInSearchDirectory) {
   LoadRootFeedDocument("root_feed.json");
 
   FilePath dest_file_path(FILE_PATH_LITERAL(
-      "gdata/.search/New Folder"));
+      "drive/.search/New Folder"));
 
   FileOperationCallback callback =
       base::Bind(&CallbackHelper::FileOperationCallback,
@@ -3567,14 +3567,14 @@ TEST_F(GDataFileSystemTest, ContentSearch_CreateDirectory) {
   LoadRootFeedDocument("root_feed.json");
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+      Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
   EXPECT_CALL(*mock_doc_service_, CreateDirectory(
       Eq(GURL("https://1_folder_content_url/")), "FolderNew", _)).Times(1);
 
   FilePath search_dir_path(FILE_PATH_LITERAL(
-         "gdata/.search/foo/folder:1_folder_resource_id.Directory 1/"
+         "drive/.search/foo/folder:1_folder_resource_id.Directory 1/"
          "FolderNew"));
-  FilePath real_dir_path(FILE_PATH_LITERAL("gdata/Directory 1/FolderNew"));
+  FilePath real_dir_path(FILE_PATH_LITERAL("drive/Directory 1/FolderNew"));
 
   EXPECT_FALSE(FindEntry(search_dir_path));
   EXPECT_FALSE(FindEntry(real_dir_path));
diff --git a/chrome/browser/chromeos/gdata/gdata_files.cc b/chrome/browser/chromeos/gdata/gdata_files.cc
index 750f194..83182bb 100644
--- a/chrome/browser/chromeos/gdata/gdata_files.cc
+++ b/chrome/browser/chromeos/gdata/gdata_files.cc
@@ -19,7 +19,7 @@ namespace {
 
 const char kSlash[] = "/";
 const char kEscapedSlash[] = "\xE2\x88\x95";
-const FilePath::CharType kGDataRootDirectory[] = FILE_PATH_LITERAL("gdata");
+const FilePath::CharType kGDataRootDirectory[] = FILE_PATH_LITERAL("drive");
 
 std::string CacheSubDirectoryTypeToString(
     GDataRootDirectory::CacheSubDirectoryType subdir) {
@@ -464,11 +464,11 @@ bool GDataRootDirectory::ModifyFindEntryParamsForSearchPath(
   DCHECK(current_dir);
   DCHECK(components);
   // |components| should contain at least 4 members.
-  // "gdata", ".search", query_name and query_result_name. Additionally,
+  // "drive", ".search", query_name and query_result_name. Additionally,
   // if query result is a directory, it may contain subdirectories and files,
   // in which case the number of components may be bigger than 4.
   DCHECK_GT(components->size(), 3u);
-  DCHECK(components->at(0) == "gdata" && components->at(1) == ".search");
+  DCHECK(components->at(0) == "drive" && components->at(1) == ".search");
 
   FilePath::StringType resource_id;
   FilePath::StringType file_name;
@@ -497,7 +497,7 @@ bool GDataRootDirectory::ModifyFindEntryParamsForSearchPath(
     *directory_path = FilePath();
   }
 
-  // Remove "gdata/.search" from path.
+  // Remove "drive/.search" from path.
   components->erase(components->begin(), components->begin() + 2);
   (*components)[0] = (*current_dir)->file_name();
   (*components)[1] = file_name;
diff --git a/chrome/browser/chromeos/gdata/gdata_files.h b/chrome/browser/chromeos/gdata/gdata_files.h
index 6beb1fd..51e9660 100644
--- a/chrome/browser/chromeos/gdata/gdata_files.h
+++ b/chrome/browser/chromeos/gdata/gdata_files.h
@@ -515,9 +515,9 @@ class GDataRootDirectory : public GDataDirectory {
   // the entry with resource id <resource_id>. This definition enables us to
   // test uniqueness of the proposed name when renaming gdata search result.
   //
-  // For example, if gdata/.search/foo/res_id.foo_name references
-  // gdata/result_parent/result, and the search path is
-  // gdata/.search/foo/res_ud.foo_name/foo_child, we'll set current dir to the
+  // For example, if drive/.search/foo/res_id.foo_name references
+  // drive/result_parent/result, and the search path is
+  // drive/.search/foo/res_ud.foo_name/foo_child, we'll set current dir to the
   // entry with path reulst_parent, and components to [result_parent, result,
   // foo_child].
   bool ModifyFindEntryParamsForSearchPath(
diff --git a/chrome/browser/chromeos/gdata/gdata_upload_file_info.h b/chrome/browser/chromeos/gdata/gdata_upload_file_info.h
index bee1d64..5ab4a46 100644
--- a/chrome/browser/chromeos/gdata/gdata_upload_file_info.h
+++ b/chrome/browser/chromeos/gdata/gdata_upload_file_info.h
@@ -51,7 +51,7 @@ struct UploadFileInfo {
   // multiple ResumeUpload requests.
   // Location URL where file is to be uploaded to, returned from InitiateUpload.
   GURL upload_location;
-  // Final path in gdata. Looks like /special/gdata/MyFolder/MyFile.
+  // Final path in gdata. Looks like /special/drive/MyFolder/MyFile.
   FilePath gdata_path;
 
   // TODO(achuith): Use generic stream object after FileStream is refactored to
diff --git a/chrome/browser/chromeos/gdata/gdata_util.cc b/chrome/browser/chromeos/gdata/gdata_util.cc
index fc76769..d06b14e 100644
--- a/chrome/browser/chromeos/gdata/gdata_util.cc
+++ b/chrome/browser/chromeos/gdata/gdata_util.cc
@@ -41,14 +41,14 @@ namespace {
 
 const char kGDataSpecialRootPath[] = "/special";
 
-const char kGDataMountPointPath[] = "/special/gdata";
+const char kGDataMountPointPath[] = "/special/drive";
 
 const FilePath::CharType* kGDataMountPointPathComponents[] = {
-  "/", "special", "gdata"
+  "/", "special", "drive"
 };
 
 const FilePath::CharType* kGDataSearchPathComponents[] = {
-  "gdata", ".search"
+  "drive", ".search"
 };
 
 const int kReadOnlyFilePermissions = base::PLATFORM_FILE_OPEN |
@@ -233,7 +233,7 @@ FilePath ExtractGDataPath(const FilePath& path) {
   std::vector<FilePath::StringType> components;
   path.GetComponents(&components);
 
-  // -1 to include 'gdata'.
+  // -1 to include 'drive'.
   FilePath extracted;
   for (size_t i = arraysize(kGDataMountPointPathComponents) - 1;
        i < components.size(); ++i) {
@@ -261,7 +261,7 @@ void InsertGDataCachePathsPermissions(
   // We check permissions for raw cache file paths only for read-only
   // operations (when fileEntry.file() is called), so read only permissions
   // should be sufficient for all cache paths. For the rest of supported
-  // operations the file access check is done for gdata/ paths.
+  // operations the file access check is done for drive/ paths.
   cache_paths->push_back(std::make_pair(
       file_system->GetCacheFilePath(resource_id, file_md5,
           GDataRootDirectory::CACHE_TYPE_PERSISTENT,
diff --git a/chrome/browser/chromeos/gdata/gdata_util.h b/chrome/browser/chromeos/gdata/gdata_util.h
index 0e82f73..87a6c25 100644
--- a/chrome/browser/chromeos/gdata/gdata_util.h
+++ b/chrome/browser/chromeos/gdata/gdata_util.h
@@ -18,16 +18,16 @@ namespace gdata {
 namespace util {
 
 // Search path is a path used to display gdata content search results.
-// All results are displayed under virtual directory "gdata/.search", in which
+// All results are displayed under virtual directory "drive/.search", in which
 // each query is given its own directory for displaying results.
 enum GDataSearchPathType {
   // Not a search path.
   GDATA_SEARCH_PATH_INVALID,
-  // gdata/.search.
+  // drive/.search.
   GDATA_SEARCH_PATH_ROOT,
-  // Path that defines search query (gdata/.search/foo).
+  // Path that defines search query (drive/.search/foo).
   GDATA_SEARCH_PATH_QUERY,
-  // Path given to a search result (gdata/.search/foo/foo_found).
+  // Path given to a search result (drive/.search/foo/foo_found).
   // The file name will be formatted: "resource_id.file_name".
   GDATA_SEARCH_PATH_RESULT,
   // If search result is directory, it may contain some children.
@@ -44,7 +44,7 @@ const std::string& GetGDataMountPointPathAsString();
 const FilePath& GetSpecialRemoteRootPath();
 
 // Returns the gdata file resource url formatted as
-// chrome://gdata/<resource_id>/<file_name>.
+// chrome://drive/<resource_id>/<file_name>.
 GURL GetFileResourceUrl(const std::string& resource_id,
                         const std::string& file_name);
 
@@ -74,7 +74,7 @@ bool ParseSearchFileName(const std::string& search_file_name,
 
 // Extracts the GData path from the given path located under the GData mount
 // point. Returns an empty path if |path| is not under the GData mount point.
-// Examples: ExtractGDatPath("/special/gdata/foo.txt") => "gdata/foo.txt"
+// Examples: ExtractGDatPath("/special/drive/foo.txt") => "drive/foo.txt"
 FilePath ExtractGDataPath(const FilePath& path);
 
 // Returns vector of all possible cache paths for a given path on gdata mount
diff --git a/chrome/browser/chromeos/gdata/gdata_util_unittest.cc b/chrome/browser/chromeos/gdata/gdata_util_unittest.cc
index b1cddcb..727d0c6 100644
--- a/chrome/browser/chromeos/gdata/gdata_util_unittest.cc
+++ b/chrome/browser/chromeos/gdata/gdata_util_unittest.cc
@@ -17,16 +17,16 @@ TEST(GDataUtilTest, IsUnderGDataMountPoint) {
   EXPECT_FALSE(IsUnderGDataMountPoint(
       FilePath::FromUTF8Unsafe("/special/foo.txt")));
   EXPECT_FALSE(IsUnderGDataMountPoint(
-      FilePath::FromUTF8Unsafe("/special/gdatax/foo.txt")));
+      FilePath::FromUTF8Unsafe("/special/drivex/foo.txt")));
   EXPECT_FALSE(IsUnderGDataMountPoint(
-      FilePath::FromUTF8Unsafe("special/gdatax/foo.txt")));
+      FilePath::FromUTF8Unsafe("special/drivex/foo.txt")));
 
   EXPECT_TRUE(IsUnderGDataMountPoint(
-      FilePath::FromUTF8Unsafe("/special/gdata")));
+      FilePath::FromUTF8Unsafe("/special/drive")));
   EXPECT_TRUE(IsUnderGDataMountPoint(
-      FilePath::FromUTF8Unsafe("/special/gdata/foo.txt")));
+      FilePath::FromUTF8Unsafe("/special/drive/foo.txt")));
   EXPECT_TRUE(IsUnderGDataMountPoint(
-      FilePath::FromUTF8Unsafe("/special/gdata/subdir/foo.txt")));
+      FilePath::FromUTF8Unsafe("/special/drive/subdir/foo.txt")));
 }
 
 TEST(GDataUtilTest, ExtractGDataPath) {
@@ -40,15 +40,15 @@ TEST(GDataUtilTest, ExtractGDataPath) {
             ExtractGDataPath(
                 FilePath::FromUTF8Unsafe("/special/gdatax/foo.txt")));
 
-  EXPECT_EQ(FilePath::FromUTF8Unsafe("gdata"),
+  EXPECT_EQ(FilePath::FromUTF8Unsafe("drive"),
             ExtractGDataPath(
-                FilePath::FromUTF8Unsafe("/special/gdata")));
-  EXPECT_EQ(FilePath::FromUTF8Unsafe("gdata/foo.txt"),
+                FilePath::FromUTF8Unsafe("/special/drive")));
+  EXPECT_EQ(FilePath::FromUTF8Unsafe("drive/foo.txt"),
             ExtractGDataPath(
-                FilePath::FromUTF8Unsafe("/special/gdata/foo.txt")));
-  EXPECT_EQ(FilePath::FromUTF8Unsafe("gdata/subdir/foo.txt"),
+                FilePath::FromUTF8Unsafe("/special/drive/foo.txt")));
+  EXPECT_EQ(FilePath::FromUTF8Unsafe("drive/subdir/foo.txt"),
             ExtractGDataPath(
-                FilePath::FromUTF8Unsafe("/special/gdata/subdir/foo.txt")));
+                FilePath::FromUTF8Unsafe("/special/drive/subdir/foo.txt")));
 }
 
 TEST(GDataUtilTest, EscapeUnescapeCacheFileName) {
diff --git a/chrome/browser/resources/file_manager/js/directory_model.js b/chrome/browser/resources/file_manager/js/directory_model.js
index 0cc5933..3098357 100644
--- a/chrome/browser/resources/file_manager/js/directory_model.js
+++ b/chrome/browser/resources/file_manager/js/directory_model.js
@@ -90,7 +90,7 @@ DirectoryModel.DOWNLOADS_DIRECTORY = 'Downloads';
 /**
 * The name of the gdata provider directory.
 */
-DirectoryModel.GDATA_DIRECTORY = 'gdata';
+DirectoryModel.GDATA_DIRECTORY = 'drive';
 
 /**
  * DirectoryModel extends cr.EventTarget.
diff --git a/chrome/browser/resources/file_manager/js/metadata/metadata_cache.js b/chrome/browser/resources/file_manager/js/metadata/metadata_cache.js
index 5f34a59..e923454 100644
--- a/chrome/browser/resources/file_manager/js/metadata/metadata_cache.js
+++ b/chrome/browser/resources/file_manager/js/metadata/metadata_cache.js
@@ -553,7 +553,7 @@ GDataProvider.prototype = {
  * Pattern for urls supported by GDataProvider.
  */
 GDataProvider.URL_PATTERN =
-    new RegExp('^filesystem:[^/]*://[^/]*/[^/]*/gdata/(.*)');
+    new RegExp('^filesystem:[^/]*://[^/]*/[^/]*/drive/(.*)');
 
 /**
  * @param {string} url The url.
diff --git a/chrome/test/data/extensions/api_test/filebrowser_component/remote.js b/chrome/test/data/extensions/api_test/filebrowser_component/remote.js
index 9de6380..4887c42 100644
--- a/chrome/test/data/extensions/api_test/filebrowser_component/remote.js
+++ b/chrome/test/data/extensions/api_test/filebrowser_component/remote.js
@@ -11,11 +11,11 @@
 
 // These should match the counterparts in feeds used in
 // external_filesystem_apitest.cc.
-// The feeds are located in chrome/test/data/chromeos/gdata/.
-var kDirectoryPath = 'gdata/Folder';
+// The feeds are located in chrome/test/data/chromeos/drive/.
+var kDirectoryPath = 'drive/Folder';
 var kFileName = 'File.aBc';
 var kExpectedContents = 'hello, world\0';
-var kNewDirectoryPath = 'gdata/FolderNew';
+var kNewDirectoryPath = 'drive/FolderNew';
 
 // Gets local filesystem used in tests.
 TestRunner.prototype.init = function() {
@@ -34,33 +34,33 @@ TestRunner.prototype.onFileSystemFetched_ = function(fs) {
 
   this.fileSystem_ = fs;
   chrome.test.succeed();
-}
+};
 
 TestRunner.prototype.runGetDirTest = function(dirPath, doCreate) {
-  self=this;
+  self = this;
   chrome.test.assertTrue(!!this.fileSystem_);
   this.fileSystem_.root.getDirectory(dirPath, {create: doCreate},
-      function (entry) {
+      function(entry) {
         self.directoryEntry_ = entry;
         chrome.test.succeed();
       },
-      self.errorCallback_.bind(self, "Error creating directory: "));
+      self.errorCallback_.bind(self, 'Error creating directory: '));
 };
 
-TestRunner.prototype.runReadFileTest = function (fileName, expectedText) {
+TestRunner.prototype.runReadFileTest = function(fileName, expectedText) {
   var self = this;
   chrome.test.assertTrue(!!this.directoryEntry_);
   this.directoryEntry_.getFile(fileName, {},
-      function(entry){
+      function(entry) {
         self.fileEntry_ = entry;
         readFile(entry,
           function(text) {
             chrome.test.assertEq(expectedText, text);
             chrome.test.succeed();
           },
-          self.errorCallback_.bind(self, "Error reading file: "));
+          self.errorCallback_.bind(self, 'Error reading file: '));
       },
-      self.errorCallback_.bind(self, "Error opening file: "));
+      self.errorCallback_.bind(self, 'Error opening file: '));
 };
 
 TestRunner.prototype.runExecuteReadTask = function() {
@@ -77,7 +77,7 @@ TestRunner.prototype.runExecuteReadTask = function() {
     function(tasks) {
       if (!tasks || !tasks.length) {
         self.errorCallback_({message: 'No tasks registered'},
-                            "Error fetching tasks: ");
+                            'Error fetching tasks: ');
         return;
       }
 
@@ -85,7 +85,7 @@ TestRunner.prototype.runExecuteReadTask = function() {
       // file handler that will execute it.
       chrome.fileBrowserPrivate.executeTask(tasks[0].taskId, [fileURL]);
     });
-}
+};
 
 // Processes the response from file handler for which file task was executed.
 TestRunner.prototype.onHandlerRequest_ =
@@ -95,26 +95,26 @@ TestRunner.prototype.onHandlerRequest_ =
 
   this.verifyHandlerRequest(request,
       chrome.test.succeed,
-      this.errorCallback_.bind(this, ""));
-}
+      this.errorCallback_.bind(this, ''));
+};
 
 TestRunner.prototype.verifyHandlerRequest =
     function(request, successCallback, errorCallback) {
   if (!request) {
-    errorCallback({message: "Request from handler not defined."});
+    errorCallback({message: 'Request from handler not defined.'});
     return;
   }
 
   if (!request.fileContent) {
-    var error = request.error || {message: "Undefined error."};
+    var error = request.error || {message: 'Undefined error.'};
     errorCallback(error);
     return;
   }
 
   if (request.fileContent != kExpectedContents) {
     var error = {message: 'Received content does not match. ' +
-                          'Expected "' + originalText + '", ' +
-                          'Got "' + request.fileContent + '".'};
+                          'Expected ' + originalText + ', ' +
+                          'Got "' + request.fileContent + '.'};
     errorCallback(error);
     return;
   }
@@ -147,7 +147,7 @@ TestRunner.prototype.errorCallback_ = function(error, messagePrefix) {
       default:
         msg = 'Unknown Error';
         break;
-    };
+    }
   }
   chrome.test.fail(messagePrefix + msg);
 };
@@ -157,7 +157,7 @@ function TestRunner() {
   this.directoryEntry_ = undefined;
   this.fileEntry_ = undefined;
   this.listener_ = undefined;
-};
+}
 
 var testRunner = undefined;