Using PolicyServiceWatcher instead of PolicyWatcherLinux/Win/Mac.

chrome/browser/policy/chrome_browser_policy_connector.cc

 // 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.
 
 #include "chrome/browser/policy/chrome_browser_policy_connector.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 30 matching lines @@
 #endif
 
 using content::BrowserThread;
 
 namespace policy {
 
 namespace {
 
 #if defined(OS_MACOSX)
 base::FilePath GetManagedPolicyPath() {
-  // This constructs the path to the plist file in which Mac OS X stores the
-  // managed preference for the application. This is undocumented and therefore
-  // fragile, but if it doesn't work out, AsyncPolicyLoader has a task that
-  // polls periodically in order to reload managed preferences later even if we
-  // missed the change.
-  base::FilePath path;
-  if (!PathService::Get(chrome::DIR_MANAGED_PREFS, &path))
-    return base::FilePath();
-
   CFBundleRef bundle(CFBundleGetMainBundle());
   if (!bundle)
     return base::FilePath();
 
   CFStringRef bundle_id = CFBundleGetIdentifier(bundle);
   if (!bundle_id)
     return base::FilePath();
 
-  return path.Append(base::SysCFStringRefToUTF8(bundle_id) + ".plist");
+  return policy::PolicyLoaderMac::GetManagedPolicyPath(bundle_id);
 }
 #endif  // defined(OS_MACOSX)
 
 }  // namespace
 
 ChromeBrowserPolicyConnector::ChromeBrowserPolicyConnector()
     : BrowserPolicyConnector(base::Bind(&BuildHandlerList)) {
   ConfigurationPolicyProvider* platform_provider = CreatePlatformProvider();
   if (platform_provider)
     SetPlatformPolicyProvider(make_scoped_ptr(platform_provider));
@@ skipping 61 matching lines @@
       chrome_policy.GetValue(key::kEnableWebBasedSignin);
   bool enabled = false;
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (policy_value && policy_value->GetAsBoolean(&enabled) && enabled &&
       !command_line->HasSwitch(switches::kEnableWebBasedSignin)) {
     command_line->AppendSwitch(switches::kEnableWebBasedSignin);
   }
 }
 
 }  // namespace policy