Create/Delete windows profile shortcuts

chrome/browser/profiles/profile_manager_unittest.cc

Index: chrome/browser/profiles/profile_manager_unittest.cc
===================================================================
--- chrome/browser/profiles/profile_manager_unittest.cc	(revision 150342)
+++ chrome/browser/profiles/profile_manager_unittest.cc	(working copy)
@@ -23,12 +23,15 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/profiles/profile_shortcut_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/installer/util/browser_distribution.h"
+#include "chrome/installer/util/shell_util.h"
 #include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
@@ -37,6 +40,7 @@
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ -77,13 +81,6 @@
 
     return new TestingProfile(path, this);
   }
-
-#if defined(OS_WIN)
-  virtual ProfileShortcutManagerWin* CreateShortcutManager() OVERRIDE {
-    // We should avoid creating shortcuts in these tests.
-    return NULL;
-  }
-#endif
 };
 
 }  // namespace testing
@@ -117,8 +114,9 @@
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     static_cast<TestingBrowserProcess*>(g_browser_process)->SetProfileManager(
         new testing::ProfileManager(temp_dir_.path()));
+
 #if defined(OS_CHROMEOS)
-  CommandLine *cl = CommandLine::ForCurrentProcess();
+  CommandLine* cl = CommandLine::ForCurrentProcess();
   cl->AppendSwitch(switches::kTestType);
 #endif
   }
@@ -287,13 +285,16 @@
 
   profile_manager->CreateProfileAsync(dest_path,
       base::Bind(&MockObserver::OnProfileCreated,
-                 base::Unretained(&mock_observer1)), string16(), string16());
+                 base::Unretained(&mock_observer1)),
+                 string16(), string16());
   profile_manager->CreateProfileAsync(dest_path,
       base::Bind(&MockObserver::OnProfileCreated,
-                 base::Unretained(&mock_observer2)), string16(), string16());
+                 base::Unretained(&mock_observer2)),
+                 string16(), string16());
   profile_manager->CreateProfileAsync(dest_path,
       base::Bind(&MockObserver::OnProfileCreated,
-                 base::Unretained(&mock_observer3)), string16(), string16());
+                 base::Unretained(&mock_observer3)),
+                 string16(), string16());
 
   message_loop_.RunAllPending();
 }