SyncFS: Convert WAPI ResourceID to DriveAPI FileID

chrome/browser/sync_file_system/drive_file_sync_service_sync_unittest.cc

 // Copyright (c) 2013 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/sync_file_system/drive_file_sync_service.h"
 
 #include <algorithm>
 
 #include "base/format_macros.h"
 #include "base/message_loop.h"
 #include "base/rand_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/sync_file_system/drive/fake_api_util.h"
 #include "chrome/browser/sync_file_system/drive_metadata_store.h"
 #include "chrome/browser/sync_file_system/fake_remote_change_processor.h"
 #include "chrome/browser/sync_file_system/sync_file_system.pb.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/syncable/syncable_file_system_util.h"
 
 namespace sync_file_system {
 
 namespace {
 
-const char kSyncRootResourceId[] = "sync_root_resource_id";
-const char kParentResourceId[] = "parent_resource_id";
+const char kSyncRootResourceId[] = "folder:sync_root_resource_id";
+const char kParentResourceId[] = "folder:parent_resource_id";
 const char kAppId[] = "app-id";
 const char kAppOrigin[] = "chrome-extension://app-id";
 
 void DidInitialize(bool* done, SyncStatusCode status, bool created) {
   EXPECT_EQ(SYNC_STATUS_OK, status);
   *done = true;
 }
 
 void DidProcessRemoteChange(bool* done,
                             SyncStatusCode* status_out,
@@ skipping 152 matching lines @@
     fake_remote_processor_.reset();
     message_loop_.RunUntilIdle();
   }
 
   void AddOrUpdateResource(const std::string& title,
                            SyncFileType type) {
     typedef ResourceIdByTitle::iterator iterator;
     std::pair<iterator, bool> inserted =
         resources_.insert(std::make_pair(title, std::string()));
     if (inserted.second) {
-      inserted.first->second =
-          base::StringPrintf("%" PRId64, ++resource_count_);
+      switch (type) {
+        case SYNC_FILE_TYPE_FILE:
+          inserted.first->second =
+              base::StringPrintf("file:%" PRId64, ++resource_count_);
+          break;
+        case SYNC_FILE_TYPE_DIRECTORY:
+          inserted.first->second =
+              base::StringPrintf("folder:%" PRId64, ++resource_count_);
+          break;
+        default:

[tzik, 2013/05/29 04:30:24]

ditto

[nhiroki, 2013/05/29 06:31:03]

Done.

+          NOTREACHED();
+          break;
+      }
     }
     std::string resource_id = inserted.first->second;
     std::string md5_checksum;
     if (type == SYNC_FILE_TYPE_FILE)
       md5_checksum = base::StringPrintf("%" PRIx64, base::RandUint64());
 
     fake_api_util_->PushRemoteChange(kParentResourceId,
                                      kAppId,
                                      title,
                                      resource_id,
@@ skipping 212 matching lines @@
 TEST_F(DriveFileSyncServiceSyncTest, DeleteDirectoryTest) {
   std::string kDir = "dir title";
   SyncEvent sync_event[] = {
     CreateRemoteDirectoryAddEvent(kDir),
     CreateRemoteFileDeleteEvent(kDir),
   };
   RunTest(CreateTestCase(sync_event));
 }
 
 }  // namespace sync_file_system