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/bind.h" | 5 #include "base/bind.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
452 EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle()); | 452 EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle()); |
453 } | 453 } |
454 | 454 |
455 class IndexedDBBrowserTestSingleProcess : public IndexedDBBrowserTest { | 455 class IndexedDBBrowserTestSingleProcess : public IndexedDBBrowserTest { |
456 public: | 456 public: |
457 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 457 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
458 command_line->AppendSwitch(switches::kSingleProcess); | 458 command_line->AppendSwitch(switches::kSingleProcess); |
459 } | 459 } |
460 }; | 460 }; |
461 | 461 |
| 462 // Crashing on Android due to kSingleProcess flag: http://crbug.com/342525 |
| 463 #if defined(OS_ANDROID) |
| 464 #define MAYBE_RenderThreadShutdownTest DISABLED_RenderThreadShutdownTest |
| 465 #else |
| 466 #define MAYBE_RenderThreadShutdownTest RenderThreadShutdownTest |
| 467 #endif |
462 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestSingleProcess, | 468 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestSingleProcess, |
463 RenderThreadShutdownTest) { | 469 MAYBE_RenderThreadShutdownTest) { |
464 SimpleTest(GetTestUrl("indexeddb", "shutdown_with_requests.html")); | 470 SimpleTest(GetTestUrl("indexeddb", "shutdown_with_requests.html")); |
465 } | 471 } |
466 | 472 |
467 } // namespace content | 473 } // namespace content |
OLD | NEW |