Fix static set_close_on_deactivate overriding non-virtual base method

chrome/browser/ui/views/avatar_menu_bubble_view.h

 // Copyright (c) 2011 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_AVATAR_MENU_BUBBLE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_AVATAR_MENU_BUBBLE_VIEW_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 64 matching lines @@
   virtual void Init() OVERRIDE;
   virtual void WindowClosing() OVERRIDE;
 
   // AvatarMenuObserver implementation.
   virtual void OnAvatarMenuChanged(
       AvatarMenu* avatar_menu) OVERRIDE;
 
   // 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 set_close_on_deactivate_for_testing(bool close) {

[Peter Kasting, 2013/11/04 22:19:33]

If these functions are only for tests, and only called with "false" as an arg,
change them to "clear_close_on_deactivate_for_testing()" which takes no args. 
(All applicable files)

[yao, 2013/11/06 19:56:53]

Done.

+    close_on_deactivate_for_testing_ = close;
   }
 
  private:
   AvatarMenuBubbleView(views::View* anchor_view,
                        views::BubbleBorder::Arrow arrow,
                        const gfx::Rect& anchor_rect,
                        Browser* browser);
 
   // Sets the colors on all the |item_views_|. Called after the
   // BubbleDelegateView is created and has loaded the colors from the
@@ skipping 21 matching lines @@
 
   // This will be non-NULL if and only if |expanded_| is false and
   // avatar_menu_->GetManagedUserInformation() returns a non-empty string.
   // See OnAvatarMenuChanged().
   views::Label* managed_user_info_;
   views::ImageView* icon_view_;
   views::Separator* separator_switch_users_;
   views::Link* switch_profile_link_;
 
   static AvatarMenuBubbleView* avatar_bubble_;
-  static bool close_on_deactivate_;
+  static bool close_on_deactivate_for_testing_;
 
   // Is set to true if the managed user has clicked on Switch Users.
   bool expanded_;
 
   DISALLOW_COPY_AND_ASSIGN(AvatarMenuBubbleView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_AVATAR_MENU_BUBBLE_VIEW_H_