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>
diff --git a/dns_client.cc b/dns_client.cc
index 461b6a5..e3ae826 100644
--- a/dns_client.cc
+++ b/dns_client.cc
@@ -18,7 +18,7 @@
#include <base/bind.h>
#include <base/bind_helpers.h>
#include <base/stl_util.h>
-#include <base/string_number_conversions.h>
+#include <base/strings/string_number_conversions.h>
#include "shill/logging.h"
#include "shill/shill_ares.h"
@@ -67,7 +67,6 @@
callback_(callback),
timeout_ms_(timeout_ms),
running_(false),
- resolver_state_(NULL),
weak_ptr_factory_(this),
ares_(Ares::GetInstance()),
time_(Time::GetInstance()) {}