Database support for GDataDirectoryService.

chrome/browser/chromeos/gdata/gdata_file_system.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_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/platform_file.h"
 #include "base/timer.h"
 #include "chrome/browser/chromeos/gdata/gdata_cache.h"
 #include "chrome/browser/chromeos/gdata/gdata_file_system_interface.h"
 #include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
 #include "chrome/browser/chromeos/gdata/gdata_files.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "content/public/browser/notification_observer.h"
 
 namespace base {
-
 class SequencedTaskRunner;
-
 }  // namespace base
 
 namespace gdata {
 
 class DocumentsServiceInterface;
 class DriveWebAppsRegistryInterface;
 struct UploadFileInfo;
 
 namespace {
 struct LoadRootFeedParams;
 }  // namespace
 
 // The production implementation of GDataFileSystemInterface.
 class GDataFileSystem : public GDataFileSystemInterface,
                         public content::NotificationObserver {
  public:
   GDataFileSystem(Profile* profile,
                   GDataCache* cache,
+                  GDataDirectoryService* directory_service,

[hashimoto, 2012/07/24 08:41:51]

Are you going to inject a mock in tests?

                   DocumentsServiceInterface* documents_service,
                   GDataUploaderInterface* uploader,
                   DriveWebAppsRegistryInterface* webapps_registry,
                   base::SequencedTaskRunner* blocking_task_runner);
   virtual ~GDataFileSystem();
 
   // GDataFileSystem overrides.
   virtual void Initialize() OVERRIDE;
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
@@ skipping 782 matching lines @@
     GDataFileError error,
     scoped_ptr<GDataEntryProto> entry_proto);
 
   // Part of RequestDirectoryRefreshOnUIThread(). Called after
   // GetEntryInfoByPath() is complete.
   void RequestDirectoryRefreshOnUIThreadAfterGetEntryInfo(
     const FilePath& file_path,
     GDataFileError error,
     scoped_ptr<GDataEntryProto> entry_proto);
 
-  // All members should be accessed only on UI thread. Do not post tasks to
-  // other threads with base::Unretained(this).
-  scoped_ptr<GDataDirectoryService> directory_service_;
-
   // The profile hosts the GDataFileSystem via GDataSystemService.
   Profile* profile_;
 
   // The cache owned by GDataSystemService.
   GDataCache* cache_;
 
+  // All members should be accessed only on UI thread. Do not post tasks to
+  // other threads with base::Unretained(this). Owned by GDataSystemService.
+  GDataDirectoryService* directory_service_;
+
   // The uploader owned by GDataSystemService.
   GDataUploaderInterface* uploader_;
 
   // The document service owned by GDataSystemService.
   DocumentsServiceInterface* documents_service_;
 
   // The webapps registry owned by GDataSystemService.
   DriveWebAppsRegistryInterface* webapps_registry_;
 
   // Periodic timer for checking updates.
@@ skipping 12 matching lines @@
   base::WeakPtr<GDataFileSystem> ui_weak_ptr_;
 
   ObserverList<Observer> observers_;
 
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_