gdata: Simplify semantics of sub_dir_type in CacheEntry.

chrome/browser/chromeos/gdata/gdata_cache_metadata_unittest.cc

Index: chrome/browser/chromeos/gdata/gdata_cache_metadata_unittest.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_cache_metadata_unittest.cc b/chrome/browser/chromeos/gdata/gdata_cache_metadata_unittest.cc
index 0e540e4ba9bd0f7d9c9f510077e091b14c11a495..75d8c29bab606750cac804b0454e578a5312679f 100644
--- a/chrome/browser/chromeos/gdata/gdata_cache_metadata_unittest.cc
+++ b/chrome/browser/chromeos/gdata/gdata_cache_metadata_unittest.cc
@@ -336,7 +336,7 @@ TEST_F(GDataCacheMetadataMapTest, Initialization) {
   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")));
 
@@ -369,12 +369,12 @@ TEST_F(GDataCacheMetadataMapTest, RemoveTemporaryFilesTest) {
   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>",