commit 6ca1ac42836fb005f67514b8deb7a1dc8d59247b
author tfarina <tfarina@chromium.org> Fri Oct 16 11:01:32 2015 -0700
committer Commit bot <commit-bot@chromium.org> Fri Oct 16 18:01:40 2015 +0000
tree e8bdb5068377cb87afe147b4ca34501ed83cf714
parent 861c55e58311383b7f4f61af463ddea53eb3f30f

Get rid of deprecated HttpClient fail_redirect accessors.

This patch removes set_fail_redirect()/fail_redirect() method accessors
from HttpClient class and converts their usage to
set_redirection_action/redirection_action where appropriate.

BUG=None
R=pthatcher@webrtc.org

Review URL: https://codereview.webrtc.org/1396683005

Cr-Commit-Position: refs/heads/master@{#10304}

webrtc/base/httpclient.h

diff --git a/webrtc/base/httpclient.h b/webrtc/base/httpclient.h
index 087b1f2..e7d2c5c 100644
--- a/webrtc/base/httpclient.h
+++ b/webrtc/base/httpclient.h
@@ -83,11 +83,6 @@
   enum RedirectAction { REDIRECT_DEFAULT, REDIRECT_ALWAYS, REDIRECT_NEVER };
   void set_redirect_action(RedirectAction action) { redirect_action_ = action; }
   RedirectAction redirect_action() const { return redirect_action_; }
-  // Deprecated
-  void set_fail_redirect(bool fail_redirect) {
-    redirect_action_ = REDIRECT_NEVER;
-  }
-  bool fail_redirect() const { return (REDIRECT_NEVER == redirect_action_); }
 
   enum UriForm { URI_DEFAULT, URI_ABSOLUTE, URI_RELATIVE };
   void set_uri_form(UriForm form) { uri_form_ = form; }

webrtc/base/httprequest.cc

diff --git a/webrtc/base/httprequest.cc b/webrtc/base/httprequest.cc
index 3199c8f..0139f01 100644
--- a/webrtc/base/httprequest.cc
+++ b/webrtc/base/httprequest.cc
@@ -48,11 +48,13 @@
 
 const int kDefaultHTTPTimeout = 30 * 1000; // 30 sec
 
-HttpRequest::HttpRequest(const std::string &user_agent)
-    : firewall_(0), port_(80), secure_(false),
-      timeout_(kDefaultHTTPTimeout), fail_redirect_(false),
-      client_(user_agent.c_str(), NULL), error_(HE_NONE) {
-}
+HttpRequest::HttpRequest(const std::string& user_agent)
+    : firewall_(0),
+      port_(80),
+      secure_(false),
+      timeout_(kDefaultHTTPTimeout),
+      client_(user_agent.c_str(), NULL),
+      error_(HE_NONE) {}
 
 HttpRequest::~HttpRequest() = default;
 
@@ -82,7 +84,7 @@
   if (transparent_proxy) {
     client_.set_proxy(proxy_);
   }
-  client_.set_fail_redirect(fail_redirect_);
+  client_.set_redirect_action(HttpClient::REDIRECT_ALWAYS);
 
   SocketAddress server(host_, port_);
   client_.set_server(server);