drive: Fix lifetime model of FileBrowserEventRouter

chrome/browser/chromeos/extensions/file_browser_private_api.cc

Index: chrome/browser/chromeos/extensions/file_browser_private_api.cc
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
index 18909be0487378160aab170226079c770b20eef7..e4b7e7c9d46a732a5ac9816aacc67d1d0bbf5dc6 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
@@ -565,7 +565,7 @@ class RequestLocalFileSystemFunction::LocalFileSystemCallbackDispatcher {
 };
 
 FileBrowserPrivateAPI::FileBrowserPrivateAPI(Profile* profile)
-    : event_router_(make_scoped_refptr(new FileBrowserEventRouter(profile))) {
+    : event_router_(new FileBrowserEventRouter(profile)) {
   (new FileBrowserHandlerParser)->Register();
 
   ExtensionFunctionRegistry* registry =
@@ -720,7 +720,7 @@ bool FileWatchBrowserFunctionBase::RunImpl() {
 }
 
 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();
@@ -734,14 +734,14 @@ void FileWatchBrowserFunctionBase::RunFileWatchOperationOnFileThread(
 }
 
 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);