Revert 69167, itself a revert of 69165 - Merge the installer, installer_util ...

chrome/installer/util/master_preferences.h

 // Copyright (c) 2010 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.
 //
 // This file contains functions processing master preference file used by
 // setup and first run.
 
 #ifndef CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
 #define CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
 
 class DictionaryValue;
 class FilePath;
 
-namespace installer_util {
+namespace installer {
 
 // This is the default name for the master preferences file used to pre-set
 // values in the user profile at first run.
 const char kDefaultMasterPrefs[] = "master_preferences";
 
 // The master preferences is a JSON file with the same entries as the
 // 'Default\Preferences' file. This function parses the distribution
 // section of the preferences file.
 //
 // A prototypical 'master_preferences' file looks like this:
@@ skipping 156 matching lines @@
   bool preferences_read_from_file_;
   bool ceee_;
   bool chrome_;
   bool chrome_frame_;
   bool multi_install_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MasterPreferences);
 };
 
-}  // namespace installer_util
+}  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_