Merge 120807 - Revert 116685 - Make incognito windows not inherit HSTS state from the main profile.

chrome/browser/profiles/profile_io_data.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 11 matching lines @@
 class AudioManager;
 class ChromeAppCacheService;
 class ChromeBlobStorageContext;
 class CookieSettings;
 class DesktopNotificationService;
 class ExtensionInfoMap;
 class HostContentSettingsMap;
 class IOThread;
 class Profile;
 class ProtocolHandlerRegistry;
+class TransportSecurityPersister;
 
 namespace fileapi {
 class FileSystemContext;
 }  // namespace fileapi
 
 namespace media_stream {
 class MediaStreamManager;
 }  // namespace media_stream
 
 namespace net {
@@ skipping 248 matching lines @@
   mutable scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
 
   // TODO(willchan): Remove from ResourceContext.
   mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
   mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   mutable scoped_refptr<CookieSettings> cookie_settings_;
   mutable DesktopNotificationService* notification_service_;
 
   mutable ResourceContext resource_context_;
 
+  mutable scoped_ptr<TransportSecurityPersister>
+      transport_security_persister_;
+
   // These are only valid in between LazyInitialize() and their accessor being
   // called.
   mutable scoped_refptr<ChromeURLRequestContext> main_request_context_;
   mutable scoped_refptr<ChromeURLRequestContext> extensions_request_context_;
   // One AppRequestContext per isolated app.
   mutable AppRequestContextMap app_request_context_map_;
 
   // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
   bool initialized_on_UI_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_