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

Unified Diff: chrome/browser/download/chrome_download_manager_delegate_unittest.cc

Issue 2319623002: Remove calls to IsRunningSequenceOnCurrentThread() from plugin_service_impl.cc (Closed)
Patch Set: fix android build error Created 4 years, 3 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
« no previous file with comments | « no previous file | content/browser/plugin_service_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/download/chrome_download_manager_delegate_unittest.cc
diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
index 6d6c7ac3adc1a1cbbea11e818d3676fca73a4696..b3d3b03f0176a0e7b24f33d38eabec548095dc32 100644
--- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
@@ -12,6 +12,7 @@
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
+#include "build/build_config.h"
#include "chrome/browser/download/chrome_download_manager_delegate.h"
#include "chrome/browser/download/download_item_model.h"
#include "chrome/browser/download/download_prefs.h"
@@ -35,6 +36,10 @@
#include "chrome/browser/safe_browsing/download_protection_service.h"
#endif
+#if !defined(OS_ANDROID)
+#include "content/public/browser/plugin_service.h"
+#endif
+
using ::testing::AtMost;
using ::testing::Invoke;
using ::testing::Ref;
@@ -405,6 +410,10 @@ TEST_F(ChromeDownloadManagerDelegateTest, StartDownload_LastSavePath) {
}
TEST_F(ChromeDownloadManagerDelegateTest, MaybeDangerousContent) {
+#if !defined(OS_ANDROID)
+ content::PluginService::GetInstance()->Init();
+#endif
+
GURL url("http://example.com/foo");
std::unique_ptr<content::MockDownloadItem> download_item =
« no previous file with comments | « no previous file | content/browser/plugin_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698