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

Side by Side Diff: chrome/browser/storage/durable_storage_browsertest.cc

Issue 1382433002: Add durable storage test for incognito. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix copyright year Created 5 years, 2 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 2015 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 <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
(...skipping 12 matching lines...) Expand all
24 24
25 class DurableStorageBrowserTest : public InProcessBrowserTest { 25 class DurableStorageBrowserTest : public InProcessBrowserTest {
26 public: 26 public:
27 DurableStorageBrowserTest() = default; 27 DurableStorageBrowserTest() = default;
28 ~DurableStorageBrowserTest() override = default; 28 ~DurableStorageBrowserTest() override = default;
29 29
30 void SetUpCommandLine(base::CommandLine*) override; 30 void SetUpCommandLine(base::CommandLine*) override;
31 void SetUpOnMainThread() override; 31 void SetUpOnMainThread() override;
32 32
33 protected: 33 protected:
34 content::RenderFrameHost* GetRenderFrameHost(Browser* browser) {
35 return browser->tab_strip_model()->GetActiveWebContents()->GetMainFrame();
36 }
37
34 content::RenderFrameHost* GetRenderFrameHost() { 38 content::RenderFrameHost* GetRenderFrameHost() {
35 return browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame(); 39 return GetRenderFrameHost(browser());
40 }
41
42 void Bookmark(Browser* browser) {
43 bookmarks::BookmarkModel* bookmark_model =
44 BookmarkModelFactory::GetForProfile(browser->profile());
45 bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model);
46 bookmarks::AddIfNotBookmarked(bookmark_model, url_, base::ASCIIToUTF16(""));
36 } 47 }
37 48
38 void Bookmark() { 49 void Bookmark() {
39 bookmarks::BookmarkModel* bookmark_model = 50 Bookmark(browser());
40 BookmarkModelFactory::GetForProfile(browser()->profile());
41 bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model);
42 bookmarks::AddIfNotBookmarked(bookmark_model, url_, base::ASCIIToUTF16(""));
43 } 51 }
44 52
45 GURL url_; 53 GURL url_;
46 54
47 private: 55 private:
48 DISALLOW_COPY_AND_ASSIGN(DurableStorageBrowserTest); 56 DISALLOW_COPY_AND_ASSIGN(DurableStorageBrowserTest);
49 }; 57 };
50 58
51 void DurableStorageBrowserTest::SetUpCommandLine( 59 void DurableStorageBrowserTest::SetUpCommandLine(
52 base::CommandLine* command_line) { 60 base::CommandLine* command_line) {
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 bool default_box_is_persistent = false; 149 bool default_box_is_persistent = false;
142 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( 150 EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
143 GetRenderFrameHost(), "requestPermission()", &default_box_is_persistent)); 151 GetRenderFrameHost(), "requestPermission()", &default_box_is_persistent));
144 EXPECT_TRUE(default_box_is_persistent); 152 EXPECT_TRUE(default_box_is_persistent);
145 153
146 browser()->tab_strip_model()->ActivateTabAt(0, false); 154 browser()->tab_strip_model()->ActivateTabAt(0, false);
147 EXPECT_TRUE(content::ExecuteScriptAndExtractString( 155 EXPECT_TRUE(content::ExecuteScriptAndExtractString(
148 GetRenderFrameHost(), "checkPermission()", &permission_string)); 156 GetRenderFrameHost(), "checkPermission()", &permission_string));
149 EXPECT_EQ("granted", permission_string); 157 EXPECT_EQ("granted", permission_string);
150 } 158 }
159
160 IN_PROC_BROWSER_TEST_F(DurableStorageBrowserTest, Incognito) {
161 Browser* browser = CreateIncognitoBrowser();
162 ui_test_utils::NavigateToURL(browser, url_);
163
164 Bookmark(browser);
165 bool default_box_is_persistent = false;
166 EXPECT_TRUE(content::ExecuteScriptAndExtractBool(GetRenderFrameHost(browser),
167 "requestPermission()",
168 &default_box_is_persistent));
169 EXPECT_TRUE(default_box_is_persistent);
170
171 std::string permission_string;
172 EXPECT_TRUE(content::ExecuteScriptAndExtractString(
173 GetRenderFrameHost(browser), "checkPermission()", &permission_string));
174 EXPECT_EQ("granted", permission_string);
175 }
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