Remove BrowserList usage from autofill CC infobar delegate, replacing it with...

Remove BrowserList usage from autofill CC infobar delegate, replacing it with using content api directly to open a tab in the relevant context. This also allows us to remove some cruft from Browser.

http://crbug.com/129187
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10417036

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138379 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/autofill/autofill_cc_infobar_delegate.cc

@@ -7,8 +7,11 @@
 #include "base/logging.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
+#include "chrome/common/url_constants.h"
+#include "content/public/browser/page_navigator.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_delegate.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -86,14 +89,12 @@ string16 AutofillCCInfoBarDelegate::GetLinkText() const {
 }
 
 bool AutofillCCInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
-#if defined(OS_ANDROID)
-  // There's no link for infobars on Android.
-  NOTREACHED();
+  owner()->web_contents()->GetDelegate()->OpenURLFromTab(
+      owner()->web_contents(),
+      content::OpenURLParams(GURL(chrome::kAutofillHelpURL),
+                             content::Referrer(),
+                             NEW_FOREGROUND_TAB,
+                             content::PAGE_TRANSITION_LINK,
+                             false));
   return false;
-#else
-  Browser* browser = BrowserList::GetLastActive();
-  DCHECK(browser);
-  browser->OpenAutofillHelpTabAndActivate();
-  return false;
-#endif  // #if defined(OS_ANDROID)
 }

chrome/browser/ui/browser.cc

@@ -2256,11 +2256,6 @@ void Browser::ShowHelpTab() {
   ShowSingletonTab(GURL(chrome::kChromeHelpURL));
 }
 
-void Browser::OpenAutofillHelpTabAndActivate() {
-  AddSelectedTabWithURL(GURL(chrome::kAutofillHelpURL),
-                        content::PAGE_TRANSITION_LINK);
-}
-
 void Browser::OpenPrivacyDashboardTabAndActivate() {
   OpenURL(OpenURLParams(
       GURL(kPrivacyDashboardUrl), Referrer(),

chrome/browser/ui/browser.h

@@ -658,7 +658,6 @@ class Browser : public TabStripModelDelegate,
   void OpenAboutChromeDialog();
   void OpenUpdateChromeDialog();
   void ShowHelpTab();
-  void OpenAutofillHelpTabAndActivate();
   void OpenPrivacyDashboardTabAndActivate();
   void OpenSearchEngineOptionsDialog();
   void OpenPluginsTabAndActivate();