[filebrowser] Fix the browser_tests using invalid mount point.

chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc

 // Copyright (c) 2011 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/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ skipping 200 matching lines @@
 #if !defined(OS_CHROMEOS)
 #define MAYBE_SelectFileAndCancel DISABLED_SelectFileAndCancel
 #else
 #define MAYBE_SelectFileAndCancel SelectFileAndCancel
 #endif
 IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
                        MAYBE_SelectFileAndCancel) {
   // Add tmp mount point even though this test won't use it directly.
   // We need this to make sure that at least one top-level directory exists
   // in the file browser.
-  FilePath tmp_dir("/tmp");
+  FilePath tmp_dir("/tmp/Downloads");
+  ScopedTempDir downloads_dir;
+  ASSERT_TRUE(downloads_dir.Set(tmp_dir));

[zel, 2011/12/06 17:29:29]

I suggest something like this instead:

ScopedTempDir downloads_dir;
ASSERT_TRUE(downloads_dir.CreateUniqueTempDirUnderPath("/tmp"));
FilePath dir_path = downloads_dir.Take();    // get path
ASSERT_TRUE(downloads_dir.Set(dir_path));    // Reclaim ownership
ASSERT_TRUE(file_util::CreateDirectory(dir_path.Append("Downloads")));   //
create Downloads sub dir

This will make your code more resilient to random stuff that might still reside
in /tmp/Downloads after test runs.

[zel, 2011/12/06 17:42:02]

Shorter version:

ScopedTempDir downloads_dir;
ASSERT_TRUE(downloads_dir.CreateUniqueTempDirUnderPath("/tmp"));
ASSERT_TRUE(file_util::CreateDirectory(downloads_dir.path().Append("Downloads")));

[dgozman, 2011/12/07 11:20:42]

Done.

   AddMountPoint(tmp_dir);
 
   gfx::NativeWindow owning_window = browser()->window()->GetNativeHandle();
 
   // FilePath() for default path.
   OpenDialog(SelectFileDialog::SELECT_OPEN_FILE, FilePath(), owning_window, "");
 
   // Press 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());
 }
 
 // TODO(jamescook): Make dialog work on non-ChromeOS platforms. crbug.com/97424
 #if !defined(OS_CHROMEOS)
 #define MAYBE_SelectFileAndOpen DISABLED_SelectFileAndOpen
 #else
 #define MAYBE_SelectFileAndOpen SelectFileAndOpen
 #endif
 IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
                        MAYBE_SelectFileAndOpen) {
   // Allow the tmp directory to be mounted.  We explicitly use /tmp because
-  // it it whitelisted for file system access on Chrome OS.
-  FilePath tmp_dir("/tmp");
+  // it is whitelisted for file system access on Chrome OS.
+  // File manager looks for Downloads mount point, so use this name.
+  FilePath tmp_dir("/tmp/Downloads");

[sky, 2011/12/06 17:23:59]

You want PathService::Get(base::DIR_TEMP, &tmp_path);

[dgozman, 2011/12/07 11:20:42]

Done.

+  ScopedTempDir downloads_dir;
+  ASSERT_TRUE(downloads_dir.Set(tmp_dir));
   AddMountPoint(tmp_dir);
 
   // Create a directory with a single file in it.  ScopedTempDir will delete
   // itself and our temp file when it goes out of scope.
   ScopedTempDir scoped_temp_dir;
   ASSERT_TRUE(scoped_temp_dir.CreateUniqueTempDirUnderPath(tmp_dir));
   FilePath temp_dir = scoped_temp_dir.path();
   FilePath test_file = temp_dir.AppendASCII("file_manager_test.html");
 
   // Create an empty file to give us something to select.
@@ skipping 23 matching lines @@
 
 // TODO(jamescook): Make dialog work on non-ChromeOS platforms. crbug.com/97424
 #if !defined(OS_CHROMEOS)
 #define MAYBE_SelectFileAndSave DISABLED_SelectFileAndSave
 #else
 #define MAYBE_SelectFileAndSave SelectFileAndSave
 #endif
 IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
                        MAYBE_SelectFileAndSave) {
   // Allow the tmp directory to be mounted.  We explicitly use /tmp because
-  // it it whitelisted for file system access on Chrome OS.
-  FilePath tmp_dir("/tmp");
+  // it is whitelisted for file system access on Chrome OS.
+  // File manager looks for Downloads mount point, so use this name.
+  FilePath tmp_dir("/tmp/Downloads");
+  ScopedTempDir downloads_dir;
+  ASSERT_TRUE(downloads_dir.Set(tmp_dir));
   AddMountPoint(tmp_dir);
 
   // Create a directory with a single file in it.  ScopedTempDir will delete
   // itself and our temp file when it goes out of scope.
   ScopedTempDir scoped_temp_dir;
   ASSERT_TRUE(scoped_temp_dir.CreateUniqueTempDirUnderPath(tmp_dir));
   FilePath temp_dir = scoped_temp_dir.path();
   FilePath test_file = temp_dir.AppendASCII("file_manager_test.html");
 
   gfx::NativeWindow owning_window = browser()->window()->GetNativeHandle();
@@ skipping 20 matching lines @@
 #if !defined(OS_CHROMEOS)
 #define MAYBE_OpenSingletonTabAndCancel DISABLED_OpenSingletonTabAndCancel
 #else
 #define MAYBE_OpenSingletonTabAndCancel OpenSingletonTabAndCancel
 #endif
 IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
                        MAYBE_OpenSingletonTabAndCancel) {
   // Add tmp mount point even though this test won't use it directly.
   // We need this to make sure that at least one top-level directory exists
   // in the file browser.
-  FilePath tmp_dir("/tmp");
+  FilePath tmp_dir("/tmp/Downloads");
+  ScopedTempDir downloads_dir;
+  ASSERT_TRUE(downloads_dir.Set(tmp_dir));
   AddMountPoint(tmp_dir);
 
   gfx::NativeWindow owning_window = browser()->window()->GetNativeHandle();
 
   OpenDialog(SelectFileDialog::SELECT_OPEN_FILE, FilePath(), owning_window, "");
 
   // Open a singleton tab in background.
   browser::NavigateParams p(browser(), GURL("www.google.com"),
                             content::PAGE_TRANSITION_LINK);
   p.window_action = browser::NavigateParams::SHOW_WINDOW;
@@ skipping 13 matching lines @@
 #if !defined(OS_CHROMEOS)
 #define MAYBE_OpenTwoDialogs DISABLED_OpenTwoDialogs
 #else
 #define MAYBE_OpenTwoDialogs OpenTwoDialogs
 #endif
 IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
                        MAYBE_OpenTwoDialogs) {
   // Add tmp mount point even though this test won't use it directly.
   // We need this to make sure that at least one top-level directory exists
   // in the file browser.
-  FilePath tmp_dir("/tmp");
+  FilePath tmp_dir("/tmp/Downloads");
+  ScopedTempDir downloads_dir;
+  ASSERT_TRUE(downloads_dir.Set(tmp_dir));
   AddMountPoint(tmp_dir);
 
   gfx::NativeWindow owning_window = browser()->window()->GetNativeHandle();
 
   OpenDialog(SelectFileDialog::SELECT_OPEN_FILE, FilePath(), owning_window, "");
 
   TryOpeningSecondDialog(owning_window);
 
   // Second dialog should not be running.
   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());
 }