Merge 59915 - Refcount the host content settings map from the content excepti...

chrome/browser/host_content_settings_map.cc

 // Copyright (c) 2010 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/host_content_settings_map.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_thread.h"
@@ skipping 688 matching lines @@
     updating_preferences_ = true;
     prefs->ClearPref(prefs::kDefaultContentSettings);
     prefs->ClearPref(prefs::kContentSettingsPatterns);
     prefs->ClearPref(prefs::kBlockThirdPartyCookies);
     updating_preferences_ = false;
     NotifyObservers(
         ContentSettingsDetails(Pattern(), CONTENT_SETTINGS_TYPE_DEFAULT, ""));
   }
 }
 
-bool HostContentSettingsMap::IsOffTheRecord() {
-  return profile_->IsOffTheRecord();
-}
-
 void HostContentSettingsMap::Observe(NotificationType type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 
   if (NotificationType::PREF_CHANGED == type) {
     if (updating_preferences_)
       return;
 
     std::string* name = Details<std::string>(details).ptr();
@@ skipping 155 matching lines @@
   if (!profile_)
     return;
   PrefService* prefs = profile_->GetPrefs();
   prefs->RemovePrefObserver(prefs::kDefaultContentSettings, this);
   prefs->RemovePrefObserver(prefs::kContentSettingsPatterns, this);
   prefs->RemovePrefObserver(prefs::kBlockThirdPartyCookies, this);
   notification_registrar_.Remove(this, NotificationType::PROFILE_DESTROYED,
                                  Source<Profile>(profile_));
   profile_ = NULL;
 }