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

chrome/browser/profiles/profile_impl_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_IMPL_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_IO_DATA_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 
-class TransportSecurityPersister;
-
 namespace chrome_browser_net {
 class HttpServerPropertiesManager;
 class Predictor;
 }
 
 namespace net {
 class HttpServerProperties;
 class HttpTransactionFactory;
 }  // namespace net
 
@@ skipping 117 matching lines @@
   mutable scoped_ptr<LazyParams> lazy_params_;
 
   mutable scoped_ptr<chrome_browser_net::HttpServerPropertiesManager>
       http_server_properties_manager_;
 
   mutable scoped_refptr<ChromeURLRequestContext> media_request_context_;
 
   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_;
 
   // Parameters needed for isolated apps.
   FilePath app_path_;
   mutable bool clear_local_state_on_exit_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileImplIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IMPL_IO_DATA_H_