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

Side by Side Diff: chrome/browser/profiles/profile_manager_unittest.cc

Issue 6122006: Cleanup: Remove unneeded includes of pref_names.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "app/system_monitor.h" 7 #include "app/system_monitor.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "chrome/browser/browser_thread.h" 12 #include "chrome/browser/browser_thread.h"
13 #include "chrome/browser/prefs/pref_service.h" 13 #include "chrome/browser/prefs/pref_service.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/profiles/profile_manager.h" 15 #include "chrome/browser/profiles/profile_manager.h"
16 #include "chrome/common/chrome_constants.h" 16 #include "chrome/common/chrome_constants.h"
17 #include "chrome/common/chrome_paths.h" 17 #include "chrome/common/chrome_paths.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "chrome/common/notification_service.h" 19 #include "chrome/common/notification_service.h"
20 #include "chrome/common/pref_names.h"
21 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
22 21
23 class ProfileManagerTest : public testing::Test { 22 class ProfileManagerTest : public testing::Test {
24 protected: 23 protected:
25 ProfileManagerTest() : ui_thread_(BrowserThread::UI, &message_loop_) { 24 ProfileManagerTest() : ui_thread_(BrowserThread::UI, &message_loop_) {
26 } 25 }
27 26
28 virtual void SetUp() { 27 virtual void SetUp() {
29 // Name a subdirectory of the temp directory. 28 // Name a subdirectory of the temp directory.
30 ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_dir_)); 29 ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_dir_));
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 // Force lazy-init of some profile services to simulate use. 139 // Force lazy-init of some profile services to simulate use.
141 EXPECT_TRUE(profile1->GetHistoryService(Profile::EXPLICIT_ACCESS)); 140 EXPECT_TRUE(profile1->GetHistoryService(Profile::EXPLICIT_ACCESS));
142 EXPECT_TRUE(profile1->GetBookmarkModel()); 141 EXPECT_TRUE(profile1->GetBookmarkModel());
143 EXPECT_TRUE(profile2->GetBookmarkModel()); 142 EXPECT_TRUE(profile2->GetBookmarkModel());
144 EXPECT_TRUE(profile2->GetHistoryService(Profile::EXPLICIT_ACCESS)); 143 EXPECT_TRUE(profile2->GetHistoryService(Profile::EXPLICIT_ACCESS));
145 profile1.reset(); 144 profile1.reset();
146 profile2.reset(); 145 profile2.reset();
147 // Make sure history cleans up correctly. 146 // Make sure history cleans up correctly.
148 message_loop_.RunAllPending(); 147 message_loop_.RunAllPending();
149 } 148 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_manager.cc ('k') | chrome/browser/remoting/remoting_resources_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698