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

Side by Side Diff: ios/public/provider/chrome/browser/test_chrome_browser_provider.h

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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef IOS_PUBLIC_PROVIDER_CHROME_BROWSER_TEST_CHROME_BROWSER_PROVIDER_H_ 5 #ifndef IOS_PUBLIC_PROVIDER_CHROME_BROWSER_TEST_CHROME_BROWSER_PROVIDER_H_
6 #define IOS_PUBLIC_PROVIDER_CHROME_BROWSER_TEST_CHROME_BROWSER_PROVIDER_H_ 6 #define IOS_PUBLIC_PROVIDER_CHROME_BROWSER_TEST_CHROME_BROWSER_PROVIDER_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h" 11 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
11 12
12 class FakeProfileOAuth2TokenServiceIOSProvider; 13 class FakeProfileOAuth2TokenServiceIOSProvider;
13 14
14 namespace ios { 15 namespace ios {
15 16
16 class TestUpdatableResourceProvider; 17 class TestUpdatableResourceProvider;
17 18
18 class TestChromeBrowserProvider : public ChromeBrowserProvider { 19 class TestChromeBrowserProvider : public ChromeBrowserProvider {
19 public: 20 public:
20 TestChromeBrowserProvider(); 21 TestChromeBrowserProvider();
21 ~TestChromeBrowserProvider() override; 22 ~TestChromeBrowserProvider() override;
22 23
23 // Returns the current provider as a |TestChromeBrowserProvider|. 24 // Returns the current provider as a |TestChromeBrowserProvider|.
24 static TestChromeBrowserProvider* GetTestProvider(); 25 static TestChromeBrowserProvider* GetTestProvider();
25 26
26 // ChromeBrowserProvider: 27 // ChromeBrowserProvider:
27 ProfileOAuth2TokenServiceIOSProvider* 28 ProfileOAuth2TokenServiceIOSProvider*
28 GetProfileOAuth2TokenServiceIOSProvider() override; 29 GetProfileOAuth2TokenServiceIOSProvider() override;
29 ChromeIdentityService* GetChromeIdentityService() override; 30 ChromeIdentityService* GetChromeIdentityService() override;
30 UpdatableResourceProvider* GetUpdatableResourceProvider() override; 31 UpdatableResourceProvider* GetUpdatableResourceProvider() override;
31 32
32 private: 33 private:
33 scoped_ptr<FakeProfileOAuth2TokenServiceIOSProvider> 34 std::unique_ptr<FakeProfileOAuth2TokenServiceIOSProvider>
34 oauth2_token_service_provider_; 35 oauth2_token_service_provider_;
35 scoped_ptr<ChromeIdentityService> chrome_identity_service_; 36 std::unique_ptr<ChromeIdentityService> chrome_identity_service_;
36 scoped_ptr<TestUpdatableResourceProvider> test_updatable_resource_provider_; 37 std::unique_ptr<TestUpdatableResourceProvider>
38 test_updatable_resource_provider_;
37 39
38 DISALLOW_COPY_AND_ASSIGN(TestChromeBrowserProvider); 40 DISALLOW_COPY_AND_ASSIGN(TestChromeBrowserProvider);
39 }; 41 };
40 42
41 } // namespace ios 43 } // namespace ios
42 44
43 #endif // IOS_PUBLIC_PROVIDER_CHROME_BROWSER_TEST_CHROME_BROWSER_PROVIDER_H_ 45 #endif // IOS_PUBLIC_PROVIDER_CHROME_BROWSER_TEST_CHROME_BROWSER_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698