commit 6fbf64f493a9aae7d743888039c61a57386203db
author Ben Chan <benchan@chromium.org> Wed May 21 18:07:01 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri May 23 17:56:19 2014 +0000
tree 7d2f5eed7c7ec1301981a5e3c1e9ef6c1378caa8
parent f2288216af22b1be995ec88e48e6531164769f7f

shill: Update to build against libchrome-271506.

BUG=chromium:375032
TEST=`USE='cellular gdmwimax wimax vpn' FEATURES=test emerge-$BOARD platform2`

Change-Id: Ib7c8b2b290caa261cbb61d30cf8a361a1e3345e1
Reviewed-on: https://chromium-review.googlesource.com/201211
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>

crypto_des_cbc_unittest.cc

diff --git a/crypto_des_cbc_unittest.cc b/crypto_des_cbc_unittest.cc
index 0ba8206..2998fd6 100644
--- a/crypto_des_cbc_unittest.cc
+++ b/crypto_des_cbc_unittest.cc
@@ -53,12 +53,12 @@
 
   string matter = string(kTestIV) + kTestKey;
 
-  file_util::WriteFile(key_matter, matter.data(), matter.size() - 1);
+  base::WriteFile(key_matter, matter.data(), matter.size() - 1);
   EXPECT_FALSE(crypto_.LoadKeyMatter(key_matter));
   EXPECT_TRUE(crypto_.key().empty());
   EXPECT_TRUE(crypto_.iv().empty());
 
-  file_util::WriteFile(key_matter, matter.data(), matter.size());
+  base::WriteFile(key_matter, matter.data(), matter.size());
   EXPECT_TRUE(crypto_.LoadKeyMatter(key_matter));
   EXPECT_EQ(kTestKey, string(crypto_.key().begin(), crypto_.key().end()));
   EXPECT_EQ(kTestIV, string(crypto_.iv().begin(), crypto_.iv().end()));
@@ -67,12 +67,12 @@
   const char kIV2[] = "87654321";
   matter = string("X") + kIV2 + kKey2;
 
-  file_util::WriteFile(key_matter, matter.data(), matter.size());
+  base::WriteFile(key_matter, matter.data(), matter.size());
   EXPECT_TRUE(crypto_.LoadKeyMatter(key_matter));
   EXPECT_EQ(kKey2, string(crypto_.key().begin(), crypto_.key().end()));
   EXPECT_EQ(kIV2, string(crypto_.iv().begin(), crypto_.iv().end()));
 
-  file_util::WriteFile(key_matter, " ", 1);
+  base::WriteFile(key_matter, " ", 1);
   EXPECT_FALSE(crypto_.LoadKeyMatter(key_matter));
   EXPECT_TRUE(crypto_.key().empty());
   EXPECT_TRUE(crypto_.iv().empty());