Database support for GDataDirectoryService.

chrome/browser/chromeos/gdata/gdata_system_service.cc

Index: chrome/browser/chromeos/gdata/gdata_system_service.cc
===================================================================
--- chrome/browser/chromeos/gdata/gdata_system_service.cc	(revision 148059)
+++ chrome/browser/chromeos/gdata/gdata_system_service.cc	(working copy)
@@ -27,23 +27,18 @@
 using content::BrowserContext;
 using content::BrowserThread;
 
+namespace gdata {
 namespace {
 
+const FilePath::CharType kGDataResourceMetadataDBPath[] =
+    FILE_PATH_LITERAL("resource_metadata.db");
+
 // Used in test to setup system service.
 gdata::DocumentsServiceInterface* g_test_documents_service = NULL;
 const std::string* g_test_cache_root = NULL;
 
-scoped_refptr<base::SequencedTaskRunner> GetTaskRunner(
-    const base::SequencedWorkerPool::SequenceToken& sequence_token) {
-  return BrowserThread::GetBlockingPool()->GetSequencedTaskRunner(
-      sequence_token);
-}
+}  // namespace
 
-}  // nemaspace
-
-namespace gdata {
-
-//===================== GDataSystemService ====================================
 GDataSystemService::GDataSystemService(Profile* profile)
     : profile_(profile),
       sequence_token_(BrowserThread::GetBlockingPool()->GetSequenceToken()),
@@ -64,19 +59,27 @@
   documents_service_.reset(documents_service);
   cache_ = GDataCache::CreateGDataCacheOnUIThread(
       cache_root,
-      GetTaskRunner(sequence_token_));
+      GetTaskRunner());
   uploader_.reset(new GDataUploader(docs_service()));
   webapps_registry_.reset(new DriveWebAppsRegistry);
+  directory_service_.reset(new GDataDirectoryService);
   file_system_.reset(new GDataFileSystem(profile_,
                                          cache(),
+                                         directory_service_.get(),
                                          docs_service(),
                                          uploader(),
                                          webapps_registry(),
-                                         GetTaskRunner(sequence_token_)));
+                                         GetTaskRunner()));
   download_observer_.reset(new GDataDownloadObserver(uploader(),
                                                      file_system()));
   sync_client_.reset(new GDataSyncClient(profile_, file_system(), cache()));
 
+#if 1

[satorux1, 2012/07/24 16:30:34]

#if 1 is weird. did you mean to use a command line flag instead?

+  directory_service_->InitFromDB(
+      cache_->GetCacheDirectoryPath(GDataCache::CACHE_TYPE_META).Append(
+          kGDataResourceMetadataDBPath), GetTaskRunner());

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

Isn't there any chance for |directory_service_| to be accessed on UI thread
before the initialization completes?

+#endif
+
   sync_client_->Initialize();
   file_system_->Initialize();
   cache_->RequestInitializeOnUIThread();
@@ -127,6 +130,11 @@
     provider->RemoveMountPoint(mount_point);
 }
 
+scoped_refptr<base::SequencedTaskRunner> GDataSystemService::GetTaskRunner() {
+  return BrowserThread::GetBlockingPool()->GetSequencedTaskRunner(
+      sequence_token_);
+}
+
 //===================== GDataSystemServiceFactory =============================
 
 // static