Extract external file systems handling from isolated context.

chrome/browser/ui/views/select_file_dialog_extension_browsertest.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/ui/views/select_file_dialog_extension.h"
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/test/test_utils.h"
 #include "ui/base/dialogs/select_file_dialog.h"
 #include "ui/base/dialogs/selected_file_info.h"
+#include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 
 using content::BrowserContext;
 
 // Mock listener used by test below.
 class MockSelectFileDialogListener : public ui::SelectFileDialog::Listener {
  public:
   MockSelectFileDialogListener()
     : file_selected_(false),
@@ skipping 71 matching lines @@
 
     second_dialog_ = NULL;
     second_listener_.reset();
   }
 
   // Creates a file system mount point for a directory.
   void AddMountPoint(const FilePath& path) {
     fileapi::ExternalFileSystemMountPointProvider* provider =
         BrowserContext::GetDefaultStoragePartition(browser()->profile())->
             GetFileSystemContext()->external_provider();
-    provider->AddLocalMountPoint(path);
+
+    fileapi::ExternalMountPoints::GetSystemInstance()->RevokeFileSystem(
+        "Downloads");

[kinuko, 2013/01/08 12:22:43]

nit: This hard-coded string may look less nicer. Worth a comment?

[tbarzic, 2013/01/09 01:26:34]

Done.

+    ASSERT_TRUE(provider->AddLocalMountPoint(path));
   }
 
   void CheckJavascriptErrors() {
     content::RenderViewHost* host = dialog_->GetRenderViewHost();
     scoped_ptr<base::Value> value(host->ExecuteJavascriptAndGetValue(
         string16(),
         ASCIIToUTF16("window.JSErrorCount")));
     int js_error_count = 0;
     ASSERT_TRUE(value->GetAsInteger(&js_error_count));
     ASSERT_EQ(0, js_error_count);
@@ skipping 227 matching lines @@
   ASSERT_FALSE(second_dialog_->IsRunning(owning_window));
 
   // Click cancel button.
   CloseDialog(DIALOG_BTN_CANCEL, owning_window);
 
   // Listener should have been informed of the cancellation.
   ASSERT_FALSE(listener_->file_selected());
   ASSERT_TRUE(listener_->canceled());
   ASSERT_EQ(this, listener_->params());
 }