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

Side by Side Diff: chrome/browser/notifications/notification_browsertest.cc

Issue 10795090: Move ExecuteJavaScript functions from ui_test_utils.h to browser_test_utils.h so they can be reused… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 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 "chrome/browser/infobars/infobar_tab_helper.h" 5 #include "chrome/browser/infobars/infobar_tab_helper.h"
6 #include "chrome/browser/ui/browser.h" 6 #include "chrome/browser/ui/browser.h"
7 #include "chrome/browser/ui/browser_tabstrip.h" 7 #include "chrome/browser/ui/browser_tabstrip.h"
8 #include "chrome/browser/ui/tab_contents/tab_contents.h" 8 #include "chrome/browser/ui/tab_contents/tab_contents.h"
9 #include "chrome/test/base/in_process_browser_test.h" 9 #include "chrome/test/base/in_process_browser_test.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
11 #include "content/public/browser/web_contents.h" 11 #include "content/public/browser/web_contents.h"
12 #include "content/public/test/browser_test_utils.h"
12 #include "net/base/net_util.h" 13 #include "net/base/net_util.h"
13 #include "net/test/test_server.h" 14 #include "net/test/test_server.h"
14 15
15 class NotificationsPermissionTest : public InProcessBrowserTest { 16 class NotificationsPermissionTest : public InProcessBrowserTest {
16 public: 17 public:
17 NotificationsPermissionTest() {} 18 NotificationsPermissionTest() {}
18 }; 19 };
19 20
20 // If this flakes, use http://crbug.com/62311 and http://crbug.com/74428. 21 // If this flakes, use http://crbug.com/62311 and http://crbug.com/74428.
21 IN_PROC_BROWSER_TEST_F(NotificationsPermissionTest, TestUserGestureInfobar) { 22 IN_PROC_BROWSER_TEST_F(NotificationsPermissionTest, TestUserGestureInfobar) {
22 ASSERT_TRUE(test_server()->Start()); 23 ASSERT_TRUE(test_server()->Start());
23 24
24 ui_test_utils::NavigateToURL( 25 ui_test_utils::NavigateToURL(
25 browser(), 26 browser(),
26 test_server()->GetURL( 27 test_server()->GetURL(
27 "files/notifications/notifications_request_function.html")); 28 "files/notifications/notifications_request_function.html"));
28 29
29 // Request permission by calling request() while eval'ing an inline script; 30 // Request permission by calling request() while eval'ing an inline script;
30 // That's considered a user gesture to webkit, and should produce an infobar. 31 // That's considered a user gesture to webkit, and should produce an infobar.
31 bool result; 32 bool result;
32 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( 33 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
33 chrome::GetActiveWebContents(browser())->GetRenderViewHost(), 34 chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
34 L"", 35 L"",
35 L"window.domAutomationController.send(request());", 36 L"window.domAutomationController.send(request());",
36 &result)); 37 &result));
37 EXPECT_TRUE(result); 38 EXPECT_TRUE(result);
38 39
39 EXPECT_EQ(1U, chrome::GetTabContentsAt(browser(), 0)->infobar_tab_helper()-> 40 EXPECT_EQ(1U, chrome::GetTabContentsAt(browser(), 0)->infobar_tab_helper()->
40 infobar_count()); 41 infobar_count());
41 } 42 }
42 43
43 // If this flakes, use http://crbug.com/62311. 44 // If this flakes, use http://crbug.com/62311.
44 IN_PROC_BROWSER_TEST_F(NotificationsPermissionTest, TestNoUserGestureInfobar) { 45 IN_PROC_BROWSER_TEST_F(NotificationsPermissionTest, TestNoUserGestureInfobar) {
45 ASSERT_TRUE(test_server()->Start()); 46 ASSERT_TRUE(test_server()->Start());
46 47
47 // Load a page which just does a request; no user gesture should result 48 // Load a page which just does a request; no user gesture should result
48 // in no infobar. 49 // in no infobar.
49 ui_test_utils::NavigateToURL( 50 ui_test_utils::NavigateToURL(
50 browser(), 51 browser(),
51 test_server()->GetURL( 52 test_server()->GetURL(
52 "files/notifications/notifications_request_inline.html")); 53 "files/notifications/notifications_request_inline.html"));
53 54
54 EXPECT_EQ(0U, chrome::GetTabContentsAt(browser(), 0)->infobar_tab_helper()-> 55 EXPECT_EQ(0U, chrome::GetTabContentsAt(browser(), 0)->infobar_tab_helper()->
55 infobar_count()); 56 infobar_count());
56 } 57 }
OLDNEW
« no previous file with comments | « chrome/browser/net/load_timing_observer_browsertest.cc ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698