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

chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc

Index: chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
diff --git a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
index 1950d18ea4e14971ec2dfc112d5b61f63db73278..c7531d73da0d644d20f2a93ab9a84b0155588819 100644
--- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
+++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
@@ -6,6 +6,7 @@
 #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"
@@ -32,10 +33,10 @@ namespace {
 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);
 }