More misc. cleanups to minimize future refactoring diffs.

chrome/browser/search_engines/template_url_service_test_util.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/search_engines/template_url_service_test_util.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 209 matching lines @@
 void TemplateURLServiceTestUtil::SetGoogleBaseURL(
     const std::string& base_url) const {
   UIThreadSearchTermsData::SetGoogleBaseURL(new std::string(base_url));
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
       content::NotificationService::AllSources(),
       content::NotificationService::NoDetails());
 }
 
 TemplateURLService* TemplateURLServiceTestUtil::model() const {
-  return TemplateURLServiceFactory::GetForProfile(profile());
+  return TemplateURLServiceFactory::GetForProfile(profile_.get());
 }
 
 TestingProfile* TemplateURLServiceTestUtil::profile() const {
   return profile_.get();
 }
 
 void TemplateURLServiceTestUtil::StartIOThread() {
   profile_->StartIOThread();
 }
 
 void TemplateURLServiceTestUtil::PumpLoop() {
   message_loop_.RunAllPending();
 }