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

chrome/installer/util/helper.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.
 
 #include "chrome/installer/util/helper.h"
 
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "chrome/installer/util/browser_distribution.h"
 
@@ skipping 15 matching lines @@
   }
 
   return install_path;
 }
 
 }  // namespace
 
 FilePath installer::GetChromeInstallPath(bool system_install,
                                          BrowserDistribution* dist) {
   return GetChromeInstallBasePath(system_install, dist,
-                                  installer_util::kInstallBinaryDir);
+                                  installer::kInstallBinaryDir);
 }
 
 FilePath installer::GetChromeUserDataPath(BrowserDistribution* dist) {
   return GetChromeInstallBasePath(false, dist,
-      installer_util::kInstallUserDataDir);
+      installer::kInstallUserDataDir);
 }