Disconnect one click sign in code. The code itself will be removed in followup

chrome/browser/password_manager/save_password_infobar_delegate.cc

Index: chrome/browser/password_manager/save_password_infobar_delegate.cc
diff --git a/chrome/browser/password_manager/save_password_infobar_delegate.cc b/chrome/browser/password_manager/save_password_infobar_delegate.cc
index 09f925d6d12a00729dd55262b0d15e2fff23e30f..cc72117305649b38a2c330337a23f601734ef667 100644
--- a/chrome/browser/password_manager/save_password_infobar_delegate.cc
+++ b/chrome/browser/password_manager/save_password_infobar_delegate.cc
@@ -11,41 +11,17 @@
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/infobar.h"
 #include "components/password_manager/core/browser/password_form_manager.h"
-#include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/gaia/gaia_urls.h"

[Ilya Sherman, 2015/02/04 23:05:35]

nit: Can this be removed?

[Roger Tawa OOO till Jul 10th, 2015/02/09 16:52:24]

Done.

 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(ENABLE_ONE_CLICK_SIGNIN)
-#include "chrome/browser/ui/sync/one_click_signin_helper.h"
-#endif
-
 // static
 void SavePasswordInfoBarDelegate::Create(
     content::WebContents* web_contents,
     scoped_ptr<password_manager::PasswordFormManager> form_to_save,
     const std::string& uma_histogram_suffix) {
-#if defined(ENABLE_ONE_CLICK_SIGNIN)
-  // Don't show the password manager infobar if this form is for a google
-  // account and we are going to show the one-click signin infobar.
-  GURL realm(form_to_save->realm());
-  // TODO(mathp): Checking only against associated_username() causes a bug
-  // referenced here: crbug.com/133275
-  // TODO(vabr): The check IsEnableWebBasedSignin is a hack for the time when
-  // OneClickSignin is disabled. http://crbug.com/339804
-  if (((realm == GaiaUrls::GetInstance()->gaia_login_form_realm()) ||
-       (realm == GURL("https://www.google.com/"))) &&
-      switches::IsEnableWebBasedSignin() &&
-      OneClickSigninHelper::CanOffer(
-          web_contents,
-          OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
-          base::UTF16ToUTF8(form_to_save->associated_username()),
-          NULL))
-    return;
-#endif
-
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents);
   infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(