chrome/browser/extensions/extension_disabled_ui_browsertest.cc - Issue 508473002: Componentize component_updater: Move URLRequestPrepackagedInterceptor from content/ to net/

Unified Diff: chrome/browser/extensions/extension_disabled_ui_browsertest.cc

Issue 508473002: Componentize component_updater: Move URLRequestPrepackagedInterceptor from content/ to net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: self review Created 6 years, 4 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

« chrome/browser/component_updater/test/crx_downloader_unittest.cc ('K') | « chrome/browser/extensions/api/management/management_browsertest.cc ('k') | content/content_tests.gypi » ('j') | content/content_tests.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_disabled_ui_browsertest.cc

diff --git a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc

index 4a523e7faeffe21464979f6aa660eafeba24cdf7..cf3d69548b2d98f0ede67ddab2f0756dd1f49ef9 100644

--- a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc

+++ b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc

@@ -19,15 +19,16 @@

#include "chrome/common/chrome_switches.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/test/test_utils.h"

-#include "content/test/net/url_request_prepackaged_interceptor.h"

#include "extensions/browser/extension_prefs.h"

#include "extensions/browser/extension_registry.h"

#include "extensions/browser/extension_system.h"

#include "extensions/common/extension.h"

#include "net/url_request/url_fetcher.h"

+#include "net/url_request/url_request_prepackaged_interceptor.h"

#include "sync/protocol/extension_specifics.pb.h"

#include "sync/protocol/sync.pb.h"

+using content::BrowserThread;

using extensions::Extension;

using extensions::ExtensionRegistry;

using extensions::ExtensionPrefs;

@@ -210,7 +211,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionDisabledGlobalErrorTest,

InstallIncreasingPermissionExtensionV1();

// Note: This interceptor gets requests on the IO thread.

- content::URLLocalHostRequestPrepackagedInterceptor interceptor;

+ net::URLLocalHostRequestPrepackagedInterceptor interceptor(

+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),

+ BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior(

+ base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));

net::URLFetcher::SetEnableInterceptionForTests(true);

interceptor.SetResponseIgnoreQuery(

GURL("http://localhost/autoupdate/updates.xml"),

@@ -247,7 +251,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionDisabledGlobalErrorTest, RemoteInstall) {

ExtensionSyncService::Get(browser()->profile());