Enable brand codes and master preferences on the Mac.

chrome/browser/first_run/first_run.cc

 // 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/first_run/first_run.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 132 matching lines @@
 #endif
   }
   return return_code;
 }
 
 // static
 bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
                                         MasterPrefs* out_prefs) {
   DCHECK(!user_data_dir.empty());
 
-  // The standard location of the master prefs is next to the chrome binary.
-  FilePath master_prefs;
-  if (!PathService::Get(base::DIR_EXE, &master_prefs))
+  FilePath master_prefs = MasterPrefsPath();
+  if (master_prefs.empty())
     return true;
-  master_prefs = master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
   installer::MasterPreferences prefs(master_prefs);
   if (!prefs.read_from_file())
     return true;
 
   out_prefs->new_tabs = prefs.GetFirstRunTabs();
 
   bool value = false;
 
 #if defined(OS_WIN)
   // RLZ is currently a Windows-only phenomenon.  When it comes to the Mac/
@@ skipping 549 matching lines @@
   if (!observer->ended()) {
     observer->set_should_quit_message_loop();
     MessageLoop::current()->Run();
   }
 
   // Unfortunately there's no success/fail signal in ImporterHost.
   return true;
 }
 
 #endif  // OS_POSIX