drive: Fix lifetime model of 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 134 matching lines @@
           &FileWatchBrowserFunctionBase::RunFileWatchOperationOnFileThread,
           this,
           FileBrowserPrivateAPI::Get(profile_)->event_router(),
           file_watch_url,
           extension_id()));
 
   return true;
 }
 
 void FileWatchBrowserFunctionBase::RunFileWatchOperationOnFileThread(
-    scoped_refptr<FileBrowserEventRouter> event_router,
+    FileBrowserEventRouter* event_router,

[satorux1, 2013/04/08 06:34:36]

I think this is unsafe, as |event_router| could be already deleted by the time
this function is called on FILE thread...

Let me see if I can fix this: crbug.com/227483.

     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);
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(
           &FileWatchBrowserFunctionBase::RespondOnUIThread, this, result));
 }
 
 bool AddFileWatchBrowserFunction::PerformFileWatchOperation(
-    scoped_refptr<FileBrowserEventRouter> event_router,
+    FileBrowserEventRouter* event_router,
     const base::FilePath& local_path, const base::FilePath& virtual_path,
     const std::string& extension_id) {
   return event_router->AddFileWatch(local_path, virtual_path, extension_id);
 }
 
 bool RemoveFileWatchBrowserFunction::PerformFileWatchOperation(
-    scoped_refptr<FileBrowserEventRouter> event_router,
+    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;
 }
 
 // static
 void GetFileTasksFileBrowserFunction::IntersectAvailableDriveTasks(
     drive::DriveWebAppsRegistry* registry,
     const FileInfoList& file_info_list,
@@ skipping 2560 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;
 }