Enable the save card bubble on Mac without a flag.

chrome/browser/ui/autofill/chrome_autofill_client.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/autofill/chrome_autofill_client.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 47 matching lines @@
 #if defined(OS_ANDROID)
 #include "components/autofill/core/browser/autofill_save_card_infobar_delegate_mobile.h"
 #include "components/autofill/core/browser/autofill_save_card_infobar_mobile.h"
 #include "components/infobars/core/infobar.h"
 #endif
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(autofill::ChromeAutofillClient);
 
 namespace autofill {
 
-namespace {
-
-#if !defined(OS_ANDROID)
-bool IsSaveCardBubbleEnabled() {
-#if defined(OS_MACOSX)
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableSaveCardBubble);
-#else
-  return true;
-#endif
-}
-#endif  // !defined(OS_ANDROID)
-
-}  // namespace
-
 ChromeAutofillClient::ChromeAutofillClient(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       unmask_controller_(
           user_prefs::UserPrefs::Get(web_contents->GetBrowserContext()),
           Profile::FromBrowserContext(web_contents->GetBrowserContext())
               ->IsOffTheRecord()),
       last_rfh_to_rac_(nullptr) {
   DCHECK(web_contents);
 
 #if !BUILDFLAG(ANDROID_JAVA_UI)
@@ skipping 97 matching lines @@
 void ChromeAutofillClient::ConfirmSaveCreditCardLocally(
     const CreditCard& card,
     const base::Closure& callback) {
 #if defined(OS_ANDROID)
   InfoBarService::FromWebContents(web_contents())->AddInfoBar(
       CreateSaveCardInfoBarMobile(
           make_scoped_ptr(new AutofillSaveCardInfoBarDelegateMobile(
               false, card, scoped_ptr<base::DictionaryValue>(nullptr),
               callback))));
 #else
-  if (IsSaveCardBubbleEnabled()) {
-    // Do lazy initialization of SaveCardBubbleControllerImpl.
-    autofill::SaveCardBubbleControllerImpl::CreateForWebContents(
-        web_contents());
-    autofill::SaveCardBubbleControllerImpl* controller =
-        autofill::SaveCardBubbleControllerImpl::FromWebContents(web_contents());
-    controller->ShowBubbleForLocalSave(card, callback);
-    return;
-  }
-
-  AutofillCCInfoBarDelegate::CreateForLocalSave(

[Evan Stade, 2016/03/07 22:42:03]

do you still need this fn for something? Do you need AutofillCCInfoBarDelegate
at all?

[Justin Donnelly, 2016/03/07 23:14:41]

Hmm, good point. we don't need CreateForLocalSave anymore. We do still need
AutofillSaveCardInfoBarDelegate though as it's extended by
AutofillSaveCardInfoBarDelegateMobile. I imagine those should be collapsed into
one class now.

I'd prefer to not do that here, though, so we don't have a big CL potentially
blocking rollback if someone encounters a problem with the new bubble. But I can
start work on the cleanup tomorrow.

-      InfoBarService::FromWebContents(web_contents()), callback);
+  // Do lazy initialization of SaveCardBubbleControllerImpl.
+  autofill::SaveCardBubbleControllerImpl::CreateForWebContents(
+      web_contents());
+  autofill::SaveCardBubbleControllerImpl* controller =
+      autofill::SaveCardBubbleControllerImpl::FromWebContents(web_contents());
+  controller->ShowBubbleForLocalSave(card, callback);
 #endif
 }
 
 void ChromeAutofillClient::ConfirmSaveCreditCardToCloud(
     const CreditCard& card,
     scoped_ptr<base::DictionaryValue> legal_message,
     const base::Closure& callback) {
 #if defined(OS_ANDROID)
   InfoBarService::FromWebContents(web_contents())->AddInfoBar(
       CreateSaveCardInfoBarMobile(
@@ skipping 161 matching lines @@
 
   ssl_status = navigation_entry->GetSSL();
   // Note: If changing the implementation below, also change
   // AwAutofillClient::IsContextSecure. See crbug.com/505388
   return ssl_status.security_style == content::SECURITY_STYLE_AUTHENTICATED &&
          !(ssl_status.content_status &
            content::SSLStatus::RAN_INSECURE_CONTENT);
 }
 
 }  // namespace autofill