Touch constants and dead code removal.

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 562 matching lines @@
     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) && !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())
       return;
 
     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();
     EXPECT_EQ(downloads.size(), 1U);
 
     FilePath full_path(DestinationFile(browser, filename));
     bool exists = false;
     for (size_t i = 0; i < downloads.size(); ++i) {
       if (downloads[i]->GetFullPath() == full_path) {
@@ skipping 1063 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]->GetDbHandle());
   EXPECT_EQ(3, search_results[1]->GetDbHandle());
   search_results.clear();
 }