Fixing flakiness of SaveDownloadableIFrame test.

chrome/browser/download/save_page_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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 138 matching lines @@
 bool DownloadStoredProperly(
     const GURL& expected_url,
     const base::FilePath& expected_path,
     int64 num_files,
     history::DownloadState expected_state,
     DownloadItem* item,
     const history::DownloadRow& info) {
   // This function may be called multiple times for a given test. Returning
   // false doesn't necessarily mean that the test has failed or will fail, it
   // might just mean that the test hasn't passed yet.
-  if (info.target_path != expected_path) {
+  if (!expected_path.empty() && info.target_path != expected_path) {
     DVLOG(20) << __FUNCTION__ << " " << info.target_path.value()
               << " != " << expected_path.value();
     return false;
   }
   if (info.url_chain.size() != 1u) {
     DVLOG(20) << __FUNCTION__ << " " << info.url_chain.size()
               << " != 1";
     return false;
   }
   if (info.url_chain[0] != expected_url) {
@@ skipping 596 matching lines @@
       GetDownloadManager())->DownloadPath();
   base::FilePath filename = download_dir.AppendASCII("dataurl.txt");
   ASSERT_TRUE(base::PathExists(filename));
   std::string contents;
   EXPECT_TRUE(base::ReadFileToString(filename, &contents));
   EXPECT_EQ("foo", contents);
 }
 
 // Test that we don't crash when the page contains an iframe that
 // was handled as a download (http://crbug.com/42212).
-// Flaky: https://crbug.com/537530.
-IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, DISABLED_SaveDownloadableIFrame) {
+IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveDownloadableIFrame) {
   GURL url = URLRequestMockHTTPJob::GetMockUrl(
       "downloads/iframe-src-is-a-download.htm");
-  ui_test_utils::NavigateToURL(browser(), url);
 
   // Wait for and then dismiss the non-save-page-as-related download item
   // (the one associated with downloading of "thisdayinhistory.xls" file).
-  VerifySavePackageExpectations(browser(), url);
-  GetDownloadManager()->RemoveAllDownloads();
+  {
+    GURL download_url("http://mock.http/downloads/thisdayinhistory.xls");
+    DownloadPersistedObserver persisted(
+        browser()->profile(),
+        base::Bind(&DownloadStoredProperly, download_url, base::FilePath(), -1,
+                   history::DownloadState::COMPLETE));
+
+    ui_test_utils::NavigateToURL(browser(), url);
+
+    ASSERT_TRUE(VerifySavePackageExpectations(browser(), download_url));
+    persisted.WaitForPersisted();
+    GetDownloadManager()->RemoveAllDownloads();
+  }
 
   base::FilePath full_file_name, dir;
   SaveCurrentTab(url, content::SAVE_PAGE_TYPE_AS_COMPLETE_HTML,
                  "iframe-src-is-a-download", 2, &dir, &full_file_name);
   ASSERT_FALSE(HasFailure());
 
   EXPECT_TRUE(base::PathExists(full_file_name));
 }
 
 // Test suite that allows testing --site-per-process against cross-site frames.
@@ skipping 124 matching lines @@
     pos = mhtml.find("Content-Type: image/png", pos);
     if (pos == std::string::npos)
       break;
     count++;
     pos++;
   }
   EXPECT_EQ(1, count) << "Verify number of image/png parts in the mhtml output";
 }
 
 }  // namespace