diff options
author | pauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 17:04:23 +0000 |
---|---|---|
committer | pauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 17:04:23 +0000 |
commit | f53b48075849f4f7d7e13002176cb861c885ab52 (patch) | |
tree | cc3429420ba40da37ffc7adad0ad63ce65fc42d5 /chrome/browser/extensions/extension_disabled_ui_browsertest.cc | |
parent | 4e4a42657994b3752962232ef8746d3f4ac70931 (diff) | |
download | chromium_src-f53b48075849f4f7d7e13002176cb861c885ab52.zip chromium_src-f53b48075849f4f7d7e13002176cb861c885ab52.tar.gz chromium_src-f53b48075849f4f7d7e13002176cb861c885ab52.tar.bz2 |
Convert trivial URLRequest::Interceptors and URLRequestJobFactory::Interceptor into URLRequestJobFactory::ProtocolHandlers.
BUG=161524
Review URL: https://codereview.chromium.org/11293252
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_disabled_ui_browsertest.cc')
-rw-r--r-- | chrome/browser/extensions/extension_disabled_ui_browsertest.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc index 1f88dd9..5033c65 100644 --- a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc @@ -5,7 +5,6 @@ #include "base/file_path.h" #include "base/files/scoped_temp_dir.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/extensions/autoupdate_interceptor.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" @@ -17,6 +16,7 @@ #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" +#include "content/test/net/url_request_prepackaged_interceptor.h" #include "net/url_request/url_fetcher.h" using extensions::Extension; @@ -189,15 +189,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionDisabledGlobalErrorTest, InstallIncreasingPermissionExtensionV1(); // 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/updates.xml", + interceptor.SetResponseIgnoreQuery( + GURL("http://localhost/autoupdate/updates.xml"), test_data_dir_.AppendASCII("permissions_increase") .AppendASCII("updates.xml")); - interceptor->SetResponseOnIOThread( - "http://localhost/autoupdate/v2.crx", + interceptor.SetResponseIgnoreQuery( + GURL("http://localhost/autoupdate/v2.crx"), scoped_temp_dir_.path().AppendASCII("permissions2.crx")); extensions::ExtensionUpdater::CheckParams params; |