Switch SupportsUserData uses to use unique_ptr.

chrome/browser/ui/autofill/save_card_bubble_controller_impl.h

 // Copyright 2015 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_SAVE_CARD_BUBBLE_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_SAVE_CARD_BUBBLE_CONTROLLER_IMPL_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/timer/elapsed_timer.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/ui/save_card_bubble_controller.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
 class PrefService;
 
 namespace autofill {
 
 // Implementation of per-tab class to control the save credit card bubble and
 // Omnibox icon.
 class SaveCardBubbleControllerImpl
     : public SaveCardBubbleController,
       public content::WebContentsObserver,
       public content::WebContentsUserData<SaveCardBubbleControllerImpl> {
  public:
+  ~SaveCardBubbleControllerImpl() override;

[sky, 2017/05/01 17:34:27]

Move definition to match new position? (same comment applies to a couple of the
other files).

[Avi (use Gerrit), 2017/05/02 01:31:35]

Was aiming to avoid churn. Also, the order in the .cc file doesn't even match
the .h currently so there's not much I can do without rearranging the whole
file.

+
   // Sets up the controller for local save and shows the bubble.
   // |save_card_callback| will be invoked if and when the Save button is
   // pressed.
   void ShowBubbleForLocalSave(const CreditCard& card,
                               const base::Closure& save_card_callback);
 
   // Sets up the controller for upload and shows the bubble.
   // |save_card_callback| will be invoked if and when the Save button is
   // pressed. The contents of |legal_message| will be displayed in the bubble.
   // A field requesting CVC will appear in the bubble if
@@ skipping 27 matching lines @@
 
   const LegalMessageLines& GetLegalMessageLines() const override;
 
   // Used to check if an entered CVC value is a valid CVC for the current card.
   // Valid CVCs are a certain length for their card type (4 for AMEX, 3
   // otherwise) and are comprised only of numbers.
   bool InputCvcIsValid(const base::string16& input_text) const override;
 
  protected:
   explicit SaveCardBubbleControllerImpl(content::WebContents* web_contents);
-  ~SaveCardBubbleControllerImpl() override;
 
   // Returns the time elapsed since |timer_| was initialized.
   // Exists for testing.
   virtual base::TimeDelta Elapsed() const;
 
   // content::WebContentsObserver:
   void DidFinishNavigation(
       content::NavigationHandle* navigation_handle) override;
 
  private:
@@ skipping 38 matching lines @@
   // Used to measure the amount of time on a page; if it's less than some
   // reasonable limit, then don't close the bubble upon navigation.
   std::unique_ptr<base::ElapsedTimer> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(SaveCardBubbleControllerImpl);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_SAVE_CARD_BUBBLE_CONTROLLER_IMPL_H_