Revert 69165 - Merge the installer, installer_util and setup_util namespaces ...

chrome/installer/util/package_unittest.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 "base/logging.h"
 #include "base/scoped_handle.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/package.h"
@@ skipping 39 matching lines @@
 
   EXPECT_FALSE(file_util::PathExists(installer_dir));
   file_util::CreateDirectory(installer_dir);
   EXPECT_TRUE(file_util::PathExists(new_version_dir));
 
   file_util::CreateDirectory(old_version_dir);
   EXPECT_TRUE(file_util::PathExists(old_version_dir));
 
   // Create a fake chrome.dll key file in the old version directory.  This
   // should prevent the old version directory from getting deleted.
-  FilePath old_chrome_dll(old_version_dir.Append(installer::kChromeDll));
+  FilePath old_chrome_dll(old_version_dir.Append(installer_util::kChromeDll));
   EXPECT_FALSE(file_util::PathExists(old_chrome_dll));
 
   // Hold on to the file exclusively to prevent the directory from
   // being deleted.
   ScopedHandle file(::CreateFile(old_chrome_dll.value().c_str(), GENERIC_READ,
                                  0, NULL, OPEN_ALWAYS, 0, NULL));
   EXPECT_TRUE(file.IsValid());
   EXPECT_TRUE(file_util::PathExists(old_chrome_dll));
 
   package->RemoveOldVersionDirectories(*new_version.get());
   // The old directory should still exist.
   EXPECT_TRUE(file_util::PathExists(old_version_dir));
   EXPECT_TRUE(file_util::PathExists(new_version_dir));
 
   // Now close the file handle to make it possible to delete our key file.
   file.Close();
 
   package->RemoveOldVersionDirectories(*new_version.get());
   // The new directory should still exist.
   EXPECT_TRUE(file_util::PathExists(new_version_dir));
 
   // Now, the old directory and key file should be gone.
   EXPECT_FALSE(file_util::PathExists(old_chrome_dll));
   EXPECT_FALSE(file_util::PathExists(old_version_dir));
 }
 
 TEST_F(PackageTest, WithProduct) {
   TempRegKeyOverride::DeleteAllTempKeys();
 
-  const installer::MasterPreferences& prefs =
-      installer::MasterPreferences::ForCurrentProcess();
+  const installer_util::MasterPreferences& prefs =
+      installer_util::MasterPreferences::ForCurrentProcess();
 
   // TODO(tommi): We should mock this and use our mocked distribution.
   const bool system_level = true;
   BrowserDistribution* distribution =
       BrowserDistribution::GetSpecificDistribution(
           BrowserDistribution::CHROME_BROWSER, prefs);
   scoped_refptr<Package> package(new Package(test_dir_.path()));
   scoped_refptr<Product> product(new Product(distribution,
                                              system_level,
                                              package.get()));
@@ skipping 17 matching lines @@
       scoped_ptr<Version> found_version(package->GetCurrentVersion());
       EXPECT_TRUE(found_version.get() != NULL);
       if (found_version.get()) {
         EXPECT_TRUE(current_version->IsEqual(*found_version.get()));
       }
     }
   }
 
   TempRegKeyOverride::DeleteAllTempKeys();
 }