drive: Fix two instances of madness in FileBrowserEventRouter

chrome/browser/chromeos/extensions/file_browser_private_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/chromeos/extensions/file_browser_private_api.h"
 
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <sys/types.h>
 #include <utime.h>
@@ skipping 547 matching lines @@
   RequestLocalFileSystemFunction* function_;
   scoped_refptr<fileapi::FileSystemContext> file_system_context_;
   // Renderer process id.
   int child_id_;
   // Extension source URL.
   scoped_refptr<const Extension> extension_;
   DISALLOW_COPY_AND_ASSIGN(LocalFileSystemCallbackDispatcher);
 };
 
 FileBrowserPrivateAPI::FileBrowserPrivateAPI(Profile* profile)
-    : event_router_(make_scoped_refptr(new FileBrowserEventRouter(profile))) {
+    : event_router_(new FileBrowserEventRouter(profile)) {
   (new FileBrowserHandlerParser)->Register();
 
   ExtensionFunctionRegistry* registry =
       ExtensionFunctionRegistry::GetInstance();
   registry->RegisterFunction<LogoutUserFunction>();
   registry->RegisterFunction<CancelFileDialogFunction>();
   registry->RegisterFunction<ExecuteTasksFileBrowserFunction>();
   registry->RegisterFunction<SetDefaultTaskFileBrowserFunction>();
   registry->RegisterFunction<FileDialogStringsFunction>();
   registry->RegisterFunction<GetFileTasksFileBrowserFunction>();
@@ skipping 101 matching lines @@
   SendResponse(true);
 }
 
 void RequestLocalFileSystemFunction::RespondFailedOnUIThread(
     base::PlatformFileError error_code) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   error_ = base::StringPrintf(kFileError, static_cast<int>(error_code));
   SendResponse(false);
 }
 
-void FileWatchBrowserFunctionBase::RespondOnUIThread(bool success) {
+void FileWatchBrowserFunctionBase::Respond(bool success) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
   SetResult(Value::CreateBooleanValue(success));
   SendResponse(success);
 }
 
 bool FileWatchBrowserFunctionBase::RunImpl() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
   if (!render_view_host() || !render_view_host()->GetProcess())
     return false;
 
   // First param is url of a file to watch.
   std::string url;
   if (!args_->GetString(0, &url) || url.empty())
     return false;
 
   content::SiteInstance* site_instance = render_view_host()->GetSiteInstance();
   scoped_refptr<fileapi::FileSystemContext> file_system_context =
       BrowserContext::GetStoragePartition(profile(), site_instance)->
           GetFileSystemContext();
 
   FileSystemURL file_watch_url = file_system_context->CrackURL(GURL(url));
-  BrowserThread::PostTask(
-      BrowserThread::FILE, FROM_HERE,
-      base::Bind(
-          &FileWatchBrowserFunctionBase::RunFileWatchOperationOnFileThread,
-          this,
-          FileBrowserPrivateAPI::Get(profile_)->event_router(),
-          file_watch_url,
-          extension_id()));
+  base::FilePath local_path = file_watch_url.path();
+  base::FilePath virtual_path = file_watch_url.virtual_path();
+  if (local_path.empty()) {
+    Respond(false);
+    return true;
+  }
+  PerformFileWatchOperation(local_path, virtual_path, extension_id());
 
   return true;
 }
 
-void FileWatchBrowserFunctionBase::RunFileWatchOperationOnFileThread(
-    scoped_refptr<FileBrowserEventRouter> event_router,
-    const FileSystemURL& file_url, const std::string& extension_id) {
-  base::FilePath local_path = file_url.path();
-  base::FilePath virtual_path = file_url.virtual_path();
-  bool result = !local_path.empty() && PerformFileWatchOperation(
-      event_router, local_path, virtual_path, extension_id);
+void AddFileWatchBrowserFunction::PerformFileWatchOperation(
+    const base::FilePath& local_path,
+    const base::FilePath& virtual_path,
+    const std::string& extension_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(
-          &FileWatchBrowserFunctionBase::RespondOnUIThread, this, result));
+  FileBrowserEventRouter* event_router =
+      FileBrowserPrivateAPI::Get(profile_)->event_router();
+  event_router->AddFileWatch(
+      local_path,
+      virtual_path,
+      extension_id,
+      base::Bind(&AddFileWatchBrowserFunction::Respond, this));
 }
 
-bool AddFileWatchBrowserFunction::PerformFileWatchOperation(
-    scoped_refptr<FileBrowserEventRouter> event_router,
-    const base::FilePath& local_path, const base::FilePath& virtual_path,
+void RemoveFileWatchBrowserFunction::PerformFileWatchOperation(
+    const base::FilePath& local_path,
+    const base::FilePath& unused,
     const std::string& extension_id) {
-  return event_router->AddFileWatch(local_path, virtual_path, extension_id);
-}
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-bool RemoveFileWatchBrowserFunction::PerformFileWatchOperation(
-    scoped_refptr<FileBrowserEventRouter> event_router,
-    const base::FilePath& local_path, const base::FilePath& unused,
-    const std::string& extension_id) {
-  event_router->RemoveFileWatch(local_path, extension_id);
-  return true;
+  FileBrowserEventRouter* event_router =
+      FileBrowserPrivateAPI::Get(profile_)->event_router();
+  event_router->RemoveFileWatch(

[hashimoto, 2013/04/08 11:10:26]

nit: Can't this method call be one line?

[satorux1, 2013/04/09 01:24:38]

Done.

+      local_path,
+      extension_id);
+  Respond(true);
 }
 
 // static
 void GetFileTasksFileBrowserFunction::IntersectAvailableDriveTasks(
     drive::DriveWebAppsRegistry* registry,
     const FileInfoList& file_info_list,
     WebAppInfoMap* app_info,
     std::set<std::string>* available_tasks) {
   for (FileInfoList::const_iterator file_iter = file_info_list.begin();
        file_iter != file_info_list.end(); ++file_iter) {
@@ skipping 2556 matching lines @@
 OpenNewWindowFunction::OpenNewWindowFunction() {}
 
 OpenNewWindowFunction::~OpenNewWindowFunction() {}
 
 bool OpenNewWindowFunction::RunImpl() {
   std::string url;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &url));
   file_manager_util::OpenNewWindow(profile_, GURL(url));
   return true;
 }