Revert 224269 "Don't persist HPKP if PrivacyMode is enabled."

trunk/src/net/url_request/url_request_test_util.h

 // Copyright (c) 2012 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 NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_
 #define NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_
 
 #include <stdlib.h>
 
 #include <map>
@@ skipping 252 matching lines @@
       const AuthChallengeInfo& auth_info,
       const AuthCallback& callback,
       AuthCredentials* credentials) OVERRIDE;
   virtual bool OnCanGetCookies(const URLRequest& request,
                                const CookieList& cookie_list) OVERRIDE;
   virtual bool OnCanSetCookie(const URLRequest& request,
                               const std::string& cookie_line,
                               CookieOptions* options) OVERRIDE;
   virtual bool OnCanAccessFile(const URLRequest& request,
                                const base::FilePath& path) const OVERRIDE;
-  virtual bool OnCanThrottleRequest(const URLRequest& request) const OVERRIDE;
+  virtual bool OnCanThrottleRequest(
+      const URLRequest& request) const OVERRIDE;
   virtual int OnBeforeSocketStreamConnect(
       SocketStream* stream,
       const CompletionCallback& callback) OVERRIDE;
   virtual void OnRequestWaitStateChange(const URLRequest& request,
                                         RequestWaitState state) OVERRIDE;
 
   void InitRequestStatesIfNew(int request_id);
 
   int last_error_;
   int error_count_;
@@ skipping 59 matching lines @@
       NetworkDelegate* network_delegate) const OVERRIDE;
   void set_main_intercept_job(URLRequestJob* job);
 
  private:
   mutable URLRequestJob* main_intercept_job_;
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_