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.h" | 8 #include "base/files/file.h" |
9 #include "base/files/file_enumerator.h" | 9 #include "base/files/file_enumerator.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
600 } | 600 } |
601 | 601 |
602 class IndexedDBBrowserTestSingleProcess : public IndexedDBBrowserTest { | 602 class IndexedDBBrowserTestSingleProcess : public IndexedDBBrowserTest { |
603 public: | 603 public: |
604 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 604 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
605 command_line->AppendSwitch(switches::kSingleProcess); | 605 command_line->AppendSwitch(switches::kSingleProcess); |
606 } | 606 } |
607 }; | 607 }; |
608 | 608 |
609 // Crashing on Android due to kSingleProcess flag: http://crbug.com/342525 | 609 // Crashing on Android due to kSingleProcess flag: http://crbug.com/342525 |
610 #if defined(OS_ANDROID) | 610 // Also disabled in debug due to flakiness: http://crbug.com/368134 |
| 611 #if defined(OS_ANDROID) || !defined(NDEBUG) |
611 #define MAYBE_RenderThreadShutdownTest DISABLED_RenderThreadShutdownTest | 612 #define MAYBE_RenderThreadShutdownTest DISABLED_RenderThreadShutdownTest |
612 #else | 613 #else |
613 #define MAYBE_RenderThreadShutdownTest RenderThreadShutdownTest | 614 #define MAYBE_RenderThreadShutdownTest RenderThreadShutdownTest |
614 #endif | 615 #endif |
615 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestSingleProcess, | 616 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestSingleProcess, |
616 MAYBE_RenderThreadShutdownTest) { | 617 MAYBE_RenderThreadShutdownTest) { |
617 SimpleTest(GetTestUrl("indexeddb", "shutdown_with_requests.html")); | 618 SimpleTest(GetTestUrl("indexeddb", "shutdown_with_requests.html")); |
618 } | 619 } |
619 | 620 |
620 } // namespace content | 621 } // namespace content |
OLD | NEW |