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

chrome/installer/util/master_preferences_dummy.cc

 // 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 defines dummy implementation of several functions from the
 // master_preferences namespace for Google Chrome. These functions allow 64-bit
 // Windows Chrome binary to build successfully. Since this binary is only used
 // for Native Client support which uses the 32 bit installer, most of the
 // master preferences functionality is not actually needed.
 
 #include "chrome/installer/util/master_preferences.h"
 
 #include <windows.h>
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "googleurl/src/gurl.h"
 
-namespace installer_util {
+namespace installer {
 
 MasterPreferences::MasterPreferences(const CommandLine& cmd_line)
     : distribution_(NULL), preferences_read_from_file_(false) {
 }
 
 MasterPreferences::MasterPreferences(const FilePath& prefs_path)
     : distribution_(NULL), preferences_read_from_file_(false) {
 }
 
 MasterPreferences::~MasterPreferences() {
@@ skipping 20 matching lines @@
   NOTREACHED();
   return std::vector<GURL>();
 }
 
 // static
 const MasterPreferences& MasterPreferences::ForCurrentProcess() {
   static MasterPreferences prefs(*CommandLine::ForCurrentProcess());
   return prefs;
 }
 }