[ew] Move operation observers from QuotaUtil to FileSystemBackend.

content/public/test/test_file_system_backend.cc

 // Copyright 2013 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 "content/public/test/test_file_system_backend.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 140 matching lines @@
 
   base::WeakPtrFactory<TestWatcherManager> weak_ptr_factory_;
 };
 
 }  // namespace
 
 // This only supports single origin.
 class TestFileSystemBackend::QuotaUtil : public storage::FileSystemQuotaUtil,
                                          public storage::FileUpdateObserver {
  public:
-  explicit QuotaUtil(base::SequencedTaskRunner* task_runner)
-      : usage_(0),
-        task_runner_(task_runner) {
-    update_observers_ = update_observers_.AddObserver(this, task_runner_.get());
-  }
+  QuotaUtil() : usage_(0) {}
   virtual ~QuotaUtil() {}
 
   // FileSystemQuotaUtil overrides.
   virtual base::File::Error DeleteOriginDataOnFileTaskRunner(
       FileSystemContext* context,
       storage::QuotaManagerProxy* proxy,
       const GURL& origin_url,
       storage::FileSystemType type) OVERRIDE {
     NOTREACHED();
     return base::File::FILE_OK;
@@ skipping 20 matching lines @@
     NOTREACHED();
   }
 
   virtual int64 GetOriginUsageOnFileTaskRunner(
       FileSystemContext* context,
       const GURL& origin_url,
       storage::FileSystemType type) OVERRIDE {
     return usage_;
   }
 
-  virtual void AddFileUpdateObserver(
-      storage::FileSystemType type,
-      FileUpdateObserver* observer,
-      base::SequencedTaskRunner* task_runner) OVERRIDE {
-    NOTIMPLEMENTED();
-  }
-
-  virtual void AddFileChangeObserver(
-      storage::FileSystemType type,
-      storage::FileChangeObserver* observer,
-      base::SequencedTaskRunner* task_runner) OVERRIDE {
-    change_observers_ = change_observers_.AddObserver(observer, task_runner);
-  }
-
-  virtual void AddFileAccessObserver(
-      storage::FileSystemType type,
-      storage::FileAccessObserver* observer,
-      base::SequencedTaskRunner* task_runner) OVERRIDE {
-    NOTIMPLEMENTED();
-  }
-
-  virtual const storage::UpdateObserverList* GetUpdateObservers(
-      storage::FileSystemType type) const OVERRIDE {
-    return &update_observers_;
-  }
-
-  virtual const storage::ChangeObserverList* GetChangeObservers(
-      storage::FileSystemType type) const OVERRIDE {
-    return &change_observers_;
-  }
-
-  virtual const storage::AccessObserverList* GetAccessObservers(
-      storage::FileSystemType type) const OVERRIDE {
-    return NULL;
-  }
-
   // FileUpdateObserver overrides.
   virtual void OnStartUpdate(const FileSystemURL& url) OVERRIDE {}
   virtual void OnUpdate(const FileSystemURL& url, int64 delta) OVERRIDE {
     usage_ += delta;
   }
   virtual void OnEndUpdate(const FileSystemURL& url) OVERRIDE {}
 
-  base::SequencedTaskRunner* task_runner() { return task_runner_.get(); }
-
  private:
   int64 usage_;
-
-  scoped_refptr<base::SequencedTaskRunner> task_runner_;
-
-  storage::UpdateObserverList update_observers_;
-  storage::ChangeObserverList change_observers_;
+  DISALLOW_COPY_AND_ASSIGN(QuotaUtil);
 };
 
 TestFileSystemBackend::TestFileSystemBackend(
     base::SequencedTaskRunner* task_runner,
     const base::FilePath& base_path)
     : base_path_(base_path),
+      task_runner_(task_runner),
       file_util_(
           new storage::AsyncFileUtilAdapter(new TestFileUtil(base_path))),
       watcher_manager_(new TestWatcherManager()),
-      quota_util_(new QuotaUtil(task_runner)),
+      quota_util_(new QuotaUtil),
       require_copy_or_move_validator_(false) {
+  update_observers_ =
+      update_observers_.AddObserver(quota_util_.get(), task_runner_.get());
 }
 
 TestFileSystemBackend::~TestFileSystemBackend() {
 }
 
 bool TestFileSystemBackend::CanHandleType(storage::FileSystemType type) const {
   return (type == storage::kFileSystemTypeTest);
 }
 
 void TestFileSystemBackend::Initialize(FileSystemContext* context) {
@@ skipping 37 matching lines @@
     copy_or_move_file_validator_factory_ = factory.Pass();
 }
 
 FileSystemOperation* TestFileSystemBackend::CreateFileSystemOperation(
     const FileSystemURL& url,
     FileSystemContext* context,
     base::File::Error* error_code) const {
   scoped_ptr<FileSystemOperationContext> operation_context(
       new FileSystemOperationContext(context));
   operation_context->set_update_observers(*GetUpdateObservers(url.type()));
-  operation_context->set_change_observers(
-      *quota_util_->GetChangeObservers(url.type()));
+  operation_context->set_change_observers(*GetChangeObservers(url.type()));
   return FileSystemOperation::Create(url, context, operation_context.Pass());
 }
 
 bool TestFileSystemBackend::SupportsStreaming(
     const storage::FileSystemURL& url) const {
   return false;
 }
 
 bool TestFileSystemBackend::HasInplaceCopyImplementation(
     storage::FileSystemType type) const {
@@ skipping 20 matching lines @@
       new storage::SandboxFileStreamWriter(
           context, url, offset, *GetUpdateObservers(url.type())));
 }
 
 storage::FileSystemQuotaUtil* TestFileSystemBackend::GetQuotaUtil() {
   return quota_util_.get();
 }
 
 const storage::UpdateObserverList* TestFileSystemBackend::GetUpdateObservers(
     storage::FileSystemType type) const {
-  return quota_util_->GetUpdateObservers(type);
+  return &update_observers_;
+}
+
+const storage::ChangeObserverList* TestFileSystemBackend::GetChangeObservers(
+    storage::FileSystemType type) const {
+  return &change_observers_;
+}
+
+const storage::AccessObserverList* TestFileSystemBackend::GetAccessObservers(
+    storage::FileSystemType type) const {
+  return NULL;
 }
 
 void TestFileSystemBackend::AddFileChangeObserver(
     storage::FileChangeObserver* observer) {
-  quota_util_->AddFileChangeObserver(
-      storage::kFileSystemTypeTest, observer, quota_util_->task_runner());
+  change_observers_ =
+      change_observers_.AddObserver(observer, task_runner_.get());
 }
 
 }  // namespace content