| Index: content/browser/loader/resource_dispatcher_host_browsertest.cc
|
| diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc
|
| index c6f0d1f791af37b3523c301aea56874875cf1be1..bad9b869c9f70219a16347bc8d8a53a66d0cd272 100644
|
| --- a/content/browser/loader/resource_dispatcher_host_browsertest.cc
|
| +++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc
|
| @@ -2,6 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "content/public/browser/resource_dispatcher_host.h"
|
| +
|
| +#include <utility>
|
| +
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/macros.h"
|
| @@ -15,7 +19,6 @@
|
| #include "content/browser/web_contents/web_contents_impl.h"
|
| #include "content/public/browser/browser_context.h"
|
| #include "content/public/browser/browser_thread.h"
|
| -#include "content/public/browser/resource_dispatcher_host.h"
|
| #include "content/public/browser/resource_dispatcher_host_delegate.h"
|
| #include "content/public/browser/resource_request_info.h"
|
| #include "content/public/browser/web_contents.h"
|
| @@ -287,7 +290,7 @@ scoped_ptr<net::test_server::HttpResponse> NoContentResponseHandler(
|
| scoped_ptr<net::test_server::BasicHttpResponse> http_response(
|
| new net::test_server::BasicHttpResponse);
|
| http_response->set_code(net::HTTP_NO_CONTENT);
|
| - return http_response.Pass();
|
| + return std::move(http_response);
|
| }
|
|
|
| } // namespace
|
| @@ -474,7 +477,7 @@ scoped_ptr<net::test_server::HttpResponse> HandleRedirectRequest(
|
| http_response->set_code(net::HTTP_FOUND);
|
| http_response->AddCustomHeader(
|
| "Location", request.relative_url.substr(request_path.length()));
|
| - return http_response.Pass();
|
| + return std::move(http_response);
|
| }
|
|
|
| } // namespace
|
|
|