Remove references to IsNewAvatarMenu since the flag was removed.

chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
@@ skipping 75 matching lines @@
     if (profile_->GetPath() != profile_path)
       [avatarController_ updateAvatarButtonAndLayoutParent:YES];
   }
 
   void OnProfileNameChanged(const base::FilePath& profile_path,
                             const base::string16& old_profile_name) override {
     if (profile_->GetPath() == profile_path)
       [avatarController_ updateAvatarButtonAndLayoutParent:YES];
   }
 
-  void OnProfileAvatarChanged(const base::FilePath& profile_path) override {
-    if (!switches::IsNewAvatarMenu() && profile_->GetPath() == profile_path)
-      [avatarController_ updateAvatarButtonAndLayoutParent:YES];
-  }
-
   void OnProfileSupervisedUserIdChanged(
       const base::FilePath& profile_path) override {
     if (profile_->GetPath() == profile_path)
       [avatarController_ updateAvatarButtonAndLayoutParent:YES];
   }
 
   // SigninErrorController::Observer:
   void OnErrorChanged() override {
     SigninErrorController* errorController =
         profiles::GetSigninErrorController(profile_);
@@ skipping 34 matching lines @@
 
 - (NSButton*)buttonView {
   CHECK(button_.get());  // Subclasses must set this.
   return button_.get();
 }
 
 - (void)showAvatarBubbleAnchoredAt:(NSView*)anchor
                           withMode:(BrowserWindow::AvatarBubbleMode)mode
                    withServiceType:(signin::GAIAServiceType)serviceType {
   if (menuController_) {
-    if (switches::IsNewAvatarMenu()) {
-      profiles::BubbleViewMode viewMode;
-      profiles::TutorialMode tutorialMode;
-      profiles::BubbleViewModeFromAvatarBubbleMode(
-          mode, &viewMode, &tutorialMode);
-      if (tutorialMode != profiles::TUTORIAL_MODE_NONE) {
-        ProfileChooserController* profileChooserController =
-            base::mac::ObjCCastStrict<ProfileChooserController>(
-                menuController_);
-        [profileChooserController setTutorialMode:tutorialMode];
-        [profileChooserController initMenuContentsWithView:viewMode];
-      }
+    profiles::BubbleViewMode viewMode;
+    profiles::TutorialMode tutorialMode;
+    profiles::BubbleViewModeFromAvatarBubbleMode(
+        mode, &viewMode, &tutorialMode);
+    if (tutorialMode != profiles::TUTORIAL_MODE_NONE) {
+      ProfileChooserController* profileChooserController =
+          base::mac::ObjCCastStrict<ProfileChooserController>(
+              menuController_);
+      [profileChooserController setTutorialMode:tutorialMode];
+      [profileChooserController initMenuContentsWithView:viewMode];
     }
     return;
   }
 
   DCHECK(chrome::IsCommandEnabled(browser_, IDC_SHOW_AVATAR_MENU));
 
   NSWindowController* wc =
       [browser_->window()->GetNativeWindow() windowController];
   if ([wc isKindOfClass:[BrowserWindowController class]]) {
     [static_cast<BrowserWindowController*>(wc)
         lockBarVisibilityForOwner:self withAnimation:NO delay:NO];
   }
 
   // The new avatar bubble does not have an arrow, and it should be anchored
   // to the edge of the avatar button.
-  int anchorX = switches::IsNewAvatarMenu() ?
-      NSMaxX([anchor bounds]) - kMenuXOffsetAdjust :
-      NSMidX([anchor bounds]);
+  int anchorX = NSMaxX([anchor bounds]) - kMenuXOffsetAdjust;
   NSPoint point = NSMakePoint(anchorX,
                               NSMaxY([anchor bounds]) + kMenuYOffsetAdjust);
   point = [anchor convertPoint:point toView:nil];
   point = [[anchor window] convertBaseToScreen:point];
 
   // |menuController_| will automatically release itself on close.
-  if (switches::IsNewAvatarMenu()) {
-    profiles::BubbleViewMode viewMode;
-    profiles::TutorialMode tutorialMode;
-    profiles::BubbleViewModeFromAvatarBubbleMode(
-        mode, &viewMode, &tutorialMode);
-    // Don't start creating the view if it would be an empty fast user switcher.
-    // It has to happen here to prevent the view system from creating an empty
-    // container.
-    if (viewMode == profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER &&
-        !profiles::HasProfileSwitchTargets(browser_->profile())) {
-      return;
-    }
+  profiles::BubbleViewMode viewMode;
+  profiles::TutorialMode tutorialMode;
+  profiles::BubbleViewModeFromAvatarBubbleMode(
+      mode, &viewMode, &tutorialMode);
+  // Don't start creating the view if it would be an empty fast user switcher.
+  // It has to happen here to prevent the view system from creating an empty
+  // container.
+  if (viewMode == profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER &&
+      !profiles::HasProfileSwitchTargets(browser_->profile())) {
+    return;
+  }
 
-    menuController_ =
-        [[ProfileChooserController alloc] initWithBrowser:browser_
-                                               anchoredAt:point
-                                                 viewMode:viewMode
-                                             tutorialMode:tutorialMode
-                                              serviceType:serviceType];
-  } else {
-    menuController_ =
-      [[AvatarMenuBubbleController alloc] initWithBrowser:browser_
-                                               anchoredAt:point];
-  }
+  menuController_ =
+      [[ProfileChooserController alloc] initWithBrowser:browser_
+                                             anchoredAt:point
+                                               viewMode:viewMode
+                                           tutorialMode:tutorialMode
+                                            serviceType:serviceType];
 
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(bubbleWillClose:)
              name:NSWindowWillCloseNotification
            object:[menuController_ window]];
   [menuController_ showWindow:self];
 
   ProfileMetrics::LogProfileOpenMethod(ProfileMetrics::ICON_AVATAR_BUBBLE);
 }
@@ skipping 37 matching lines @@
 }
 
 - (void)updateErrorStatus:(BOOL)hasError {
 }
 
 - (BaseBubbleController*)menuController {
   return menuController_;
 }
 
 @end