Revert 93813 - Re-landing for tbarzic@ - r93754:

Adding support for mount point different from removable devices to MountLibrary
(work in progress..have to add GetMountPoints support)

tested on ChromeOS with these three patches: http://gerrit.chromium.org/gerrit/#change,4447
http://gerrit.chromium.org/gerrit/#change,4449
http://gerrit.chromium.org/gerrit/#change,4544

BUG=chromium-os:17673,chromium-os:17783
TEST=Made sure mounting devices still works and that
     MountCompleted event gets through to
     file_browser_event_router (checking ui and chrome logs
     for mount completed entries)

TBR=tbarzic
Review URL: http://codereview.chromium.org/7492038

TBR=zelidrag@chromium.org
Review URL: http://codereview.chromium.org/7488043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93815 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 71 deletions

diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
index 91d7216..df0d61e 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
@@ -54,28 +54,6 @@ DictionaryValue* DiskToDictionaryValue(
   return result;
 }
 
-const char* MountErrorToString(chromeos::MountError error) {
-  switch (error) {
-    case chromeos::MOUNT_ERROR_NONE:
-      return "success";
-    case chromeos::MOUNT_ERROR_UNKNOWN:
-      return "error_unknown";
-    case chromeos::MOUNT_ERROR_INTERNAL:
-      return "error_internal";
-    case chromeos::MOUNT_ERROR_UNKNOWN_FILESYSTEM:
-      return "error_unknown_filesystem";
-    case chromeos::MOUNT_ERROR_UNSUPORTED_FILESYSTEM:
-      return "error_unsuported_filesystem";
-    case chromeos::MOUNT_ERROR_INVALID_ARCHIVE:
-      return "error_invalid_archive";
-    case chromeos::MOUNT_ERROR_LIBRARY_NOT_LOADED:
-      return "error_libcros_missing";
-    default:
-      NOTREACHED();
-  }
-  return "";
-}
-
 ExtensionFileBrowserEventRouter::ExtensionFileBrowserEventRouter(
     Profile* profile)
     : delegate_(new ExtensionFileBrowserEventRouter::FileWatcherDelegate(this)),
@@ -175,13 +153,6 @@ void ExtensionFileBrowserEventRouter::DeviceChanged(
   }
 }
 
-void ExtensionFileBrowserEventRouter::MountCompleted(
-    chromeos::MountLibrary::MountEvent event_type,
-    chromeos::MountError error_code,
-    const chromeos::MountLibrary::MountPointInfo& mount_info) {
-  DispatchMountCompletedEvent(event_type, error_code, mount_info);
-}
-
 void ExtensionFileBrowserEventRouter::HandleFileWatchNotification(
     const FilePath& local_path, bool got_error) {
   base::AutoLock lock(lock_);
@@ -247,37 +218,6 @@ void ExtensionFileBrowserEventRouter::DispatchMountEvent(
       GURL());
 }
 
-void ExtensionFileBrowserEventRouter::DispatchMountCompletedEvent(
-    chromeos::MountLibrary::MountEvent event,
-    chromeos::MountError error_code,
-    const chromeos::MountLibrary::MountPointInfo& mount_info) {
-  if (!profile_ || mount_info.mount_type == chromeos::MOUNT_TYPE_INVALID) {
-    NOTREACHED();
-    return;
-  }
-
-  ListValue args;
-  DictionaryValue* mount_info_value = new DictionaryValue();
-  args.Append(mount_info_value);
-  mount_info_value->SetString("sourcePath", mount_info.source_path);
-  if (event == chromeos::MountLibrary::MOUNTING) {
-    mount_info_value->SetString("eventType", "mount");
-  } else {
-    mount_info_value->SetString("eventType", "unmount");
-  }
-  mount_info_value->SetString("status", MountErrorToString(error_code));
-  chromeos::MountLibrary* lib = chromeos::CrosLibrary::Get()->GetMountLibrary();
-  mount_info_value->SetString("mountType",
-                              lib->MountTypeToString(mount_info.mount_type));
-  mount_info_value->SetString("mountPath", mount_info.mount_path);
-
-  std::string args_json;
-  base::JSONWriter::Write(&args, false /* pretty_print */, &args_json);
-  profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
-      extension_event_names::kOnFileBrowserMountCompleted, args_json, NULL,
-      GURL());
-}
-
 void ExtensionFileBrowserEventRouter::OnDiskAdded(
     const chromeos::MountLibrary::Disk* disk) {
   VLOG(1) << "Disk added: " << disk->device_path();
@@ -297,9 +237,7 @@ void ExtensionFileBrowserEventRouter::OnDiskAdded(
     // Initiate disk mount operation.
     chromeos::MountLibrary* lib =
         chromeos::CrosLibrary::Get()->GetMountLibrary();
-    lib->MountPath(disk->device_path().c_str(),
-                   chromeos::MOUNT_TYPE_DEVICE,
-                   chromeos::MountPathOptions());  // Unused.
+    lib->MountPath(disk->device_path().c_str());
   }
 }
 
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.h b/chrome/browser/chromeos/extensions/file_browser_event_router.h
index 5378372..fb8047d 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.h
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.h
@@ -46,10 +46,6 @@ class ExtensionFileBrowserEventRouter
                            const chromeos::MountLibrary::Disk* disk) OVERRIDE;
   virtual void DeviceChanged(chromeos::MountLibraryEventType event,
                              const std::string& device_path) OVERRIDE;
-  virtual void MountCompleted(chromeos::MountLibrary::MountEvent event_type,
-      chromeos::MountError error_code,
-      const chromeos::MountLibrary::MountPointInfo& mount_info)
-      OVERRIDE;
 
  private:
   typedef std::map<std::string, linked_ptr<chromeos::SystemNotification> >
@@ -107,10 +103,6 @@ class ExtensionFileBrowserEventRouter
   // Sends filesystem changed extension message to all renderers.
   void DispatchMountEvent(const chromeos::MountLibrary::Disk* disk, bool added);
 
-  void DispatchMountCompletedEvent(chromeos::MountLibrary::MountEvent event,
-      chromeos::MountError error_code,
-      const chromeos::MountLibrary::MountPointInfo& mount_info);
-
   void RemoveBrowserFromVector(const std::string& path);
 
   // Used to create a window of a standard size, and add it to a list