Index: chrome/test/live_sync/live_sync_test.cc |
=================================================================== |
--- chrome/test/live_sync/live_sync_test.cc (revision 97284) |
+++ chrome/test/live_sync/live_sync_test.cc (working copy) |
@@ -226,7 +226,9 @@ |
if (!file_util::PathExists(path)) |
CHECK(file_util::CreateDirectory(path)); |
- return Profile::CreateProfile(path); |
+ Profile* profile = Profile::CreateProfile(path); |
+ g_browser_process->profile_manager()->RegisterTestingProfile(profile, true); |
+ return profile; |
} |
Profile* LiveSyncTest::GetProfile(int index) { |
@@ -246,9 +248,9 @@ |
} |
Profile* LiveSyncTest::verifier() { |
- if (verifier_.get() == NULL) |
+ if (verifier_ == NULL) |
LOG(FATAL) << "SetupClients() has not yet been called."; |
- return verifier_.get(); |
+ return verifier_; |
} |
void LiveSyncTest::DisableVerifier() { |
@@ -277,9 +279,9 @@ |
} |
// Create the verifier profile. |
- verifier_.reset(MakeProfile(FILE_PATH_LITERAL("Verifier"))); |
+ verifier_ = MakeProfile(FILE_PATH_LITERAL("Verifier")); |
ui_test_utils::WaitForBookmarkModelToLoad(verifier()->GetBookmarkModel()); |
- return (verifier_.get() != NULL); |
+ return (verifier_ != NULL); |
} |
bool LiveSyncTest::SetupSync() { |
@@ -299,9 +301,7 @@ |
} |
void LiveSyncTest::CleanUpOnMainThread() { |
- profiles_.reset(); |
clients_.reset(); |
- verifier_.reset(NULL); |
} |
void LiveSyncTest::SetUpInProcessBrowserTestFixture() { |