commit a557c1187ff19d422db2a9c951ecd8f7243e79bd
author Mike Frysinger <vapier@chromium.org> Wed Feb 05 22:55:39 2014 -0500
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Feb 07 11:45:42 2014 +0000
tree 04a9fcf96eae791e6b175338e1f0451e404bf8c6
parent 01ca40d6900891b0af8110dda132a625d1ff12c4

update to libbase-242728

BUG=chromium:331128
TEST=`FEATURES=test emerge-x86-alex platform2` works
TEST=`cbuildbot chromiumos-sdk` works
CQ-DEPEND=CL:185131

Change-Id: Ia03a6ea7aaf6b4ee5d9c512ebf7080c0c28920f1
Reviewed-on: https://chromium-review.googlesource.com/185150
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

crash_reporter/crash_collector.cc

diff --git a/crash_reporter/crash_collector.cc b/crash_reporter/crash_collector.cc
index f364015..0521a06 100644
--- a/crash_reporter/crash_collector.cc
+++ b/crash_reporter/crash_collector.cc
@@ -22,9 +22,9 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.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/cryptohome.h"
 #include "chromeos/dbus/dbus.h"
 #include "chromeos/dbus/service_constants.h"
@@ -73,6 +73,7 @@
 const int CrashCollector::kMaxCrashDirectorySize = 32;
 
 using base::FilePath;
+using base::StringPrintf;
 
 CrashCollector::CrashCollector()
     : forced_crash_directory_(NULL),
@@ -283,7 +284,7 @@
                             &directory_owner,
                             &directory_group);
 
-  if (!file_util::PathExists(*crash_directory)) {
+  if (!base::PathExists(*crash_directory)) {
     // Create the spool directory with the appropriate mode (regardless of
     // umask) and ownership.
     mode_t old_mask = umask(0);
@@ -297,7 +298,7 @@
     umask(old_mask);
   }
 
-  if (!file_util::PathExists(*crash_directory)) {
+  if (!base::PathExists(*crash_directory)) {
     LOG(ERROR) << "Unable to create crash directory "
                << crash_directory->value().c_str();
     return false;
@@ -353,7 +354,7 @@
   if (!GetSymlinkTarget(exe_path, &target)) {
     LOG(INFO) << "GetSymlinkTarget failed - Path " << process_path.value()
               << " DirectoryExists: "
-              << file_util::DirectoryExists(process_path);
+              << base::DirectoryExists(process_path);
     // Try to further diagnose exe readlink failure cause.
     struct stat buf;
     int stat_result = stat(exe_path.value().c_str(), &buf);
@@ -422,7 +423,7 @@
     const char separator,
     std::map<std::string, std::string> *dictionary) {
   std::string contents;
-  if (!file_util::ReadFileToString(path, &contents)) {
+  if (!base::ReadFileToString(path, &contents)) {
     return false;
   }
   typedef std::vector<std::string> StringVector;
@@ -507,7 +508,7 @@
     version = i->second;
   }
   int64 payload_size = -1;
-  file_util::GetFileSize(FilePath(payload_path), &payload_size);
+  base::GetFileSize(FilePath(payload_path), &payload_size);
   std::string meta_data = StringPrintf("%sexec_name=%s\n"
                                        "ver=%s\n"
                                        "payload=%s\n"
@@ -527,7 +528,7 @@
 }
 
 bool CrashCollector::IsCrashTestInProgress() {
-  return file_util::PathExists(FilePath(kCrashTestInProgressPath));
+  return base::PathExists(FilePath(kCrashTestInProgressPath));
 }
 
 bool CrashCollector::IsDeveloperImage() {
@@ -535,7 +536,7 @@
   // for developer images.
   if (IsCrashTestInProgress())
     return false;
-  return file_util::PathExists(FilePath(kLeaveCoreFile));
+  return base::PathExists(FilePath(kLeaveCoreFile));
 }
 
 bool CrashCollector::ShouldHandleChromeCrashes() {
@@ -546,7 +547,7 @@
     // Check if there's an override to indicate we should indeed collect
     // chrome crashes.  This allows the crashes to still be tracked when
     // they occur in autotests.  See "crosbug.com/17987".
-    if (file_util::PathExists(FilePath(kCollectChromeFile)))
+    if (base::PathExists(FilePath(kCollectChromeFile)))
       return true;
   }
   // We default to ignoring chrome crashes.