Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / user_script_listener_unittest.cc

diff --git a/src/chrome/browser/extensions/user_script_listener_unittest.cc b/src/chrome/browser/extensions/user_script_listener_unittest.cc
index aa45e98..4154fd8 100644 (file)
--- a/src/chrome/browser/extensions/user_script_listener_unittest.cc
+++ b/src/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ -160,19 +161,21 @@ class UserScriptListenerTest : public ExtensionServiceTestBase {
   }
 
  protected:
-  net::TestURLRequest* StartTestRequest(net::URLRequest::Delegate* delegate,
-                                        const std::string& url_string,
-                                        net::TestURLRequestContext* context) {
+  scoped_ptr<net::URLRequest> StartTestRequest(
+      net::URLRequest::Delegate* delegate,
+      const std::string& url_string,
+      net::TestURLRequestContext* context) {
     GURL url(url_string);
-    net::TestURLRequest* request =
-        new net::TestURLRequest(url, net::DEFAULT_PRIORITY, delegate, context);
+    scoped_ptr<net::URLRequest> request(context->CreateRequest(
+        url, net::DEFAULT_PRIORITY, delegate, NULL));
 
     ResourceThrottle* throttle = listener_->CreateResourceThrottle(
         url, content::RESOURCE_TYPE_MAIN_FRAME);
 
     bool defer = false;
     if (throttle) {
-      request->SetUserData(NULL, new ThrottleController(request, throttle));
+      request->SetUserData(NULL,
+                           new ThrottleController(request.get(), throttle));
 
       throttle->WillStartRequest(&defer);
     }
@@ -180,7 +183,7 @@ class UserScriptListenerTest : public ExtensionServiceTestBase {
     if (!defer)
       request->Start();
 
-    return request;
+    return request.Pass();
   }
 
   void LoadTestExtension() {
@@ -212,7 +215,7 @@ TEST_F(UserScriptListenerTest, DelayAndUpdate) {
 
   net::TestDelegate delegate;
   net::TestURLRequestContext context;
-  scoped_ptr<net::TestURLRequest> request(
+  scoped_ptr<net::URLRequest> request(
       StartTestRequest(&delegate, kMatchingUrl, &context));
   ASSERT_FALSE(request->is_pending());
 
@@ -230,7 +233,7 @@ TEST_F(UserScriptListenerTest, DelayAndUnload) {
 
   net::TestDelegate delegate;
   net::TestURLRequestContext context;
-  scoped_ptr<net::TestURLRequest> request(
+  scoped_ptr<net::URLRequest> request(
       StartTestRequest(&delegate, kMatchingUrl, &context));
   ASSERT_FALSE(request->is_pending());
 
@@ -252,7 +255,7 @@ TEST_F(UserScriptListenerTest, DelayAndUnload) {
 TEST_F(UserScriptListenerTest, NoDelayNoExtension) {
   net::TestDelegate delegate;
   net::TestURLRequestContext context;
-  scoped_ptr<net::TestURLRequest> request(
+  scoped_ptr<net::URLRequest> request(
       StartTestRequest(&delegate, kMatchingUrl, &context));
 
   // The request should be started immediately.
@@ -268,9 +271,8 @@ TEST_F(UserScriptListenerTest, NoDelayNotMatching) {
 
   net::TestDelegate delegate;
   net::TestURLRequestContext context;
-  scoped_ptr<net::TestURLRequest> request(StartTestRequest(&delegate,
-                                                           kNotMatchingUrl,
-                                                           &context));
+  scoped_ptr<net::URLRequest> request(
+      StartTestRequest(&delegate, kNotMatchingUrl, &context));
 
   // The request should be started immediately.
   ASSERT_TRUE(request->is_pending());
@@ -300,7 +302,7 @@ TEST_F(UserScriptListenerTest, MultiProfile) {
 
   net::TestDelegate delegate;
   net::TestURLRequestContext context;
-  scoped_ptr<net::TestURLRequest> request(
+  scoped_ptr<net::URLRequest> request(
       StartTestRequest(&delegate, kMatchingUrl, &context));
   ASSERT_FALSE(request->is_pending());
 
@@ -332,8 +334,8 @@ TEST_F(UserScriptListenerTest, ResumeBeforeStart) {
   net::TestDelegate delegate;
   net::TestURLRequestContext context;
   GURL url(kMatchingUrl);
-  scoped_ptr<net::TestURLRequest> request(
-      new net::TestURLRequest(url, net::DEFAULT_PRIORITY, &delegate, &context));
+  scoped_ptr<net::URLRequest> request(context.CreateRequest(
+      url, net::DEFAULT_PRIORITY, &delegate, NULL));
 
   ResourceThrottle* throttle =
       listener_->CreateResourceThrottle(url, content::RESOURCE_TYPE_MAIN_FRAME);