commit 1c9973ab67dc3965a6de80f8039c9125d385cadb
author Ben Chan <benchan@chromium.org> Thu May 22 17:25:51 2014
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri May 23 05:02:23 2014
tree f3dbf34514b69e48d061033f310db18f9ef1a556
parent ff1d5a41523153e3d7fddcdee4b9922c305f88c9

libchromeos: Update to build against libchrome-271506.

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

Change-Id: I3a99befaa72e8485b677df611a81fa93469863c6
Reviewed-on: https://chromium-review.googlesource.com/201072
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Chris Masone <cmasone@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

chromeos/process.cc

diff --git a/chromeos/process.cc b/chromeos/process.cc
index 7a3a1d0..762224b 100644
--- a/chromeos/process.cc
+++ b/chromeos/process.cc
@@ -304,7 +304,7 @@
     LOG(ERROR) << "Could not read pid file" << pid_file;
     return false;
   }
-  TrimWhitespaceASCII(contents, TRIM_TRAILING, &contents);
+  base::TrimWhitespaceASCII(contents, base::TRIM_TRAILING, &contents);
   int64 pid_int64 = 0;
   if (!base::StringToInt64(contents, &pid_int64)) {
     LOG(ERROR) << "Unexpected pid file contents";

chromeos/process_test.cc

diff --git a/chromeos/process_test.cc b/chromeos/process_test.cc
index eb3153b..4837d58 100644
--- a/chromeos/process_test.cc
+++ b/chromeos/process_test.cc
@@ -207,8 +207,7 @@
   EXPECT_TRUE(process_.Start());
   int write_fd = process_.GetPipe(STDIN_FILENO);
   EXPECT_EQ(-1, process_.GetPipe(STDERR_FILENO));
-  EXPECT_TRUE(file_util::WriteFile(GetFdPath(write_fd), kMessage,
-                                   strlen(kMessage)));
+  EXPECT_TRUE(base::WriteFile(GetFdPath(write_fd), kMessage, strlen(kMessage)));
   close(write_fd);
   EXPECT_EQ(0, process_.Wait());
   ExpectFileEquals(kMessage, output_file_.c_str());
@@ -276,7 +275,7 @@
 TEST_F(ProcessTest, ResetPidByFile) {
   FilePath pid_path = test_path_.Append("pid");
   EXPECT_FALSE(process_.ResetPidByFile(pid_path.value()));
-  EXPECT_TRUE(file_util::WriteFile(pid_path, "456\n", 4));
+  EXPECT_TRUE(base::WriteFile(pid_path, "456\n", 4));
   EXPECT_TRUE(process_.ResetPidByFile(pid_path.value()));
   EXPECT_EQ(456, process_.pid());
   // The purpose of this unit test is to check if Process::ResetPidByFile() can

chromeos/syslog_logging.cc

diff --git a/chromeos/syslog_logging.cc b/chromeos/syslog_logging.cc
index 53c878a..f79099d 100644
--- a/chromeos/syslog_logging.cc
+++ b/chromeos/syslog_logging.cc
@@ -91,8 +91,6 @@
 void InitLog(int init_flags) {
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
-  settings.dcheck_state =
-      logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
   logging::InitLogging(settings);
   logging::SetLogMessageHandler(HandleMessage);
   SetLogFlags(init_flags);