Setup Chromad user policy plumbing

chrome/browser/bookmarks/managed_bookmark_service_factory.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/policy/policy_constants.h"
 
 namespace {
 
 std::string GetManagedBookmarksDomain(Profile* profile) {
   policy::ProfilePolicyConnector* connector =
       policy::ProfilePolicyConnectorFactory::GetForBrowserContext(profile);
-  if (connector->IsPolicyFromCloudPolicy(policy::key::kManagedBookmarks))
-    return connector->GetManagementDomain();
-  return std::string();
+  return connector->GetDisplayDomainForManagedBookmarks();
 }
 
 std::unique_ptr<KeyedService> BuildManagedBookmarkService(
     content::BrowserContext* context) {
   Profile* profile = Profile::FromBrowserContext(context);
   return base::MakeUnique<bookmarks::ManagedBookmarkService>(
       profile->GetPrefs(),
       base::Bind(&GetManagedBookmarksDomain, base::Unretained(profile)));
 }
 
@@ skipping 32 matching lines @@
 }
 
 content::BrowserContext* ManagedBookmarkServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool ManagedBookmarkServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }