Profiles: Really fix refcounted services.

chrome/browser/profiles/profile_dependency_manager.cc

 // Copyright (c) 2012 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/browser/profiles/profile_dependency_manager.h"
 
 #include <algorithm>
 #include <deque>
 #include <iterator>
 
@@ skipping 84 matching lines @@
   for (std::vector<ProfileKeyedBaseFactory*>::reverse_iterator rit =
            destruction_order_.rbegin(); rit != destruction_order_.rend();
        ++rit) {
     if (!profile->IsOffTheRecord()) {
       // We only register preferences on normal profiles because the incognito
       // profile shares the pref service with the normal one.
       (*rit)->RegisterUserPrefsOnProfile(profile);
     }
 
     if (is_testing_profile && (*rit)->ServiceIsNULLWhileTesting()) {
-      (*rit)->SetTestingFactory(profile, NULL);
+      (*rit)->SetEmptyTestingFactory(profile);
     } else if ((*rit)->ServiceIsCreatedWithProfile()) {
       // Create the service.
-      (*rit)->GetBaseForProfile(profile, true);
+      (*rit)->CreateServiceNow(profile);
     }
   }
 }
 
 void ProfileDependencyManager::DestroyProfileServices(Profile* profile) {
   if (destruction_order_.empty())
     BuildDestructionOrder(profile);
 
   for (std::vector<ProfileKeyedBaseFactory*>::const_iterator it =
            destruction_order_.begin(); it != destruction_order_.end(); ++it) {
@@ skipping 184 matching lines @@
   }
 
   result.append("\n  /* Toplevel profile */\n");
   result.append("  Profile [shape=box];\n");
 
   result.append("}\n");
   return result;
 }
 
 #endif