// 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"
}
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);
}
if (!defer)
request->Start();
- return request;
+ return request.Pass();
}
void LoadTestExtension() {
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());
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());
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.
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());
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());
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);