Fix sync test crashing when multiprofiles are enabled on Mac.

chrome/test/live_sync/live_sync_test.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/live_sync/live_sync_test.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 208 matching lines @@
 
 // static
 Profile* LiveSyncTest::MakeProfile(const FilePath::StringType name) {
   FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
   path = path.Append(name);
 
   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) {
   if (profiles_.empty())
     LOG(FATAL) << "SetupSync() has not yet been called.";
   if (index < 0 || index >= static_cast<int>(profiles_.size()))
     LOG(FATAL) << "GetProfile(): Index is out of bounds.";
   return profiles_[index];
 }
 
 ProfileSyncServiceHarness* LiveSyncTest::GetClient(int index) {
   if (clients_.empty())
     LOG(FATAL) << "SetupClients() has not yet been called.";
   if (index < 0 || index >= static_cast<int>(clients_.size()))
     LOG(FATAL) << "GetClient(): Index is out of bounds.";
   return clients_[index];
 }
 
 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() {
   use_verifier_ = false;
 }
 
 bool LiveSyncTest::SetupClients() {
   if (num_clients_ <= 0)
     LOG(FATAL) << "num_clients_ incorrectly initialized.";
   if (!profiles_.empty() || !clients_.empty())
     LOG(FATAL) << "SetupClients() has already been called.";
 
   // Start up a sync test server if one is needed.
   SetUpTestServerIfRequired();
 
   // Create the required number of sync profiles and clients.
   for (int i = 0; i < num_clients_; ++i) {
     profiles_.push_back(MakeProfile(
         base::StringPrintf(FILE_PATH_LITERAL("Profile%d"), i)));
     EXPECT_FALSE(GetProfile(i) == NULL) << "GetProfile(" << i << ") failed.";
     clients_.push_back(
         new ProfileSyncServiceHarness(GetProfile(i), username_, password_));
     EXPECT_FALSE(GetClient(i) == NULL) << "GetClient(" << i << ") failed.";
     ui_test_utils::WaitForBookmarkModelToLoad(
         GetProfile(i)->GetBookmarkModel());
   }
 
   // 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() {
   // Create sync profiles and clients if they haven't already been created.
   if (profiles_.empty()) {
     if (!SetupClients())
       LOG(FATAL) << "SetupClients() failed.";
   }
 
   // Sync each of the profiles.
   for (int i = 0; i < num_clients_; ++i) {
     if (!GetClient(i)->SetupSync())
       LOG(FATAL) << "SetupSync() failed.";
   }
 
   return true;
 }
 
 void LiveSyncTest::CleanUpOnMainThread() {
-  profiles_.reset();
   clients_.reset();
-  verifier_.reset(NULL);
 }
 
 void LiveSyncTest::SetUpInProcessBrowserTestFixture() {
   // We don't take a reference to |resolver|, but mock_host_resolver_override_
   // does, so effectively assumes ownership.
   net::RuleBasedHostResolverProc* resolver =
       new net::RuleBasedHostResolverProc(host_resolver());
   resolver->AllowDirectLookup("*.google.com");
   // On Linux, we use Chromium's NSS implementation which uses the following
   // hosts for certificate verification. Without these overrides, running the
@@ skipping 221 matching lines @@
                                   const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       new SetProxyConfigTask(&done,
                              context_getter,
                              proxy_config));
   done.Wait();
 }