| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/environment.h" | 5 #include "base/environment.h" |
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
| 9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
| 10 #include "base/string_split.h" | 10 #include "base/string_split.h" |
| (...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 | 363 |
| 364 #if defined(OS_MACOSX) | 364 #if defined(OS_MACOSX) |
| 365 // http://crbug.com/46609 | 365 // http://crbug.com/46609 |
| 366 #define MAYBE_PerfSeveralTabsReference FLAKY_PerfSeveralTabsReference | 366 #define MAYBE_PerfSeveralTabsReference FLAKY_PerfSeveralTabsReference |
| 367 #define MAYBE_PerfSeveralTabs FLAKY_PerfSeveralTabs | 367 #define MAYBE_PerfSeveralTabs FLAKY_PerfSeveralTabs |
| 368 // http://crbug.com/52858 | 368 // http://crbug.com/52858 |
| 369 #define MAYBE_PerfRestoreSeveralTabs FLAKY_PerfRestoreSeveralTabs | 369 #define MAYBE_PerfRestoreSeveralTabs FLAKY_PerfRestoreSeveralTabs |
| 370 #define MAYBE_PerfExtensionContentScript50 FLAKY_PerfExtensionContentScript50 | 370 #define MAYBE_PerfExtensionContentScript50 FLAKY_PerfExtensionContentScript50 |
| 371 #elif defined(OS_WIN) | 371 #elif defined(OS_WIN) |
| 372 // http://crbug.com/46609 | 372 // http://crbug.com/46609 |
| 373 #if !defined(NDEBUG) |
| 374 // http://crbug.com/102584 |
| 375 #define MAYBE_PerfSeveralTabs DISABLED_PerfSeveralTabs |
| 376 #else |
| 373 #define MAYBE_PerfSeveralTabs FLAKY_PerfSeveralTabs | 377 #define MAYBE_PerfSeveralTabs FLAKY_PerfSeveralTabs |
| 378 #endif |
| 374 #define MAYBE_PerfSeveralTabsReference PerfSeveralTabsReference | 379 #define MAYBE_PerfSeveralTabsReference PerfSeveralTabsReference |
| 375 #define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs | 380 #define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs |
| 376 #define MAYBE_PerfExtensionContentScript50 PerfExtensionContentScript50 | 381 #define MAYBE_PerfExtensionContentScript50 PerfExtensionContentScript50 |
| 377 #else | 382 #else |
| 378 #define MAYBE_PerfSeveralTabsReference PerfSeveralTabsReference | 383 #define MAYBE_PerfSeveralTabsReference PerfSeveralTabsReference |
| 379 #define MAYBE_PerfSeveralTabs PerfSeveralTabs | 384 #define MAYBE_PerfSeveralTabs PerfSeveralTabs |
| 380 #define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs | 385 #define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs |
| 381 #define MAYBE_PerfExtensionContentScript50 PerfExtensionContentScript50 | 386 #define MAYBE_PerfExtensionContentScript50 PerfExtensionContentScript50 |
| 382 #endif | 387 #endif |
| 383 | 388 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 443 UITestBase::CUSTOM_FRAME, 0, 0); | 448 UITestBase::CUSTOM_FRAME, 0, 0); |
| 444 } | 449 } |
| 445 | 450 |
| 446 TEST_F(StartupTest, PerfNativeFrameGtkTheme) { | 451 TEST_F(StartupTest, PerfNativeFrameGtkTheme) { |
| 447 RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT, | 452 RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT, |
| 448 UITestBase::CUSTOM_FRAME_NATIVE_THEME, 0, 0); | 453 UITestBase::CUSTOM_FRAME_NATIVE_THEME, 0, 0); |
| 449 } | 454 } |
| 450 #endif | 455 #endif |
| 451 | 456 |
| 452 } // namespace | 457 } // namespace |
| OLD | NEW |