Enable brand codes and master preferences on the Mac.

chrome/browser/mac/keystone_glue.mm

 // 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.
 
 #import "chrome/browser/mac/keystone_glue.h"
 
 #include <sys/param.h>
 #include <sys/mount.h>
 
 #include <vector>
@@ skipping 23 matching lines @@
 // updates to Chrome.)
 
 #if defined(GOOGLE_CHROME_BUILD)
 #define kBrandFileName @"Google Chrome Brand.plist";
 #elif defined(CHROMIUM_BUILD)
 #define kBrandFileName @"Chromium Brand.plist";
 #else
 #error Unknown branding
 #endif
 
+#if defined(GOOGLE_CHROME_BUILD)
+#define kMasterPreferencesFileName @"Google Chrome Master Preferences";

[Mark Mentovai, 2011/08/24 21:37:31]

You equipped this for a separate master preferences file for Chromium and Google
Chrome. Once you do that, you need to treat the canary separately as well.

+#elif defined(CHROMIUM_BUILD)
+#define kMasterPreferencesFileName @"Chromium Master Preferences";
+#else
+#error Unknown branding
+#endif
+
 // These directories are hardcoded in Keystone promotion preflight and the
 // Keystone install script, so NSSearchPathForDirectoriesInDomains isn't used
 // since the scripts couldn't use anything like that.
 NSString* kBrandUserFile = @"~/Library/Google/" kBrandFileName;
 NSString* kBrandSystemFile = @"/Library/Google/" kBrandFileName;
+// Only support a system-level master preferences file.
+NSString* kMasterPreferencesFile
+    = @"/Library/Google/" kMasterPreferencesFileName;
 
 NSString* UserBrandFilePath() {
   return [kBrandUserFile stringByStandardizingPath];
 }
 NSString* SystemBrandFilePath() {
   return [kBrandSystemFile stringByStandardizingPath];
 }
 
 // Adaptor for scheduling an Objective-C method call on a |WorkerPool|
 // thread.
@@ skipping 851 matching lines @@
   if (appPath != appPath_) {
     [appPath_ release];
     appPath_ = [appPath copy];
   }
 }
 
 @end  // @implementation KeystoneGlue
 
 namespace keystone_glue {
 
+FilePath MasterPrefsPath() {
+  return FilePath([[kMasterPreferencesFile stringByStandardizingPath]

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

stringByStandardizingPath doesn’t gain anything here, since we know the string
is pretty standard already.

stringByStandardizingPath can talk to the filesystem and perform blocking
operations.

+                      fileSystemRepresentation]);
+}
+
+std::string BrandCode() {
+  KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue];

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

Name things like keystone_glue. You‘re not in an @objc thing here.

+  NSString* brand_path = [keystoneGlue brandFilePath];
+
+  if (![brand_path length])
+    return std::string();
+
+  NSString* brand_code =

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

On which thread will this be called? Remember, we want to be careful about
things that talk to the filesystem.

Maybe a better question isn’t actually about the thread that this runs on, but
when it runs. First-run-only on the main thread ought to be tolerable. “Main
thread during each browser startup” may not be.

[Avi (use Gerrit), 2011/08/24 20:38:36]

This is called only on the first run, on the main thread.

+      [NSString stringWithContentsOfFile:brand_path
+                                encoding:NSASCIIStringEncoding
+                                   error:nil];
+  if (!brand_code)
+    return std::string();
+
+  return base::SysNSStringToUTF8(brand_code);

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

We're also paying a lot in conversions  ASC -> NSString -> UTF8.
file_util::ReadFileToString?

+}
+
 bool KeystoneEnabled() {
   return [KeystoneGlue defaultKeystoneGlue] != nil;
 }
 
 string16 CurrentlyInstalledVersion() {
   KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue];
   NSString* version = [keystoneGlue currentlyInstalledVersion];
   return base::SysNSStringToUTF16(version);
 }
 
 }  // namespace keystone_glue