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

Side by Side Diff: chrome/browser/apps/web_view_browsertest.cc

Issue 684613002: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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/path_service.h" 5 #include "base/path_service.h"
6 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/apps/app_browsertest_util.h" 8 #include "chrome/browser/apps/app_browsertest_util.h"
9 #include "chrome/browser/chrome_content_browser_client.h" 9 #include "chrome/browser/chrome_content_browser_client.h"
10 #include "chrome/browser/prerender/prerender_link_manager.h" 10 #include "chrome/browser/prerender/prerender_link_manager.h"
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 bool expect_allow_; 247 bool expect_allow_;
248 bool decision_made_; 248 bool decision_made_;
249 bool last_download_allowed_; 249 bool last_download_allowed_;
250 scoped_refptr<content::MessageLoopRunner> message_loop_runner_; 250 scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
251 251
252 DISALLOW_COPY_AND_ASSIGN(MockDownloadWebContentsDelegate); 252 DISALLOW_COPY_AND_ASSIGN(MockDownloadWebContentsDelegate);
253 }; 253 };
254 254
255 class WebViewTest : public extensions::PlatformAppBrowserTest { 255 class WebViewTest : public extensions::PlatformAppBrowserTest {
256 protected: 256 protected:
257 virtual void SetUp() override { 257 void SetUp() override {
258 if (UsesFakeSpeech()) { 258 if (UsesFakeSpeech()) {
259 // SpeechRecognition test specific SetUp. 259 // SpeechRecognition test specific SetUp.
260 fake_speech_recognition_manager_.reset( 260 fake_speech_recognition_manager_.reset(
261 new content::FakeSpeechRecognitionManager()); 261 new content::FakeSpeechRecognitionManager());
262 fake_speech_recognition_manager_->set_should_send_fake_response(true); 262 fake_speech_recognition_manager_->set_should_send_fake_response(true);
263 // Inject the fake manager factory so that the test result is returned to 263 // Inject the fake manager factory so that the test result is returned to
264 // the web page. 264 // the web page.
265 content::SpeechRecognitionManager::SetManagerForTesting( 265 content::SpeechRecognitionManager::SetManagerForTesting(
266 fake_speech_recognition_manager_.get()); 266 fake_speech_recognition_manager_.get());
267 } 267 }
268 extensions::PlatformAppBrowserTest::SetUp(); 268 extensions::PlatformAppBrowserTest::SetUp();
269 } 269 }
270 270
271 virtual void TearDown() override { 271 void TearDown() override {
272 if (UsesFakeSpeech()) { 272 if (UsesFakeSpeech()) {
273 // SpeechRecognition test specific TearDown. 273 // SpeechRecognition test specific TearDown.
274 content::SpeechRecognitionManager::SetManagerForTesting(NULL); 274 content::SpeechRecognitionManager::SetManagerForTesting(NULL);
275 } 275 }
276 276
277 extensions::PlatformAppBrowserTest::TearDown(); 277 extensions::PlatformAppBrowserTest::TearDown();
278 } 278 }
279 279
280 void SetUpOnMainThread() override { 280 void SetUpOnMainThread() override {
281 extensions::PlatformAppBrowserTest::SetUpOnMainThread(); 281 extensions::PlatformAppBrowserTest::SetUpOnMainThread();
(...skipping 1975 matching lines...) Expand 10 before | Expand all | Expand 10 after
2257 }; 2257 };
2258 2258
2259 IN_PROC_BROWSER_TEST_F(WebViewPluginTest, TestLoadPluginEvent) { 2259 IN_PROC_BROWSER_TEST_F(WebViewPluginTest, TestLoadPluginEvent) {
2260 TestHelper("testPluginLoadPermission", "web_view/shim", NO_TEST_SERVER); 2260 TestHelper("testPluginLoadPermission", "web_view/shim", NO_TEST_SERVER);
2261 } 2261 }
2262 #endif // defined(ENABLE_PLUGINS) 2262 #endif // defined(ENABLE_PLUGINS)
2263 2263
2264 class WebViewCaptureTest : public WebViewTest { 2264 class WebViewCaptureTest : public WebViewTest {
2265 public: 2265 public:
2266 WebViewCaptureTest() {} 2266 WebViewCaptureTest() {}
2267 virtual ~WebViewCaptureTest() {} 2267 ~WebViewCaptureTest() override {}
2268 virtual void SetUp() override { 2268 void SetUp() override {
2269 EnablePixelOutput(); 2269 EnablePixelOutput();
2270 WebViewTest::SetUp(); 2270 WebViewTest::SetUp();
2271 } 2271 }
2272 }; 2272 };
2273 2273
2274 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestZoomAPI) { 2274 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestZoomAPI) {
2275 TestHelper("testZoomAPI", "web_view/shim", NO_TEST_SERVER); 2275 TestHelper("testZoomAPI", "web_view/shim", NO_TEST_SERVER);
2276 } 2276 }
2277 2277
2278 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI) { 2278 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI) {
(...skipping 20 matching lines...) Expand all
2299 // http://crbug.com/403325 2299 // http://crbug.com/403325
2300 #define MAYBE_WebViewInBackgroundPage \ 2300 #define MAYBE_WebViewInBackgroundPage \
2301 DISABLED_WebViewInBackgroundPage 2301 DISABLED_WebViewInBackgroundPage
2302 #else 2302 #else
2303 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage 2303 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage
2304 #endif 2304 #endif
2305 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { 2305 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) {
2306 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) 2306 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background"))
2307 << message_; 2307 << message_;
2308 } 2308 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698