Enable brand codes and master preferences on the Mac.

chrome/browser/first_run/first_run_mac.mm

Index: chrome/browser/first_run/first_run_mac.mm
diff --git a/chrome/browser/first_run/first_run_mac.mm b/chrome/browser/first_run/first_run_mac.mm
index c866583503b05956bd9b39d8c09b97637ae06c0e..b9045bbe2cd78c7f94de259406d99bf8155ae8e4 100644
--- a/chrome/browser/first_run/first_run_mac.mm
+++ b/chrome/browser/first_run/first_run_mac.mm
@@ -5,6 +5,9 @@
 #include "chrome/browser/first_run/first_run.h"
 
 #include "base/file_path.h"
+#include "base/string_util.h"
+#include "chrome/browser/mac/keystone_glue.h"
+#include "chrome/browser/mac/master_prefs.h"
 
 bool FirstRun::ImportBookmarks(const FilePath& import_bookmarks_path) {
   // http://crbug.com/48880
@@ -13,8 +16,9 @@ bool FirstRun::ImportBookmarks(const FilePath& import_bookmarks_path) {
 
 // static
 bool FirstRun::IsOrganicFirstRun() {
-  // We treat all installs as organic.
-  return true;
+  std::string brand = keystone_glue::BrandCode();
+  return StartsWithASCII(brand, "GG", true) ||

[Mark Mentovai, 2011/08/25 13:35:08]

Caution! No brand code at all is also organic.

[Avi (use Gerrit), 2011/08/25 15:24:52]

Done.

+         StartsWithASCII(brand, "EU", true);
 }
 
 // static
@@ -22,3 +26,8 @@ void FirstRun::PlatformSetup() {
   // Things that Windows does here (creating a desktop icon, for example) are
   // not needed.
 }
+
+// static
+FilePath FirstRun::MasterPrefsPath() {
+  return master_prefs::MasterPrefsPath();
+}