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/profile.cc b/profile.cc
index 911be12..1de8fe3 100644
--- a/profile.cc
+++ b/profile.cc
@@ -8,12 +8,12 @@
#include <string>
#include <vector>
-#include <base/file_path.h>
+#include <base/files/file_path.h>
#include <base/file_util.h>
#include <base/stl_util.h>
-#include <base/string_split.h>
-#include <base/string_util.h>
-#include <base/stringprintf.h>
+#include <base/strings/string_split.h>
+#include <base/strings/string_util.h>
+#include <base/strings/stringprintf.h>
#include <chromeos/dbus/service_constants.h>
#include "shill/adaptor_interfaces.h"
@@ -133,7 +133,7 @@
return false;
}
- if (!file_util::Delete(path, false)) {
+ if (!base::DeleteFile(path, false)) {
Error::PopulateAndLog(
error, Error::kOperationFailed,
base::StringPrintf("Could not remove path %s", path.value().c_str()));
@@ -278,7 +278,7 @@
vector<Profile::Identifier> Profile::LoadUserProfileList(const FilePath &path) {
vector<Identifier> profile_identifiers;
string profile_data;
- if (!file_util::ReadFileToString(path, &profile_data)) {
+ if (!base::ReadFileToString(path, &profile_data)) {
return profile_identifiers;
}