Revert 164876 - Set root resource ID upon full feed update.

chrome/browser/chromeos/drive/drive_file_system_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/drive/drive_file_system.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 31 matching lines @@
 using ::testing::AtLeast;
 using ::testing::Eq;
 using ::testing::NotNull;
 using ::testing::Return;
 using ::testing::StrictMock;
 using ::testing::_;
 
 namespace drive {
 namespace {
 
-// The root directory resource ID for WAPI.
-// TODO(haruki): Make Drive API equivalent work. http://crbug.com/157114
-const char kTestRootDirectoryResourceId[] = "folder:testroot";
-
 const char kSymLinkToDevNull[] = "/dev/null";
 
 const int64 kLotsOfSpace = kMinFreeSpace * 10;
 
 struct SearchResultPair {
   const char* path;
   const bool is_directory;
 };
 
 // Callback to DriveFileSystem::Search used in ContentSearch tests.
@@ skipping 558 matching lines @@
   // equal to that of "account_metadata.json" test data, indicating the cache is
   // holding the latest file system info.
   void SaveTestFileSystem(SaveTestFileSystemParam param) {
     DriveRootDirectoryProto root;
     root.set_version(kProtoVersion);
     root.set_largest_changestamp(param == USE_SERVER_TIMESTAMP ? 654321 : 1);
     DriveDirectoryProto* root_dir = root.mutable_drive_directory();
     DriveEntryProto* dir_base = root_dir->mutable_drive_entry();
     PlatformFileInfoProto* platform_info = dir_base->mutable_file_info();
     dir_base->set_title("drive");
-    dir_base->set_resource_id(kTestRootDirectoryResourceId);
+    dir_base->set_resource_id(kDriveRootDirectoryResourceId);
     dir_base->set_upload_url("http://resumable-create-media/1");
     platform_info->set_is_directory(true);
 
     // drive/File1
     DriveEntryProto* file = root_dir->add_child_files();
     file->set_title("File1");
     file->set_resource_id("resource_id:File1");
     file->set_upload_url("http://resumable-edit-media/1");
     file->mutable_file_specific_info()->set_file_md5("md5");
     platform_info = file->mutable_file_info();
@@ skipping 227 matching lines @@
   EXPECT_EQ(2, counter);
 }
 
 TEST_F(DriveFileSystemTest, SearchRootDirectory) {
   LoadRootFeedDocument("gdata/root_feed.json");
 
   const FilePath kFilePath = FilePath(FILE_PATH_LITERAL("drive"));
   scoped_ptr<DriveEntryProto> entry = GetEntryInfoByPathSync(
       FilePath(FILE_PATH_LITERAL(kFilePath)));
   ASSERT_TRUE(entry.get());
-  // We get kWAPIRootDirectoryResourceId instead of kTestRootDirectoryResourceId
-  // here, as the root ID is set in DriveFeedLoader::UpdateFromFeed().
-  EXPECT_EQ(kWAPIRootDirectoryResourceId, entry->resource_id());
+  EXPECT_EQ(kDriveRootDirectoryResourceId, entry->resource_id());
 }
 
 TEST_F(DriveFileSystemTest, SearchExistingFile) {
   LoadRootFeedDocument("gdata/root_feed.json");
 
   const FilePath kFilePath = FilePath(
       FILE_PATH_LITERAL("drive/File 1.txt"));
   scoped_ptr<DriveEntryProto> entry = GetEntryInfoByPathSync(kFilePath);
   ASSERT_TRUE(entry.get());
   EXPECT_EQ("file:2_file_resource_id", entry->resource_id());
@@ skipping 1681 matching lines @@
   file_system_->GetAvailableSpace(callback);
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(GG_LONGLONG(6789012345), callback_helper_->quota_bytes_used_);
   EXPECT_EQ(GG_LONGLONG(9876543210), callback_helper_->quota_bytes_total_);
 }
 
 TEST_F(DriveFileSystemTest, RequestDirectoryRefresh) {
   LoadRootFeedDocument("gdata/root_feed.json");
 
   // We'll fetch documents in the root directory with its resource ID.
-  // kWAPIRootDirectoryResourceId instead of kTestRootDirectoryResourceId
-  // is used here as the root ID is set in DriveFeedLoader::UpdateFromFeed().
   EXPECT_CALL(*mock_drive_service_,
-              GetDocuments(Eq(GURL()), _, _, kWAPIRootDirectoryResourceId, _))
+              GetDocuments(Eq(GURL()), _, _, kDriveRootDirectoryResourceId, _))
       .Times(1);
   // We'll notify the directory change to the observer.
   EXPECT_CALL(*mock_directory_observer_,
               OnDirectoryChanged(Eq(FilePath(kDriveRootDirectory)))).Times(1);
 
   file_system_->RequestDirectoryRefresh(FilePath(kDriveRootDirectory));
   google_apis::test_util::RunBlockingPoolTask();
 }
 
 TEST_F(DriveFileSystemTest, OpenAndCloseFile) {
@@ skipping 81 matching lines @@
 
   // Try to close the same file twice.
   file_system_->CloseFile(kFileInRoot, close_file_callback);
   message_loop_.Run();
 
   // It must fail.
   EXPECT_EQ(DRIVE_FILE_ERROR_NOT_FOUND, callback_helper_->last_error_);
 }
 
 }   // namespace drive