diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-18 19:52:40 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-18 19:52:40 +0000 |
| commit | 1ef5ad42064c8ef0d1503b68a7fbac01887ca093 (patch) | |
| tree | 34a32b11a9db6f69fef27e7e81863d82a29bcd2d /chrome/test | |
| parent | 59b49a66c3cd959fcf9d7b4bd9c6d88c70b39919 (diff) | |
| download | chromium_src-1ef5ad42064c8ef0d1503b68a7fbac01887ca093.zip chromium_src-1ef5ad42064c8ef0d1503b68a7fbac01887ca093.tar.gz chromium_src-1ef5ad42064c8ef0d1503b68a7fbac01887ca093.tar.bz2 | |
Reverting 14005.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/browser_with_test_window_test.cc | 4 | ||||
| -rw-r--r-- | chrome/test/in_process_browser_test.cc | 2 | ||||
| -rw-r--r-- | chrome/test/ui_test_utils.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/browser_with_test_window_test.cc index b0d6a84..1881a54 100644 --- a/chrome/test/browser_with_test_window_test.cc +++ b/chrome/test/browser_with_test_window_test.cc @@ -51,7 +51,7 @@ void BrowserWithTestWindowTest::AddTab(Browser* browser, const GURL& url) { TabContents* new_tab = browser->AddTabWithURL(url, GURL(), PageTransition::TYPED, true, 0, NULL); - CommitPendingLoadAsNewNavigation(&new_tab->controller(), url); + CommitPendingLoadAsNewNavigation(new_tab->controller(), url); } void BrowserWithTestWindowTest::CommitPendingLoadAsNewNavigation( @@ -73,5 +73,5 @@ void BrowserWithTestWindowTest::NavigateAndCommit( } void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) { - NavigateAndCommit(&browser()->GetSelectedTabContents()->controller(), url); + NavigateAndCommit(browser()->GetSelectedTabContents()->controller(), url); } diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index 25cc6ee..47e0e81 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -175,7 +175,7 @@ Browser* InProcessBrowserTest::CreateBrowser(Profile* profile) { // Wait for the page to finish loading. ui_test_utils::WaitForNavigation( - &browser->GetSelectedTabContents()->controller()); + browser->GetSelectedTabContents()->controller()); browser->window()->Show(); diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc index 2d91bcc..be86d17 100644 --- a/chrome/test/ui_test_utils.cc +++ b/chrome/test/ui_test_utils.cc @@ -93,7 +93,7 @@ void NavigateToURLBlockUntilNavigationsComplete(Browser* browser, const GURL& url, int number_of_navigations) { NavigationController* controller = - &browser->GetSelectedTabContents()->controller(); + browser->GetSelectedTabContents()->controller(); browser->OpenURLFromTab(browser->GetSelectedTabContents(), url, GURL(), CURRENT_TAB, PageTransition::TYPED); WaitForNavigations(controller, number_of_navigations); |