Database support for GDataDirectoryService.

chrome/browser/chromeos/gdata/gdata_system_service.cc

 // 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.
 
 #include "chrome/browser/chromeos/gdata/gdata_system_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/gdata/drive_webapps_registry.h"
 #include "chrome/browser/chromeos/gdata/gdata_documents_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_download_observer.h"
 #include "chrome/browser/chromeos/gdata/gdata_file_system.h"
 #include "chrome/browser/chromeos/gdata/gdata_file_system_proxy.h"
 #include "chrome/browser/chromeos/gdata/gdata_sync_client.h"
 #include "chrome/browser/chromeos/gdata/gdata_uploader.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 
 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()),
       cache_(NULL) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 GDataSystemService::~GDataSystemService() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   cache_->DestroyOnUIThread();
 }
 
 void GDataSystemService::Initialize(
     DocumentsServiceInterface* documents_service,
     const FilePath& cache_root) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   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();
 
   content::DownloadManager* download_manager =
     g_browser_process->download_status_updater() ?
         BrowserContext::GetDownloadManager(profile_) : NULL;
   download_observer_->Initialize(
       download_manager,
       cache_->GetCacheDirectoryPath(
@@ skipping 30 matching lines @@
 }
 
 void GDataSystemService::RemoveDriveMountPoint() {
   const FilePath mount_point = gdata::util::GetGDataMountPointPath();
   fileapi::ExternalFileSystemMountPointProvider* provider =
       BrowserContext::GetFileSystemContext(profile_)->external_provider();
   if (provider && provider->HasMountPoint(mount_point))
     provider->RemoveMountPoint(mount_point);
 }
 
+scoped_refptr<base::SequencedTaskRunner> GDataSystemService::GetTaskRunner() {
+  return BrowserThread::GetBlockingPool()->GetSequencedTaskRunner(
+      sequence_token_);
+}
+
 //===================== GDataSystemServiceFactory =============================
 
 // static
 GDataSystemService* GDataSystemServiceFactory::GetForProfile(
     Profile* profile) {
   return static_cast<GDataSystemService*>(
       GetInstance()->GetServiceForProfile(profile, true));
 }
 
 // static
@@ skipping 46 matching lines @@
       g_test_cache_root ? FilePath(*g_test_cache_root) :
                           GDataCache::GetCacheRootPath(profile);
   delete g_test_cache_root;
   g_test_cache_root = NULL;
 
   service->Initialize(documents_service, cache_root);
   return service;
 }
 
 }  // namespace gdata