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

Side by Side Diff: chrome/browser/extensions/web_contents_browsertest.cc

Issue 11728003: Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adding files for gpu_tests and NaCl browser tests. Created 7 years, 11 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/extensions/extension_browsertest.h" 5 #include "chrome/browser/extensions/extension_browsertest.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/test/base/ui_test_utils.h" 8 #include "chrome/test/base/ui_test_utils.h"
9 #include "content/public/test/browser_test_utils.h" 9 #include "content/public/test/browser_test_utils.h"
10 10
11 // Tests that we can load extension pages into the tab area and they can call 11 // Tests that we can load extension pages into the tab area and they can call
12 // extension APIs. 12 // extension APIs.
13 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WebContents) { 13 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WebContents) {
14 ASSERT_TRUE(LoadExtension( 14 ASSERT_TRUE(LoadExtension(
15 test_data_dir_.AppendASCII("good").AppendASCII("Extensions") 15 test_data_dir_.AppendASCII("good").AppendASCII("Extensions")
16 .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj") 16 .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
17 .AppendASCII("1.0.0.0"))); 17 .AppendASCII("1.0.0.0")));
18 18
19 ui_test_utils::NavigateToURL( 19 ui_test_utils::NavigateToURL(
20 browser(), 20 browser(),
21 GURL("chrome-extension://behllobkkfkfnphdnhnkndlbkcpglgmj/page.html")); 21 GURL("chrome-extension://behllobkkfkfnphdnhnkndlbkcpglgmj/page.html"));
22 22
23 bool result = false; 23 bool result = false;
24 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( 24 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
25 chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", 25 chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
26 L"testTabsAPI()", &result)); 26 "",
27 "testTabsAPI()",
28 &result));
27 EXPECT_TRUE(result); 29 EXPECT_TRUE(result);
28 30
29 // There was a bug where we would crash if we navigated to a page in the same 31 // There was a bug where we would crash if we navigated to a page in the same
30 // extension because no new render view was getting created, so we would not 32 // extension because no new render view was getting created, so we would not
31 // do some setup. 33 // do some setup.
32 ui_test_utils::NavigateToURL( 34 ui_test_utils::NavigateToURL(
33 browser(), 35 browser(),
34 GURL("chrome-extension://behllobkkfkfnphdnhnkndlbkcpglgmj/page.html")); 36 GURL("chrome-extension://behllobkkfkfnphdnhnkndlbkcpglgmj/page.html"));
35 result = false; 37 result = false;
36 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( 38 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
37 chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", 39 chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
38 L"testTabsAPI()", &result)); 40 "",
41 "testTabsAPI()",
42 &result));
39 EXPECT_TRUE(result); 43 EXPECT_TRUE(result);
40 } 44 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/subscribe_page_action_browsertest.cc ('k') | chrome/browser/extensions/web_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698