Add ResourceRequestInfo.

chrome/browser/chromeos/gview_request_interceptor_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/chromeos/gview_request_interceptor.h"
 #include "chrome/browser/plugin_prefs.h"
 #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"
 #include "net/url_request/url_request_job_factory.h"
 #include "net/url_request/url_request_test_job.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/plugins/npapi/mock_plugin_list.h"
 
 using content::BrowserThread;
@@ skipping 72 matching lines @@
     PluginPrefsFactory::GetInstance()->ForceRegisterPrefsForTest(&prefs_);
     plugin_prefs_ = new PluginPrefs();
     plugin_prefs_->SetPrefs(&prefs_);
     ChromePluginServiceFilter* filter =
         ChromePluginServiceFilter::GetInstance();
     filter->RegisterResourceContext(plugin_prefs_, &resource_context_);
     PluginService::GetInstance()->SetFilter(filter);
 
     ASSERT_TRUE(PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path_));
 
-    handler_ = new content::DummyResourceHandler();
-
     PluginService::GetInstance()->SetPluginListForTesting(&plugin_list_);
     PluginService::GetInstance()->Init();
   }
 
   virtual void TearDown() {
     plugin_prefs_->ShutdownOnUIThread();
     net::URLRequestContext* request_context =
         resource_context_.GetRequestContext();
     request_context->set_job_factory(old_factory_);
     ChromePluginServiceFilter* filter =
@@ skipping 25 matching lines @@
       // system - which is OK since we don't actually use it, just
       // need it to be "enabled" for the test.
       RegisterPDFPlugin();
       is_loaded = PluginService::GetInstance()->GetPluginInfoByPath(
           pdf_path_, &info);
     }
     EXPECT_EQ(want_loaded, is_loaded);
   }
 
   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());
   }
 
  protected:
   base::ShadowingAtExitManager at_exit_manager_;  // Deletes PluginService.
   MessageLoopForIO message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
   webkit::npapi::MockPluginList plugin_list_;
   TestingPrefService prefs_;
   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_;
 };
 
 TEST_F(GViewRequestInterceptorTest, DoNotInterceptHtml) {
   net::URLRequest request(GURL(kHtmlUrl), &test_delegate_);
   SetupRequest(&request);
   request.Start();
   MessageLoop::current()->Run();
@@ skipping 79 matching lines @@
   SetupRequest(&request);
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(0, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL(kPdfBlob), request.url());
 }
 
 }  // namespace
 
 }  // namespace chromeos