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

Side by Side Diff: content/browser/dom_storage/dom_storage_browsertest.cc

Issue 2710583004: Disable MojoDOMStorageBrowserTest.DataPersists on Linux. (Closed)
Patch Set: Created 3 years, 10 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 | « no previous file | 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/command_line.h" 5 #include "base/command_line.h"
6 #include "build/build_config.h"
6 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" 7 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
7 #include "content/browser/dom_storage/local_storage_context_mojo.h" 8 #include "content/browser/dom_storage/local_storage_context_mojo.h"
8 #include "content/browser/web_contents/web_contents_impl.h" 9 #include "content/browser/web_contents/web_contents_impl.h"
9 #include "content/common/dom_storage/dom_storage_types.h" 10 #include "content/common/dom_storage/dom_storage_types.h"
10 #include "content/public/browser/browser_context.h" 11 #include "content/public/browser/browser_context.h"
11 #include "content/public/browser/storage_partition.h" 12 #include "content/public/browser/storage_partition.h"
12 #include "content/public/common/content_paths.h" 13 #include "content/public/common/content_paths.h"
13 #include "content/public/common/content_switches.h" 14 #include "content/public/common/content_switches.h"
14 #include "content/public/test/browser_test_utils.h" 15 #include "content/public/test/browser_test_utils.h"
15 #include "content/public/test/content_browser_test.h" 16 #include "content/public/test/content_browser_test.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito); 79 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito);
79 } 80 }
80 81
81 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, PRE_DataPersists) { 82 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, PRE_DataPersists) {
82 SimpleTest(GetTestUrl("dom_storage", "store_data.html"), kNotIncognito); 83 SimpleTest(GetTestUrl("dom_storage", "store_data.html"), kNotIncognito);
83 } 84 }
84 85
85 // http://crbug.com/654704 PRE_ tests aren't supported on Android. 86 // http://crbug.com/654704 PRE_ tests aren't supported on Android.
86 #if defined(OS_ANDROID) 87 #if defined(OS_ANDROID)
87 #define MAYBE_DataPersists DISABLED_DataPersists 88 #define MAYBE_DataPersists DISABLED_DataPersists
88 #elif defined(OS_WIN) 89 #elif defined(OS_WIN) || defined(OS_LINUX)
89 // Disabled on Windows due to flake (https://crbug.com/692885). 90 // Disabled on Windows and Linux due to flake (https://crbug.com/692885).
90 #define MAYBE_DataPersists DISABLED_DataPersists 91 #define MAYBE_DataPersists DISABLED_DataPersists
91 #else 92 #else
92 #define MAYBE_DataPersists DataPersists 93 #define MAYBE_DataPersists DataPersists
93 #endif 94 #endif
94 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, MAYBE_DataPersists) { 95 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, MAYBE_DataPersists) {
95 SimpleTest(GetTestUrl("dom_storage", "verify_data.html"), kNotIncognito); 96 SimpleTest(GetTestUrl("dom_storage", "verify_data.html"), kNotIncognito);
96 } 97 }
97 98
98 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, SanityCheck) { 99 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, SanityCheck) {
99 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kNotIncognito); 100 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kNotIncognito);
100 } 101 }
101 102
102 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, SanityCheckIncognito) { 103 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, SanityCheckIncognito) {
103 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito); 104 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito);
104 } 105 }
105 106
106 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, PRE_DataPersists) { 107 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, PRE_DataPersists) {
107 SimpleTest(GetTestUrl("dom_storage", "store_data.html"), kNotIncognito); 108 SimpleTest(GetTestUrl("dom_storage", "store_data.html"), kNotIncognito);
108 Flush(); 109 Flush();
109 } 110 }
110 111
111 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, MAYBE_DataPersists) { 112 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, MAYBE_DataPersists) {
112 SimpleTest(GetTestUrl("dom_storage", "verify_data.html"), kNotIncognito); 113 SimpleTest(GetTestUrl("dom_storage", "verify_data.html"), kNotIncognito);
113 } 114 }
114 115
115 } // namespace content 116 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698