commit a0ddf46e466bd4ba3d20952f0a6988c680c1af14
author Ben Chan <benchan@chromium.org> Thu Feb 06 11:32:42 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Apr 10 01:17:26 2014 +0000
tree e336ce7569c01ac171338e7e935e69aee3443168
parent 3ff527c8b5ab153016b7d86a1cf3be2e3e6c97c8

shill: Update to build against libchrome-242728.

BUG=chromium:341521
CQ-DEPEND=CL:193660
TEST=Tested the following:
1. `FEATURES=test USE='cellular wimax' emerge-$BOARD platform2`
2. Run the following tests:
   - network_3GSmokeTest
   - network_VPNConnect.*
   - network_WiMaxSmoke
   - wifi_matfunc

Change-Id: Ic1553c182ab7a833a68c45f012f646b8930cb095
Reviewed-on: https://chromium-review.googlesource.com/193606
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

http_proxy.cc

diff --git a/http_proxy.cc b/http_proxy.cc
index c568098..238a679 100644
--- a/http_proxy.cc
+++ b/http_proxy.cc
@@ -14,10 +14,10 @@
 #include <vector>
 
 #include <base/bind.h>
-#include <base/string_number_conversions.h>
-#include <base/string_split.h>
-#include <base/string_util.h>
-#include <base/stringprintf.h>
+#include <base/strings/string_number_conversions.h>
+#include <base/strings/string_split.h>
+#include <base/strings/string_util.h>
+#include <base/strings/stringprintf.h>
 
 #include "shill/async_connection.h"
 #include "shill/connection.h"
@@ -70,10 +70,8 @@
       write_server_callback_(Bind(&HTTPProxy::WriteToServer,
                                   weak_ptr_factory_.GetWeakPtr())),
       dispatcher_(NULL),
-      dns_client_(NULL),
       proxy_port_(-1),
       proxy_socket_(-1),
-      server_async_connection_(NULL),
       sockets_(NULL),
       client_socket_(-1),
       server_port_(kDefaultServerPort),
@@ -328,7 +326,7 @@
 // error occurs.
 bool HTTPProxy::ProcessLastHeaderLine() {
   string *header = &client_headers_.back();
-  TrimString(*header, "\r", header);
+  base::TrimString(*header, "\r", header);
 
   if (header->empty()) {
     // Empty line terminates client headers.