Cosmetic cleanups in chrome/browser/policy/

chrome/browser/policy/configuration_policy_provider_mac.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/configuration_policy_provider_mac.h"
 
+#include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/path_service.h"
+#include "base/platform_file.h"
 #include "base/sys_string_conversions.h"
+#include "chrome/browser/preferences_mac.h"
 #include "chrome/common/chrome_paths.h"
 
 namespace policy {
 
-static FilePath GetManagedPolicyPath() {
+namespace {
+
+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, FileBasedPolicyLoader has a task that
   // polls periodically in order to reload managed preferences later even if we
   // missed the change.
   FilePath path;
   if (!PathService::Get(chrome::DIR_MANAGED_PREFS, &path))
     return FilePath();
 
   CFBundleRef bundle(CFBundleGetMainBundle());
   if (!bundle)
     return FilePath();
 
   CFStringRef bundle_id = CFBundleGetIdentifier(bundle);
   if (!bundle_id)
     return FilePath();
 
   return path.Append(base::SysCFStringRefToUTF8(bundle_id) + ".plist");
 }
 
+}  // namespace
+
 MacPreferencesPolicyProviderDelegate::MacPreferencesPolicyProviderDelegate(
     MacPreferences* preferences,
     const ConfigurationPolicyProvider::PolicyDefinitionList* policy_list)
     : FileBasedPolicyProvider::ProviderDelegate(GetManagedPolicyPath()),
       policy_list_(policy_list),
       preferences_(preferences) {
 }
 
 MacPreferencesPolicyProviderDelegate::~MacPreferencesPolicyProviderDelegate() {}
 
@@ skipping 84 matching lines @@
 
 ConfigurationPolicyProviderMac::ConfigurationPolicyProviderMac(
     const ConfigurationPolicyProvider::PolicyDefinitionList* policy_list,
     MacPreferences* preferences)
     : FileBasedPolicyProvider(policy_list,
           new MacPreferencesPolicyProviderDelegate(preferences,
                                                    policy_list)) {
 }
 
 }  // namespace policy