SyncFS: Reorder initialization sequence of SyncFileSystemService

chrome/browser/extensions/api/sync_file_system/sync_file_system_api.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/extensions/api/sync_file_system/sync_file_system_api.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 91 matching lines @@
     SetResult(new base::FundamentalValue(false));
     SendResponse(false);
     return;
   }
 
   SetResult(new base::FundamentalValue(true));
   SendResponse(true);
 }
 
 bool SyncFileSystemRequestFileSystemFunction::RunImpl() {
+  // SyncFileSystem initialization is done in OpenFileSystem below, but we call
+  // GetSyncFileSystemService here too to initialize sync event observer for
+  // extensions API.
+  GetSyncFileSystemService(profile());
+
   // Initializes sync context for this extension and continue to open
   // a new file system.
-  GetSyncFileSystemService(profile())->
-      InitializeForApp(
-          GetFileSystemContext(),
-          source_url().GetOrigin(),
-          base::Bind(&self::DidInitializeFileSystemContext, this));
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      Bind(&fileapi::FileSystemContext::OpenFileSystem,
+           GetFileSystemContext(),
+           source_url().GetOrigin(),
+           fileapi::kFileSystemTypeSyncable,
+           fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
+           base::Bind(&self::DidOpenFileSystem, this)));
   return true;
 }
 
 fileapi::FileSystemContext*
 SyncFileSystemRequestFileSystemFunction::GetFileSystemContext() {
   DCHECK(render_view_host());
   return BrowserContext::GetStoragePartition(
       profile(),
       render_view_host()->GetSiteInstance())->GetFileSystemContext();
 }
 
-void SyncFileSystemRequestFileSystemFunction::DidInitializeFileSystemContext(
-    SyncStatusCode status) {
-  if (status != sync_file_system::SYNC_STATUS_OK) {
-    error_ = sync_file_system::SyncStatusCodeToString(status);
-    SendResponse(false);
-    return;
-  }
-
-  if (!render_view_host()) {
-    // The app seems to have been closed.
-    return;
-  }
-
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      Bind(&fileapi::FileSystemContext::OpenFileSystem,
-           GetFileSystemContext(),
-           source_url().GetOrigin(),
-           fileapi::kFileSystemTypeSyncable,
-           fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
-           base::Bind(&self::DidOpenFileSystem, this)));
-}
-
 void SyncFileSystemRequestFileSystemFunction::DidOpenFileSystem(
     base::PlatformFileError error,
     const std::string& file_system_name,
     const GURL& root_url) {
   // Repost to switch from IO thread to UI thread for SendResponse().
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         Bind(&SyncFileSystemRequestFileSystemFunction::DidOpenFileSystem,
@@ skipping 224 matching lines @@
 
 bool SyncFileSystemGetServiceStatusFunction::RunImpl() {
   sync_file_system::SyncFileSystemService* service = GetSyncFileSystemService(
       profile());
   results_ = api::sync_file_system::GetServiceStatus::Results::Create(
       SyncServiceStateToExtensionEnum(service->GetSyncServiceState()));
   return true;
 }
 
 }  // namespace extensions