Fix static set_close_on_deactivate overriding non-virtual base method

chrome/browser/ui/views/profile_chooser_view.h

 // Copyright 2013 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_VIEWS_PROFILE_CHOOSER_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_PROFILE_CHOOSER_VIEW_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 32 matching lines @@
                          views::BubbleBorder::Arrow arrow,
                          views::BubbleBorder::BubbleAlignment border_alignment,
                          const gfx::Rect& anchor_rect,
                          Browser* browser);
   static bool IsShowing();
   static void Hide();
 
   // We normally close the bubble any time it becomes inactive but this can lead
   // to flaky tests where unexpected UI events are triggering this behavior.
   // Tests should call this with "false" for more consistent operation.
-  static void set_close_on_deactivate(bool close) {
-    close_on_deactivate_ = close;
+  static void clear_close_on_deactivate_for_testing() {
+    close_on_deactivate_for_testing_ = false;
   }
 
  private:
   friend class NewAvatarMenuButtonTest;
   FRIEND_TEST_ALL_PREFIXES(NewAvatarMenuButtonTest, SignOut);
 
   typedef std::vector<size_t> Indexes;
   typedef std::map<views::Button*, int> ButtonIndexes;
 
   // Different views that can be displayed in the bubble.
@@ skipping 17 matching lines @@
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
   // LinkListener:
   virtual void LinkClicked(views::Link* sender, int event_flags) OVERRIDE;
 
   // AvatarMenuObserver:
   virtual void OnAvatarMenuChanged(AvatarMenu* avatar_menu) OVERRIDE;
 
   static ProfileChooserView* profile_bubble_;
-  static bool close_on_deactivate_;
+  static bool close_on_deactivate_for_testing_;
 
   void ResetLinksAndButtons();
 
   // Shows either the profile chooser or the account management views.
   void ShowView(BubbleViewMode view_to_display,
                 AvatarMenu* avatar_menu);
 
   // Creates the main profile card for the profile |avatar_item|. |is_guest|
   // is used to determine whether to show any Sign in/Sign out/Manage accounts
   // links.
@@ skipping 25 matching lines @@
   // Action buttons.
   views::TextButton* guest_button_;
   views::TextButton* end_guest_button_;
   views::TextButton* add_user_button_;
   views::TextButton* users_button_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileChooserView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PROFILE_CHOOSER_VIEW_H_