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

Side by Side Diff: ios/chrome/browser/browser_state/test_chrome_browser_state_isolated_context.mm

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ios/chrome/browser/browser_state/test_chrome_browser_state_isolated_co ntext.h" 5 #include "ios/chrome/browser/browser_state/test_chrome_browser_state_isolated_co ntext.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "components/syncable_prefs/pref_service_syncable.h" 8 #include "components/syncable_prefs/pref_service_syncable.h"
9 #include "ios/web/public/web_thread.h" 9 #include "ios/web/public/web_thread.h"
10 #include "net/url_request/url_request_test_util.h" 10 #include "net/url_request/url_request_test_util.h"
11 11
12 TestChromeBrowserStateWithIsolatedContext:: 12 TestChromeBrowserStateWithIsolatedContext::
13 TestChromeBrowserStateWithIsolatedContext() 13 TestChromeBrowserStateWithIsolatedContext()
14 : TestChromeBrowserState(base::FilePath(), 14 : TestChromeBrowserState(
15 scoped_ptr<syncable_prefs::PrefServiceSyncable>(), 15 base::FilePath(),
16 TestingFactories(), 16 std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
17 RefcountedTestingFactories()), 17 TestingFactories(),
18 RefcountedTestingFactories()),
18 main_context_called_(false), 19 main_context_called_(false),
19 request_context_(new net::TestURLRequestContextGetter( 20 request_context_(new net::TestURLRequestContextGetter(
20 web::WebThread::GetTaskRunnerForThread(web::WebThread::IO))) {} 21 web::WebThread::GetTaskRunnerForThread(web::WebThread::IO))) {}
21 22
22 TestChromeBrowserStateWithIsolatedContext:: 23 TestChromeBrowserStateWithIsolatedContext::
23 ~TestChromeBrowserStateWithIsolatedContext() {} 24 ~TestChromeBrowserStateWithIsolatedContext() {}
24 25
25 bool TestChromeBrowserStateWithIsolatedContext::MainContextCalled() const { 26 bool TestChromeBrowserStateWithIsolatedContext::MainContextCalled() const {
26 return main_context_called_; 27 return main_context_called_;
27 } 28 }
28 29
29 IOSWebViewFactoryExternalService 30 IOSWebViewFactoryExternalService
30 TestChromeBrowserStateWithIsolatedContext::SharingService() { 31 TestChromeBrowserStateWithIsolatedContext::SharingService() {
31 return SSO_AUTHENTICATION; 32 return SSO_AUTHENTICATION;
32 } 33 }
33 34
34 net::URLRequestContextGetter* 35 net::URLRequestContextGetter*
35 TestChromeBrowserStateWithIsolatedContext::GetRequestContext() { 36 TestChromeBrowserStateWithIsolatedContext::GetRequestContext() {
36 main_context_called_ = true; 37 main_context_called_ = true;
37 return TestChromeBrowserState::GetRequestContext(); 38 return TestChromeBrowserState::GetRequestContext();
38 } 39 }
39 40
40 net::URLRequestContextGetter* 41 net::URLRequestContextGetter*
41 TestChromeBrowserStateWithIsolatedContext::CreateIsolatedRequestContext( 42 TestChromeBrowserStateWithIsolatedContext::CreateIsolatedRequestContext(
42 const base::FilePath& partition_path) { 43 const base::FilePath& partition_path) {
43 return request_context_.get(); 44 return request_context_.get();
44 } 45 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698