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

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

Issue 1962713003: Enable MojoDOMStorageBrowserTest on OSX too. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 "content/browser/web_contents/web_contents_impl.h" 6 #include "content/browser/web_contents/web_contents_impl.h"
7 #include "content/common/dom_storage/dom_storage_types.h" 7 #include "content/common/dom_storage/dom_storage_types.h"
8 #include "content/public/common/content_paths.h" 8 #include "content/public/common/content_paths.h"
9 #include "content/public/common/content_switches.h" 9 #include "content/public/common/content_switches.h"
10 #include "content/public/test/browser_test_utils.h" 10 #include "content/public/test/browser_test_utils.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 static const bool kNotIncognito = false; 50 static const bool kNotIncognito = false;
51 51
52 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, SanityCheck) { 52 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, SanityCheck) {
53 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kNotIncognito); 53 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kNotIncognito);
54 } 54 }
55 55
56 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, SanityCheckIncognito) { 56 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, SanityCheckIncognito) {
57 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito); 57 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito);
58 } 58 }
59 59
60 // Enable when crbug/609632 is fixed. 60 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, SanityCheck) {
61 #if defined(OS_MACOSX)
62 #define MAYBE_SanityCheck DISABLED_SanityCheck
63 #else
64 #define MAYBE_SanityCheck SanityCheck
65 #endif
66 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, MAYBE_SanityCheck) {
67 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kNotIncognito); 61 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kNotIncognito);
68 } 62 }
69 63
70 // Enable when crbug/609632 is fixed. 64 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, SanityCheckIncognito) {
71 #if defined(OS_MACOSX)
72 #define MAYBE_SanityCheckIncognito DISABLED_SanityCheckIncognito
73 #else
74 #define MAYBE_SanityCheckIncognito SanityCheckIncognito
75 #endif
76 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, MAYBE_SanityCheckIncognito) {
77 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito); 65 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito);
78 } 66 }
79 67
80 } // namespace content 68 } // 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