Index: chrome/browser/chromeos/gview_request_interceptor_unittest.cc |
=================================================================== |
--- chrome/browser/chromeos/gview_request_interceptor_unittest.cc (revision 125418) |
+++ chrome/browser/chromeos/gview_request_interceptor_unittest.cc (working copy) |
@@ -13,12 +13,10 @@ |
#include "chrome/browser/plugin_prefs_factory.h" |
#include "chrome/common/chrome_paths.h" |
#include "chrome/test/base/testing_pref_service.h" |
-#include "content/browser/renderer_host/dummy_resource_handler.h" |
-#include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" |
#include "content/public/browser/plugin_service.h" |
+#include "content/public/browser/resource_request_info.h" |
#include "content/test/mock_resource_context.h" |
#include "content/test/test_browser_thread.h" |
-#include "ipc/ipc_message.h" |
#include "net/base/load_flags.h" |
#include "net/url_request/url_request.h" |
#include "net/url_request/url_request_job.h" |
@@ -111,8 +109,6 @@ |
ASSERT_TRUE(PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path_)); |
- handler_ = new content::DummyResourceHandler(); |
- |
PluginService::GetInstance()->SetPluginListForTesting(&plugin_list_); |
PluginService::GetInstance()->Init(); |
} |
@@ -158,27 +154,8 @@ |
} |
void SetupRequest(net::URLRequest* request) { |
- ResourceDispatcherHostRequestInfo* info = |
- new ResourceDispatcherHostRequestInfo( |
- handler_, |
- content::PROCESS_TYPE_RENDERER, |
- -1, // child_id |
- MSG_ROUTING_NONE, |
- 0, // origin_pid |
- request->identifier(), |
- false, // is_main_frame |
- -1, // frame_id |
- false, // parent_is_main_frame |
- -1, // parent_frame_id |
- ResourceType::MAIN_FRAME, |
- content::PAGE_TRANSITION_LINK, |
- 0, // upload_size |
- false, // is_download |
- true, // allow_download |
- false, // has_user_gesture |
- WebKit::WebReferrerPolicyDefault, |
- &resource_context_); |
- request->SetUserData(NULL, info); |
+ content::ResourceRequestInfo::AllocateForTesting(request, |
+ &resource_context_); |
request->set_context(resource_context_.GetRequestContext()); |
} |
@@ -193,7 +170,6 @@ |
scoped_refptr<PluginPrefs> plugin_prefs_; |
net::URLRequestJobFactory job_factory_; |
const net::URLRequestJobFactory* old_factory_; |
- scoped_refptr<ResourceHandler> handler_; |
TestDelegate test_delegate_; |
FilePath pdf_path_; |
content::MockResourceContext resource_context_; |