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) |
@@ -77,13 +77,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 +110,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 +281,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(); |
} |