| 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/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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 static const bool kNotIncognito = false; | 49 static const bool kNotIncognito = false; |
| 50 | 50 |
| 51 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, SanityCheck) { | 51 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, SanityCheck) { |
| 52 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kNotIncognito); | 52 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kNotIncognito); |
| 53 } | 53 } |
| 54 | 54 |
| 55 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, SanityCheckIncognito) { | 55 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, SanityCheckIncognito) { |
| 56 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito); | 56 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito); |
| 57 } | 57 } |
| 58 | 58 |
| 59 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, PRE_DataPersists) { |
| 60 SimpleTest(GetTestUrl("dom_storage", "store_data.html"), kNotIncognito); |
| 61 } |
| 62 |
| 63 // http://crbug.com/654704 PRE_ tests aren't supported on Android. |
| 64 #if defined(OS_ANDROID) |
| 65 #define MAYBE_DataPersists DISABLED_DataPersists |
| 66 #else |
| 67 #define MAYBE_DataPersists DataPersists |
| 68 #endif |
| 69 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, MAYBE_DataPersists) { |
| 70 SimpleTest(GetTestUrl("dom_storage", "verify_data.html"), kNotIncognito); |
| 71 } |
| 72 |
| 59 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, SanityCheck) { | 73 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, SanityCheck) { |
| 60 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kNotIncognito); | 74 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kNotIncognito); |
| 61 } | 75 } |
| 62 | 76 |
| 63 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, SanityCheckIncognito) { | 77 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, SanityCheckIncognito) { |
| 64 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito); | 78 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito); |
| 65 } | 79 } |
| 66 | 80 |
| 81 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, PRE_DataPersists) { |
| 82 SimpleTest(GetTestUrl("dom_storage", "store_data.html"), kNotIncognito); |
| 83 } |
| 84 |
| 85 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, MAYBE_DataPersists) { |
| 86 SimpleTest(GetTestUrl("dom_storage", "verify_data.html"), kNotIncognito); |
| 87 } |
| 88 |
| 67 } // namespace content | 89 } // namespace content |
| OLD | NEW |