Download shelf autohides on showing in shell, just same as regular open

chrome/browser/download/download_browsertest.cc

 // Copyright (c) 2012 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 "chrome/browser/download/download_browsertest.h"
 
 #include <stdint.h>
 #include <sstream>
 #include <utility>
 
@@ skipping 30 matching lines @@
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/download/download_target_determiner.h"
 #include "chrome/browser/download/download_test_file_activity_observer.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/permissions/permission_request_manager.h"
+#include "chrome/browser/platform_util_internal.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
@@ skipping 95 matching lines @@
     if (waiting_)
       base::MessageLoopForUI::current()->QuitWhenIdle();
   }
 
   content::DownloadManager* manager_;
   bool waiting_;
 
   DISALLOW_COPY_AND_ASSIGN(CreatedObserver);
 };
 
+class ShownObserver : public content::DownloadItem::Observer {
+ public:
+  explicit ShownObserver(DownloadItem* item)
+      : item_(item),
+        waiting_(false) {
+    item->AddObserver(this);
+  }
+
+  ~ShownObserver() override {
+    if (item_)
+      item_->RemoveObserver(this);
+  }
+
+  void Wait() {
+    if (DownloadItemModel(item_).GetOpenedOrShown()) {
+        return;
+    }
+    waiting_ = true;
+    content::RunMessageLoop();
+    waiting_ = false;
+  }
+
+ private:
+  void OnDownloadShown(content::DownloadItem* item) override {
+    DCHECK_EQ(item_, item);
+    if (waiting_)
+      base::MessageLoopForUI::current()->QuitWhenIdle();
+  }
+
+  void OnDownloadDestroyed(content::DownloadItem* item) override {
+    DCHECK_EQ(item_, item);
+    item_->RemoveObserver(this);
+    item_ = NULL;
+  }
+
+  content::DownloadItem* item_;
+  bool waiting_;
+
+  DISALLOW_COPY_AND_ASSIGN(ShownObserver);
+};
+
 class PercentWaiter : public content::DownloadItem::Observer {
  public:
   explicit PercentWaiter(DownloadItem* item)
     : item_(item),
       waiting_(false),
       error_(false),
       prev_percent_(0) {
     item_->AddObserver(this);
   }
   ~PercentWaiter() override {
@@ skipping 237 matching lines @@
   };
 
   struct FileErrorInjectInfo {
     DownloadInfo download_info;
     content::TestFileErrorInjector::FileErrorInfo error_info;
   };
 
   DownloadTest() {}
 
   void SetUpOnMainThread() override {
+    // This prevents platfrom_util from invoking any shell or external APIs
+    // during tests. Doing so may result in external applications being launched
+    // and intefering with tests.
+    platform_util::internal::DisableShellOperationsForTesting();
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true));
     ASSERT_TRUE(InitialSetup());
   }
 
   void TearDownOnMainThread() override {
     // Needs to be torn down on the main thread. file_activity_observer_ holds a
     // reference to the ChromeDownloadManagerDelegate which should be destroyed
     // on the UI thread.
@@ skipping 3232 matching lines @@
       DangerousDownloadWaiter(
           browser(), 1,
           content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_DENY));
   ui_test_utils::NavigateToURL(browser(), extension_url);
 
   observer->WaitForFinished();
 
   // Download shelf should close.
   EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
 }
-#endif  // defined(OS_CHROMEOS)
+
+IN_PROC_BROWSER_TEST_F(DownloadTest, OpenClosesShelf) {
+  base::FilePath file(FILE_PATH_LITERAL(kDownloadTest1Path));
+  GURL url(URLRequestMockHTTPJob::GetMockUrl("download-test1.lib"));
+
+  DownloadAndWait(browser(), url);
+
+  std::vector<DownloadItem*> download_items;
+  GetDownloads(browser(), &download_items);
+  ASSERT_EQ(1UL, download_items.size());
+
+  ShownObserver observer(download_items[0]);
+  download_items[0]->OpenDownload();
+  observer.Wait();
+
+  EXPECT_TRUE(DownloadItemModel(download_items[0]).GetOpenedOrShown());
+
+  // Download shelf should close.
+  EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
+}
+
+IN_PROC_BROWSER_TEST_F(DownloadTest, ShowInShellClosesShelf) {
+  base::FilePath file(FILE_PATH_LITERAL(kDownloadTest1Path));
+  GURL url(URLRequestMockHTTPJob::GetMockUrl("download-test1.lib"));
+
+  DownloadAndWait(browser(), url);
+
+  std::vector<DownloadItem*> download_items;
+  GetDownloads(browser(), &download_items);
+  ASSERT_EQ(1UL, download_items.size());
+
+  ShownObserver observer(download_items[0]);
+  download_items[0]->ShowDownloadInShell();
+  observer.Wait();
+
+  EXPECT_TRUE(DownloadItemModel(download_items[0]).GetOpenedOrShown());
+
+  // Download shelf should close.
+  EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
+}
+
+#endif  // !defined(OS_CHROMEOS)