| 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" | 6 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" |
| 7 #include "content/browser/dom_storage/local_storage_context_mojo.h" | 7 #include "content/browser/dom_storage/local_storage_context_mojo.h" |
| 8 #include "content/browser/web_contents/web_contents_impl.h" | 8 #include "content/browser/web_contents/web_contents_impl.h" |
| 9 #include "content/common/dom_storage/dom_storage_types.h" | 9 #include "content/common/dom_storage/dom_storage_types.h" |
| 10 #include "content/public/browser/browser_context.h" | 10 #include "content/public/browser/browser_context.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito); | 78 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito); |
| 79 } | 79 } |
| 80 | 80 |
| 81 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, PRE_DataPersists) { | 81 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, PRE_DataPersists) { |
| 82 SimpleTest(GetTestUrl("dom_storage", "store_data.html"), kNotIncognito); | 82 SimpleTest(GetTestUrl("dom_storage", "store_data.html"), kNotIncognito); |
| 83 } | 83 } |
| 84 | 84 |
| 85 // http://crbug.com/654704 PRE_ tests aren't supported on Android. | 85 // http://crbug.com/654704 PRE_ tests aren't supported on Android. |
| 86 #if defined(OS_ANDROID) | 86 #if defined(OS_ANDROID) |
| 87 #define MAYBE_DataPersists DISABLED_DataPersists | 87 #define MAYBE_DataPersists DISABLED_DataPersists |
| 88 #elif defined(OS_WIN) |
| 89 // Disabled on Windows due to flake (https://crbug.com/692885). |
| 90 #define MAYBE_DataPersists DISABLED_DataPersists |
| 88 #else | 91 #else |
| 89 #define MAYBE_DataPersists DataPersists | 92 #define MAYBE_DataPersists DataPersists |
| 90 #endif | 93 #endif |
| 91 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, MAYBE_DataPersists) { | 94 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, MAYBE_DataPersists) { |
| 92 SimpleTest(GetTestUrl("dom_storage", "verify_data.html"), kNotIncognito); | 95 SimpleTest(GetTestUrl("dom_storage", "verify_data.html"), kNotIncognito); |
| 93 } | 96 } |
| 94 | 97 |
| 95 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, SanityCheck) { | 98 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, SanityCheck) { |
| 96 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kNotIncognito); | 99 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kNotIncognito); |
| 97 } | 100 } |
| 98 | 101 |
| 99 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, SanityCheckIncognito) { | 102 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, SanityCheckIncognito) { |
| 100 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito); | 103 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito); |
| 101 } | 104 } |
| 102 | 105 |
| 103 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, PRE_DataPersists) { | 106 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, PRE_DataPersists) { |
| 104 SimpleTest(GetTestUrl("dom_storage", "store_data.html"), kNotIncognito); | 107 SimpleTest(GetTestUrl("dom_storage", "store_data.html"), kNotIncognito); |
| 105 Flush(); | 108 Flush(); |
| 106 } | 109 } |
| 107 | 110 |
| 108 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, MAYBE_DataPersists) { | 111 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, MAYBE_DataPersists) { |
| 109 SimpleTest(GetTestUrl("dom_storage", "verify_data.html"), kNotIncognito); | 112 SimpleTest(GetTestUrl("dom_storage", "verify_data.html"), kNotIncognito); |
| 110 } | 113 } |
| 111 | 114 |
| 112 } // namespace content | 115 } // namespace content |
| OLD | NEW |