drive: Use "/drive/root" namespace and fix Files app and tests.

chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc

Index: chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc
diff --git a/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc
index 8dc952cac662582fe5ac9fbc9b8a6b0c6d5fd5a9..f1b3e50649cf17823bfe732adfd84c187974cea7 100644
--- a/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc
@@ -15,6 +15,7 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/drive_cache.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/chromeos/drive/drive_resource_metadata_storage.h"
 #include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/google_apis/test_util.h"
@@ -30,8 +31,6 @@ namespace {
 const char kResumableEditMediaUrl[] = "http://resumable-edit-media/";
 const char kResumableCreateMediaUrl[] = "http://resumable-create-media/";
 
-const char kTestRootResourceId[] = "test_root";
-
 // The changestamp of the resource metadata used in
 // DriveResourceMetadataTest.
 const int64 kTestChangestamp = 100;
@@ -88,9 +87,10 @@ class DriveResourceMetadataTest : public testing::Test {
         content::BrowserThread::GetBlockingPool();
     blocking_task_runner_ =
         pool->GetSequencedTaskRunner(pool->GetSequenceToken());
-    resource_metadata_.reset(new DriveResourceMetadata(kTestRootResourceId,
-                                                       temp_dir_.path(),
-                                                       blocking_task_runner_));
+    resource_metadata_.reset(new DriveResourceMetadata(
+        util::kDriveGrandRootSpecialResourceId,
+        temp_dir_.path(),
+        blocking_task_runner_));
     Init(resource_metadata_.get());
   }
 
@@ -174,9 +174,11 @@ void DriveResourceMetadataTest::Init(DriveResourceMetadata* resource_metadata) {
 
   int sequence_id = 1;
   ASSERT_TRUE(AddDriveEntryProto(
-      resource_metadata, sequence_id++, true, kTestRootResourceId));
+      resource_metadata, sequence_id++, true,
+      util::kDriveGrandRootSpecialResourceId));
   ASSERT_TRUE(AddDriveEntryProto(
-      resource_metadata, sequence_id++, true, kTestRootResourceId));
+      resource_metadata, sequence_id++, true,
+      util::kDriveGrandRootSpecialResourceId));
   ASSERT_TRUE(AddDriveEntryProto(
       resource_metadata, sequence_id++, true, "resource_id:dir1"));
 
@@ -257,14 +259,15 @@ TEST_F(DriveResourceMetadataTest, VersionCheck) {
   DriveEntryProto* mutable_entry =
       proto.mutable_drive_directory()->mutable_drive_entry();
   mutable_entry->mutable_file_info()->set_is_directory(true);
-  mutable_entry->set_resource_id(kTestRootResourceId);
+  mutable_entry->set_resource_id(util::kDriveGrandRootSpecialResourceId);
   mutable_entry->set_upload_url(kResumableCreateMediaUrl);
   mutable_entry->set_title("drive");
 
   scoped_ptr<DriveResourceMetadata, test_util::DestroyHelperForTests>
-      resource_metadata(new DriveResourceMetadata(kTestRootResourceId,
-                                                  temp_dir_.path(),
-                                                  blocking_task_runner_));
+      resource_metadata(new DriveResourceMetadata(
+          util::kDriveGrandRootSpecialResourceId,
+          temp_dir_.path(),
+          blocking_task_runner_));
   ForceUsingMemoryStorage(resource_metadata.get());
 
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
@@ -303,9 +306,10 @@ TEST_F(DriveResourceMetadataTest, VersionCheck) {
 
 TEST_F(DriveResourceMetadataTest, LargestChangestamp) {
   scoped_ptr<DriveResourceMetadata, test_util::DestroyHelperForTests>
-      resource_metadata(new DriveResourceMetadata(kTestRootResourceId,
-                                                  temp_dir_.path(),
-                                                  blocking_task_runner_));
+      resource_metadata(new DriveResourceMetadata(
+          util::kDriveGrandRootSpecialResourceId,
+          temp_dir_.path(),
+          blocking_task_runner_));
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
   resource_metadata->Initialize(
       google_apis::test_util::CreateCopyResultCallback(&error));
@@ -328,9 +332,10 @@ TEST_F(DriveResourceMetadataTest, LargestChangestamp) {
 
 TEST_F(DriveResourceMetadataTest, GetEntryInfoByResourceId_RootDirectory) {
   scoped_ptr<DriveResourceMetadata, test_util::DestroyHelperForTests>
-      resource_metadata(new DriveResourceMetadata(kTestRootResourceId,
-                                                  temp_dir_.path(),
-                                                  blocking_task_runner_));
+      resource_metadata(new DriveResourceMetadata(
+          util::kDriveGrandRootSpecialResourceId,
+          temp_dir_.path(),
+          blocking_task_runner_));
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
   resource_metadata->Initialize(
       google_apis::test_util::CreateCopyResultCallback(&error));
@@ -342,7 +347,7 @@ TEST_F(DriveResourceMetadataTest, GetEntryInfoByResourceId_RootDirectory) {
 
   // Look up the root directory by its resource ID.
   resource_metadata->GetEntryInfoByResourceId(
-      kTestRootResourceId,
+      util::kDriveGrandRootSpecialResourceId,
       google_apis::test_util::CreateCopyResultCallback(
           &error, &drive_file_path, &entry_proto));
   google_apis::test_util::RunBlockingPoolTask();
@@ -574,7 +579,7 @@ TEST_F(DriveResourceMetadataTest, RemoveEntry) {
 
   // Try removing root. This should fail.
   resource_metadata_->RemoveEntry(
-      kTestRootResourceId,
+      util::kDriveGrandRootSpecialResourceId,
       google_apis::test_util::CreateCopyResultCallback(
           &error, &drive_file_path));
   google_apis::test_util::RunBlockingPoolTask();
@@ -816,7 +821,7 @@ TEST_F(DriveResourceMetadataTest, RefreshEntry_Root) {
   ASSERT_TRUE(entry_proto.get());
   EXPECT_EQ("drive", entry_proto->base_name());
   ASSERT_TRUE(entry_proto->file_info().is_directory());
-  EXPECT_EQ(kTestRootResourceId, entry_proto->resource_id());
+  EXPECT_EQ(util::kDriveGrandRootSpecialResourceId, entry_proto->resource_id());
   EXPECT_TRUE(entry_proto->upload_url().empty());
 
   // Set upload url and call RefreshEntry on root.
@@ -833,7 +838,7 @@ TEST_F(DriveResourceMetadataTest, RefreshEntry_Root) {
   ASSERT_TRUE(entry_proto.get());
   EXPECT_EQ("drive", entry_proto->base_name());
   EXPECT_TRUE(entry_proto->file_info().is_directory());
-  EXPECT_EQ(kTestRootResourceId, entry_proto->resource_id());
+  EXPECT_EQ(util::kDriveGrandRootSpecialResourceId, entry_proto->resource_id());
   EXPECT_EQ("http://root.upload.url/", entry_proto->upload_url());
 
   // Make sure the children have moved over. Test file9.
@@ -1226,12 +1231,18 @@ TEST_F(DriveResourceMetadataTest, RemoveAll) {
   ASSERT_TRUE(entry_proto.get());
   EXPECT_EQ("drive", entry_proto->base_name());
   ASSERT_TRUE(entry_proto->file_info().is_directory());
-  EXPECT_EQ(kTestRootResourceId, entry_proto->resource_id());
+  EXPECT_EQ(util::kDriveGrandRootSpecialResourceId, entry_proto->resource_id());
 
-  // root should have no children.
+  // There is only "other", which is empty.

[satorux1, 2013/04/05 01:55:30]

Why was "drive/root" removed here?

[Haruki Sato, 2013/04/05 04:35:25]

Thank you for the comment.

This was from the original CL we split from, where we added "/drive/root" in
ChangeListLoader.
In this intermediate CL, we are creating it in DriveResourceMetadata, but seems
like I forgot to update this unittest.
I revisited this unittest and changed it reflecting the current (in this CL)
usage.

   entries = ReadDirectoryByPathSync(base::FilePath::FromUTF8Unsafe("drive"));
   ASSERT_TRUE(entries.get());
-  EXPECT_TRUE(entries->empty());
+  EXPECT_EQ(1U, entries->size());
+
+  scoped_ptr<DriveEntryProtoVector> entries_in_other =
+      ReadDirectoryByPathSync(base::FilePath::FromUTF8Unsafe("drive/other"));
+  ASSERT_TRUE(entries_in_other.get());
+  EXPECT_TRUE(entries_in_other->empty());
+
 }
 
 TEST_F(DriveResourceMetadataTest, PerDirectoryChangestamp) {
@@ -1240,7 +1251,8 @@ TEST_F(DriveResourceMetadataTest, PerDirectoryChangestamp) {
 
   scoped_ptr<DriveResourceMetadata, test_util::DestroyHelperForTests>
       resource_metadata_original(new DriveResourceMetadata(
-          kTestRootResourceId, temp_dir_.path(), blocking_task_runner_));
+          util::kDriveGrandRootSpecialResourceId, temp_dir_.path(),
+          blocking_task_runner_));
   ForceUsingMemoryStorage(resource_metadata_original.get());
 
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
@@ -1259,7 +1271,8 @@ TEST_F(DriveResourceMetadataTest, PerDirectoryChangestamp) {
   DriveEntryProto directory_entry;
   directory_entry.mutable_file_info()->set_is_directory(true);
   directory_entry.set_resource_id(kSubDirectoryResourceId);
-  directory_entry.set_parent_resource_id(kTestRootResourceId);
+  directory_entry.set_parent_resource_id(
+      util::kDriveGrandRootSpecialResourceId);
   directory_entry.set_title("directory");
   base::FilePath file_path;
   resource_metadata_original->AddEntry(
@@ -1271,9 +1284,10 @@ TEST_F(DriveResourceMetadataTest, PerDirectoryChangestamp) {
   google_apis::test_util::RunBlockingPoolTask();
 
   scoped_ptr<DriveResourceMetadata, test_util::DestroyHelperForTests>
-      resource_metadata(new DriveResourceMetadata(kTestRootResourceId,
-                                                  temp_dir_.path(),
-                                                  blocking_task_runner_));
+      resource_metadata(new DriveResourceMetadata(
+          util::kDriveGrandRootSpecialResourceId,
+          temp_dir_.path(),
+          blocking_task_runner_));
   ForceUsingMemoryStorage(resource_metadata.get());
 
   resource_metadata->Initialize(
@@ -1311,9 +1325,10 @@ TEST_F(DriveResourceMetadataTest, SaveAndLoad) {
   // Save metadata and reset.
   resource_metadata_->MaybeSave();
 
-  resource_metadata_.reset(new DriveResourceMetadata(kTestRootResourceId,
-                                                     temp_dir_.path(),
-                                                     blocking_task_runner_));
+  resource_metadata_.reset(new DriveResourceMetadata(
+      util::kDriveGrandRootSpecialResourceId,
+      temp_dir_.path(),
+      blocking_task_runner_));
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
   resource_metadata_->Initialize(
       google_apis::test_util::CreateCopyResultCallback(&error));