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

chrome/installer/util/shell_util_unittest.cc

 // Copyright (c) 2009 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 <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include <fstream>
 
@@ skipping 112 matching lines @@
   const std::wstring description(L"dummy description");
   EXPECT_TRUE(ShellUtil::UpdateChromeShortcut(dist, exe_path.value(),
                                               shortcut_path.value(),
                                               description, true));
   EXPECT_TRUE(VerifyChromeShortcut(exe_path.value(),
                                    shortcut_path.value(),
                                    description, 0));
 
   // Now specify an icon index in master prefs and make sure it works.
   FilePath prefs_path = test_dir_.AppendASCII(
-      installer_util::kDefaultMasterPrefs);
+      installer::kDefaultMasterPrefs);
   std::ofstream file;
   file.open(prefs_path.value().c_str());
   ASSERT_TRUE(file.is_open());
   file <<
 "{"
 " \"distribution\":{"
 "   \"chrome_shortcut_icon_index\" : 1"
 " }"
 "}";
   file.close();
   ASSERT_TRUE(file_util::Delete(shortcut_path, false));
   EXPECT_TRUE(ShellUtil::UpdateChromeShortcut(dist, exe_path.value(),
                                               shortcut_path.value(),
                                               description, true));
   EXPECT_TRUE(VerifyChromeShortcut(exe_path.value(),
                                    shortcut_path.value(),
                                    description, 1));
 
   // Now change only description to update shortcut and make sure icon index
   // doesn't change.
   const std::wstring description2(L"dummy description 2");
   EXPECT_TRUE(ShellUtil::UpdateChromeShortcut(dist, exe_path.value(),
                                               shortcut_path.value(),
                                               description2, false));
   EXPECT_TRUE(VerifyChromeShortcut(exe_path.value(),
                                    shortcut_path.value(),
                                    description2, 1));
 }