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>

key_file_store.cc

diff --git a/key_file_store.cc b/key_file_store.cc
index 12a5f0a..cfcd487 100644
--- a/key_file_store.cc
+++ b/key_file_store.cc
@@ -8,7 +8,7 @@
 
 #include <base/files/important_file_writer.h>
 #include <base/file_util.h>
-#include <base/string_number_conversions.h>
+#include <base/strings/string_number_conversions.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -45,7 +45,7 @@
 
 bool KeyFileStore::IsNonEmpty() const {
   int64 file_size = 0;
-  return file_util::GetFileSize(path_, &file_size) && file_size != 0;
+  return base::GetFileSize(path_, &file_size) && file_size != 0;
 }
 
 bool KeyFileStore::Open() {