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

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

Issue 140073002: <webview>: navigating to WebStore should fire a loadabort instead of crashing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge with ToT Created 6 years, 10 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 | chrome/test/data/extensions/platform_apps/web_view/shim/inject_comm_channel.js » ('j') | 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 "apps/ui/native_app_window.h" 5 #include "apps/ui/native_app_window.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/apps/app_browsertest_util.h" 9 #include "chrome/browser/apps/app_browsertest_util.h"
10 #include "chrome/browser/automation/automation_util.h" 10 #include "chrome/browser/automation/automation_util.h"
(...skipping 1845 matching lines...) Expand 10 before | Expand all | Expand 10 after
1856 WebViewTest::SetUp(); 1856 WebViewTest::SetUp();
1857 } 1857 }
1858 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 1858 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
1859 command_line->AppendSwitch(GetParam()); 1859 command_line->AppendSwitch(GetParam());
1860 // http://crbug.com/327035 1860 // http://crbug.com/327035
1861 command_line->AppendSwitch(switches::kDisableDelegatedRenderer); 1861 command_line->AppendSwitch(switches::kDisableDelegatedRenderer);
1862 WebViewTest::SetUpCommandLine(command_line); 1862 WebViewTest::SetUpCommandLine(command_line);
1863 } 1863 }
1864 }; 1864 };
1865 1865
1866 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestNavigateToWebStore) {
1867 TestHelper("testNavigateToWebStore", "web_view/shim", NO_TEST_SERVER);
1868 }
1869
1866 // <webview> screenshot capture fails with ubercomp. 1870 // <webview> screenshot capture fails with ubercomp.
1867 // See http://crbug.com/327035. 1871 // See http://crbug.com/327035.
1868 IN_PROC_BROWSER_TEST_P(WebViewCaptureTest, 1872 IN_PROC_BROWSER_TEST_P(WebViewCaptureTest,
1869 DISABLED_Shim_ScreenshotCapture) { 1873 DISABLED_Shim_ScreenshotCapture) {
1870 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); 1874 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER);
1871 } 1875 }
1872 1876
1873 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor, 1877 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor,
1874 WebViewCaptureTest, 1878 WebViewCaptureTest,
1875 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); 1879 ::testing::Values(std::string(switches::kDisableThreadedCompositing)));
1876 1880
1877 // http://crbug.com/171744 1881 // http://crbug.com/171744
1878 #if !defined(OS_MACOSX) 1882 #if !defined(OS_MACOSX)
1879 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor, 1883 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor,
1880 WebViewCaptureTest, 1884 WebViewCaptureTest,
1881 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); 1885 ::testing::Values(std::string(switches::kEnableThreadedCompositing)));
1882 #endif 1886 #endif
OLDNEW
« no previous file with comments | « no previous file | chrome/test/data/extensions/platform_apps/web_view/shim/inject_comm_channel.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698