| Index: chrome/browser/profiles/profile_manager_unittest.cc
|
| diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
|
| index 0104271f09d5bf3bc9be7e87212722867e463830..42fd467e652c51cf44f6d7958f258a7d8fbfd3d8 100644
|
| --- a/chrome/browser/profiles/profile_manager_unittest.cc
|
| +++ b/chrome/browser/profiles/profile_manager_unittest.cc
|
| @@ -96,7 +96,7 @@ class ProfileManagerTest : public testing::Test {
|
| db_thread_(BrowserThread::DB, &message_loop_),
|
| file_thread_(BrowserThread::FILE, &message_loop_),
|
| io_thread_(local_state_.Get(), NULL,
|
| - extension_event_router_forwarder_) {
|
| + extension_event_router_forwarder_.get()) {
|
| #if defined(OS_MACOSX)
|
| base::SystemMonitor::AllocateSystemIOPorts();
|
| #endif
|
| @@ -215,14 +215,16 @@ TEST_F(ProfileManagerTest, CreateAndUseTwoProfiles) {
|
| // Force lazy-init of some profile services to simulate use.
|
| profile1->CreateHistoryService(true, false);
|
| EXPECT_TRUE(HistoryServiceFactory::GetForProfile(profile1,
|
| - Profile::EXPLICIT_ACCESS));
|
| + Profile::EXPLICIT_ACCESS).
|
| + get());
|
| profile1->CreateBookmarkModel(true);
|
| EXPECT_TRUE(BookmarkModelFactory::GetForProfile(profile1));
|
| profile2->CreateBookmarkModel(true);
|
| EXPECT_TRUE(BookmarkModelFactory::GetForProfile(profile2));
|
| profile2->CreateHistoryService(true, false);
|
| EXPECT_TRUE(HistoryServiceFactory::GetForProfile(profile2,
|
| - Profile::EXPLICIT_ACCESS));
|
| + Profile::EXPLICIT_ACCESS).
|
| + get());
|
|
|
| // Make sure any pending tasks run before we destroy the profiles.
|
| message_loop_.RunAllPending();
|
|
|