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

chrome/browser/host_content_settings_map.h

 // 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.
 
 // Maps hostnames to custom content settings.  Written on the UI thread and read
 // on any thread.  One instance per profile.
 
 #ifndef CHROME_BROWSER_HOST_CONTENT_SETTINGS_MAP_H_
 #define CHROME_BROWSER_HOST_CONTENT_SETTINGS_MAP_H_
 #pragma once
@@ skipping 206 matching lines @@
   // invoked on an off-the-record map.
   //
   // This should only be called on the UI thread.
   void SetBlockThirdPartyCookies(bool block);
 
   // Resets all settings levels.
   //
   // This should only be called on the UI thread.
   void ResetToDefaults();
 
-  // Whether this settings map is associated with an OTR session.
-  bool IsOffTheRecord();
-
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
  private:
   friend class base::RefCountedThreadSafe<HostContentSettingsMap>;
 
   typedef std::pair<ContentSettingsType, std::string>
       ContentSettingsTypeResourceIdentifierPair;
@@ skipping 68 matching lines @@
 };
 
 // Stream operator so HostContentSettingsMap::Pattern can be used in
 // assertion statements.
 inline std::ostream& operator<<(
     std::ostream& out, const HostContentSettingsMap::Pattern& pattern) {
   return out << pattern.AsString();
 }
 
 #endif  // CHROME_BROWSER_HOST_CONTENT_SETTINGS_MAP_H_