Revert 273810 "Added alternative configuration for the data redu..."

trunk/src/chrome/browser/net/spdyproxy/proxy_advisor.cc

 // Copyright 2013 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 "chrome/browser/net/spdyproxy/proxy_advisor.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/load_flags.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_status_code.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
-// TODO(marq): Remove this class because it is not being used.
-
 // Ensure data reduction features are available.
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 #error proxy_advisor should only be included in Android or iOS builds.
 #endif
 
 using content::BrowserThread;
 using data_reduction_proxy::DataReductionProxySettings;
 
 namespace {
 const char kOmniboxMotivation[] = "omnibox";
@@ skipping 78 matching lines @@
     chrome_browser_net::UrlInfo::ResolutionMotivation motivation,
     bool is_preconnect) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (!WouldProxyURL(url))
     return;
 
   std::string motivation_name(MotivationName(motivation, is_preconnect));
   std::string header_value = motivation_name + " " + url.spec();
   net::URLRequestContext* context = context_getter_->GetURLRequestContext();
-  data_reduction_proxy::DataReductionProxyParams params(
-      data_reduction_proxy::DataReductionProxyParams::kAllowed |
-      data_reduction_proxy::DataReductionProxyParams::kFallbackAllowed |
-      data_reduction_proxy::DataReductionProxyParams::kPromoAllowed);
   std::string endpoint =
-      params.origin().spec() + "preconnect";
+      DataReductionProxySettings::GetDataReductionProxyOrigin() + "preconnect";
   scoped_ptr<net::URLRequest> request = context->CreateRequest(
       GURL(endpoint), net::DEFAULT_PRIORITY, this, NULL);
   request->set_method("HEAD");
   request->SetExtraRequestHeaderByName(
       "Proxy-Host-Advisory", header_value, false);
   request->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                         net::LOAD_DO_NOT_SAVE_COOKIES |
                         net::LOAD_BYPASS_PROXY |
                         net::LOAD_DISABLE_CACHE);
   net::URLRequest* raw_request = request.get();
@@ skipping 19 matching lines @@
   scoped_ptr<net::URLRequest> scoped_request_for_deletion(request);
   inflight_requests_.erase(request);
   // |scoped_request_for_deletion| will delete |request|
 }
 
 void ProxyAdvisor::UpdateProxyState() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // Delete all inflight requests. Each request's destructor will call Cancel().
   STLDeleteElements(&inflight_requests_);
 }