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

chrome/browser/profiles/profile_impl_io_data.h

Index: chrome/browser/profiles/profile_impl_io_data.h
===================================================================
--- chrome/browser/profiles/profile_impl_io_data.h	(revision 120815)
+++ chrome/browser/profiles/profile_impl_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.
 
@@ -12,8 +12,6 @@
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 
-class TransportSecurityPersister;
-
 namespace chrome_browser_net {
 class HttpServerPropertiesManager;
 class Predictor;
@@ -151,7 +149,6 @@
   mutable scoped_ptr<net::HttpTransactionFactory> main_http_factory_;
   mutable scoped_ptr<net::HttpTransactionFactory> media_http_factory_;
   mutable scoped_ptr<net::FtpTransactionFactory> ftp_factory_;
-  mutable scoped_ptr<TransportSecurityPersister> transport_security_persister_;
 
   mutable scoped_ptr<chrome_browser_net::Predictor> predictor_;