Remove Active Downloads UI.

chrome/browser/download/save_page_browsertest.cc

Index: chrome/browser/download/save_page_browsertest.cc
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index 49e351a3ad1fe1fab596178000feb47caacbe169..41e1ab88c83bc990b13f13071c12bebd60414fee 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/webui/chromeos/active_downloads_ui.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ -98,33 +97,8 @@ class SavePageBrowserTest : public InProcessBrowserTest {
         GetOriginalUrl();
   }
 
-#if defined(OS_CHROMEOS) && !defined(USE_AURA)
-  const ActiveDownloadsUI::DownloadList& GetDownloads() const {
-    Browser* popup = ActiveDownloadsUI::GetPopup();
-    EXPECT_TRUE(popup);
-    ActiveDownloadsUI* downloads_ui = static_cast<ActiveDownloadsUI*>(
-        popup->GetSelectedWebContents()->GetWebUI()->GetController());
-    EXPECT_TRUE(downloads_ui);
-    return downloads_ui->GetDownloads();
-  }
-#endif
-
-  void CheckDownloadUI(const FilePath& download_path) const {
-#if defined(OS_CHROMEOS) && !defined(USE_AURA)
-    const ActiveDownloadsUI::DownloadList& downloads = GetDownloads();
-    EXPECT_EQ(downloads.size(), 1U);
-
-    bool found = false;
-    for (size_t i = 0; i < downloads.size(); ++i) {
-      if (downloads[i]->GetFullPath() == download_path) {
-        found = true;
-        break;
-      }
-    }
-    EXPECT_TRUE(found);
-#else
+  void CheckDownloadShelfIsVisible() const {

[achuithb, 2012/04/16 14:27:05]

Not sure if the indirection is worthwhile. Might be better to replace all
instances of this function with the function body.

[asanka, 2012/04/17 20:02:25]

Done.

     EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible());
-#endif
   }
 
   DownloadManager* GetDownloadManager() const {
@@ -211,7 +185,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveHTMLOnly) {
 
   EXPECT_EQ(url, WaitForSavePackageToFinish());
 
-  CheckDownloadUI(full_file_name);
+  CheckDownloadShelfIsVisible();
   CheckDownloadHistory(url, full_file_name, 1);  // a.htm is 1 file.
 
   EXPECT_TRUE(file_util::PathExists(full_file_name));
@@ -236,7 +210,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveViewSourceHTMLOnly) {
 
   EXPECT_EQ(actual_page_url, WaitForSavePackageToFinish());
 
-  CheckDownloadUI(full_file_name);
+  CheckDownloadShelfIsVisible();
   CheckDownloadHistory(actual_page_url, full_file_name, 1);  // a.htm is 1 file.
 
   EXPECT_TRUE(file_util::PathExists(full_file_name));
@@ -256,7 +230,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveCompleteHTML) {
 
   EXPECT_EQ(url, WaitForSavePackageToFinish());
 
-  CheckDownloadUI(full_file_name);
+  CheckDownloadShelfIsVisible();
   CheckDownloadHistory(url, full_file_name, 3);  // b.htm is 3 files.
 
   EXPECT_TRUE(file_util::PathExists(full_file_name));
@@ -290,7 +264,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, FileNameFromPageTitle) {
 
   EXPECT_EQ(url, WaitForSavePackageToFinish());
 
-  CheckDownloadUI(full_file_name);
+  CheckDownloadShelfIsVisible();
   CheckDownloadHistory(url, full_file_name, 3);  // b.htm is 3 files.
 
   EXPECT_TRUE(file_util::PathExists(full_file_name));
@@ -316,15 +290,11 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, RemoveFromList) {
 
   EXPECT_EQ(url, WaitForSavePackageToFinish());
 
-  CheckDownloadUI(full_file_name);
+  CheckDownloadShelfIsVisible();
   CheckDownloadHistory(url, full_file_name, 1);  // a.htm is 1 file.
 
   EXPECT_EQ(GetDownloadManager()->RemoveAllDownloads(), 1);
 
-#if defined(OS_CHROMEOS) && !defined(USE_AURA)
-  EXPECT_EQ(GetDownloads().size(), 0U);
-#endif
-
   // Should not be in history.
   QueryDownloadHistory();
   EXPECT_EQ(std::find_if(history_entries_.begin(), history_entries_.end(),