summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/app_process_apitest.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-22 06:55:31 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-22 06:55:31 +0000
commitbe1f56ab53f9f07d981859fb1dc55ac1d7980226 (patch)
tree73ab07f324bb0a2a4aa0e4b3caa5f0325bce18f5 /chrome/browser/extensions/app_process_apitest.cc
parent89a6e72128eac7c64a7351de54a3aa2598e9e337 (diff)
downloadchromium_src-be1f56ab53f9f07d981859fb1dc55ac1d7980226.zip
chromium_src-be1f56ab53f9f07d981859fb1dc55ac1d7980226.tar.gz
chromium_src-be1f56ab53f9f07d981859fb1dc55ac1d7980226.tar.bz2
Move a bunch of methods from TabContents into the WebContents interface. This change either moves CamelCase functions into the interface, or renames existing unix_hacker functions to CamelCase.
BUG=98716 Review URL: http://codereview.chromium.org/8949061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/app_process_apitest.cc')
-rw-r--r--chrome/browser/extensions/app_process_apitest.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index 2d3139a..47c42ec 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -109,7 +109,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) {
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_TRUE(process_map->Contains(
browser()->GetTabContentsAt(1)->GetRenderProcessHost()->GetID()));
- EXPECT_FALSE(browser()->GetTabContentsAt(1)->web_ui());
+ EXPECT_FALSE(browser()->GetTabContentsAt(1)->GetWebUI());
LOG(INFO) << "Nav 1.";
ui_test_utils::NavigateToURLWithDisposition(
@@ -117,7 +117,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) {
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_TRUE(process_map->Contains(
browser()->GetTabContentsAt(2)->GetRenderProcessHost()->GetID()));
- EXPECT_FALSE(browser()->GetTabContentsAt(2)->web_ui());
+ EXPECT_FALSE(browser()->GetTabContentsAt(2)->GetWebUI());
LOG(INFO) << "Nav 2.";
ui_test_utils::WindowedNotificationObserver tab_added_observer(
@@ -130,7 +130,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) {
LOG(INFO) << "Nav 3.";
EXPECT_FALSE(process_map->Contains(
browser()->GetTabContentsAt(3)->GetRenderProcessHost()->GetID()));
- EXPECT_FALSE(browser()->GetTabContentsAt(3)->web_ui());
+ EXPECT_FALSE(browser()->GetTabContentsAt(3)->GetWebUI());
// We should have opened 3 new extension tabs. Including the original blank
// tab, we now have 4 tabs. Because the app_process app has the background
@@ -221,7 +221,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessInstances) {
LOG(INFO) << "Nav 1.";
EXPECT_TRUE(process_map->Contains(
browser()->GetTabContentsAt(1)->GetRenderProcessHost()->GetID()));
- EXPECT_FALSE(browser()->GetTabContentsAt(1)->web_ui());
+ EXPECT_FALSE(browser()->GetTabContentsAt(1)->GetWebUI());
ui_test_utils::WindowedNotificationObserver tab_added_observer(
content::NOTIFICATION_TAB_ADDED,
@@ -233,7 +233,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessInstances) {
LOG(INFO) << "Nav 2.";
EXPECT_TRUE(process_map->Contains(
browser()->GetTabContentsAt(2)->GetRenderProcessHost()->GetID()));
- EXPECT_FALSE(browser()->GetTabContentsAt(2)->web_ui());
+ EXPECT_FALSE(browser()->GetTabContentsAt(2)->GetWebUI());
// We should have opened 2 new extension tabs. Including the original blank
// tab, we now have 3 tabs. The two app tabs should not be in the same
@@ -287,7 +287,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, BookmarkAppGetsNormalProcess) {
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_FALSE(process_map->Contains(
browser()->GetTabContentsAt(1)->GetRenderProcessHost()->GetID()));
- EXPECT_FALSE(browser()->GetTabContentsAt(1)->web_ui());
+ EXPECT_FALSE(browser()->GetTabContentsAt(1)->GetWebUI());
ui_test_utils::WindowedNotificationObserver tab_added_observer(
content::NOTIFICATION_TAB_ADDED,
@@ -297,7 +297,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, BookmarkAppGetsNormalProcess) {
ui_test_utils::NavigateToURL(browser(), base_url.Resolve("path2/empty.html"));
EXPECT_FALSE(process_map->Contains(
browser()->GetTabContentsAt(2)->GetRenderProcessHost()->GetID()));
- EXPECT_FALSE(browser()->GetTabContentsAt(2)->web_ui());
+ EXPECT_FALSE(browser()->GetTabContentsAt(2)->GetWebUI());
// We should have opened 2 new bookmark app tabs. Including the original blank
// tab, we now have 3 tabs. Because normal pages use the