Revert of Add the chrome.fileSystem.onVolumeListChanged event.

chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc

 // Copyright 2014 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/file_system/file_system_api.h"
 
-#include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
-#include "base/location.h"
 #include "base/path_service.h"
-#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/extensions/api/file_system.h"
 #include "content/public/test/test_utils.h"
-#include "extensions/browser/event_router.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/test_util.h"
 #include "storage/browser/fileapi/external_mount_points.h"
 #include "ui/base/ui_base_types.h"
 
 using file_manager::VolumeManager;
 
 namespace extensions {
 namespace {
 
 // Mount point names for chrome.fileSystem.requestFileSystem() tests.
 const char kWritableMountPointName[] = "writable";
 const char kReadOnlyMountPointName[] = "read-only";
 
 // Child directory created in each of the mount points.
 const char kChildDirectory[] = "child-dir";
 
-// ID of a testing extension.
-const char kTestingExtensionId[] = "pkplfbidichfdicaijlchgnapepdginl";
-
 }  // namespace
 
 // Skips the user consent dialog for chrome.fileSystem.requestFileSystem() and
 // simulates clicking of the specified dialog button.
 class ScopedSkipRequestFileSystemDialog {
  public:
   explicit ScopedSkipRequestFileSystemDialog(ui::DialogButton button) {
     file_system_api::ConsentProviderDelegate::SetAutoDialogButtonForTest(
         button);
   }
   ~ScopedSkipRequestFileSystemDialog() {
     file_system_api::ConsentProviderDelegate::SetAutoDialogButtonForTest(
         ui::DIALOG_BUTTON_NONE);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedSkipRequestFileSystemDialog);
 };
 
-// Observers adding a listener to the |event_name| event by |extension|, and
-// then fires the |callback|.
-class ScopedAddListenerObserver : public EventRouter::Observer {
- public:
-  ScopedAddListenerObserver(Profile* profile,
-                            const std::string& event_name,
-                            const std::string& extension_id,
-                            const base::Closure& callback)
-      : extension_id_(extension_id),
-        callback_(callback),
-        event_router_(EventRouter::EventRouter::Get(profile)) {
-    DCHECK(profile);
-    DCHECK(event_router_);
-    event_router_->RegisterObserver(this, event_name);
-  }
-
-  ~ScopedAddListenerObserver() { event_router_->UnregisterObserver(this); }
-
-  // EventRouter::Observer overrides.
-  void OnListenerAdded(const EventListenerInfo& details) override {
-    // Call the callback only once, as the listener may be added multiple times.
-    if (details.extension_id == extension_id_ && !callback_.is_null()) {
-      base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, callback_);
-      callback_ = base::Closure();
-    }
-  }
-
- private:
-  const std::string extension_id_;
-  base::Closure callback_;
-  EventRouter* const event_router_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedAddListenerObserver);
-};
-
 // This class contains chrome.filesystem API test specific to Chrome OS, namely,
 // the integrated Google Drive support.
 class FileSystemApiTestForDrive : public PlatformAppBrowserTest {
  public:
   FileSystemApiTestForDrive()
       : fake_drive_service_(NULL),
         integration_service_(NULL) {
   }
 
   // Sets up fake Drive service for tests (this has to be injected before the
@@ skipping 106 matching lines @@
     CreateTestingFileSystem(kReadOnlyMountPointName, true /* read_only */);
     PlatformAppBrowserTest::SetUpOnMainThread();
   }
 
   void TearDownOnMainThread() override {
     PlatformAppBrowserTest::TearDownOnMainThread();
     user_manager_enabler_.reset();
     fake_user_manager_ = nullptr;
   }
 
-  // Simulates mounting a removable volume.
-  void MountFakeVolume() {
-    VolumeManager* const volume_manager =
-        VolumeManager::Get(browser()->profile());
-    ASSERT_TRUE(volume_manager);
-    volume_manager->AddVolumeForTesting(
-        base::FilePath("/a/b/c"), file_manager::VOLUME_TYPE_TESTING,
-        chromeos::DEVICE_TYPE_UNKNOWN, false /* read_only */);
-  }
-
  protected:
   base::ScopedTempDir temp_dir_;
   chromeos::FakeChromeUserManager* fake_user_manager_;
   scoped_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
 
   // Creates a testing file system in a testing directory.
   void CreateTestingFileSystem(const std::string& mount_point_name,
                                bool read_only) {
     const base::FilePath mount_point_path =
         temp_dir_.path().Append(mount_point_name);
+    LOG(ERROR) << mount_point_path.value();
     ASSERT_TRUE(base::CreateDirectory(mount_point_path));
     ASSERT_TRUE(
         base::CreateDirectory(mount_point_path.Append(kChildDirectory)));
     ASSERT_TRUE(content::BrowserContext::GetMountPoints(browser()->profile())
                     ->RegisterFileSystem(
                         mount_point_name, storage::kFileSystemTypeNativeLocal,
                         storage::FileSystemMountOption(), mount_point_path));
     VolumeManager* const volume_manager =
         VolumeManager::Get(browser()->profile());
     ASSERT_TRUE(volume_manager);
@@ skipping 211 matching lines @@
       << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(FileSystemApiTestForRequestFileSystem,
                        GetVolumeList_NotKioskSession) {
   ASSERT_TRUE(RunPlatformAppTest(
       "api_test/file_system/get_volume_list_not_kiosk_session"))
       << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(FileSystemApiTestForRequestFileSystem,
-                       OnVolumeListChanged) {
-  EnterKioskSession();
-
-  ScopedAddListenerObserver observer(
-      profile(), extensions::api::file_system::OnVolumeListChanged::kEventName,
-      kTestingExtensionId,
-      base::Bind(&FileSystemApiTestForRequestFileSystem::MountFakeVolume,
-                 this));
-
-  ASSERT_TRUE(RunPlatformAppTest("api_test/file_system/on_volume_list_changed"))
-      << message_;
-}
-
 }  // namespace extensions