Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(619)

Side by Side Diff: headless/lib/browser/headless_content_browser_client.cc

Issue 1854043002: convert //headless to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "headless/lib/browser/headless_content_browser_client.h" 5 #include "headless/lib/browser/headless_content_browser_client.h"
6 6
7 #include <memory>
8
9 #include "base/memory/ptr_util.h"
7 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
8 #include "headless/lib/browser/headless_browser_context.h" 11 #include "headless/lib/browser/headless_browser_context.h"
9 #include "headless/lib/browser/headless_browser_impl.h" 12 #include "headless/lib/browser/headless_browser_impl.h"
10 #include "headless/lib/browser/headless_browser_main_parts.h" 13 #include "headless/lib/browser/headless_browser_main_parts.h"
11 14
12 namespace headless { 15 namespace headless {
13 16
14 HeadlessContentBrowserClient::HeadlessContentBrowserClient( 17 HeadlessContentBrowserClient::HeadlessContentBrowserClient(
15 HeadlessBrowserImpl* browser) 18 HeadlessBrowserImpl* browser)
16 : browser_(browser) {} 19 : browser_(browser) {}
17 20
18 HeadlessContentBrowserClient::~HeadlessContentBrowserClient() {} 21 HeadlessContentBrowserClient::~HeadlessContentBrowserClient() {}
19 22
20 content::BrowserMainParts* HeadlessContentBrowserClient::CreateBrowserMainParts( 23 content::BrowserMainParts* HeadlessContentBrowserClient::CreateBrowserMainParts(
21 const content::MainFunctionParams&) { 24 const content::MainFunctionParams&) {
22 scoped_ptr<HeadlessBrowserMainParts> browser_main_parts = 25 std::unique_ptr<HeadlessBrowserMainParts> browser_main_parts =
23 make_scoped_ptr(new HeadlessBrowserMainParts(browser_)); 26 base::WrapUnique(new HeadlessBrowserMainParts(browser_));
24 browser_->set_browser_main_parts(browser_main_parts.get()); 27 browser_->set_browser_main_parts(browser_main_parts.get());
25 return browser_main_parts.release(); 28 return browser_main_parts.release();
26 } 29 }
27 30
28 net::URLRequestContextGetter* 31 net::URLRequestContextGetter*
29 HeadlessContentBrowserClient::CreateRequestContext( 32 HeadlessContentBrowserClient::CreateRequestContext(
30 content::BrowserContext* content_browser_context, 33 content::BrowserContext* content_browser_context,
31 content::ProtocolHandlerMap* protocol_handlers, 34 content::ProtocolHandlerMap* protocol_handlers,
32 content::URLRequestInterceptorScopedVector request_interceptors) { 35 content::URLRequestInterceptorScopedVector request_interceptors) {
33 CHECK(content_browser_context == browser_context()); 36 CHECK(content_browser_context == browser_context());
34 scoped_refptr<HeadlessURLRequestContextGetter> url_request_context_getter( 37 scoped_refptr<HeadlessURLRequestContextGetter> url_request_context_getter(
35 new HeadlessURLRequestContextGetter( 38 new HeadlessURLRequestContextGetter(
36 false /* ignore_certificate_errors */, browser_context()->GetPath(), 39 false /* ignore_certificate_errors */, browser_context()->GetPath(),
37 content::BrowserThread::GetMessageLoopProxyForThread( 40 content::BrowserThread::GetMessageLoopProxyForThread(
38 content::BrowserThread::IO), 41 content::BrowserThread::IO),
39 content::BrowserThread::GetMessageLoopProxyForThread( 42 content::BrowserThread::GetMessageLoopProxyForThread(
40 content::BrowserThread::FILE), 43 content::BrowserThread::FILE),
41 protocol_handlers, std::move(request_interceptors), 44 protocol_handlers, std::move(request_interceptors),
42 nullptr /* net_log */, browser_context()->options())); 45 nullptr /* net_log */, browser_context()->options()));
43 browser_context()->SetURLRequestContextGetter(url_request_context_getter); 46 browser_context()->SetURLRequestContextGetter(url_request_context_getter);
44 return url_request_context_getter.get(); 47 return url_request_context_getter.get();
45 } 48 }
46 49
47 HeadlessBrowserContext* HeadlessContentBrowserClient::browser_context() const { 50 HeadlessBrowserContext* HeadlessContentBrowserClient::browser_context() const {
48 return browser_->browser_context(); 51 return browser_->browser_context();
49 } 52 }
50 53
51 } // namespace headless 54 } // namespace headless
OLDNEW
« no previous file with comments | « headless/lib/browser/headless_browser_main_parts.h ('k') | headless/lib/browser/headless_devtools.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698