summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc')
-rw-r--r--chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
index 81be184..6625964 100644
--- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
+++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
@@ -61,12 +61,7 @@ class ProfileShortcutManagerTest : public testing::Test {
file_thread_(BrowserThread::FILE, &message_loop_) {
}
- virtual void SetUp() OVERRIDE {
- // Mock the user's Desktop into a temp directory.
- ASSERT_TRUE(fake_user_desktop_.CreateUniqueTempDir());
- ASSERT_TRUE(PathService::Override(base::DIR_USER_DESKTOP,
- fake_user_desktop_.path()));
-
+ virtual void SetUp() {
TestingBrowserProcess* browser_process =
static_cast<TestingBrowserProcess*>(g_browser_process);
profile_manager_.reset(new TestingProfileManager(browser_process));
@@ -85,7 +80,7 @@ class ProfileShortcutManagerTest : public testing::Test {
second_profile_name_ = ASCIIToUTF16("My profile 2");
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() {
message_loop_.RunAllPending();
int num_profiles =
@@ -153,7 +148,6 @@ class ProfileShortcutManagerTest : public testing::Test {
content::TestBrowserThread ui_thread_;
content::TestBrowserThread file_thread_;
scoped_ptr<TestingProfileManager> profile_manager_;
- ScopedTempDir fake_user_desktop_;
FilePath dest_path_;
string16 profile_name_;
FilePath second_dest_path_;