OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_ |
6 #define CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_ | 6 #define CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_ |
7 | 7 |
8 #include "base/memory/scoped_ptr.h" | 8 #include <memory> |
| 9 |
9 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" | 10 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" |
10 #include "chrome/test/base/testing_profile_manager.h" | 11 #include "chrome/test/base/testing_profile_manager.h" |
11 | 12 |
12 namespace content { | 13 namespace content { |
13 class TestBrowserThreadBundle; | 14 class TestBrowserThreadBundle; |
14 } | 15 } |
15 | 16 |
16 class Browser; | 17 class Browser; |
17 class TestingProfile; | 18 class TestingProfile; |
18 | 19 |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 const TestingProfile::TestingFactories& testing_factories); | 65 const TestingProfile::TestingFactories& testing_factories); |
65 | 66 |
66 const TestingProfile::TestingFactories& testing_factories() { | 67 const TestingProfile::TestingFactories& testing_factories() { |
67 return testing_factories_; | 68 return testing_factories_; |
68 } | 69 } |
69 | 70 |
70 private: | 71 private: |
71 TestingProfileManager profile_manager_; | 72 TestingProfileManager profile_manager_; |
72 TestingProfile* profile_; // Weak; owned by profile_manager_. | 73 TestingProfile* profile_; // Weak; owned by profile_manager_. |
73 TestingProfile::TestingFactories testing_factories_; | 74 TestingProfile::TestingFactories testing_factories_; |
74 scoped_ptr<Browser> browser_; | 75 std::unique_ptr<Browser> browser_; |
75 | 76 |
76 scoped_ptr<content::TestBrowserThreadBundle> thread_bundle_; | 77 std::unique_ptr<content::TestBrowserThreadBundle> thread_bundle_; |
77 }; | 78 }; |
78 | 79 |
79 #endif // CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_ | 80 #endif // CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_ |
OLD | NEW |