Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2014)

Unified Diff: chrome/browser/profiles/profile_manager_unittest.cc

Issue 10823217: Create/Delete windows profile shortcuts (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Modified shortcut tests to be Windows only and removed extra #includes from Profile Manager tests. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_manager.cc ('k') | chrome/browser/profiles/profile_shortcut_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « chrome/browser/profiles/profile_manager.cc ('k') | chrome/browser/profiles/profile_shortcut_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698