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

chrome/browser/chromeos/drive/drive_prefetcher_unittest.cc

Index: chrome/browser/chromeos/drive/drive_prefetcher_unittest.cc
diff --git a/chrome/browser/chromeos/drive/drive_prefetcher_unittest.cc b/chrome/browser/chromeos/drive/drive_prefetcher_unittest.cc
index 354b0b0b2122474142f58a3af1d4eec5abc1e58a..7ff887b6d75d79720de54e0f8527a087c6f1d82e 100644
--- a/chrome/browser/chromeos/drive/drive_prefetcher_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_prefetcher_unittest.cc
@@ -88,31 +88,45 @@ ACTION_P(MockReadDirectory, test_entries) {
 }
 
 const TestEntry kEmptyDrive[] = {
-  { FILE_PATH_LITERAL("drive"), TYPE_DIRECTORY, 0, 0, "id:drive" },
+  { FILE_PATH_LITERAL("drive/root"), TYPE_DIRECTORY, 0, 0, "id:drive" },
 };
 
 const TestEntry kOneFileDrive[] = {
-  { FILE_PATH_LITERAL("drive"), TYPE_DIRECTORY, 0, 0, "id:drive" },
-  { FILE_PATH_LITERAL("drive/abc.txt"), TYPE_REGULAR_FILE, 1, 0, "id:abc" },
+  { FILE_PATH_LITERAL("drive/root"), TYPE_DIRECTORY, 0, 0, "id:drive" },
+  { FILE_PATH_LITERAL("drive/root/abc.txt"), TYPE_REGULAR_FILE, 1, 0,
+      "id:abc" },
 };
 
 const char* kExpectedOneFile[] = { "id:abc" };
 
 const TestEntry kComplexDrive[] = {

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

The table became a bit harder to read. Can you do:

#define FPL FILE_PATH_LITERAL
...
#undef FPL

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

Done.

-  // Path                                  Type           Access Modify   ID
-  { FILE_PATH_LITERAL("drive"),            TYPE_DIRECTORY,    0, 0, "id:root" },
-  { FILE_PATH_LITERAL("drive/a"),          TYPE_DIRECTORY,    0, 0, "id:a" },
-  { FILE_PATH_LITERAL("drive/a/foo.txt"),  TYPE_REGULAR_FILE, 3, 2, "id:foo1" },
-  { FILE_PATH_LITERAL("drive/a/b"),        TYPE_DIRECTORY,    8, 0, "id:b" },
-  { FILE_PATH_LITERAL("drive/a/bar.jpg"),  TYPE_REGULAR_FILE, 5, 0, "id:bar1",
+  // Path                                  Type           Access Modify
+  //     ID
+  { FILE_PATH_LITERAL("drive/root"),            TYPE_DIRECTORY,    0, 0,
+      "id:root" },
+  { FILE_PATH_LITERAL("drive/root/a"),          TYPE_DIRECTORY,    0, 0,
+      "id:a" },
+  { FILE_PATH_LITERAL("drive/root/a/foo.txt"),  TYPE_REGULAR_FILE, 3, 2,
+      "id:foo1" },
+  { FILE_PATH_LITERAL("drive/root/a/b"),        TYPE_DIRECTORY,    8, 0,
+      "id:b" },
+  { FILE_PATH_LITERAL("drive/root/a/bar.jpg"),  TYPE_REGULAR_FILE, 5, 0,
+      "id:bar1",
                                            999 },
-  { FILE_PATH_LITERAL("drive/a/b/x.gdoc"), TYPE_HOSTED_FILE,  7, 0, "id:new" },
-  { FILE_PATH_LITERAL("drive/a/buz.zip"),  TYPE_REGULAR_FILE, 4, 0, "id:buz1" },
-  { FILE_PATH_LITERAL("drive/a/old.gdoc"), TYPE_HOSTED_FILE,  1, 0, "id:old" },
-  { FILE_PATH_LITERAL("drive/c"),          TYPE_DIRECTORY,    0, 0, "id:c" },
-  { FILE_PATH_LITERAL("drive/c/foo.txt"),  TYPE_REGULAR_FILE, 3, 1, "id:foo2" },
-  { FILE_PATH_LITERAL("drive/c/buz.zip"),  TYPE_REGULAR_FILE, 1, 0, "id:buz2" },
-  { FILE_PATH_LITERAL("drive/bar.jpg"),    TYPE_REGULAR_FILE, 6, 0, "id:bar2" },
+  { FILE_PATH_LITERAL("drive/root/a/b/x.gdoc"), TYPE_HOSTED_FILE,  7, 0,
+      "id:new" },
+  { FILE_PATH_LITERAL("drive/root/a/buz.zip"),  TYPE_REGULAR_FILE, 4, 0,
+      "id:buz1" },
+  { FILE_PATH_LITERAL("drive/root/a/old.gdoc"), TYPE_HOSTED_FILE,  1, 0,
+      "id:old" },
+  { FILE_PATH_LITERAL("drive/root/c"),          TYPE_DIRECTORY,    0, 0,
+      "id:c" },
+  { FILE_PATH_LITERAL("drive/root/c/foo.txt"),  TYPE_REGULAR_FILE, 3, 1,
+      "id:foo2" },
+  { FILE_PATH_LITERAL("drive/root/c/buz.zip"),  TYPE_REGULAR_FILE, 1, 0,
+      "id:buz2" },
+  { FILE_PATH_LITERAL("drive/root/bar.jpg"),    TYPE_REGULAR_FILE, 6, 0,
+      "id:bar2" },
 };
 
 const char* kTop3Files[] = {