Extend and refactor GDataFileBase and derived classes.

chrome/browser/chromeos/gdata/gdata_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 <errno.h>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 535 matching lines @@
 
   FilePath nonexisting_file(FILE_PATH_LITERAL("gdata/Dummy file.txt"));
   FilePath file_in_root(FILE_PATH_LITERAL("gdata/File 1.txt"));
   FilePath dir_in_root(FILE_PATH_LITERAL("gdata/Directory 1"));
   FilePath file_in_subdir(
       FILE_PATH_LITERAL("gdata/Directory 1/SubDirectory File 1.txt"));
 
   GDataFileBase* file = NULL;
   EXPECT_TRUE((file = FindFile(file_in_root)) != NULL);
   EXPECT_TRUE(file->AsGDataFile() != NULL);
-  std::string file_in_root_resource = file->AsGDataFile()->resource();
+  std::string file_in_root_resource = file->AsGDataFile()->resource_id();
   EXPECT_EQ(file, FindFileByResource(file_in_root_resource));
 
   EXPECT_TRUE(FindFile(dir_in_root) != NULL);
 
   EXPECT_TRUE((file = FindFile(file_in_subdir)) != NULL);
   EXPECT_TRUE(file->AsGDataFile() != NULL);
-  std::string file_in_subdir_resource = file->AsGDataFile()->resource();
+  std::string file_in_subdir_resource = file->AsGDataFile()->resource_id();
   EXPECT_EQ(file, FindFileByResource(file_in_subdir_resource));
 
   // Remove first file in root.
   EXPECT_TRUE(RemoveFile(file_in_root));
   EXPECT_TRUE(FindFile(file_in_root) == NULL);
   EXPECT_EQ(NULL, FindFileByResource(file_in_root_resource));
   EXPECT_TRUE(FindFile(dir_in_root) != NULL);
   EXPECT_TRUE((file = FindFile(file_in_subdir)) != NULL);
   EXPECT_EQ(file, FindFileByResource(file_in_subdir_resource));
 
@@ skipping 180 matching lines @@
     file = file_info->AsGDataFile();
     ASSERT_TRUE(file != NULL);
   }
 
   // A file that exists in GData but not in cache.
   FilePath cache_file_path = file_system_->GetFromCacheForPath(gdata_file_path);
   EXPECT_TRUE(cache_file_path.empty());
 
   // Store a file corresponding to resource and md5 of "gdata/File 1.txt" to
   // cache.
-  TestStoreToCache(file->resource(), file->file_md5(),
+  TestStoreToCache(file->resource_id(), file->file_md5(),
                    GetTestFilePath("root_feed.json"));
 
   // Now the file should exist in cache.
   cache_file_path = file_system_->GetFromCacheForPath(gdata_file_path);
-  EXPECT_EQ(file_system_->GetCacheFilePath(file->resource(), file->file_md5()),
+  EXPECT_EQ(file_system_->GetCacheFilePath(file->resource_id(),
+                                           file->file_md5()),
             cache_file_path);
 
   // A file that doesn't exist in gdata.
   cache_file_path = file_system_->GetFromCacheForPath(
       FilePath(FILE_PATH_LITERAL("gdata/Nonexistent.txt")));
   EXPECT_TRUE(cache_file_path.empty());
 }
 
 // Create a directory through the document service
 TEST_F(GDataFileSystemTest, CreateDirectoryWithService) {
@@ skipping 39 matching lines @@
 
   virtual void SetUp() OVERRIDE {
     profile_.reset(new TestingProfile);
     // TODO(kuan): Create some cache files to trigger scanning of cache dir,
     // and write tests to check the cache map.
     Init(profile_.get());
   }
 };
 
 }   // namespace gdata