Inhibit creation of new users if it's disabled by policy

BrowserAddPersonEnabled policy controls whether Chrome allows Add Person
from the user manager. Hovewer, it doesn't inhibit the user from
creation of a new profile from the profile menu in the menu bar on Mac.

This CL removes Add Person menu item if BrowserAddPersonEnabled policy
is set to false.

Bug: 807860
Change-Id: Id8a34bbe164cad8998de2d36f2d23b9396d95c82
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1645224Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Alex Ilin <alexilin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#666298}

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

@@ -21,7 +21,9 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/prefs/pref_service.h"
 #include "components/signin/core/browser/account_consistency_method.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/gfx/image/image.h"
@@ -40,6 +42,13 @@ enum ValidateMenuItemSelector {
   MAX_VALIDATE_MENU_SELECTOR,
 };
 
+// Check Add Person pref.
+bool IsAddPersonEnabled() {
+  PrefService* service = g_browser_process->local_state();
+  DCHECK(service);
+  return service->GetBoolean(prefs::kBrowserAddPersonEnabled);
+}
+
 }  // namespace
 
 @interface ProfileMenuController (Private)
@@ -181,6 +190,9 @@ class Observer : public BrowserListObserver, public AvatarMenuObserver {
            [menuItem action] != @selector(editProfile:);
   }
 
+  if (!IsAddPersonEnabled())
+    return [menuItem action] != @selector(newProfile:);
+
   size_t index = avatarMenu_->GetActiveProfileIndex();
   if (avatarMenu_->GetNumberOfItems() <= index) {
     ValidateMenuItemSelector currentSelector = UNKNOWN_SELECTOR;
@@ -241,11 +253,14 @@ class Observer : public BrowserListObserver, public AvatarMenuObserver {
                                         action:@selector(editProfile:)];
   [[self menu] addItem:item];
 
-  [[self menu] addItem:[NSMenuItem separatorItem]];
-  item = [self createItemWithTitle:l10n_util::GetNSStringWithFixup(
-      IDS_PROFILES_CREATE_NEW_PROFILE_OPTION)
-                            action:@selector(newProfile:)];
-  [[self menu] addItem:item];
+  if (IsAddPersonEnabled()) {
+    [[self menu] addItem:[NSMenuItem separatorItem]];
+
+    item = [self createItemWithTitle:l10n_util::GetNSStringWithFixup(
+                                         IDS_PROFILES_CREATE_NEW_PROFILE_OPTION)
+                              action:@selector(newProfile:)];
+    [[self menu] addItem:item];
+  }
 
   [self rebuildMenu];
 }

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

@@ -26,13 +26,7 @@
 
 class ProfileMenuControllerTest : public CocoaProfileTest {
  public:
-  ProfileMenuControllerTest() {
-    item_.reset([[NSMenuItem alloc] initWithTitle:@"Users"
-                                           action:nil
-                                    keyEquivalent:@""]);
-    controller_.reset(
-        [[ProfileMenuController alloc] initWithMainMenuItem:item_]);
-  }
+  ProfileMenuControllerTest() { RebuildController(); }
 
   void SetUp() override {
     CocoaProfileTest::SetUp();
@@ -42,6 +36,14 @@ class ProfileMenuControllerTest : public CocoaProfileTest {
     chrome::testing::NSRunLoopRunAllPending();
   }
 
+  void RebuildController() {
+    item_.reset([[NSMenuItem alloc] initWithTitle:@"Users"
+                                           action:nil
+                                    keyEquivalent:@""]);
+    controller_.reset(
+        [[ProfileMenuController alloc] initWithMainMenuItem:item_]);
+  }
+
   void TestBottomItems() {
     NSMenu* menu = [controller() menu];
     NSInteger count = [menu numberOfItems];
@@ -247,3 +249,23 @@ TEST_F(ProfileMenuControllerTest, DeleteActiveProfile) {
   [controller() activeBrowserChangedTo:NULL];
   base::ThreadRestrictions::SetIOAllowed(io_was_allowed);
 }
+
+TEST_F(ProfileMenuControllerTest, AddProfileDisabled) {
+  PrefService* local_state = g_browser_process->local_state();
+  local_state->SetBoolean(prefs::kBrowserAddPersonEnabled, false);
+
+  RebuildController();
+  // Spin the runloop so |-initializeMenu| gets called.
+  chrome::testing::NSRunLoopRunAllPending();
+
+  NSMenu* menu = [controller() menu];
+  NSInteger count = [menu numberOfItems];
+
+  ASSERT_GE(count, 2);
+
+  NSMenuItem* item = [menu itemAtIndex:count - 2];
+  EXPECT_TRUE([item isSeparatorItem]);
+
+  item = [menu itemAtIndex:count - 1];
+  EXPECT_EQ(@selector(editProfile:), [item action]);
+}