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>

dhcp_config_unittest.cc

diff --git a/dhcp_config_unittest.cc b/dhcp_config_unittest.cc
index cd37627..c449ae3 100644
--- a/dhcp_config_unittest.cc
+++ b/dhcp_config_unittest.cc
@@ -7,7 +7,7 @@
 #include <base/bind.h>
 #include <base/file_util.h>
 #include <base/files/scoped_temp_dir.h>
-#include <base/stringprintf.h>
+#include <base/strings/stringprintf.h>
 #include <chromeos/dbus/service_constants.h>
 
 #include "shill/dbus_adaptor.h"
@@ -146,16 +146,16 @@
   EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
   config->root_ = temp_dir_.path();
   FilePath varrun = temp_dir_.path().Append("var/run/dhcpcd");
-  EXPECT_TRUE(file_util::CreateDirectory(varrun));
+  EXPECT_TRUE(base::CreateDirectory(varrun));
   pid_file_ = varrun.Append(base::StringPrintf("dhcpcd-%s.pid", kDeviceName));
   FilePath varlib = temp_dir_.path().Append("var/lib/dhcpcd");
-  EXPECT_TRUE(file_util::CreateDirectory(varlib));
+  EXPECT_TRUE(base::CreateDirectory(varlib));
   lease_file_ =
       varlib.Append(base::StringPrintf("dhcpcd-%s.lease", kDeviceName));
   EXPECT_EQ(0, file_util::WriteFile(pid_file_, "", 0));
   EXPECT_EQ(0, file_util::WriteFile(lease_file_, "", 0));
-  EXPECT_TRUE(file_util::PathExists(pid_file_));
-  EXPECT_TRUE(file_util::PathExists(lease_file_));
+  EXPECT_TRUE(base::PathExists(pid_file_));
+  EXPECT_TRUE(base::PathExists(lease_file_));
 
   return config;
 }
@@ -168,8 +168,8 @@
   DHCPConfig::ChildWatchCallback(kPID, 10, config.get());
   EXPECT_EQ(NULL, DHCPProvider::GetInstance()->GetConfig(kPID).get());
 
-  EXPECT_FALSE(file_util::PathExists(pid_file_));
-  EXPECT_EQ(lease_file_exists, file_util::PathExists(lease_file_));
+  EXPECT_FALSE(base::PathExists(pid_file_));
+  EXPECT_EQ(lease_file_exists, base::PathExists(lease_file_));
 }
 
 TEST_F(DHCPConfigTest, GetIPv4AddressString) {