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

Side by Side Diff: chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "chrome/browser/apps/app_browsertest_util.h" 6 #include "chrome/browser/apps/app_browsertest_util.h"
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h" 8 #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h"
9 #include "chrome/browser/extensions/component_loader.h" 9 #include "chrome/browser/extensions/component_loader.h"
10 #include "chrome/browser/extensions/extension_browsertest.h" 10 #include "chrome/browser/extensions/extension_browsertest.h"
(...skipping 13 matching lines...) Expand all
24 void StopMessageLoopCallback() { 24 void StopMessageLoopCallback() {
25 base::MessageLoopForUI::current()->Quit(); 25 base::MessageLoopForUI::current()->Quit();
26 } 26 }
27 27
28 } // namespace 28 } // namespace
29 29
30 namespace extensions { 30 namespace extensions {
31 31
32 class FeedbackTest : public ExtensionBrowserTest { 32 class FeedbackTest : public ExtensionBrowserTest {
33 public: 33 public:
34 virtual void SetUp() OVERRIDE { 34 virtual void SetUp() override {
35 extensions::ComponentLoader::EnableBackgroundExtensionsForTesting(); 35 extensions::ComponentLoader::EnableBackgroundExtensionsForTesting();
36 InProcessBrowserTest::SetUp(); 36 InProcessBrowserTest::SetUp();
37 } 37 }
38 38
39 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 39 virtual void SetUpCommandLine(CommandLine* command_line) override {
40 command_line->AppendSwitch(::switches::kEnableUserMediaScreenCapturing); 40 command_line->AppendSwitch(::switches::kEnableUserMediaScreenCapturing);
41 InProcessBrowserTest::SetUpCommandLine(command_line); 41 InProcessBrowserTest::SetUpCommandLine(command_line);
42 } 42 }
43 43
44 protected: 44 protected:
45 bool IsFeedbackAppAvailable() { 45 bool IsFeedbackAppAvailable() {
46 return extensions::EventRouter::Get(browser()->profile()) 46 return extensions::EventRouter::Get(browser()->profile())
47 ->ExtensionHasEventListener( 47 ->ExtensionHasEventListener(
48 kFeedbackExtensionId, 48 kFeedbackExtensionId,
49 extensions::api::feedback_private::OnFeedbackRequested::kEventName); 49 extensions::api::feedback_private::OnFeedbackRequested::kEventName);
(...skipping 30 matching lines...) Expand all
80 // See http://crbug.com/369886. 80 // See http://crbug.com/369886.
81 IN_PROC_BROWSER_TEST_F(FeedbackTest, DISABLED_ShowFeedback) { 81 IN_PROC_BROWSER_TEST_F(FeedbackTest, DISABLED_ShowFeedback) {
82 WaitForExtensionViewsToLoad(); 82 WaitForExtensionViewsToLoad();
83 83
84 ASSERT_TRUE(IsFeedbackAppAvailable()); 84 ASSERT_TRUE(IsFeedbackAppAvailable());
85 StartFeedbackUI(); 85 StartFeedbackUI();
86 VerifyFeedbackAppLaunch(); 86 VerifyFeedbackAppLaunch();
87 } 87 }
88 88
89 } // namespace extensions 89 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698