Revert r19752

chrome/browser/renderer_host/test/render_view_host_manager_browsertest.cc

 // Copyright (c) 2009 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/browser.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 64 matching lines @@
     }
   }
 
  private:
   NotificationRegistrar registrar_;
 };
 
 // Test for crbug.com/12745. This tests that if a download is initiated from
 // a chrome:// page that has registered and onunload handler, the browser
 // will be able to close.
+// TODO(rafaelw): The fix for 12745 has now also been reverted. Another fix
+// must be found before this can be re-enabled.
 IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
                        DISABLED_BrowserCloseAfterDownload) {
   GURL downloads_url("chrome://downloads");
   FilePath zip_download;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &zip_download));
   zip_download = zip_download.AppendASCII("zip").AppendASCII("test.zip");
   ASSERT_TRUE(file_util::PathExists(zip_download));
   GURL zip_url = net::FilePathToFileURL(zip_download);
 
   ui_test_utils::NavigateToURL(browser(), downloads_url);
   TabContents *contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(contents);
   bool result = false;
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       contents->render_view_host(),
       L"",
       L"window.onunload = function() { var do_nothing = 0; }; "
       L"window.domAutomationController.send(true);",
       &result));
   EXPECT_TRUE(result);
   ui_test_utils::NavigateToURL(browser(), zip_url);
 
   ui_test_utils::WaitForDownloadCount(
     browser()->profile()->GetDownloadManager(), 1);
 
   browser()->CloseWindow();
   BrowserClosedObserver wait_for_close(browser());
 }