Temporarily deactivate Start Menu shortcut move code in light of unresolved issues.

chrome/installer/setup/install.cc

Index: chrome/installer/setup/install.cc
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index b472cb7aae321edd5df8e7e12e7608edd020e976..dae0127546e2cf534cc7d0b42c0f5ad40263d531 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -431,19 +431,25 @@ void CreateOrUpdateShortcuts(
   // exist at the expected location on disk.  First check if it exists in the
   // previous location (under a subdirectory) and, if so, move it to the new
   // location.
-  base::FilePath old_shortcut_path;
-  ShellUtil::GetShortcutPath(
-      ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED, dist,
-      shortcut_level, &old_shortcut_path);
-  if (base::PathExists(old_shortcut_path)) {
-    ShellUtil::MoveExistingShortcut(
-        ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED,
-        ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT,
-        dist, start_menu_properties);
-  }
-
+  // base::FilePath old_shortcut_path;
+  // ShellUtil::GetShortcutPath(
+  //     ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED, dist,
+  //     shortcut_level, &old_shortcut_path);
+  // if (base::PathExists(old_shortcut_path)) {
+  //   ShellUtil::MoveExistingShortcut(
+  //       ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED,
+  //       ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT,
+  //       dist, start_menu_properties);
+  // }
+
+  // ExecuteAndLogShortcutOperation(
+  //     ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT, dist,
+  //     start_menu_properties, shortcut_operation);
+
+  // TODO(bcwhite): Reactivate the code above and remove this when we figure out
+  // the cause of http://crbug.com/548964 and http://crbug.com/548965.
   ExecuteAndLogShortcutOperation(
-      ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT, dist,
+      ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED, dist,
       start_menu_properties, shortcut_operation);
 }