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

chrome/browser/chromeos/drive/drive_prefetcher_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_prefetcher.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 70 matching lines @@
 
   scoped_ptr<DriveEntryProtoVector> entries(new DriveEntryProtoVector);
   for (size_t i = 0; i < test_entries.size(); ++i) {
     if (test_entries[i].IsDirectChildOf(directory))
       entries->push_back(test_entries[i].ToDriveEntryProto());
   }
   callback.Run(DRIVE_FILE_OK, false /* hide_hosted_document */, entries.Pass());
 }
 
 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[] = {
   "id:bar2",  // The file with the largest timestamp
               // "bar1" is the second latest, but its file size is over limit.
   "id:buz1",  // The third latest file.
   "id:foo1"   // 4th. Has same access time with id:foo2, so the one with the
               // newer modified time wins.
 };
 
@@ skipping 92 matching lines @@
   // This is checked by setting the fetch limit larger than the number of files.
   InitPrefetcher(100, 99999999);
   VerifyFullScan(
       std::vector<TestEntry>(kComplexDrive,
                              kComplexDrive + arraysize(kComplexDrive)),
       std::vector<std::string>(kAllRegularFiles,
                                kAllRegularFiles + arraysize(kAllRegularFiles)));
 }
 
 }  // namespace drive