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

chrome/browser/profiles/profile_io_data.h

Index: chrome/browser/profiles/profile_io_data.h
===================================================================
--- chrome/browser/profiles/profile_io_data.h	(revision 120815)
+++ chrome/browser/profiles/profile_io_data.h	(working copy)
@@ -1,4 +1,4 @@
-// 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.
 
@@ -30,6 +30,7 @@
 class IOThread;
 class Profile;
 class ProtocolHandlerRegistry;
+class TransportSecurityPersister;
 
 namespace fileapi {
 class FileSystemContext;
@@ -298,6 +299,9 @@
 
   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_;