| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #if defined(OS_MACOSX) |
| 9 #import "base/mac/mac_util.h" |
| 10 #endif |
| 8 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 9 #include "base/string_util.h" | 12 #include "base/string_util.h" |
| 10 #include "base/strings/string_split.h" | 13 #include "base/strings/string_split.h" |
| 11 #include "base/threading/sequenced_worker_pool.h" | 14 #include "base/threading/sequenced_worker_pool.h" |
| 12 #include "chrome/browser/browser_process.h" | 15 #include "chrome/browser/browser_process.h" |
| 13 #include "chrome/browser/page_cycler/page_cycler.h" | 16 #include "chrome/browser/page_cycler/page_cycler.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/profiles/profile_manager.h" | 18 #include "chrome/browser/profiles/profile_manager.h" |
| 16 #include "chrome/browser/ui/browser_list.h" | 19 #include "chrome/browser/ui/browser_list.h" |
| 17 #include "chrome/common/chrome_notification_types.h" | 20 #include "chrome/common/chrome_notification_types.h" |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 #if defined(OS_LINUX) | 323 #if defined(OS_LINUX) |
| 321 // Bug 159026: Fails on Linux in both debug and release mode. | 324 // Bug 159026: Fails on Linux in both debug and release mode. |
| 322 #define MAYBE_PlaybackMode DISABLED_PlaybackMode | 325 #define MAYBE_PlaybackMode DISABLED_PlaybackMode |
| 323 #elif (defined(OS_WIN) || defined(OS_MACOSX) ) && !defined(NDEBUG) | 326 #elif (defined(OS_WIN) || defined(OS_MACOSX) ) && !defined(NDEBUG) |
| 324 // Bug 131333: This test fails on a XP debug bot since Build 17609. | 327 // Bug 131333: This test fails on a XP debug bot since Build 17609. |
| 325 #define MAYBE_PlaybackMode DISABLED_PlaybackMode | 328 #define MAYBE_PlaybackMode DISABLED_PlaybackMode |
| 326 #else | 329 #else |
| 327 #define MAYBE_PlaybackMode PlaybackMode | 330 #define MAYBE_PlaybackMode PlaybackMode |
| 328 #endif | 331 #endif |
| 329 IN_PROC_BROWSER_TEST_F(PageCyclerCachedBrowserTest, MAYBE_PlaybackMode) { | 332 IN_PROC_BROWSER_TEST_F(PageCyclerCachedBrowserTest, MAYBE_PlaybackMode) { |
| 333 #if defined(OS_MACOSX) |
| 334 // TODO(kbr): re-enable: http://crbug.com/222296 |
| 335 if (base::mac::IsOSMountainLionOrLater()) |
| 336 return; |
| 337 #endif |
| 338 |
| 330 base::ScopedTempDir temp; | 339 base::ScopedTempDir temp; |
| 331 ASSERT_TRUE(temp.CreateUniqueTempDir()); | 340 ASSERT_TRUE(temp.CreateUniqueTempDir()); |
| 332 | 341 |
| 333 RegisterForNotifications(); | 342 RegisterForNotifications(); |
| 334 InitFilePaths(temp.path()); | 343 InitFilePaths(temp.path()); |
| 335 | 344 |
| 336 InitPageCycler(); | 345 InitPageCycler(); |
| 337 | 346 |
| 338 page_cycler()->Run(); | 347 page_cycler()->Run(); |
| 339 | 348 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 ASSERT_EQ(1u, errors.size()); | 394 ASSERT_EQ(1u, errors.size()); |
| 386 | 395 |
| 387 std::string expected_error; | 396 std::string expected_error; |
| 388 expected_error.append("Failed to load the page at: ") | 397 expected_error.append("Failed to load the page at: ") |
| 389 .append(kCacheMissURL) | 398 .append(kCacheMissURL) |
| 390 .append(": The requested entry was not found in the cache."); | 399 .append(": The requested entry was not found in the cache."); |
| 391 | 400 |
| 392 ASSERT_FALSE(errors[0].compare(expected_error)); | 401 ASSERT_FALSE(errors[0].compare(expected_error)); |
| 393 } | 402 } |
| 394 #endif // !defined(OS_CHROMEOS) | 403 #endif // !defined(OS_CHROMEOS) |
| OLD | NEW |