Revert 93843 - Disabled borken tests, will figure out tomorrow why they don't work on bbots and do locally.

BUG=none
TEST=none
TBR=jamescook

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

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

2 files changed, 3 insertions, 4 deletions

diff --git a/chrome/browser/extensions/extension_file_browser_private_apitest.cc b/chrome/browser/extensions/extension_file_browser_private_apitest.cc
index 4b2f564..58d41c9 100644
--- a/chrome/browser/extensions/extension_file_browser_private_apitest.cc
+++ b/chrome/browser/extensions/extension_file_browser_private_apitest.cc
@@ -94,8 +94,7 @@ class ExtensionFileBrowserPrivateApiTest : public ExtensionApiTest {
   chromeos::MountLibrary::DiskMap volumes_;
 };
 
-IN_PROC_BROWSER_TEST_F(ExtensionFileBrowserPrivateApiTest,
-                       DISABLED_FileBrowserMount) {
+IN_PROC_BROWSER_TEST_F(ExtensionFileBrowserPrivateApiTest, FileBrowserMount) {
   // We will call fileBrowserPrivate.unmountVolume once. To test that method, we
   // check that UnmountPath is really called with the same value.
   EXPECT_CALL(mount_library_mock_, UnmountPath(StrEq("devicePath1")))
diff --git a/chrome/browser/ui/views/file_manager_dialog_browsertest.cc b/chrome/browser/ui/views/file_manager_dialog_browsertest.cc
index a664a1f..19312d0 100644
--- a/chrome/browser/ui/views/file_manager_dialog_browsertest.cc
+++ b/chrome/browser/ui/views/file_manager_dialog_browsertest.cc
@@ -154,7 +154,7 @@ IN_PROC_BROWSER_TEST_F(FileManagerDialogTest, FLAKY_SelectFileAndCancel) {
   ASSERT_EQ(this, listener_->params());
 }
 
-IN_PROC_BROWSER_TEST_F(FileManagerDialogTest, FLAKY_SelectFileAndOpen) {
+IN_PROC_BROWSER_TEST_F(FileManagerDialogTest, 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");
@@ -219,7 +219,7 @@ IN_PROC_BROWSER_TEST_F(FileManagerDialogTest, FLAKY_SelectFileAndOpen) {
   ASSERT_EQ(this, listener_->params());
 }
 
-IN_PROC_BROWSER_TEST_F(FileManagerDialogTest, FLAKY_SelectFileAndSave) {
+IN_PROC_BROWSER_TEST_F(FileManagerDialogTest, 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");