chrome/browser/extensions/api/extension_action/page_action_apitest.cc - Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

Unified Diff: chrome/browser/extensions/api/extension_action/page_action_apitest.cc

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/extension_action/browser_action_apitest.cc ('k') | chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/page_action_apitest.cc

===================================================================

--- chrome/browser/extensions/api/extension_action/page_action_apitest.cc (revision 145001)

+++ chrome/browser/extensions/api/extension_action/page_action_apitest.cc (working copy)

@@ -9,6 +9,7 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/sessions/restore_tab_helper.h"

#include "chrome/browser/ui/browser.h"

+#include "chrome/browser/ui/browser_tabstrip.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/omnibox/location_bar.h"

#include "chrome/browser/ui/tab_contents/tab_contents.h"

@@ -33,8 +34,8 @@

}

// Test that we received the changes.

- int tab_id = browser()->GetActiveTabContents()->

- restore_tab_helper()->session_id().id();

+ int tab_id = chrome::GetActiveTabContents(browser())->restore_tab_helper()->

+ session_id().id();

ExtensionAction* action = extension->page_action();

ASSERT_TRUE(action);

EXPECT_EQ("Modified", action->GetTitle(tab_id));

@@ -43,7 +44,7 @@

// Simulate the page action being clicked.

ResultCatcher catcher;

int tab_id =

- ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents());

+ ExtensionTabUtil::GetTabId(chrome::GetActiveWebContents(browser()));

ExtensionService* service = browser()->profile()->GetExtensionService();

service->browser_event_router()->PageActionExecuted(

browser()->profile(), *action, tab_id, "", 0);

@@ -59,7 +60,7 @@

}

// Test that we received the changes.

- tab_id = browser()->GetActiveTabContents()->restore_tab_helper()->

+ tab_id = chrome::GetActiveTabContents(browser())->restore_tab_helper()->

session_id().id();

EXPECT_FALSE(action->GetIcon(tab_id).isNull());

}

@@ -71,7 +72,8 @@

const Extension* extension = GetSingleLoadedExtension();

ASSERT_TRUE(extension) << message_;

- int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents());

+ int tab_id = ExtensionTabUtil::GetTabId(

+ chrome::GetActiveWebContents(browser()));

ExtensionAction* page_action = extension->page_action();

ASSERT_TRUE(page_action)

@@ -117,7 +119,8 @@