drive: DriveIntegrationService owns ResourceMetadataStorage

chrome/browser/chromeos/drive/resource_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_DRIVE_RESOURCE_METADATA_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_RESOURCE_METADATA_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/resource_metadata_storage.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace drive {
 
 class ResourceEntry;
-class ResourceMetadataStorage;
 
 typedef std::vector<ResourceEntry> ResourceEntryVector;
 typedef std::map<std::string /* resource_id */, ResourceEntry>
     ResourceEntryMap;
 
 // Holds information needed to fetch contents of a directory.
 // This object is copyable.
 class DirectoryFetchInfo {
  public:
   DirectoryFetchInfo() : changestamp_(0) {}
@@ skipping 66 matching lines @@
 typedef base::Callback<void(const ResourceEntry& entry)> IterateCallback;
 
 namespace internal {
 
 // Storage for Drive Metadata.
 // All methods must be run with |blocking_task_runner| unless otherwise noted.
 class ResourceMetadata {
  public:
   typedef ResourceMetadataStorage::Iterator Iterator;
 
-  // |root_resource_id| is the resource id for the root directory.
-  // Must be called on the UI thread.
   ResourceMetadata(
-      const base::FilePath& data_directory_path,
+      ResourceMetadataStorage* storage,
       scoped_refptr<base::SequencedTaskRunner> blocking_task_runner);
 
   // Initializes this object.
   // This method should be called before any other methods.
   FileError Initialize() WARN_UNUSED_RESULT;
 
   // Destroys this object.  This method posts a task to |blocking_task_runner_|
   // to safely delete this object.
   // Must be called on the UI thread.
   void Destroy();
@@ skipping 168 matching lines @@
 
   // Puts an entry under its parent directory. Removes the child from the old
   // parent if there is. This method will also do name de-duplication to ensure
   // that the exposed presentation path does not have naming conflicts. Two
   // files with the same name "Foo" will be renames to "Foo (1)" and "Foo (2)".
   bool PutEntryUnderDirectory(const ResourceEntry& entry);
 
   // Removes the entry and its descendants.
   bool RemoveEntryRecursively(const std::string& resource_id);
 
-  const base::FilePath data_directory_path_;
-
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
 
-  scoped_ptr<ResourceMetadataStorage> storage_;
+  ResourceMetadataStorage* storage_;
 
   // This should remain the last member so it'll be destroyed first and
   // invalidate its weak pointers before other members are destroyed.
   base::WeakPtrFactory<ResourceMetadata> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceMetadata);
 };
 
 }  // namespace internal
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_RESOURCE_METADATA_H_