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

Side by Side Diff: chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc

Issue 1865213004: Convert //chrome/browser/ui 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 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 #include "base/macros.h" 5 #include "base/macros.h"
6 #include "base/run_loop.h" 6 #include "base/run_loop.h"
7 #include "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 #include "chrome/browser/extensions/extension_action_test_util.h" 8 #include "chrome/browser/extensions/extension_action_test_util.h"
9 #include "chrome/browser/extensions/extension_browsertest.h" 9 #include "chrome/browser/extensions/extension_browsertest.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 protected: 157 protected:
158 ToolbarActionViewInteractiveUITest(); 158 ToolbarActionViewInteractiveUITest();
159 ~ToolbarActionViewInteractiveUITest() override; 159 ~ToolbarActionViewInteractiveUITest() override;
160 160
161 // ExtensionBrowserTest: 161 // ExtensionBrowserTest:
162 void SetUpCommandLine(base::CommandLine* command_line) override; 162 void SetUpCommandLine(base::CommandLine* command_line) override;
163 void TearDownOnMainThread() override; 163 void TearDownOnMainThread() override;
164 164
165 private: 165 private:
166 // Override the extensions-action-redesign switch. 166 // Override the extensions-action-redesign switch.
167 scoped_ptr<extensions::FeatureSwitch::ScopedOverride> feature_override_; 167 std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> feature_override_;
168 168
169 DISALLOW_COPY_AND_ASSIGN(ToolbarActionViewInteractiveUITest); 169 DISALLOW_COPY_AND_ASSIGN(ToolbarActionViewInteractiveUITest);
170 }; 170 };
171 171
172 ToolbarActionViewInteractiveUITest::ToolbarActionViewInteractiveUITest() {} 172 ToolbarActionViewInteractiveUITest::ToolbarActionViewInteractiveUITest() {}
173 ToolbarActionViewInteractiveUITest::~ToolbarActionViewInteractiveUITest() {} 173 ToolbarActionViewInteractiveUITest::~ToolbarActionViewInteractiveUITest() {}
174 174
175 void ToolbarActionViewInteractiveUITest::SetUpCommandLine( 175 void ToolbarActionViewInteractiveUITest::SetUpCommandLine(
176 base::CommandLine* command_line) { 176 base::CommandLine* command_line) {
177 ExtensionBrowserTest::SetUpCommandLine(command_line); 177 ExtensionBrowserTest::SetUpCommandLine(command_line);
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP, 390 ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP,
391 base::Bind(&ActivateOverflowedActionWithKeyboard, 391 base::Bind(&ActivateOverflowedActionWithKeyboard,
392 browser(), loop.QuitClosure())); 392 browser(), loop.QuitClosure()));
393 loop.Run(); 393 loop.Run();
394 394
395 // The app menu should no longer be showing. 395 // The app menu should no longer be showing.
396 EXPECT_FALSE(app_menu_button->IsMenuShowing()); 396 EXPECT_FALSE(app_menu_button->IsMenuShowing());
397 // And the extension should have been activated. 397 // And the extension should have been activated.
398 EXPECT_TRUE(listener.WaitUntilSatisfied()); 398 EXPECT_TRUE(listener.WaitUntilSatisfied());
399 } 399 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698