| Index: webkit/media/buffered_resource_loader.cc
|
| diff --git a/webkit/media/buffered_resource_loader.cc b/webkit/media/buffered_resource_loader.cc
|
| index b1a40033f2ba95318ce7a7a8fedf5d139d867a5f..89575709d9b05d7baee00d3cc73b902b9fa03f9d 100644
|
| --- a/webkit/media/buffered_resource_loader.cc
|
| +++ b/webkit/media/buffered_resource_loader.cc
|
| @@ -169,20 +169,20 @@ void BufferedResourceLoader::Start(
|
| WebString::fromUTF8("identity;q=1, *;q=0"));
|
|
|
| // Check for our test WebURLLoader.
|
| - WebURLLoader* loader = NULL;
|
| + scoped_ptr<WebURLLoader> loader;
|
| if (test_loader_.get()) {
|
| - loader = test_loader_.release();
|
| + loader = test_loader_.Pass();
|
| } else {
|
| WebURLLoaderOptions options;
|
| options.allowCredentials = true;
|
| options.crossOriginRequestPolicy =
|
| WebURLLoaderOptions::CrossOriginRequestPolicyAllow;
|
| - loader = frame->createAssociatedURLLoader(options);
|
| + loader.reset(frame->createAssociatedURLLoader(options));
|
| }
|
|
|
| // Start the resource loading.
|
| loader->loadAsynchronously(request, this);
|
| - active_loader_.reset(new ActiveLoader(loader));
|
| + active_loader_.reset(new ActiveLoader(loader.Pass()));
|
| }
|
|
|
| void BufferedResourceLoader::Stop() {
|
| @@ -317,8 +317,9 @@ const GURL& BufferedResourceLoader::url() {
|
| return url_;
|
| }
|
|
|
| -void BufferedResourceLoader::SetURLLoaderForTest(WebURLLoader* test_loader) {
|
| - test_loader_.reset(test_loader);
|
| +void BufferedResourceLoader::SetURLLoaderForTest(
|
| + scoped_ptr<WebURLLoader> test_loader) {
|
| + test_loader_ = test_loader.Pass();
|
| }
|
|
|
| /////////////////////////////////////////////////////////////////////////////
|
|
|