Reset the Lo-Fi main frame state when there is a new main frame request

components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc

 // Copyright 2014 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.
 
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 159 matching lines @@
 
 base::Time DataReductionProxyRequestOptions::Now() const {
   return base::Time::Now();
 }
 
 void DataReductionProxyRequestOptions::RandBytes(void* output,
                                                  size_t length) const {
   crypto::RandBytes(output, length);
 }
 
-void DataReductionProxyRequestOptions::MaybeAddRequestHeader(
-    const net::ProxyServer& proxy_server,
+void DataReductionProxyRequestOptions::AddRequestHeader(
     net::HttpRequestHeaders* request_headers) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  if (!proxy_server.is_valid())
-    return;
-  if (proxy_server.is_direct())
-    return;
-  if (proxy_server.host_port_pair().IsEmpty())
-    return;
-  if (data_reduction_proxy_config_->IsDataReductionProxy(
-          proxy_server.host_port_pair(), NULL)) {
-    SetHeader(request_headers);
-  }
-}
-
-void DataReductionProxyRequestOptions::SetHeader(
-    net::HttpRequestHeaders* headers) {
   base::Time now = Now();
   // Authorization credentials must be regenerated if they are expired.
   if (!use_assigned_credentials_ && (now > credentials_expiration_time_))
     UpdateCredentials();
   const char kChromeProxyHeader[] = "Chrome-Proxy";
   std::string header_value;
-  if (headers->HasHeader(kChromeProxyHeader)) {
-    headers->GetHeader(kChromeProxyHeader, &header_value);
-    headers->RemoveHeader(kChromeProxyHeader);
+  if (request_headers->HasHeader(kChromeProxyHeader)) {
+    request_headers->GetHeader(kChromeProxyHeader, &header_value);
+    request_headers->RemoveHeader(kChromeProxyHeader);
     header_value += ", ";
   }
   header_value += header_value_;
-  headers->SetHeader(kChromeProxyHeader, header_value);
+  request_headers->SetHeader(kChromeProxyHeader, header_value);
 }
 
 void DataReductionProxyRequestOptions::ComputeCredentials(
     const base::Time& now,
     std::string* session,
     std::string* credentials) const {
   DCHECK(session);
   DCHECK(credentials);
   int64_t timestamp = (now - base::Time::UnixEpoch()).InMilliseconds() / 1000;
 
@@ skipping 112 matching lines @@
     if (base::TrimWhitespaceASCII(kv_pair.first, base::TRIM_ALL) ==
         kSecureSessionHeaderOption) {
       return base::TrimWhitespaceASCII(kv_pair.second, base::TRIM_ALL)
           .as_string();
     }
   }
   return "";
 }
 
 }  // namespace data_reduction_proxy