Database support for GDataDirectoryService.

chrome/browser/chromeos/gdata/gdata_file_system.h

Index: chrome/browser/chromeos/gdata/gdata_file_system.h
===================================================================
--- chrome/browser/chromeos/gdata/gdata_file_system.h	(revision 148059)
+++ chrome/browser/chromeos/gdata/gdata_file_system.h	(working copy)
@@ -23,9 +23,7 @@
 #include "content/public/browser/notification_observer.h"
 
 namespace base {
-
 class SequencedTaskRunner;
-
 }  // namespace base
 
 namespace gdata {
@@ -44,6 +42,7 @@
  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,
@@ -846,16 +845,16 @@
     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_;