Break test cases on inner asserts.

chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc

Index: chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc
index d06a676c700b04925a37e82e999f58b1de328533..3df621bd029fa30fe1e549d62cc31c7da61aab96 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc
@@ -139,7 +139,7 @@ void TestFilePathWatcher::StartWatching() {
       path_, false /*recursive*/,
       base::Bind(&TestFilePathWatcher::FilePathWatcherCallback,
                  base::Unretained(this)));
-  ASSERT_TRUE(ok);
+  DCHECK(ok);
 
   // If the condition was already met before FilePathWatcher was launched,
   // FilePathWatcher won't be able to detect a change, so check the condition
@@ -276,7 +276,6 @@ class LocalTestVolume : public TestVolume {
   void CreateFile(const std::string& source_file_name,
                   const std::string& target_name,
                   const std::string& modification_time) {
-
     std::string content_data;
     base::FilePath test_file_path =
         google_apis::test_util::GetTestFilePath("chromeos/file_manager").
@@ -775,68 +774,70 @@ INSTANTIATE_TEST_CASE_P(InNonGuestMode,
                         ::testing::Values(false));
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserLocalTest, TestFileDisplay) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   DoTestFileDisplay(&volume_);
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestKeyboardCopy) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   DoTestKeyboardCopy(&volume_);
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestKeyboardDelete) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   DoTestKeyboardDelete(&volume_);
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestOpenRecent) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("openSidebarRecent");
+  ASSERT_NO_FATAL_FAILURE(StartTest("openSidebarRecent"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 // TODO(hirono): Bring back the offline feature. http://crbug.com/238545
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, DISABLED_TestOpenOffline) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("openSidebarOffline");
+  ASSERT_NO_FATAL_FAILURE(StartTest("openSidebarOffline"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestOpenSharedWithMe) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("openSidebarSharedWithMe");
+  ASSERT_NO_FATAL_FAILURE(StartTest("openSidebarSharedWithMe"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestAutocomplete) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("autocomplete");
+  ASSERT_NO_FATAL_FAILURE(StartTest("autocomplete"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
                        TransferFromDriveToDownloads) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("transferFromDriveToDownloads");
+  ASSERT_NO_FATAL_FAILURE(
+      StartTest("transferFromDriveToDownloads"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
                        TransferFromDownloadsToDrive) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("transferFromDownloadsToDrive");
+  ASSERT_NO_FATAL_FAILURE(
+      StartTest("transferFromDownloadsToDrive"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
                        TransferFromSharedToDownloads) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
   StartTest("transferFromSharedToDownloads");

[hirono, 2013/05/23 06:40:46]

Could you add ASSERT_NO_FATAL_FAILURE here?

[mtomasz, 2013/05/23 07:07:32]

Done.

   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
@@ -844,23 +845,23 @@ IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
                        TransferFromSharedToDrive) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("transferFromSharedToDrive");
+  ASSERT_NO_FATAL_FAILURE(StartTest("transferFromSharedToDrive"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
                        TransferFromRecentToDownloads) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("transferFromRecentToDownloads");
+  ASSERT_NO_FATAL_FAILURE(StartTest("transferFromRecentToDownloads"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
                        TransferFromRecentToDrive) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
   StartTest("transferFromRecentToDrive");

[hirono, 2013/05/23 06:38:44]

Could you add ASSERT_NO_FATAL_FAILURE here?

[mtomasz, 2013/05/23 07:07:32]

Done.

   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
@@ -869,18 +870,18 @@ IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
 // TODO(hirono): Bring back the offline feature. http://crbug.com/238545
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
                        DISABLED_TransferFromOfflineToDownloads) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("transferFromOfflineToDownloads");
+  ASSERT_NO_FATAL_FAILURE(StartTest("transferFromOfflineToDownloads"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 // TODO(hirono): Bring back the offline feature. http://crbug.com/238545
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
                        DISABLED_TransferFromOfflineToDrive) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("transferFromOfflineToDrive");
+  ASSERT_NO_FATAL_FAILURE(StartTest("transferFromOfflineToDrive"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 }  // namespace