touchui: Fix browser_tests on chromeos by using the slightly changed API for ActiveDownloadsUI.

BUG=none
TEST=browser_tests with touchui=1 chromeos=1

Review URL: http://codereview.chromium.org/7909005

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

2 files changed, 20 insertions, 1 deletions

diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 060e756..f100c01 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -912,6 +912,15 @@ class DownloadTest : public InProcessBrowserTest {
   void CheckDownloadUI(Browser* browser, bool expected_non_cros,
       bool expected_cros, const FilePath& filename) {
 #if defined(OS_CHROMEOS)
+#if defined(TOUCH_UI)
+    TabContents* download_contents = ActiveDownloadsUI::GetPopup(NULL);
+    EXPECT_EQ(expected_cros, download_contents != NULL);
+    if (!download_contents || filename.empty())
+      return;
+
+    ActiveDownloadsUI* downloads_ui = static_cast<ActiveDownloadsUI*>(
+        download_contents->web_ui());
+#else
     Browser* popup = ActiveDownloadsUI::GetPopup();
     EXPECT_EQ(expected_cros, popup != NULL);
     if (!popup || filename.empty())
@@ -919,6 +928,8 @@ class DownloadTest : public InProcessBrowserTest {
 
     ActiveDownloadsUI* downloads_ui = static_cast<ActiveDownloadsUI*>(
         popup->GetSelectedTabContents()->web_ui());
+#endif  // defined(TOUCH_UI)
+
     ASSERT_TRUE(downloads_ui);
     const ActiveDownloadsUI::DownloadList& downloads =
         downloads_ui->GetDownloads();
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index e3833a7..28cea2d 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -75,7 +75,15 @@ class SavePageBrowserTest : public InProcessBrowserTest {
     return Details<DownloadItem>(observer.details()).ptr()->original_url();
   }
 
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+  const ActiveDownloadsUI::DownloadList& GetDownloads() const {
+    TabContents* download_contents = ActiveDownloadsUI::GetPopup(NULL);
+    ActiveDownloadsUI* downloads_ui = static_cast<ActiveDownloadsUI*>(
+        download_contents->web_ui());
+    EXPECT_TRUE(downloads_ui);
+    return downloads_ui->GetDownloads();
+  }
+#elif defined(OS_CHROMEOS)
   const ActiveDownloadsUI::DownloadList& GetDownloads() const {
     Browser* popup = ActiveDownloadsUI::GetPopup();
     EXPECT_TRUE(popup);