Remove kDisableDownloadNotification and stop compiling shelf code on

chrome/browser/download/download_browsertest.cc

Index: chrome/browser/download/download_browsertest.cc
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 5fdcbf45f3b4b525b84edc2b7f537113804705d6..dfe8a1cb4cbbb5a705768801bb9ce72be327a436 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -300,11 +300,13 @@ bool WasAutoOpened(DownloadItem* item) {
   return item->GetAutoOpened();
 }
 
+#if !defined(OS_CHROMEOS)
 // Called when a download starts. Marks the download as hidden.
 void SetHiddenDownloadCallback(DownloadItem* item,
                                content::DownloadInterruptReason reason) {
   DownloadItemModel(item).SetShouldShowInShelf(false);
 }
+#endif
 
 // Callback for HistoryObserver; used in DownloadHistoryCheck
 bool HasDataAndName(const history::DownloadRow& row) {
@@ -3383,11 +3385,9 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, FeedbackService) {
 }
 #endif  // FULL_SAFE_BROWSING
 
+#if !defined(OS_CHROMEOS)
 class DownloadTestWithShelf : public DownloadTest {
   void SetUpCommandLine(base::CommandLine* command_line) override {
-#if defined(OS_CHROMEOS)
-    command_line->AppendSwitch(switches::kDisableDownloadNotification);
-#endif
     DownloadTest::SetUpCommandLine(command_line);
   }
 };
@@ -3552,13 +3552,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTestWithShelf, PRE_DownloadTest_History) {
   content::RunMessageLoop();
 }
 
-#if defined(OS_CHROMEOS)
-// Times out on ChromeOS: http://crbug.com/217810
-#define MAYBE_DownloadTest_History DISABLED_DownloadTest_History
-#else
-#define MAYBE_DownloadTest_History DownloadTest_History
-#endif
-IN_PROC_BROWSER_TEST_F(DownloadTestWithShelf, MAYBE_DownloadTest_History) {
+IN_PROC_BROWSER_TEST_F(DownloadTestWithShelf, DownloadTest_History) {
   // This starts up right after PRE_DownloadTest_History and shares the same
   // profile directory.
   GURL download_url(URLRequestMockHTTPJob::GetMockUrl(kDownloadTest1Path));
@@ -3643,3 +3637,4 @@ IN_PROC_BROWSER_TEST_F(DownloadTestWithShelf, CrxDenyInstall) {
   // Download shelf should close.
   EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
 }
+#endif