gdata: Move GDataCache::CacheEntry out of GDataCache

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/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 104 matching lines @@
   upload_file_info->gdata_path = gdata_path;
   upload_file_info->file_path = local_file_path;
   upload_file_info->entry.reset(document_entry);
   base::MessageLoopProxy::current()->PostTask(FROM_HERE,
       base::Bind(arg5, error, base::Passed(&upload_file_info)));
 
   const int kUploadId = 123;
   return kUploadId;
 }
 
-// Converts |cache_state| to a GDataCache::CacheEntry.
-GDataCache::CacheEntry ToCacheEntry(int cache_state) {
-  return GDataCache::CacheEntry("dummy_md5", cache_state);
+// Converts |cache_state| to a GDataCacheEntry.
+GDataCacheEntry ToCacheEntry(int cache_state) {
+  return GDataCacheEntry("dummy_md5", cache_state);
 }
 
 }  // namespace
 
 class MockFreeDiskSpaceGetter : public FreeDiskSpaceGetterInterface {
  public:
   virtual ~MockFreeDiskSpaceGetter() {}
   MOCK_CONST_METHOD0(AmountOfFreeDiskSpace, int64());
 };
 
@@ skipping 275 matching lines @@
 
   FilePath GetCacheFilePath(const std::string& resource_id,
                             const std::string& md5,
                             GDataCache::CacheSubDirectoryType sub_dir_type,
                             GDataCache::CachedFileOrigin file_origin) {
     return cache_->GetCacheFilePath(resource_id, md5, sub_dir_type,
                                     file_origin);
   }
 
   // Helper function to call GetCacheEntry from origin thread.
-  scoped_ptr<GDataCache::CacheEntry> GetCacheEntryFromOriginThread(
+  scoped_ptr<GDataCacheEntry> GetCacheEntryFromOriginThread(
       const std::string& resource_id,
       const std::string& md5) {
-    scoped_ptr<GDataCache::CacheEntry> cache_entry;
+    scoped_ptr<GDataCacheEntry> cache_entry;
     content::BrowserThread::GetBlockingPool()
         ->GetSequencedTaskRunner(sequence_token_)->PostTask(
             FROM_HERE,
             base::Bind(
                 &GDataFileSystemTest::GetCacheEntryFromOriginThreadInternal,
                 base::Unretained(this),
                 resource_id,
                 md5,
                 &cache_entry));
     test_util::RunBlockingPoolTask();
     return cache_entry.Pass();
   }
 
   // Used to implement GetCacheEntry.
   void GetCacheEntryFromOriginThreadInternal(
       const std::string& resource_id,
       const std::string& md5,
-      scoped_ptr<GDataCache::CacheEntry>* cache_entry) {
+      scoped_ptr<GDataCacheEntry>* cache_entry) {
     cache_entry->reset(cache_->GetCacheEntry(resource_id, md5).release());
   }
 
   // Returns true if the cache entry exists for the given resource ID and MD5.
   bool CacheEntryExists(const std::string& resource_id,
                         const std::string& md5) {
     return GetCacheEntryFromOriginThread(resource_id, md5).get();
   }
 
   // Returns true if the cache file exists for the given resource ID and MD5.
@@ skipping 40 matching lines @@
   }
 
   void VerifyRemoveFromCache(base::PlatformFileError error,
                              const std::string& resource_id,
                              const std::string& md5) {
     ++num_callback_invocations_;
 
     EXPECT_EQ(expected_error_, error);
 
     // Verify cache map.
-    scoped_ptr<GDataCache::CacheEntry> cache_entry =
+    scoped_ptr<GDataCacheEntry> cache_entry =
         GetCacheEntryFromOriginThread(resource_id, md5);
     if (cache_entry.get())
       EXPECT_TRUE(cache_entry->IsDirty());
 
     // If entry doesn't exist, verify that:
     // - no files with "<resource_id>.* exists in persistent and tmp dirs
     // - no "<resource_id>" symlink exists in pinned and outgoing dirs.
     std::vector<PathToVerify> paths_to_verify;
     paths_to_verify.push_back(  // Index 0: CACHE_TYPE_TMP.
         PathToVerify(cache_->GetCacheFilePath(resource_id, "*",
@@ skipping 148 matching lines @@
   }
 
   // Verify the file identified by |resource_id| and |md5| is in the expected
   // cache state after |OpenFile|, that is, marked dirty and has no outgoing
   // symlink, etc.
   void VerifyCacheStateAfterOpenFile(base::PlatformFileError error,
                                      const std::string& resource_id,
                                      const std::string& md5,
                                      const FilePath& cache_file_path) {
     expected_error_ = base::PLATFORM_FILE_OK;
-    expected_cache_state_ = (GDataCache::CACHE_STATE_PRESENT |
-                             GDataCache::CACHE_STATE_DIRTY |
-                             GDataCache::CACHE_STATE_PERSISTENT);
+    expected_cache_state_ = (CACHE_STATE_PRESENT |
+                             CACHE_STATE_DIRTY |
+                             CACHE_STATE_PERSISTENT);
     expected_sub_dir_type_ = GDataCache::CACHE_TYPE_PERSISTENT;
     expect_outgoing_symlink_ = false;
     VerifyMarkDirty(error, resource_id, md5, cache_file_path);
   }
 
   // Verify the file identified by |resource_id| and |md5| is in the expected
   // cache state after |CloseFile|, that is, marked dirty and has an outgoing
   // symlink, etc.
   void VerifyCacheStateAfterCloseFile(base::PlatformFileError error,
                                       const std::string& resource_id,
                                       const std::string& md5) {
     expected_error_ = base::PLATFORM_FILE_OK;
-    expected_cache_state_ = (GDataCache::CACHE_STATE_PRESENT |
-                             GDataCache::CACHE_STATE_DIRTY |
-                             GDataCache::CACHE_STATE_PERSISTENT);
+    expected_cache_state_ = (CACHE_STATE_PRESENT |
+                             CACHE_STATE_DIRTY |
+                             CACHE_STATE_PERSISTENT);
     expected_sub_dir_type_ = GDataCache::CACHE_TYPE_PERSISTENT;
     expect_outgoing_symlink_ = true;
     VerifyCacheFileState(error, resource_id, md5);
   }
 
   void VerifyCacheFileState(base::PlatformFileError error,
                             const std::string& resource_id,
                             const std::string& md5) {
     ++num_callback_invocations_;
 
     EXPECT_EQ(expected_error_, error);
 
     // Verify cache map.
-    scoped_ptr<GDataCache::CacheEntry> cache_entry =
+    scoped_ptr<GDataCacheEntry> cache_entry =
         GetCacheEntryFromOriginThread(resource_id, md5);
     if (ToCacheEntry(expected_cache_state_).IsPresent() ||
         ToCacheEntry(expected_cache_state_).IsPinned()) {
       ASSERT_TRUE(cache_entry.get());
       EXPECT_EQ(expected_cache_state_, cache_entry->cache_state());
-      EXPECT_EQ(expected_sub_dir_type_, cache_entry->GetSubDirectoryType());
+      EXPECT_EQ(expected_sub_dir_type_,
+                GDataCache::GetSubDirectoryType(*cache_entry));
     } else {
       EXPECT_FALSE(cache_entry.get());
     }
 
     // Verify actual cache file.
     FilePath dest_path = cache_->GetCacheFilePath(
         resource_id,
         md5,
         ToCacheEntry(expected_cache_state_).IsPinned() ||
         ToCacheEntry(expected_cache_state_).IsDirty() ?
@@ skipping 1416 matching lines @@
   EXPECT_CALL(*mock_free_disk_space_checker_, AmountOfFreeDiskSpace())
       .WillOnce(Return(0))
       .WillOnce(Return(file_size + kMinFreeSpace))
       .WillOnce(Return(file_size + kMinFreeSpace));
 
   // Store something in the temporary cache directory.
   TestStoreToCache("<resource_id>",
                    "<md5>",
                    GetTestFilePath("root_feed.json"),
                    base::PLATFORM_FILE_OK,
-                   GDataCache::CACHE_STATE_PRESENT,
+                   CACHE_STATE_PRESENT,
                    GDataCache::CACHE_TYPE_TMP);
   ASSERT_TRUE(CacheEntryExists("<resource_id>", "<md5>"));
   ASSERT_TRUE(CacheFileExists("<resource_id>", "<md5>"));
 
   // Before Download starts metadata from server will be fetched.
   // We will read content url from the result.
   scoped_ptr<base::Value> document(LoadJSONFile("document_to_download.json"));
   SetExpectationsForGetDocumentEntry(&document, "file:2_file_resource_id");
 
   // The file is obtained with the mock DocumentsService, because of we freed
@@ skipping 73 matching lines @@
   FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt"));
   GDataEntry* entry = FindEntry(file_in_root);
   GDataFile* file = entry->AsGDataFile();
   FilePath downloaded_file = GetCachePathForFile(file);
 
   // Store something as cached version of this file.
   TestStoreToCache(file->resource_id(),
                    file->file_md5(),
                    GetTestFilePath("root_feed.json"),
                    base::PLATFORM_FILE_OK,
-                   GDataCache::CACHE_STATE_PRESENT,
+                   CACHE_STATE_PRESENT,
                    GDataCache::CACHE_TYPE_TMP);
 
   // Make sure we don't fetch metadata for downloading file.
   EXPECT_CALL(*mock_doc_service_, GetDocumentEntry(_, _)).Times(0);
 
   // Make sure we don't call downloads at all.
   EXPECT_CALL(*mock_doc_service_,
               DownloadFile(file_in_root,
                            downloaded_file,
                            GURL("https://file_content_url_changed/"),
@@ skipping 79 matching lines @@
   FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt"));
   GDataEntry* entry = FindEntry(file_in_root);
   GDataFile* file = entry->AsGDataFile();
   FilePath downloaded_file = GetCachePathForFile(file);
 
   // Store something as cached version of this file.
   TestStoreToCache(file->resource_id(),
                    file->file_md5(),
                    GetTestFilePath("root_feed.json"),
                    base::PLATFORM_FILE_OK,
-                   GDataCache::CACHE_STATE_PRESENT,
+                   CACHE_STATE_PRESENT,
                    GDataCache::CACHE_TYPE_TMP);
 
   // The file is obtained from the cache.
   // Make sure we don't call downloads at all.
   EXPECT_CALL(*mock_doc_service_, DownloadFile(_, _, _, _, _))
       .Times(0);
 
   file_system_->GetFileByResourceId(file->resource_id(), callback,
                                     GetDownloadDataCallback());
   test_util::RunBlockingPoolTask();
 
   EXPECT_EQ(REGULAR_FILE, callback_helper_->file_type_);
   EXPECT_EQ(downloaded_file.value(),
             callback_helper_->download_path_.value());
 }
 
 TEST_F(GDataFileSystemTest, UpdateFileByResourceId_PersistentFile) {
   LoadRootFeedDocument("root_feed.json");
 
   // This is a file defined in root_feed.json.
   const FilePath kFilePath(FILE_PATH_LITERAL("drive/File 1.txt"));
   const std::string kResourceId("file:2_file_resource_id");
   const std::string kMd5("3b4382ebefec6e743578c76bbd0575ce");
 
   // Pin the file so it'll be store in "persistent" directory.
   EXPECT_CALL(*mock_sync_client_, OnCachePinned(kResourceId, kMd5)).Times(1);
   TestPin(kResourceId,
           kMd5,
           base::PLATFORM_FILE_OK,
-          GDataCache::CACHE_STATE_PINNED,
+          CACHE_STATE_PINNED,
           GDataCache::CACHE_TYPE_TMP);
 
   // First store a file to cache. A cache file will be created at:
   // GCache/v1/persistent/<kResourceId>.<kMd5>
   const FilePath original_cache_file_path =
       GDataCache::GetCacheRootPath(profile_.get())
       .AppendASCII("persistent")
       .AppendASCII(kResourceId + "." + kMd5);
   TestStoreToCache(kResourceId,
                    kMd5,
                    GetTestFilePath("root_feed.json"),  // Anything works.
                    base::PLATFORM_FILE_OK,
-                   GDataCache::CACHE_STATE_PRESENT |
-                   GDataCache::CACHE_STATE_PINNED |
-                   GDataCache::CACHE_STATE_PERSISTENT,
+                   CACHE_STATE_PRESENT |
+                   CACHE_STATE_PINNED |
+                   CACHE_STATE_PERSISTENT,
                    GDataCache::CACHE_TYPE_PERSISTENT);
   ASSERT_TRUE(file_util::PathExists(original_cache_file_path));
 
   // Add the dirty bit. The cache file will be renamed to
   // GCache/v1/persistent/<kResourceId>.local
   TestMarkDirty(kResourceId,
                 kMd5,
                 base::PLATFORM_FILE_OK,
-                GDataCache::CACHE_STATE_PRESENT |
-                GDataCache::CACHE_STATE_PINNED |
-                GDataCache::CACHE_STATE_DIRTY |
-                GDataCache::CACHE_STATE_PERSISTENT,
+                CACHE_STATE_PRESENT |
+                CACHE_STATE_PINNED |
+                CACHE_STATE_DIRTY |
+                CACHE_STATE_PERSISTENT,
                 GDataCache::CACHE_TYPE_PERSISTENT);
   const FilePath dirty_cache_file_path =
       GDataCache::GetCacheRootPath(profile_.get())
       .AppendASCII("persistent")
       .AppendASCII(kResourceId + ".local");
   ASSERT_FALSE(file_util::PathExists(original_cache_file_path));
   ASSERT_TRUE(file_util::PathExists(dirty_cache_file_path));
 
   // Commit the dirty bit. The cache file name remains the same
   // but a symlink will be created at:
   // GCache/v1/outgoing/<kResourceId>
   EXPECT_CALL(*mock_sync_client_, OnCacheCommitted(kResourceId)).Times(1);
   TestCommitDirty(kResourceId,
                   kMd5,
                   base::PLATFORM_FILE_OK,
-                  GDataCache::CACHE_STATE_PRESENT |
-                  GDataCache::CACHE_STATE_PINNED |
-                  GDataCache::CACHE_STATE_DIRTY |
-                  GDataCache::CACHE_STATE_PERSISTENT,
+                  CACHE_STATE_PRESENT |
+                  CACHE_STATE_PINNED |
+                  CACHE_STATE_DIRTY |
+                  CACHE_STATE_PERSISTENT,
                   GDataCache::CACHE_TYPE_PERSISTENT);
   const FilePath outgoing_symlink_path =
       GDataCache::GetCacheRootPath(profile_.get())
       .AppendASCII("outgoing")
       .AppendASCII(kResourceId);
   ASSERT_TRUE(file_util::PathExists(dirty_cache_file_path));
   ASSERT_TRUE(file_util::PathExists(outgoing_symlink_path));
 
   // Create a DocumentEntry, which is needed to mock
   // GDataUploaderInterface::UploadExistingFile().
@@ skipping 202 matching lines @@
 
   // Try to close the same file twice.
   file_system_->CloseFile(kFileInRoot, close_file_callback);
   message_loop_.Run();
 
   // It must fail.
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, callback_helper_->last_error_);
 }
 
 }   // namespace gdata