Fix static set_close_on_deactivate overriding non-virtual base method

chrome/browser/ui/views/avatar_menu_bubble_view.h

Index: chrome/browser/ui/views/avatar_menu_bubble_view.h
diff --git a/chrome/browser/ui/views/avatar_menu_bubble_view.h b/chrome/browser/ui/views/avatar_menu_bubble_view.h
index e9e722553be2004304f32c3696888ad4fa574f36..be2e8b351f569a1d63461b1a1740a16942eef29b 100644
--- a/chrome/browser/ui/views/avatar_menu_bubble_view.h
+++ b/chrome/browser/ui/views/avatar_menu_bubble_view.h
@@ -82,8 +82,8 @@ class AvatarMenuBubbleView : public views::BubbleDelegateView,
   // 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:
@@ -125,7 +125,7 @@ class AvatarMenuBubbleView : public views::BubbleDelegateView,
   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_;