| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 841 EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle()); | 841 EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle()); |
| 842 } | 842 } |
| 843 | 843 |
| 844 class IndexedDBBrowserTestSingleProcess : public IndexedDBBrowserTest { | 844 class IndexedDBBrowserTestSingleProcess : public IndexedDBBrowserTest { |
| 845 public: | 845 public: |
| 846 void SetUpCommandLine(base::CommandLine* command_line) override { | 846 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 847 command_line->AppendSwitch(switches::kSingleProcess); | 847 command_line->AppendSwitch(switches::kSingleProcess); |
| 848 } | 848 } |
| 849 }; | 849 }; |
| 850 | 850 |
| 851 // Flaky on linux_chromium_asan_rel_ng: crbug.com/581448 | |
| 852 #if defined(ADDRESS_SANITIZER) | |
| 853 #define MAYBE_RenderThreadShutdownTest DISABLED_RenderThreadShutdownTest | |
| 854 #else | |
| 855 #define MAYBE_RenderThreadShutdownTest RenderThreadShutdownTest | |
| 856 #endif | |
| 857 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestSingleProcess, | 851 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestSingleProcess, |
| 858 MAYBE_RenderThreadShutdownTest) { | 852 RenderThreadShutdownTest) { |
| 859 SimpleTest(GetTestUrl("indexeddb", "shutdown_with_requests.html")); | 853 SimpleTest(GetTestUrl("indexeddb", "shutdown_with_requests.html")); |
| 860 } | 854 } |
| 861 | 855 |
| 862 } // namespace content | 856 } // namespace content |
| OLD | NEW |