Fix DownloadTests and change cros/aura to use shelf

chrome/browser/download/download_browsertest.cc

 // Copyright (c) 2011 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/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
@@ skipping 561 matching lines @@
     DCHECK(downloads);
     DownloadManager* manager = DownloadManagerForBrowser(browser);
     manager->SearchDownloads(string16(), downloads);
   }
 
   // Check that the download UI (shelf on non-chromeos or panel on chromeos)
   // is visible or not as expected. Additionally, check that the filename
   // is present in the UI (currently only on chromeos).
   void CheckDownloadUI(Browser* browser, bool expected_non_cros,
       bool expected_cros, const FilePath& filename) {
-#if defined(OS_CHROMEOS)
+#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();
@@ skipping 18 matching lines @@
         break;
       }
     }
     EXPECT_TRUE(exists);
 #else
     EXPECT_EQ(expected_non_cros, browser->window()->IsDownloadShelfVisible());
     // TODO: Check for filename match in download shelf.
 #endif
   }
   static void ExpectWindowCountAfterDownload(size_t expected) {
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) && !defined(USE_AURA)
     // On ChromeOS, a download panel is created to display
     // download information, and this counts as a window.
     expected++;
 #endif
     EXPECT_EQ(expected, BrowserList::size());
   }
 
   // Arrange for select file calls on the given browser from the
   // download manager to always choose the suggested file.
   void NullSelectFile(Browser* browser) {
@@ skipping 145 matching lines @@
   // Download a file and wait.
   DownloadAndWait(browser(), url, EXPECT_NO_SELECT_DIALOG);
 
   CheckDownload(browser(), download_file, file);
 
   // Check state.
   EXPECT_EQ(1, browser()->tab_count());
   CheckDownloadUI(browser(), true, true, download_file);
 }
 
-#if !defined(OS_CHROMEOS)  // Download shelf is not per-window on ChromeOS.
+#if !defined(OS_CHROMEOS) || defined(USE_AURA)
+// Download shelf is not per-window on ChromeOS.
 // Test that the download shelf is per-window by starting a download in one
 // tab, opening a second tab, closing the shelf, going back to the first tab,
 // and checking that the shelf is closed.
 IN_PROC_BROWSER_TEST_F(DownloadTest, PerWindowShelf) {
   ASSERT_TRUE(InitialSetup(false));
   FilePath file(FILE_PATH_LITERAL("download-test3.gif"));
   GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
   FilePath download_file(FILE_PATH_LITERAL("download-test3-attachment.gif"));
 
   // Download a file and wait.
@@ skipping 46 matching lines @@
   ASSERT_TRUE(RunSizeTest(browser(), SIZE_TEST_TYPE_KNOWN,
                           "71% - ", "100% - "));
 }
 
 // Test that when downloading an item in Incognito mode, we don't crash when
 // closing the last Incognito window (http://crbug.com/13983).
 // Also check that the download shelf is not visible after closing the
 // Incognito window.
 IN_PROC_BROWSER_TEST_F(DownloadTest, IncognitoDownload) {
   ASSERT_TRUE(InitialSetup(false));
-
   // Open an Incognito window.
   Browser* incognito = CreateIncognitoBrowser();  // Waits.
   ASSERT_TRUE(incognito);
   int window_count = BrowserList::size();
   EXPECT_EQ(2, window_count);
 
   // Download a file in the Incognito window and wait.
   CreateAndSetDownloadsDirectory(incognito);
   FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
   GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
@@ skipping 810 matching lines @@
   search_results.clear();
 
   manager->SearchDownloads(UTF8ToUTF16("another_file"), &search_results);
   ASSERT_EQ(2u, search_results.size());
   std::sort(search_results.begin(), search_results.end(),
             DownloadItemSorter);
   EXPECT_EQ(2, search_results[0]->db_handle());
   EXPECT_EQ(3, search_results[1]->db_handle());
   search_results.clear();
 }