Add new PathService paths for Windows' All Users Desktop and Quick Launch folders.

chrome/installer/util/shell_util_unittest.cc

 // Copyright (c) 2012 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 <shlobj.h>
-
 #include <fstream>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/md5.h"
+#include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/test/test_shortcut_win.h"
 #include "base/win/shortcut.h"
 #include "base/win/windows_version.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
-class ShellUtilTestWithDirAndDist : public testing::Test {
+class ShellUtilShortcutTest : public testing::Test {
  protected:
   virtual void SetUp() {

[grt (UTC plus 2), 2012/09/19 16:44:46]

OVERRIDE

[gab, 2012/09/19 18:22:58]

Done (and also done in profile_shorcut_manager_unittest_win.cc).

-    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     dist_ = BrowserDistribution::GetDistribution();
     ASSERT_TRUE(dist_ != NULL);
+
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    ASSERT_TRUE(fake_user_desktop_.CreateUniqueTempDir());
+    ASSERT_TRUE(fake_common_desktop_.CreateUniqueTempDir());
+    EXPECT_TRUE(PathService::Override(base::DIR_USER_DESKTOP,

[grt (UTC plus 2), 2012/09/19 16:44:46]

why not ASSERT_TRUE?  should the test continue if these calls to Override fail?

[gab, 2012/09/19 18:22:58]

Well the test as a whole can still pass if Override fails (i.e. by creating and
testing shortcuts on the real Desktop).

The thinking was that the test would fail (as there would be an EXPECT error at
the end), but the developer investigating would know the rest of the test passed
(i.e. not other errors) so that the problem is the Override (which is likely a
problem external to this test).

+                                      fake_user_desktop_.path()));
+    EXPECT_TRUE(PathService::Override(base::DIR_COMMON_DESKTOP,
+                                      fake_common_desktop_.path()));
   }
 
   BrowserDistribution* dist_;
 
   ScopedTempDir temp_dir_;
+
+  ScopedTempDir fake_user_desktop_;
+  ScopedTempDir fake_common_desktop_;
 };
 
 // Returns the status of a call to base::win::VerifyShorcut for the properties
 // passed in.
 // TODO(gab): This is only temporary while waiting for my upcoming CL that will
 // massively refactor the shell_util shortcut methods' interface (i.e. I didn't
 // want to adapt every test here for this half-changed state as they will change
 // again very soon).
 base::win::VerifyShortcutStatus VerifyChromeShortcut(
     const FilePath& exe_path,
     const FilePath& shortcut_path,
     const string16& description,
     int icon_index) {
   base::win::ShortcutProperties expected_properties;
   expected_properties.set_target(exe_path);
   expected_properties.set_description(description);
   expected_properties.set_icon(exe_path, icon_index);
   return base::win::VerifyShortcut(shortcut_path, expected_properties);
 }
 
 }
 
 // Test that we can open archives successfully.
-TEST_F(ShellUtilTestWithDirAndDist, UpdateChromeShortcutTest) {
+TEST_F(ShellUtilShortcutTest, UpdateChromeShortcut) {
   // Create an executable in test path by copying ourself to it.
   wchar_t exe_full_path_str[MAX_PATH];
   EXPECT_FALSE(::GetModuleFileName(NULL, exe_full_path_str, MAX_PATH) == 0);
   FilePath exe_full_path(exe_full_path_str);
 
   FilePath exe_path = temp_dir_.path().AppendASCII("setup.exe");
   EXPECT_TRUE(file_util::CopyFile(exe_full_path, exe_path));
 
   FilePath shortcut_path = temp_dir_.path().AppendASCII("shortcut.lnk");
   const string16 description(L"dummy description");
@@ skipping 43 matching lines @@
                                               shortcut_path.value(),
                                               string16(),
                                               description2,
                                               exe_path.value(),
                                               dist_->GetIconIndex(),
                                               ShellUtil::SHORTCUT_NO_OPTIONS));
   EXPECT_EQ(base::win::VERIFY_SHORTCUT_SUCCESS,
             VerifyChromeShortcut(exe_path, shortcut_path, description2, 1));
 }
 
-TEST_F(ShellUtilTestWithDirAndDist, CreateChromeDesktopShortcutTest) {
-  // Run this test on Vista+ only if we are running elevated.
-  if (base::win::GetVersion() > base::win::VERSION_XP && !IsUserAnAdmin()) {
-    LOG(ERROR) << "Must be admin to run this test on Vista+";
-    return;
-  }
-
+TEST_F(ShellUtilShortcutTest, CreateChromeDesktopShortcut) {
   // Create an executable in test path by copying ourself to it.
   wchar_t exe_full_path_str[MAX_PATH];
   EXPECT_FALSE(::GetModuleFileName(NULL, exe_full_path_str, MAX_PATH) == 0);
   FilePath exe_full_path(exe_full_path_str);
 
   FilePath exe_path = temp_dir_.path().AppendASCII("setup.exe");
   EXPECT_TRUE(file_util::CopyFile(exe_full_path, exe_path));
 
   const string16 description(L"dummy description");
 
@@ skipping 157 matching lines @@
   EXPECT_EQ(base::win::VERIFY_SHORTCUT_SUCCESS,
             VerifyChromeShortcut(
                 exe_path, second_profile_shortcut_path, description, 0));
   std::vector<string16> profile_names;
   profile_names.push_back(default_profile_shortcut_name);
   profile_names.push_back(second_profile_shortcut_name);
   EXPECT_TRUE(ShellUtil::RemoveChromeDesktopShortcutsWithAppendedNames(
       profile_names));
 }
 
-TEST_F(ShellUtilTestWithDirAndDist, BuildAppModelIdBasic) {
+TEST(ShellUtilTest, BuildAppModelIdBasic) {
   std::vector<string16> components;
-  const string16 base_app_id(dist_->GetBaseAppId());
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+  const string16 base_app_id(dist->GetBaseAppId());
   components.push_back(base_app_id);
   ASSERT_EQ(base_app_id, ShellUtil::BuildAppModelId(components));
 }
 
-TEST_F(ShellUtilTestWithDirAndDist, BuildAppModelIdManySmall) {
+TEST(ShellUtilTest, BuildAppModelIdManySmall) {
   std::vector<string16> components;
-  const string16 suffixed_app_id(dist_->GetBaseAppId().append(L".gab"));
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+  const string16 suffixed_app_id(dist->GetBaseAppId().append(L".gab"));
   components.push_back(suffixed_app_id);
   components.push_back(L"Default");
   components.push_back(L"Test");
   ASSERT_EQ(suffixed_app_id + L".Default.Test",
             ShellUtil::BuildAppModelId(components));
 }
 
-TEST_F(ShellUtilTestWithDirAndDist, BuildAppModelIdLongUsernameNormalProfile) {
+TEST(ShellUtilTest, BuildAppModelIdLongUsernameNormalProfile) {
   std::vector<string16> components;
   const string16 long_appname(
       L"Chrome.a_user_who_has_a_crazy_long_name_with_some_weird@symbols_in_it_"
       L"that_goes_over_64_characters");
   components.push_back(long_appname);
   components.push_back(L"Default");
   ASSERT_EQ(L"Chrome.a_user_wer_64_characters.Default",
             ShellUtil::BuildAppModelId(components));
 }
 
-TEST_F(ShellUtilTestWithDirAndDist, BuildAppModelIdLongEverything) {
+TEST(ShellUtilTest, BuildAppModelIdLongEverything) {
   std::vector<string16> components;
   const string16 long_appname(
       L"Chrome.a_user_who_has_a_crazy_long_name_with_some_weird@symbols_in_it_"
       L"that_goes_over_64_characters");
   components.push_back(long_appname);
   components.push_back(
       L"A_crazy_profile_name_not_even_sure_whether_that_is_possible");
   const string16 constructed_app_id(ShellUtil::BuildAppModelId(components));
   ASSERT_LE(constructed_app_id.length(), installer::kMaxAppModelIdLength);
   ASSERT_EQ(L"Chrome.a_user_wer_64_characters.A_crazy_profilethat_is_possible",
@@ skipping 27 matching lines @@
 
   const string16 expected[] = { L"", L"MY", L"MZXQ", L"MZXW6", L"MZXW6YQ",
                                 L"MZXW6YTB", L"MZXW6YTBOI"};
 
   // Run the tests, with one more letter in the input every pass.
   for (int i = 0; i < arraysize(expected); ++i) {
     ASSERT_EQ(expected[i],
               ShellUtil::ByteArrayToBase32(test_array, i));
   }
 }