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>

certificate_file.cc

diff --git a/certificate_file.cc b/certificate_file.cc
index a7dacce..d65bbe5 100644
--- a/certificate_file.cc
+++ b/certificate_file.cc
@@ -10,9 +10,9 @@
 #include <vector>
 
 #include <base/file_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 "shill/logging.h"
 
@@ -37,7 +37,7 @@
 CertificateFile::~CertificateFile() {
   SLOG(Crypto, 2) << __func__;
   if (!output_file_.empty()) {
-    file_util::Delete(output_file_, false);
+    base::DeleteFile(output_file_, false);
   }
 }
 
@@ -97,8 +97,8 @@
 }
 
 FilePath CertificateFile::WriteFile(const string &output_data) {
-  if (!file_util::DirectoryExists(root_directory_)) {
-    if (!file_util::CreateDirectory(root_directory_)) {
+  if (!base::DirectoryExists(root_directory_)) {
+    if (!base::CreateDirectory(root_directory_)) {
       LOG(ERROR) << "Unable to create parent directory  "
                  << root_directory_.value();
       return FilePath();
@@ -107,17 +107,17 @@
               S_IRWXU | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH)) {
       LOG(ERROR) << "Failed to set permissions on "
                  << root_directory_.value();
-      file_util::Delete(root_directory_, true);
+      base::DeleteFile(root_directory_, true);
       return FilePath();
     }
   }
   if (!output_file_.empty()) {
-    file_util::Delete(output_file_, false);
+    base::DeleteFile(output_file_, false);
     output_file_ = FilePath();
   }
 
   FilePath output_file;
-  if (!file_util::CreateTemporaryFileInDir(root_directory_, &output_file)) {
+  if (!base::CreateTemporaryFileInDir(root_directory_, &output_file)) {
     LOG(ERROR) << "Unable to create output file.";
     return FilePath();
   }
@@ -133,7 +133,7 @@
   if (chmod(output_file.value().c_str(),
             S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) {
     LOG(ERROR) << "Failed to set permissions on " << output_file.value();
-    file_util::Delete(output_file, false);
+    base::DeleteFile(output_file, false);
     return FilePath();
   }
   output_file_ = output_file;