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

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

Issue 149783002: Disable AutoSizeSW test on mac because it's flaky. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | Annotate | Revision Log
« 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 "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 615 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 #endif 626 #endif
627 627
628 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/autosize")) 628 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/autosize"))
629 << message_; 629 << message_;
630 } 630 }
631 631
632 #if !defined(OS_CHROMEOS) 632 #if !defined(OS_CHROMEOS)
633 // This test ensures <webview> doesn't crash in SW rendering when autosize is 633 // This test ensures <webview> doesn't crash in SW rendering when autosize is
634 // turned on. 634 // turned on.
635 // Flaky on Windows http://crbug.com/299507 635 // Flaky on Windows http://crbug.com/299507
636 #if defined(OS_WIN) 636 #if defined(OS_WIN) || defined(OS_MACOSX)
637 #define MAYBE_AutoSizeSW DISABLED_AutoSizeSW 637 #define MAYBE_AutoSizeSW DISABLED_AutoSizeSW
638 #else 638 #else
639 #define MAYBE_AutoSizeSW AutoSizeSW 639 #define MAYBE_AutoSizeSW AutoSizeSW
640 #endif 640 #endif
641 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_AutoSizeSW) { 641 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_AutoSizeSW) {
642 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/autosize")) 642 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/autosize"))
643 << message_; 643 << message_;
644 } 644 }
645 #endif 645 #endif
646 646
(...skipping 1232 matching lines...) Expand 10 before | Expand all | Expand 10 after
1879 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor, 1879 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor,
1880 WebViewCaptureTest, 1880 WebViewCaptureTest,
1881 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); 1881 ::testing::Values(std::string(switches::kDisableThreadedCompositing)));
1882 1882
1883 // http://crbug.com/171744 1883 // http://crbug.com/171744
1884 #if !defined(OS_MACOSX) 1884 #if !defined(OS_MACOSX)
1885 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor, 1885 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor,
1886 WebViewCaptureTest, 1886 WebViewCaptureTest,
1887 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); 1887 ::testing::Values(std::string(switches::kEnableThreadedCompositing)));
1888 #endif 1888 #endif
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