| OLD | NEW |
| 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 #ifndef IOS_CHROME_TEST_IOS_CHROME_SCOPED_TESTING_CHROME_BROWSER_PROVIDER_H_ | 5 #ifndef IOS_CHROME_TEST_IOS_CHROME_SCOPED_TESTING_CHROME_BROWSER_PROVIDER_H_ |
| 6 #define IOS_CHROME_TEST_IOS_CHROME_SCOPED_TESTING_CHROME_BROWSER_PROVIDER_H_ | 6 #define IOS_CHROME_TEST_IOS_CHROME_SCOPED_TESTING_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 | 11 |
| 11 namespace ios { | 12 namespace ios { |
| 12 class ChromeBrowserProvider; | 13 class ChromeBrowserProvider; |
| 13 } | 14 } |
| 14 | 15 |
| 15 // Helper class to temporarily set up a ChromeBrowserProvider and restore | 16 // Helper class to temporarily set up a ChromeBrowserProvider and restore |
| 16 // the previous one on teardown. | 17 // the previous one on teardown. |
| 17 class IOSChromeScopedTestingChromeBrowserProvider { | 18 class IOSChromeScopedTestingChromeBrowserProvider { |
| 18 public: | 19 public: |
| 19 explicit IOSChromeScopedTestingChromeBrowserProvider( | 20 explicit IOSChromeScopedTestingChromeBrowserProvider( |
| 20 scoped_ptr<ios::ChromeBrowserProvider> chrome_browser_provider); | 21 std::unique_ptr<ios::ChromeBrowserProvider> chrome_browser_provider); |
| 21 ~IOSChromeScopedTestingChromeBrowserProvider(); | 22 ~IOSChromeScopedTestingChromeBrowserProvider(); |
| 22 | 23 |
| 23 private: | 24 private: |
| 24 scoped_ptr<ios::ChromeBrowserProvider> chrome_browser_provider_; | 25 std::unique_ptr<ios::ChromeBrowserProvider> chrome_browser_provider_; |
| 25 ios::ChromeBrowserProvider* original_chrome_browser_provider_; | 26 ios::ChromeBrowserProvider* original_chrome_browser_provider_; |
| 26 | 27 |
| 27 DISALLOW_COPY_AND_ASSIGN(IOSChromeScopedTestingChromeBrowserProvider); | 28 DISALLOW_COPY_AND_ASSIGN(IOSChromeScopedTestingChromeBrowserProvider); |
| 28 }; | 29 }; |
| 29 | 30 |
| 30 #endif // IOS_CHROME_TEST_IOS_CHROME_SCOPED_TESTING_CHROME_BROWSER_PROVIDER_H_ | 31 #endif // IOS_CHROME_TEST_IOS_CHROME_SCOPED_TESTING_CHROME_BROWSER_PROVIDER_H_ |
| OLD | NEW |