gdata: Simplify semantics of sub_dir_type in CacheEntry.

chrome/browser/chromeos/gdata/gdata_cache_metadata_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/gdata/gdata_cache_metadata.h"
 
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 318 matching lines @@
   cache_entry = metadata_->GetCacheEntry("id_symlink_tmp", "");
   EXPECT_FALSE(cache_entry.get());
   EXPECT_FALSE(PathExists(pinned_directory_.AppendASCII("id_symlink_tmp")));
 
   // Check contents in "pinned" directory.
   //
   // "id_corge" is pinned but not present.
   cache_entry = metadata_->GetCacheEntry("id_corge", "");
   ASSERT_TRUE(cache_entry.get());
   EXPECT_EQ("", cache_entry->md5);
-  EXPECT_EQ(GDataCache::CACHE_TYPE_PINNED, cache_entry->sub_dir_type);
+  EXPECT_EQ(GDataCache::CACHE_TYPE_TMP, cache_entry->sub_dir_type);
   EXPECT_EQ(GDataCache::CACHE_STATE_PINNED, cache_entry->cache_state);
   EXPECT_TRUE(IsLink(pinned_directory_.AppendASCII("id_corge")));
 
   // "id_dangling" should be removed during cache initialization.
   cache_entry = metadata_->GetCacheEntry("id_dangling", "");
   EXPECT_FALSE(cache_entry.get());
   EXPECT_FALSE(IsLink(pinned_directory_.AppendASCII("id_dangling")));
 
   // "id_outside" should be removed during cache initialization.
   cache_entry = metadata_->GetCacheEntry("id_outside", "");
@@ skipping 12 matching lines @@
 
   GDataCacheMetadataMap::CacheMap cache_map;
   InsertIntoMap(&cache_map,
                 "<resource_id_1>",
                 "<md5>",
                 GDataCache::CACHE_TYPE_TMP,
                 GDataCache::CACHE_STATE_PRESENT);
   InsertIntoMap(&cache_map,
                 "<resource_id_2>",
                 "<md5>",
-                GDataCache::CACHE_TYPE_PINNED,
+                GDataCache::CACHE_TYPE_PERSISTENT,
                 GDataCache::CACHE_STATE_PRESENT);
   InsertIntoMap(&cache_map,
                 "<resource_id_3>",
                 "<md5>",
-                GDataCache::CACHE_TYPE_OUTGOING,
+                GDataCache::CACHE_TYPE_PERSISTENT,

[hshi1, 2012/07/10 00:45:53]

This seems to be the only line of change in your patch that involves the type
CACHE_TYPE_OUTGOING. Are you sure you do not need to handle this case in
gdata_cache_metadata.cc?

[satorux1, 2012/07/10 03:18:56]

Yes, this is intentional. We don't store cache files in the outgoing directory.
the directory is used to create some symlinks.

                 GDataCache::CACHE_STATE_PRESENT);
   InsertIntoMap(&cache_map,
                 "<resource_id_4>",
                 "<md5>",
                 GDataCache::CACHE_TYPE_TMP,
                 GDataCache::CACHE_STATE_PRESENT);
 
   metadata_->cache_map_ = cache_map;
   metadata_->RemoveTemporaryFiles();
   // resource 1 and 4 should be gone, as these are CACHE_TYPE_TMP.
   EXPECT_FALSE(metadata_->GetCacheEntry("<resource_id_1>", "").get());
   EXPECT_TRUE(metadata_->GetCacheEntry("<resource_id_2>", "").get());
   EXPECT_TRUE(metadata_->GetCacheEntry("<resource_id_3>", "").get());
   EXPECT_FALSE(metadata_->GetCacheEntry("<resource_id_4>", "").get());
 }
 
 }  // namespace gdata