Revert EnableClose() removal and related crash fixes. I don't understand the crashes here, and th...

chrome/test/base/testing_profile.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/base/testing_profile.h"
 
 #include "build/build_config.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 355 matching lines @@
 
 static ProfileKeyedService* BuildTemplateURLService(Profile* profile) {
   return new TemplateURLService(profile);
 }
 
 void TestingProfile::CreateTemplateURLService() {
   TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
       this, BuildTemplateURLService);
 }
 
-void TestingProfile::BlockUntilTemplateURLServiceLoaded() {
-  TemplateURLService* turl_model =
-      TemplateURLServiceFactory::GetForProfile(this);
-  if (turl_model->loaded())
-    return;
-
-  ui_test_utils::WindowedNotificationObserver turl_service_load_observer(
-      chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
-      content::NotificationService::AllSources());
-  turl_model->Load();
-  turl_service_load_observer.Wait();
-}
-
 void TestingProfile::CreateExtensionProcessManager() {
   extension_process_manager_.reset(ExtensionProcessManager::Create(this));
 }
 
 ExtensionService* TestingProfile::CreateExtensionService(
     const CommandLine* command_line,
     const FilePath& install_directory,
     bool autoupdate_enabled) {
   // Extension pref store, created for use by |extension_prefs_|.
 
@@ skipping 455 matching lines @@
 quota::SpecialStoragePolicy* TestingProfile::GetSpecialStoragePolicy() {
   return GetExtensionSpecialStoragePolicy();
 }
 
 void TestingProfile::DestroyWebDataService() {
   if (!web_data_service_.get())
     return;
 
   web_data_service_->Shutdown();
 }