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

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

Issue 592413002: WebViewTest.Shim_TestGetProcessId does not need a test server (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1187 matching lines...) Expand 10 before | Expand all | Expand 10 after
1198 1198
1199 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestReload) { 1199 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestReload) {
1200 TestHelper("testReload", "web_view/shim", NO_TEST_SERVER); 1200 TestHelper("testReload", "web_view/shim", NO_TEST_SERVER);
1201 } 1201 }
1202 1202
1203 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestReloadAfterTerminate) { 1203 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestReloadAfterTerminate) {
1204 TestHelper("testReloadAfterTerminate", "web_view/shim", NO_TEST_SERVER); 1204 TestHelper("testReloadAfterTerminate", "web_view/shim", NO_TEST_SERVER);
1205 } 1205 }
1206 1206
1207 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestGetProcessId) { 1207 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestGetProcessId) {
1208 TestHelper("testGetProcessId", "web_view/shim", NEEDS_TEST_SERVER); 1208 TestHelper("testGetProcessId", "web_view/shim", NO_TEST_SERVER);
1209 } 1209 }
1210 1210
1211 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestHiddenBeforeNavigation) { 1211 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestHiddenBeforeNavigation) {
1212 TestHelper("testHiddenBeforeNavigation", "web_view/shim", NO_TEST_SERVER); 1212 TestHelper("testHiddenBeforeNavigation", "web_view/shim", NO_TEST_SERVER);
1213 } 1213 }
1214 1214
1215 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestRemoveWebviewOnExit) { 1215 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestRemoveWebviewOnExit) {
1216 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. 1216 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages.
1217 1217
1218 // Launch the app and wait until it's ready to load a test. 1218 // Launch the app and wait until it's ready to load a test.
(...skipping 1129 matching lines...) Expand 10 before | Expand all | Expand 10 after
2348 // http://crbug.com/403325 2348 // http://crbug.com/403325
2349 #define MAYBE_WebViewInBackgroundPage \ 2349 #define MAYBE_WebViewInBackgroundPage \
2350 DISABLED_WebViewInBackgroundPage 2350 DISABLED_WebViewInBackgroundPage
2351 #else 2351 #else
2352 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage 2352 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage
2353 #endif 2353 #endif
2354 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { 2354 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) {
2355 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) 2355 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background"))
2356 << message_; 2356 << message_;
2357 } 2357 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698