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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/management/management_browsertest.cc

Issue 11293252: Change Interceptors into URLRequestJobFactory::ProtocolHandlers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: some cleanup Created 8 years, 1 month 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/component_updater_interceptor.cc ('K') | « chrome/browser/component_updater/test/component_updater_service_unittest.cc ('k') | chrome/browser/extensions/autoupdate_interceptor.h » ('j') | chrome/browser/extensions/autoupdate_interceptor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f91dbe8f999fbbdbbb653f21bfef42997154cc78..22a8ccf512fc268870236f5dec1edfd9fdba9f7c 100644
--- a/chrome/browser/extensions/api/management/management_browsertest.cc
+++ b/chrome/browser/extensions/api/management/management_browsertest.cc
@@ -250,14 +250,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, MAYBE_AutoUpdate) {
NotificationListener notification_listener;
FilePath basedir = test_data_dir_.AppendASCII("autoupdate");
// Note: This interceptor gets requests on the IO thread.
- scoped_refptr<extensions::AutoUpdateInterceptor> interceptor(
- new extensions::AutoUpdateInterceptor());
+ extensions::AutoUpdateInterceptor interceptor;
net::URLFetcher::SetEnableInterceptionForTests(true);
- interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
- basedir.AppendASCII("manifest_v2.xml"));
- interceptor->SetResponseOnIOThread("http://localhost/autoupdate/v2.crx",
- basedir.AppendASCII("v2.crx"));
+ interceptor.SetResponse("http://localhost/autoupdate/manifest",
+ basedir.AppendASCII("manifest_v2.xml"));
+ interceptor.SetResponse("http://localhost/autoupdate/v2.crx",
+ basedir.AppendASCII("v2.crx"));
// Install version 1 of the extension.
ExtensionTestMessageListener listener1("v1 installed", false);
@@ -298,10 +297,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, MAYBE_AutoUpdate) {
// Now try doing an update to version 3, which has been incorrectly
// signed. This should fail.
- interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
- basedir.AppendASCII("manifest_v3.xml"));
- interceptor->SetResponseOnIOThread("http://localhost/autoupdate/v3.crx",
- basedir.AppendASCII("v3.crx"));
+ interceptor.SetResponse("http://localhost/autoupdate/manifest",
+ basedir.AppendASCII("manifest_v3.xml"));
+ interceptor.SetResponse("http://localhost/autoupdate/v3.crx",
+ basedir.AppendASCII("v3.crx"));
service->updater()->CheckNow(params);
ASSERT_TRUE(WaitForExtensionInstallError());
@@ -335,14 +334,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest,
NotificationListener notification_listener;
FilePath basedir = test_data_dir_.AppendASCII("autoupdate");
// Note: This interceptor gets requests on the IO thread.
- scoped_refptr<extensions::AutoUpdateInterceptor> interceptor(
- new extensions::AutoUpdateInterceptor());
+ extensions::AutoUpdateInterceptor interceptor;
net::URLFetcher::SetEnableInterceptionForTests(true);
- interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
- basedir.AppendASCII("manifest_v2.xml"));
- interceptor->SetResponseOnIOThread("http://localhost/autoupdate/v2.crx",
- basedir.AppendASCII("v2.crx"));
+ interceptor.SetResponse("http://localhost/autoupdate/manifest",
+ basedir.AppendASCII("manifest_v2.xml"));
+ interceptor.SetResponse("http://localhost/autoupdate/v2.crx",
+ basedir.AppendASCII("v2.crx"));
// Install version 1 of the extension.
ExtensionTestMessageListener listener1("v1 installed", false);
@@ -404,14 +402,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalUrlUpdate) {
FilePath basedir = test_data_dir_.AppendASCII("autoupdate");
// Note: This interceptor gets requests on the IO thread.
- scoped_refptr<extensions::AutoUpdateInterceptor> interceptor(
- new extensions::AutoUpdateInterceptor());
+ extensions::AutoUpdateInterceptor interceptor;
net::URLFetcher::SetEnableInterceptionForTests(true);
- interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
- basedir.AppendASCII("manifest_v2.xml"));
- interceptor->SetResponseOnIOThread("http://localhost/autoupdate/v2.crx",
- basedir.AppendASCII("v2.crx"));
+ interceptor.SetResponse("http://localhost/autoupdate/manifest",
+ basedir.AppendASCII("manifest_v2.xml"));
+ interceptor.SetResponse("http://localhost/autoupdate/v2.crx",
+ basedir.AppendASCII("v2.crx"));
const size_t size_before = service->extensions()->size();
ASSERT_TRUE(service->disabled_extensions()->is_empty());
@@ -490,14 +487,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalPolicyRefresh) {
FilePath basedir = test_data_dir_.AppendASCII("autoupdate");
// Note: This interceptor gets requests on the IO thread.
- scoped_refptr<extensions::AutoUpdateInterceptor> interceptor(
- new extensions::AutoUpdateInterceptor());
+ extensions::AutoUpdateInterceptor interceptor;
net::URLFetcher::SetEnableInterceptionForTests(true);
- interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
- basedir.AppendASCII("manifest_v2.xml"));
- interceptor->SetResponseOnIOThread("http://localhost/autoupdate/v2.crx",
- basedir.AppendASCII("v2.crx"));
+ interceptor.SetResponse("http://localhost/autoupdate/manifest",
+ basedir.AppendASCII("manifest_v2.xml"));
+ interceptor.SetResponse("http://localhost/autoupdate/v2.crx",
+ basedir.AppendASCII("v2.crx"));
const size_t size_before = service->extensions()->size();
ASSERT_TRUE(service->disabled_extensions()->is_empty());
@@ -569,14 +565,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest,
ASSERT_TRUE(service->disabled_extensions()->is_empty());
// Note: This interceptor gets requests on the IO thread.
- scoped_refptr<extensions::AutoUpdateInterceptor> interceptor(
- new extensions::AutoUpdateInterceptor());
+ extensions::AutoUpdateInterceptor interceptor;
net::URLFetcher::SetEnableInterceptionForTests(true);
- interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
- basedir.AppendASCII("manifest_v2.xml"));
- interceptor->SetResponseOnIOThread("http://localhost/autoupdate/v2.crx",
- basedir.AppendASCII("v2.crx"));
+ interceptor.SetResponse("http://localhost/autoupdate/manifest",
+ basedir.AppendASCII("manifest_v2.xml"));
+ interceptor.SetResponse("http://localhost/autoupdate/v2.crx",
+ basedir.AppendASCII("v2.crx"));
// Check that the policy is initially empty.
PrefService* prefs = browser()->profile()->GetPrefs();
« chrome/browser/component_updater/component_updater_interceptor.cc ('K') | « chrome/browser/component_updater/test/component_updater_service_unittest.cc ('k') | chrome/browser/extensions/autoupdate_interceptor.h » ('j') | chrome/browser/extensions/autoupdate_interceptor.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698