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

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: Addressed comments Created 6 years, 11 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 "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 1847 matching lines...) Expand 10 before | Expand all | Expand 10 after
1858 WebViewCaptureTest() {} 1858 WebViewCaptureTest() {}
1859 virtual ~WebViewCaptureTest() {} 1859 virtual ~WebViewCaptureTest() {}
1860 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 1860 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
1861 command_line->AppendSwitch(GetParam()); 1861 command_line->AppendSwitch(GetParam());
1862 // http://crbug.com/327035 1862 // http://crbug.com/327035
1863 command_line->AppendSwitch(switches::kDisableDelegatedRenderer); 1863 command_line->AppendSwitch(switches::kDisableDelegatedRenderer);
1864 WebViewTest::SetUpCommandLine(command_line); 1864 WebViewTest::SetUpCommandLine(command_line);
1865 } 1865 }
1866 }; 1866 };
1867 1867
1868 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestNavigateToWebStore) {
1869 TestHelper("testNavigateToWebStore", "web_view/shim", NO_TEST_SERVER);
1870 }
1871
1868 #if defined(USE_AURA) && defined(OS_LINUX) 1872 #if defined(USE_AURA) && defined(OS_LINUX)
1869 // Keeps failing on LinuxAura try server, tentatively disable this 1873 // Keeps failing on LinuxAura try server, tentatively disable this
1870 // so that CQ becomes sane. 1874 // so that CQ becomes sane.
1871 // crbug.com/330146 1875 // crbug.com/330146
1872 #define MAYBE_Shim_ScreenshotCapture DISABLED_Shim_ScreenshotCapture 1876 #define MAYBE_Shim_ScreenshotCapture DISABLED_Shim_ScreenshotCapture
1873 #else 1877 #else
1874 #define MAYBE_Shim_ScreenshotCapture Shim_ScreenshotCapture 1878 #define MAYBE_Shim_ScreenshotCapture Shim_ScreenshotCapture
1875 #endif 1879 #endif
1876 IN_PROC_BROWSER_TEST_P(WebViewCaptureTest, 1880 IN_PROC_BROWSER_TEST_P(WebViewCaptureTest,
1877 MAYBE_Shim_ScreenshotCapture) { 1881 MAYBE_Shim_ScreenshotCapture) {
1878 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); 1882 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER);
1879 } 1883 }
1880 1884
1881 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor, 1885 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor,
1882 WebViewCaptureTest, 1886 WebViewCaptureTest,
1883 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); 1887 ::testing::Values(std::string(switches::kDisableThreadedCompositing)));
1884 1888
1885 // http://crbug.com/171744 1889 // http://crbug.com/171744
1886 #if !defined(OS_MACOSX) 1890 #if !defined(OS_MACOSX)
1887 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor, 1891 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor,
1888 WebViewCaptureTest, 1892 WebViewCaptureTest,
1889 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); 1893 ::testing::Values(std::string(switches::kEnableThreadedCompositing)));
1890 #endif 1894 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698