commit 3ba6c5b65778964fe3f643ca9df6a17b41181bf2
author Chris Masone <cmasone@chromium.org> Fri May 13 16:57:09 2011 -0700
committer Chris Masone <cmasone@chromium.org> Sat May 14 11:10:51 2011 -0700
tree 25dee88bf5a42aabaf3e05d26cff3a1b1034e829
parent 543eee323d080a57fe54f5f4869b1be65872d329

[crash-reporter] rolling to libchrome 87480

BUG=chromium-os:14304
TEST=emerge with features=test

Change-Id: Ida7067b3578619bbb99c8b5c626fd6301cdccd8d
Reviewed-on: http://gerrit.chromium.org/gerrit/887
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>

crash_reporter/crash_collector.cc

diff --git a/crash_reporter/crash_collector.cc b/crash_reporter/crash_collector.cc
index 5247d91..9f3aed1 100644
--- a/crash_reporter/crash_collector.cc
+++ b/crash_reporter/crash_collector.cc
@@ -16,6 +16,7 @@
 #include "base/eintr_wrapper.h"
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/string_string.h"
 #include "base/string_util.h"
 #include "chromeos/process.h"
 
@@ -264,7 +265,7 @@
   }
   typedef std::vector<std::string> StringVector;
   StringVector lines;
-  SplitString(contents, '\n', &lines);
+  base::SplitString(contents, '\n', &lines);
   bool any_errors = false;
   for (StringVector::iterator line = lines.begin(); line != lines.end();
        ++line) {
@@ -275,7 +276,7 @@
     if (IsCommentLine(*line))
       continue;
     StringVector sides;
-    SplitString(*line, separator, &sides);
+    base::SplitString(*line, separator, &sides);
     if (sides.size() != 2) {
       any_errors = true;
       continue;

crash_reporter/user_collector.cc

diff --git a/crash_reporter/user_collector.cc b/crash_reporter/user_collector.cc
index a038e69..f6ae24d 100644
--- a/crash_reporter/user_collector.cc
+++ b/crash_reporter/user_collector.cc
@@ -15,6 +15,7 @@
 
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/string_string.h"
 #include "base/string_util.h"
 #include "chromeos/process.h"
 #include "chromeos/syslog_logging.h"
@@ -168,7 +169,7 @@
   // From fs/proc/array.c:task_state(), this file contains:
   // \nUid:\t<uid>\t<euid>\t<suid>\t<fsuid>\n
   std::vector<std::string> status_lines;
-  SplitString(status_contents, '\n', &status_lines);
+  base::SplitString(status_contents, '\n', &status_lines);
   std::vector<std::string>::iterator line_iterator;
   for (line_iterator = status_lines.begin();
        line_iterator != status_lines.end();
@@ -182,7 +183,7 @@
   std::string id_substring = line_iterator->substr(strlen(prefix),
                                                    std::string::npos);
   std::vector<std::string> ids;
-  SplitString(id_substring, '\t', &ids);
+  base::SplitString(id_substring, '\t', &ids);
   if (ids.size() != kIdMax || kind < 0 || kind >= kIdMax) {
     return false;
   }