Merge the installer, installer_util and setup_util namespaces into a single i...

chrome/installer/setup/setup_util.cc

Index: chrome/installer/setup/setup_util.cc
===================================================================
--- chrome/installer/setup/setup_util.cc	(revision 68996)
+++ chrome/installer/setup/setup_util.cc	(working copy)
@@ -13,7 +13,7 @@
 #include "courgette/courgette.h"
 #include "third_party/bspatch/mbspatch.h"
 
-int setup_util::ApplyDiffPatch(const FilePath& src,
+int installer::ApplyDiffPatch(const FilePath& src,
                                const FilePath& patch,
                                const FilePath& dest) {
   VLOG(1) << "Applying patch " << patch.value() << " to file " << src.value()
@@ -33,7 +33,7 @@
                           dest.value().c_str());
 }
 
-installer::Version* setup_util::GetVersionFromArchiveDir(
+installer::Version* installer::GetVersionFromArchiveDir(
     const FilePath& chrome_path) {
   VLOG(1) << "Looking for Chrome version folder under " << chrome_path.value();
   FilePath root_path = chrome_path.Append(L"*");