Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3058)

Unified Diff: chrome/browser/extensions/api/downloads/downloads_api_unittest.cc

Issue 12047039: download: Remove DownloadManager::MockDownloadOpenForTesting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and comment fix Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
index eb46e02f579639da647ce868f28020e3ec0d929f..b950d9483c1818e1c4e118221f90ebf62d6706fa 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/download/download_file_icon_extractor.h"
#include "chrome/browser/download/download_service.h"
#include "chrome/browser/download/download_service_factory.h"
-#include "chrome/browser/download/download_test_file_chooser_observer.h"
+#include "chrome/browser/download/download_test_file_activity_observer.h"
#include "chrome/browser/extensions/api/downloads/downloads_api.h"
#include "chrome/browser/extensions/event_names.h"
#include "chrome/browser/extensions/extension_apitest.h"
@@ -272,7 +272,7 @@ class DownloadExtensionTest : public ExtensionApiTest {
GetOnRecordManager()->RemoveAllDownloads();
events_listener_.reset(new DownloadsEventsListener());
// Disable file chooser for current profile.
- DownloadTestFileChooserObserver observer(current_browser()->profile());
+ DownloadTestFileActivityObserver observer(current_browser()->profile());
observer.EnableFileChooser(false);
}
@@ -283,7 +283,7 @@ class DownloadExtensionTest : public ExtensionApiTest {
incognito_browser_ = CreateIncognitoBrowser();
GetOffRecordManager()->RemoveAllDownloads();
// Disable file chooser for incognito profile.
- DownloadTestFileChooserObserver observer(incognito_browser_->profile());
+ DownloadTestFileActivityObserver observer(incognito_browser_->profile());
observer.EnableFileChooser(false);
}
current_browser_ = incognito_browser_;
@@ -821,7 +821,6 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
new DownloadsOpenFunction(),
"[-42]").c_str());
- GetCurrentManager()->MockDownloadOpenForTesting();
DownloadItem* download_item = CreateSlowTestDownload();
ASSERT_TRUE(download_item);
EXPECT_FALSE(download_item->GetOpened());
« no previous file with comments | « chrome/browser/download/download_test_file_chooser_observer.cc ('k') | chrome/browser/ui/browser_close_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698