Refactor ShellUtil shortcut code -- single multi-purpose methods as opposed to many slighlty diffe…

chrome/browser/profiles/profile_shortcut_manager_unittest_win.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 "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
+#include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "base/test/test_shortcut_win.h"
 #include "base/win/shortcut.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "content/public/test/test_browser_thread.h"
 #include "grit/theme_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // Sets |path| to the path to the shortcut for this profile.
 // Automatically fails the test on failure to do so.
 void GetShortcutPathForProfile(BrowserDistribution* dist,
                                const string16& profile_name,
                                FilePath* path) {
-  string16 shortcut_name;
-  EXPECT_TRUE(ShellUtil::GetDesktopPath(false, path));
-  EXPECT_TRUE(ShellUtil::GetChromeShortcutName(dist, false, profile_name,
-                                               &shortcut_name));
+  EXPECT_TRUE(ShellUtil::GetShortcutPath(ShellUtil::SHORTCUT_DESKTOP, dist,
+                                         ShellUtil::CURRENT_USER, path));
+  string16 shortcut_name(
+      ProfileShortcutManager::GetShortcutNameForProfile(profile_name));
   *path = path->Append(shortcut_name);
 }
 
 // Returns true if the shortcut for this profile exists.
 bool ProfileShortcutExists(BrowserDistribution* dist,
                            const string16& profile_name) {
   FilePath shortcut_path;
   GetShortcutPathForProfile(dist, profile_name, &shortcut_path);
   return file_util::PathExists(shortcut_path);
 }
@@ skipping 214 matching lines @@
       CreateProfileShortcut(second_dest_path_);
   MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   MessageLoop::current()->Run();
   ValidateProfileShortcut(dist_, second_profile_name_);
 
   // Verify that the original shortcut received the profile's name
   ValidateProfileShortcut(dist_, profile_name_);
   // Verify that a default shortcut no longer exists
   EXPECT_FALSE(ProfileShortcutExists(dist_, string16()));
 }