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 CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_ | 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_ |
6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_ | 6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
| 10 #include <memory> |
| 11 |
10 #include "base/macros.h" | 12 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "chrome/browser/extensions/browser_action_test_util.h" | 13 #include "chrome/browser/extensions/browser_action_test_util.h" |
13 #include "chrome/browser/extensions/extension_action_test_util.h" | 14 #include "chrome/browser/extensions/extension_action_test_util.h" |
14 #include "chrome/test/base/browser_with_test_window_test.h" | 15 #include "chrome/test/base/browser_with_test_window_test.h" |
15 #include "extensions/common/feature_switch.h" | 16 #include "extensions/common/feature_switch.h" |
16 #include "ui/base/material_design/material_design_controller.h" | 17 #include "ui/base/material_design/material_design_controller.h" |
17 | 18 |
18 class ExtensionAction; | 19 class ExtensionAction; |
19 class ToolbarActionsBar; | 20 class ToolbarActionsBar; |
20 | 21 |
21 namespace content { | 22 namespace content { |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 BrowserActionTestUtil* overflow_browser_action_test_util() { | 88 BrowserActionTestUtil* overflow_browser_action_test_util() { |
88 return overflow_browser_action_test_util_.get(); | 89 return overflow_browser_action_test_util_.get(); |
89 } | 90 } |
90 | 91 |
91 private: | 92 private: |
92 // The associated ToolbarActionsModel (owned by the keyed service setup). | 93 // The associated ToolbarActionsModel (owned by the keyed service setup). |
93 ToolbarActionsModel* toolbar_model_; | 94 ToolbarActionsModel* toolbar_model_; |
94 | 95 |
95 // A BrowserActionTestUtil object constructed with the associated | 96 // A BrowserActionTestUtil object constructed with the associated |
96 // ToolbarActionsBar. | 97 // ToolbarActionsBar. |
97 scoped_ptr<BrowserActionTestUtil> browser_action_test_util_; | 98 std::unique_ptr<BrowserActionTestUtil> browser_action_test_util_; |
98 | 99 |
99 // The overflow container's BrowserActionTestUtil (only non-null if | 100 // The overflow container's BrowserActionTestUtil (only non-null if |
100 // |use_redesign| is true). | 101 // |use_redesign| is true). |
101 scoped_ptr<BrowserActionTestUtil> overflow_browser_action_test_util_; | 102 std::unique_ptr<BrowserActionTestUtil> overflow_browser_action_test_util_; |
102 | 103 |
103 // True if the extension action redesign switch should be enabled. | 104 // True if the extension action redesign switch should be enabled. |
104 bool use_redesign_; | 105 bool use_redesign_; |
105 | 106 |
106 scoped_ptr<extensions::FeatureSwitch::ScopedOverride> redesign_switch_; | 107 std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> redesign_switch_; |
107 | 108 |
108 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarUnitTest); | 109 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarUnitTest); |
109 }; | 110 }; |
110 | 111 |
111 class ToolbarActionsBarRedesignUnitTest : public ToolbarActionsBarUnitTest { | 112 class ToolbarActionsBarRedesignUnitTest : public ToolbarActionsBarUnitTest { |
112 public: | 113 public: |
113 ToolbarActionsBarRedesignUnitTest(); | 114 ToolbarActionsBarRedesignUnitTest(); |
114 ~ToolbarActionsBarRedesignUnitTest() override; | 115 ~ToolbarActionsBarRedesignUnitTest() override; |
115 | 116 |
116 private: | 117 private: |
117 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarRedesignUnitTest); | 118 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarRedesignUnitTest); |
118 }; | 119 }; |
119 | 120 |
120 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_ | 121 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_ |
OLD | NEW |