Move OpenItem/ShowItemInFolder from ContentBrowserClient to DownloadManagerDelegate

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 <sstream>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 149 matching lines @@
   return item->GetAutoOpened();
 }
 
 // Called when a download starts. Marks the download as hidden.
 void SetHiddenDownloadCallback(DownloadItem* item, net::Error error) {
   DownloadItemModel(item).SetShouldShowInShelf(false);
 }
 
 }  // namespace
 
-// While an object of this class exists, it will mock out download
-// opening for all downloads created on the specified download manager.
-class MockDownloadOpeningObserver : public DownloadManager::Observer {
- public:
-  explicit MockDownloadOpeningObserver(DownloadManager* manager)
-      : download_manager_(manager) {
-    download_manager_->AddObserver(this);
-  }
-
-  ~MockDownloadOpeningObserver() {
-    download_manager_->RemoveObserver(this);
-  }
-
-  virtual void OnDownloadCreated(
-      DownloadManager* manager, DownloadItem* item) OVERRIDE {
-    item->MockDownloadOpenForTesting();
-  }
-
- private:
-  DownloadManager* download_manager_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockDownloadOpeningObserver);
-};
-
 class HistoryObserver : public DownloadHistory::Observer {
  public:
   explicit HistoryObserver(Profile* profile)
       : profile_(profile),
         waiting_(false),
         seen_stored_(false) {
     DownloadServiceFactory::GetForProfile(profile_)->
       GetDownloadHistory()->AddObserver(this);
   }
 
@@ skipping 1276 matching lines @@
 }
 
 // Test to make sure auto-open works.
 IN_PROC_BROWSER_TEST_F(DownloadTest, AutoOpen) {
   FilePath file(FILE_PATH_LITERAL("download-autoopen.txt"));
   GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
 
   ASSERT_TRUE(
       GetDownloadPrefs(browser())->EnableAutoOpenBasedOnExtension(file));
 
-  // Mock out external opening on all downloads until end of test.
-  MockDownloadOpeningObserver observer(DownloadManagerForBrowser(browser()));
+  DownloadManagerForBrowser(browser())->MockDownloadOpenForTesting();

[Randy Smith (Not in Mondays), 2013/01/18 18:53:37]

The better way to do this (given that the DMD now implements opening) is just to
mock a DMD and remove the whole "MockDownloadOpenForTesting()" concept on any
object.  You're welcome to do that or not as you'd like--it's not really related
to this CL, just goodness that's enabled by it.

[hashimoto, 2013/01/21 10:54:25]

Filed in http://crbug.com/171224.

 
   DownloadAndWait(browser(), url);
 
   // Find the download and confirm it was opened.
   std::vector<DownloadItem*> downloads;
   DownloadManagerForBrowser(browser())->GetAllDownloads(&downloads);
   ASSERT_EQ(1u, downloads.size());
   EXPECT_EQ(DownloadItem::COMPLETE, downloads[0]->GetState());
 
   // Unfortunately, this will block forever, causing a timeout, if
@@ skipping 723 matching lines @@
   WebContents* web_contents = chrome::GetActiveWebContents(browser());
   scoped_ptr<DownloadUrlParameters> params(
       DownloadUrlParameters::FromWebContents(web_contents, url));
   params->set_callback(base::Bind(&SetHiddenDownloadCallback));
   download_manager->DownloadUrl(params.Pass());
   observer->WaitForFinished();
 
   // Verify that download shelf is not shown.
   EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
 }