Index: chrome/browser/extensions/api/management/management_browsertest.cc |
diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc |
index 9656e9d3edb9cdf8f63163c2292642aa214a0ead..1f722dfe66bc630920288266b206717721631bbb 100644 |
--- a/chrome/browser/extensions/api/management/management_browsertest.cc |
+++ b/chrome/browser/extensions/api/management/management_browsertest.cc |
@@ -19,18 +19,20 @@ |
#include "chrome/common/pref_names.h" |
#include "chrome/common/url_constants.h" |
#include "chrome/test/base/ui_test_utils.h" |
+#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/notification_service.h" |
#include "content/public/browser/render_view_host.h" |
#include "content/public/test/browser_test_utils.h" |
-#include "content/test/net/url_request_prepackaged_interceptor.h" |
#include "extensions/browser/extension_host.h" |
#include "extensions/browser/extension_prefs.h" |
#include "extensions/browser/extension_registry.h" |
#include "extensions/browser/extension_system.h" |
#include "extensions/browser/notification_types.h" |
#include "extensions/browser/pref_names.h" |
+#include "net/url_request/test_url_request_interceptor.h" |
#include "net/url_request/url_fetcher.h" |
+using content::BrowserThread; |
using extensions::Extension; |
using extensions::ExtensionRegistry; |
using extensions::Manifest; |
@@ -250,8 +252,12 @@ class NotificationListener : public content::NotificationObserver { |
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, MAYBE_AutoUpdate) { |
NotificationListener notification_listener; |
base::FilePath basedir = test_data_dir_.AppendASCII("autoupdate"); |
+ |
// Note: This interceptor gets requests on the IO thread. |
- content::URLLocalHostRequestPrepackagedInterceptor interceptor; |
+ net::LocalHostTestURLRequestInterceptor interceptor( |
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), |
+ BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior( |
+ base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); |
net::URLFetcher::SetEnableInterceptionForTests(true); |
interceptor.SetResponseIgnoreQuery( |
@@ -335,8 +341,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, |
MAYBE_AutoUpdateDisabledExtensions) { |
NotificationListener notification_listener; |
base::FilePath basedir = test_data_dir_.AppendASCII("autoupdate"); |
+ |
// Note: This interceptor gets requests on the IO thread. |
- content::URLLocalHostRequestPrepackagedInterceptor interceptor; |
+ net::LocalHostTestURLRequestInterceptor interceptor( |
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), |
+ BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior( |
+ base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); |
net::URLFetcher::SetEnableInterceptionForTests(true); |
interceptor.SetResponseIgnoreQuery( |
@@ -402,7 +412,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalUrlUpdate) { |
base::FilePath basedir = test_data_dir_.AppendASCII("autoupdate"); |
// Note: This interceptor gets requests on the IO thread. |
- content::URLLocalHostRequestPrepackagedInterceptor interceptor; |
+ net::LocalHostTestURLRequestInterceptor interceptor( |
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), |
+ BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior( |
+ base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); |
net::URLFetcher::SetEnableInterceptionForTests(true); |
interceptor.SetResponseIgnoreQuery( |
@@ -495,7 +508,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalPolicyRefresh) { |
base::FilePath basedir = test_data_dir_.AppendASCII("autoupdate"); |
// Note: This interceptor gets requests on the IO thread. |
- content::URLLocalHostRequestPrepackagedInterceptor interceptor; |
+ net::LocalHostTestURLRequestInterceptor interceptor( |
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), |
+ BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior( |
+ base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); |
net::URLFetcher::SetEnableInterceptionForTests(true); |
interceptor.SetResponseIgnoreQuery( |
@@ -572,7 +588,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, |
ASSERT_TRUE(registry->disabled_extensions().is_empty()); |
// Note: This interceptor gets requests on the IO thread. |
- content::URLLocalHostRequestPrepackagedInterceptor interceptor; |
+ net::LocalHostTestURLRequestInterceptor interceptor( |
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), |
+ BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior( |
+ base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); |
net::URLFetcher::SetEnableInterceptionForTests(true); |
interceptor.SetResponseIgnoreQuery( |