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

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

Issue 1301033004: DurableStorage: Fix compile failure on ChromeOS tryservers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« 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 <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_commands.h" 10 #include "chrome/browser/ui/browser_commands.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 } 51 }
52 52
53 IN_PROC_BROWSER_TEST_F(DurableStorageBrowserTest, DenyString) { 53 IN_PROC_BROWSER_TEST_F(DurableStorageBrowserTest, DenyString) {
54 ui_test_utils::NavigateToURL(browser(), url_); 54 ui_test_utils::NavigateToURL(browser(), url_);
55 PermissionBubbleManager::FromWebContents( 55 PermissionBubbleManager::FromWebContents(
56 browser()->tab_strip_model()->GetActiveWebContents()) 56 browser()->tab_strip_model()->GetActiveWebContents())
57 ->set_auto_response_for_test(PermissionBubbleManager::DENY_ALL); 57 ->set_auto_response_for_test(PermissionBubbleManager::DENY_ALL);
58 bool default_box_is_persistent; 58 bool default_box_is_persistent;
59 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( 59 EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
60 GetRenderFrameHost(), "requestPermission()", &default_box_is_persistent)); 60 GetRenderFrameHost(), "requestPermission()", &default_box_is_persistent));
61 EXPECT_EQ(false, default_box_is_persistent); 61 EXPECT_FALSE(default_box_is_persistent);
62 std::string permission_string; 62 std::string permission_string;
63 EXPECT_TRUE(content::ExecuteScriptAndExtractString( 63 EXPECT_TRUE(content::ExecuteScriptAndExtractString(
64 GetRenderFrameHost(), "checkPermission()", &permission_string)); 64 GetRenderFrameHost(), "checkPermission()", &permission_string));
65 EXPECT_EQ("denied", permission_string); 65 EXPECT_EQ("denied", permission_string);
66 } 66 }
67 67
68 IN_PROC_BROWSER_TEST_F(DurableStorageBrowserTest, FirstTabSeesResult) { 68 IN_PROC_BROWSER_TEST_F(DurableStorageBrowserTest, FirstTabSeesResult) {
69 ui_test_utils::NavigateToURL(browser(), url_); 69 ui_test_utils::NavigateToURL(browser(), url_);
70 std::string permission_string; 70 std::string permission_string;
71 EXPECT_TRUE(content::ExecuteScriptAndExtractString( 71 EXPECT_TRUE(content::ExecuteScriptAndExtractString(
72 GetRenderFrameHost(), "checkPermission()", &permission_string)); 72 GetRenderFrameHost(), "checkPermission()", &permission_string));
73 EXPECT_EQ("default", permission_string); 73 EXPECT_EQ("default", permission_string);
74 74
75 chrome::NewTab(browser()); 75 chrome::NewTab(browser());
76 ui_test_utils::NavigateToURL(browser(), url_); 76 ui_test_utils::NavigateToURL(browser(), url_);
77 PermissionBubbleManager::FromWebContents( 77 PermissionBubbleManager::FromWebContents(
78 browser()->tab_strip_model()->GetActiveWebContents()) 78 browser()->tab_strip_model()->GetActiveWebContents())
79 ->set_auto_response_for_test(PermissionBubbleManager::ACCEPT_ALL); 79 ->set_auto_response_for_test(PermissionBubbleManager::ACCEPT_ALL);
80 bool default_box_is_persistent = false; 80 bool default_box_is_persistent = false;
81 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( 81 EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
82 GetRenderFrameHost(), "requestPermission()", &default_box_is_persistent)); 82 GetRenderFrameHost(), "requestPermission()", &default_box_is_persistent));
83 EXPECT_EQ(true, default_box_is_persistent); 83 EXPECT_TRUE(default_box_is_persistent);
84 84
85 browser()->tab_strip_model()->ActivateTabAt(0, false); 85 browser()->tab_strip_model()->ActivateTabAt(0, false);
86 EXPECT_TRUE(content::ExecuteScriptAndExtractString( 86 EXPECT_TRUE(content::ExecuteScriptAndExtractString(
87 GetRenderFrameHost(), "checkPermission()", &permission_string)); 87 GetRenderFrameHost(), "checkPermission()", &permission_string));
88 EXPECT_EQ("granted", permission_string); 88 EXPECT_EQ("granted", permission_string);
89 } 89 }
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