| Index: chrome/browser/download/download_browsertest.cc
|
| diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
|
| index 172fae92c61cc24a9c80e4dbeff5a19451b4b7a8..ada1a540491f35be8d626aac6efb688b7db4eebc 100644
|
| --- a/chrome/browser/download/download_browsertest.cc
|
| +++ b/chrome/browser/download/download_browsertest.cc
|
| @@ -580,15 +580,6 @@ class DownloadTest : public InProcessBrowserTest {
|
| void CheckDownloadUI(Browser* browser, bool expected_non_cros,
|
| bool expected_cros, const FilePath& filename) {
|
| #if defined(OS_CHROMEOS) && !defined(USE_AURA)
|
| -#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())
|
| @@ -596,7 +587,6 @@ 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 =
|
|
|