commit 736fcb57ca2dcf09710a797e4c23a64f6cd64e16
author Ben Chan <benchan@chromium.org> Wed May 21 18:28:22 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri May 23 05:01:30 2014 +0000
tree 7b58b2095f4279d6fd678f897e34e914b23a7f4e
parent 46eb5f6eabcbde324e059b48031eaa9af11ff236

update_engine: Update to build against libchrome-271506.

BUG=chromium:375032
TEST=`FEATURES=test emerge-$BOARD update_engine`

Change-Id: Ia7be302c12b439ad8aece51c9cbe128086626620
Reviewed-on: https://chromium-review.googlesource.com/201045
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

prefs.cc

diff --git a/prefs.cc b/prefs.cc
index c1e249c..c576a62 100644
--- a/prefs.cc
+++ b/prefs.cc
@@ -34,9 +34,8 @@
   base::FilePath filename;
   TEST_AND_RETURN_FALSE(GetFileNameForKey(key, &filename));
   TEST_AND_RETURN_FALSE(base::CreateDirectory(filename.DirName()));
-  TEST_AND_RETURN_FALSE(
-      file_util::WriteFile(filename, value.data(), value.size()) ==
-      static_cast<int>(value.size()));
+  TEST_AND_RETURN_FALSE(base::WriteFile(filename, value.data(), value.size()) ==
+                        static_cast<int>(value.size()));
   return true;
 }
 
@@ -44,7 +43,7 @@
   string str_value;
   if (!GetString(key, &str_value))
     return false;
-  TrimWhitespaceASCII(str_value, TRIM_ALL, &str_value);
+  base::TrimWhitespaceASCII(str_value, base::TRIM_ALL, &str_value);
   TEST_AND_RETURN_FALSE(base::StringToInt64(str_value, value));
   return true;
 }
@@ -57,7 +56,7 @@
   string str_value;
   if (!GetString(key, &str_value))
     return false;
-  TrimWhitespaceASCII(str_value, TRIM_ALL, &str_value);
+  base::TrimWhitespaceASCII(str_value, base::TRIM_ALL, &str_value);
   if (str_value == "false") {
     *value = false;
     return true;