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..14e515d4920a502b98c2e82e118e812fbb026189 100644
--- a/chrome/browser/first_run/first_run_mac.mm
+++ b/chrome/browser/first_run/first_run_mac.mm
@@ -5,6 +5,8 @@
 #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"
 
 bool FirstRun::ImportBookmarks(const FilePath& import_bookmarks_path) {
   // http://crbug.com/48880
@@ -13,8 +15,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) ||
+         StartsWithASCII(brand, "EU", true);

[Miranda Callahan, 2011/08/19 09:03:24]

Unless we go to a model where we're actually getting brand codes through
downloads, shouldn't we be ignoring all brand codes except those we know are
inorganic? (or maybe just add a clause returning true in the case of no brand
code?)

[Avi (use Gerrit), 2011/08/19 12:18:48]

The Mac already _has_ brand codes. Four of 'em, actually. This logic is swiped
from the Windows version. I looked at the four brand codes and their meaning,
and this prescription of GG/EU vs everything else actually really makes sense.
Still, I'd like to discuss it with the people in charge of brand coding. Do you
remember who you talked to the last time about this?

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