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

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

Issue 22297005: Move webkit/{browser,common}/dom_storage into content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 | Annotate | Revision Log
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/path_service.h" 5 #include "base/path_service.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/public/common/content_paths.h" 8 #include "content/public/common/content_paths.h"
8 #include "content/public/test/browser_test_utils.h" 9 #include "content/public/test/browser_test_utils.h"
9 #include "content/shell/shell.h" 10 #include "content/shell/shell.h"
10 #include "content/test/content_browser_test.h" 11 #include "content/test/content_browser_test.h"
11 #include "content/test/content_browser_test_utils.h" 12 #include "content/test/content_browser_test_utils.h"
12 #include "net/base/net_util.h" 13 #include "net/base/net_util.h"
13 #include "webkit/common/dom_storage/dom_storage_types.h"
14 14
15 namespace content { 15 namespace content {
16 16
17 // This browser test is aimed towards exercising the DomStorage system 17 // This browser test is aimed towards exercising the DOMStorage system
18 // from end-to-end. 18 // from end-to-end.
19 class DomStorageBrowserTest : public ContentBrowserTest { 19 class DOMStorageBrowserTest : public ContentBrowserTest {
20 public: 20 public:
21 DomStorageBrowserTest() {} 21 DOMStorageBrowserTest() {}
22 22
23 void SimpleTest(const GURL& test_url, bool incognito) { 23 void SimpleTest(const GURL& test_url, bool incognito) {
24 // The test page will perform tests then navigate to either 24 // The test page will perform tests then navigate to either
25 // a #pass or #fail ref. 25 // a #pass or #fail ref.
26 Shell* the_browser = incognito ? CreateOffTheRecordBrowser() : shell(); 26 Shell* the_browser = incognito ? CreateOffTheRecordBrowser() : shell();
27 NavigateToURLBlockUntilNavigationsComplete(the_browser, test_url, 2); 27 NavigateToURLBlockUntilNavigationsComplete(the_browser, test_url, 2);
28 std::string result = the_browser->web_contents()->GetURL().ref(); 28 std::string result = the_browser->web_contents()->GetURL().ref();
29 if (result != "pass") { 29 if (result != "pass") {
30 std::string js_result; 30 std::string js_result;
31 ASSERT_TRUE(ExecuteScriptAndExtractString( 31 ASSERT_TRUE(ExecuteScriptAndExtractString(
32 the_browser->web_contents(), 32 the_browser->web_contents(),
33 "window.domAutomationController.send(getLog())", 33 "window.domAutomationController.send(getLog())",
34 &js_result)); 34 &js_result));
35 FAIL() << "Failed: " << js_result; 35 FAIL() << "Failed: " << js_result;
36 } 36 }
37 } 37 }
38 }; 38 };
39 39
40 static const bool kIncognito = true; 40 static const bool kIncognito = true;
41 static const bool kNotIncognito = false; 41 static const bool kNotIncognito = false;
42 42
43 IN_PROC_BROWSER_TEST_F(DomStorageBrowserTest, SanityCheck) { 43 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, SanityCheck) {
44 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kNotIncognito); 44 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kNotIncognito);
45 } 45 }
46 46
47 IN_PROC_BROWSER_TEST_F(DomStorageBrowserTest, SanityCheckIncognito) { 47 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, SanityCheckIncognito) {
48 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito); 48 SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito);
49 } 49 }
50 50
51 } // namespace content 51 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/dom_storage/dom_storage_area_unittest.cc ('k') | content/browser/dom_storage/dom_storage_context_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698