Revert 145933 - gdata: Remove sub_dir_type from CacheEntry for simplicity

chrome/browser/chromeos/gdata/gdata_cache_metadata.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_CACHE_METADATA_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_CACHE_METADATA_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 22 matching lines @@
   // the default value of SequenceToken.
   GDataCacheMetadata(
       base::SequencedWorkerPool* pool,
       const base::SequencedWorkerPool::SequenceToken& sequence_token);
   virtual ~GDataCacheMetadata();
 
   // Updates cache map with entry corresponding to |resource_id|.
   // Creates new entry if it doesn't exist, otherwise update the entry.
   virtual void UpdateCache(const std::string& resource_id,
                            const std::string& md5,
+                           GDataCache::CacheSubDirectoryType subdir,
                            int cache_state) = 0;
 
   // Removes entry corresponding to |resource_id| from cache map.
   virtual void RemoveFromCache(const std::string& resource_id) = 0;
 
   // Returns the cache entry for file corresponding to |resource_id| and |md5|
   // if entry exists in cache map.  Otherwise, returns NULL.
   // |md5| can be empty if only matching |resource_id| is desired, which may
   // happen when looking for pinned entries where symlinks' filenames have no
   // extension and hence no md5.
@@ skipping 27 matching lines @@
       base::SequencedWorkerPool* pool,
       const base::SequencedWorkerPool::SequenceToken& sequence_token);
   virtual ~GDataCacheMetadataMap();
 
   // Initializes the data.
   void Initialize(const std::vector<FilePath>& cache_paths);
 
   // GDataCacheMetadata overrides:
   virtual void UpdateCache(const std::string& resource_id,
                            const std::string& md5,
+                           GDataCache::CacheSubDirectoryType subdir,
                            int cache_state) OVERRIDE;
   virtual void RemoveFromCache(const std::string& resource_id) OVERRIDE;
   virtual scoped_ptr<GDataCache::CacheEntry> GetCacheEntry(
       const std::string& resource_id,
       const std::string& md5) OVERRIDE;
   virtual void RemoveTemporaryFiles() OVERRIDE;
   virtual void Iterate(const IterateCallback& callback) OVERRIDE;
 
   // A map table of cache file's resource id to its CacheEntry* entry.
   typedef std::map<std::string, GDataCache::CacheEntry> CacheMap;
@@ skipping 22 matching lines @@
                                 const GDataCache::CacheEntry& cache_entry);
 
   CacheMap cache_map_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataCacheMetadataMap);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_CACHE_METADATA_H_