Revert 9747

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9748 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 26 deletions

diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 21070b2..00fc733 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -21,7 +21,6 @@
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/ssl/ssl_host_state.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/visitedlink_master.h"
@@ -60,7 +59,7 @@ static const int kCreateSessionServiceDelayMS = 500;
 // Profile::GetDefaultRequestContext.
 URLRequestContext* Profile::default_request_context_;
 
-// static
+//static
 void Profile::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kSearchSuggestEnabled, true);
   prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly, true);
@@ -77,12 +76,12 @@ void Profile::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kEnableSpellCheck, true);
 }
 
-// static
+//static
 Profile* Profile::CreateProfile(const FilePath& path) {
   return new ProfileImpl(path);
 }
 
-// static
+//static
 URLRequestContext* Profile::GetDefaultRequestContext() {
   return default_request_context_;
 }
@@ -153,14 +152,6 @@ class OffTheRecordProfileImpl : public Profile,
     return profile_->GetUserScriptMaster();
   }
 
-  virtual SSLHostState* GetSSLHostState() {
-    if (!ssl_host_state_.get())
-      ssl_host_state_.reset(new SSLHostState());
-
-    DCHECK(ssl_host_state_->CalledOnValidThread());
-    return ssl_host_state_.get();
-  }
-
   virtual HistoryService* GetHistoryService(ServiceAccessType sat) {
     if (sat == EXPLICIT_ACCESS) {
       return profile_->GetHistoryService(sat);
@@ -315,11 +306,6 @@ class OffTheRecordProfileImpl : public Profile,
   // The download manager that only stores downloaded items in memory.
   scoped_refptr<DownloadManager> download_manager_;
 
-  // We don't want SSLHostState from the OTR profile to leak back to the main
-  // profile because then the main profile would learn some of the host names
-  // the user visited while OTR.
-  scoped_ptr<SSLHostState> ssl_host_state_;
-
   // Time we were started.
   Time start_time_;
 
@@ -513,14 +499,6 @@ UserScriptMaster* ProfileImpl::GetUserScriptMaster() {
   return user_script_master_.get();
 }
 
-SSLHostState* ProfileImpl::GetSSLHostState() {
-  if (!ssl_host_state_.get())
-    ssl_host_state_.reset(new SSLHostState());
-
-  DCHECK(ssl_host_state_->CalledOnValidThread());
-  return ssl_host_state_.get();
-}
-
 PrefService* ProfileImpl::GetPrefs() {
   if (!prefs_.get()) {
     prefs_.reset(new PrefService(GetPrefFilePath().ToWStringHack()));
@@ -790,7 +768,7 @@ SpellChecker* ProfileImpl::GetSpellChecker() {
     // This is where spellchecker gets initialized. Note that this is being
     // initialized in the ui_thread. However, this is not a problem as long as
     // it is *used* in the io thread.
-    // TODO(sidchat): One day, change everything so that spellchecker gets
+    // TODO (sidchat) One day, change everything so that spellchecker gets
     // initialized in the IO thread itself.
     InitializeSpellChecker(false);
   }