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

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: Fix PolicyTests to unregister with URLRequestFilter Created 8 years 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 | « chrome/browser/component_updater/test/component_updater_service_unittest.cc ('k') | chrome/browser/extensions/autoupdate_interceptor.h » ('j') | content/content_tests.gypi » ('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..e198a4bdce5def14eb9ae214bc9b645c62039236 100644
--- a/chrome/browser/extensions/api/management/management_browsertest.cc
+++ b/chrome/browser/extensions/api/management/management_browsertest.cc
@@ -6,7 +6,6 @@
#include "base/bind_helpers.h"
#include "base/memory/ref_counted.h"
#include "base/stl_util.h"
-#include "chrome/browser/extensions/autoupdate_interceptor.h"
#include "chrome/browser/extensions/extension_browsertest.h"
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/extensions/extension_service.h"
@@ -27,6 +26,7 @@
#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 "net/url_request/url_fetcher.h"
using extensions::Extension;
@@ -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());
+ content::URLRequestPrepackagedInterceptor 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.SetQuerylessResponse("http://localhost/autoupdate/manifest",
+ basedir.AppendASCII("manifest_v2.xml"));
+ interceptor.SetQuerylessResponse("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.SetQuerylessResponse("http://localhost/autoupdate/manifest",
+ basedir.AppendASCII("manifest_v3.xml"));
+ interceptor.SetQuerylessResponse("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());
+ content::URLRequestPrepackagedInterceptor 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.SetQuerylessResponse("http://localhost/autoupdate/manifest",
+ basedir.AppendASCII("manifest_v2.xml"));
+ interceptor.SetQuerylessResponse("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());
+ content::URLRequestPrepackagedInterceptor 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.SetQuerylessResponse("http://localhost/autoupdate/manifest",
+ basedir.AppendASCII("manifest_v2.xml"));
+ interceptor.SetQuerylessResponse("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());
+ content::URLRequestPrepackagedInterceptor 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.SetQuerylessResponse("http://localhost/autoupdate/manifest",
+ basedir.AppendASCII("manifest_v2.xml"));
+ interceptor.SetQuerylessResponse("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());
+ content::URLRequestPrepackagedInterceptor 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.SetQuerylessResponse("http://localhost/autoupdate/manifest",
+ basedir.AppendASCII("manifest_v2.xml"));
+ interceptor.SetQuerylessResponse("http://localhost/autoupdate/v2.crx",
+ basedir.AppendASCII("v2.crx"));
// Check that the policy is initially empty.
PrefService* prefs = browser()->profile()->GetPrefs();
« no previous file with comments | « chrome/browser/component_updater/test/component_updater_service_unittest.cc ('k') | chrome/browser/extensions/autoupdate_interceptor.h » ('j') | content/content_tests.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698