Enable brand codes and master preferences on the Mac.

chrome/browser/mac/keystone_glue.h

 // 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.
 
 #ifndef CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_
 #define CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_
 #pragma once
 
+#include "base/file_path.h"
 #include "base/string16.h"
 
 #if defined(__OBJC__)
 
 #import <Foundation/Foundation.h>
 
 #import "base/memory/scoped_nsobject.h"
 #include "chrome/browser/mac/scoped_authorizationref.h"
 
 // Possible outcomes of various operations.  A version may accompany some of
@@ skipping 172 matching lines @@
 // Called when an installUpdate: notification completes.
 - (void)installUpdateComplete:(NSNotification*)notification;
 
 @end  // @interface KeystoneGlue(ExposedForTesting)
 
 #endif  // __OBJC__
 
 // Functions that may be accessed from non-Objective-C C/C++ code.
 namespace keystone_glue {
 
+// Returns the path to the master preferences file.
+FilePath MasterPrefsPath();

[Mark Mentovai, 2011/08/23 16:25:12]

I’m unconvinced that this belongs as part of the keystone glue interface.

[TVL, 2011/08/23 16:51:31]

Second, this really doesn't seem like it should go in keystone_glue.

+
+// Returns the brand code of the installation.
+std::string BrandCode();

[Mark Mentovai, 2011/08/23 16:25:12]

As opposed to this, which does.

+
 // True if Keystone is enabled.
 bool KeystoneEnabled();
 
 // The version of the application currently installed on disk.
 string16 CurrentlyInstalledVersion();
 
 }  // namespace keystone_glue
 
 #endif  // CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_