Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(545)

Side by Side Diff: content/browser/indexed_db/indexed_db_browsertest.cc

Issue 342413004: Re-enable all (but four) IndexedDB content browser tests on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/android/pylib/gtest/filter/content_browsertests_disabled ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle()); 617 EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
618 } 618 }
619 619
620 class IndexedDBBrowserTestSingleProcess : public IndexedDBBrowserTest { 620 class IndexedDBBrowserTestSingleProcess : public IndexedDBBrowserTest {
621 public: 621 public:
622 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 622 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
623 command_line->AppendSwitch(switches::kSingleProcess); 623 command_line->AppendSwitch(switches::kSingleProcess);
624 } 624 }
625 }; 625 };
626 626
627 // Crashing on Android due to kSingleProcess flag: http://crbug.com/342525
628 #if defined(OS_ANDROID)
629 #define MAYBE_RenderThreadShutdownTest DISABLED_RenderThreadShutdownTest
630 #else
631 #define MAYBE_RenderThreadShutdownTest RenderThreadShutdownTest
632 #endif
633 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestSingleProcess, 627 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestSingleProcess,
634 MAYBE_RenderThreadShutdownTest) { 628 RenderThreadShutdownTest) {
635 SimpleTest(GetTestUrl("indexeddb", "shutdown_with_requests.html")); 629 SimpleTest(GetTestUrl("indexeddb", "shutdown_with_requests.html"));
636 } 630 }
637 631
638 } // namespace content 632 } // namespace content
OLDNEW
« no previous file with comments | « build/android/pylib/gtest/filter/content_browsertests_disabled ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698