commit 1a8780d309b980914a5e2403bf9addafe07386ec
author Mike Frysinger <vapier@chromium.org> Thu Feb 14 22:39:57 2013 -0500
committer ChromeBot <chrome-bot@google.com> Fri Feb 15 12:46:09 2013 -0800
tree 9e36c825d06661b9a2623b98813f63598354724a
parent 9a7ce9fbef026610c86af15c76af2d8b92654412

update to libchrome 180609

Purely mechanical changes here.

BUG=chromium-os:38933
TEST=`cros_run_unit_tests --board=stumpy -p crash-reporter` passes
CQ-DEPEND=CL:43376

Change-Id: I62d5d12556517bedf48d36ada4c651ff1c671fe9
Reviewed-on: https://gerrit.chromium.org/gerrit/43378
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: 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 35d2e68..d6fb3a4 100644
--- a/crash_reporter/crash_collector.cc
+++ b/crash_reporter/crash_collector.cc
@@ -16,9 +16,9 @@
 #include <set>
 #include <vector>
 
-#include "base/eintr_wrapper.h"
 #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"

crash_reporter/list_proxies.cc

diff --git a/crash_reporter/list_proxies.cc b/crash_reporter/list_proxies.cc
index e895058..9f3b3ec 100644
--- a/crash_reporter/list_proxies.cc
+++ b/crash_reporter/list_proxies.cc
@@ -12,8 +12,8 @@
 
 #include "base/command_line.h"
 #include "base/file_util.h"
-#include "base/string_tokenizer.h"
 #include "base/string_util.h"
+#include "base/strings/string_tokenizer.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus.h"
 #include "chromeos/syslog_logging.h"
@@ -51,7 +51,7 @@
   // Some of this code taken from
   // http://src.chromium.org/svn/trunk/src/net/proxy/proxy_server.cc and
   // http://src.chromium.org/svn/trunk/src/net/proxy/proxy_list.cc
-  StringTokenizer entry_tok(input, ";");
+  base::StringTokenizer entry_tok(input, ";");
   while (entry_tok.GetNext()) {
     std::string token = entry_tok.token();
     TrimWhitespaceASCII(token, TRIM_ALL, &token);

crash_reporter/udev_collector_test.cc

diff --git a/crash_reporter/udev_collector_test.cc b/crash_reporter/udev_collector_test.cc
index b75abfd..4d2bbe6 100644
--- a/crash_reporter/udev_collector_test.cc
+++ b/crash_reporter/udev_collector_test.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/scoped_temp_dir.h"
 #include "chromeos/test_helpers.h"
 #include "crash-reporter/udev_collector.h"
 #include "gtest/gtest.h"
@@ -51,7 +51,7 @@
     collector_.reset(new UdevCollector);
     collector_->Initialize(CountCrash, IsMetrics);
 
-    temp_dir_generator_.reset(new ScopedTempDir());
+    temp_dir_generator_.reset(new base::ScopedTempDir());
     ASSERT_TRUE(temp_dir_generator_->CreateUniqueTempDir());
     EXPECT_TRUE(temp_dir_generator_->IsValid());
 
@@ -72,7 +72,7 @@
 
  protected:
   scoped_ptr<UdevCollector> collector_;
-  scoped_ptr<ScopedTempDir> temp_dir_generator_;
+  scoped_ptr<base::ScopedTempDir> temp_dir_generator_;
 };
 
 TEST_F(UdevCollectorTest, TestNoConsent) {

crash_reporter/user_collector.cc

diff --git a/crash_reporter/user_collector.cc b/crash_reporter/user_collector.cc
index cc4beea..26c7dc1 100644
--- a/crash_reporter/user_collector.cc
+++ b/crash_reporter/user_collector.cc
@@ -17,6 +17,7 @@
 
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/posix/eintr_wrapper.h"
 #include "base/stl_util.h"
 #include "base/string_split.h"
 #include "base/string_util.h"

crash_reporter/user_collector_test.cc

diff --git a/crash_reporter/user_collector_test.cc b/crash_reporter/user_collector_test.cc
index 305781c..4c919de 100644
--- a/crash_reporter/user_collector_test.cc
+++ b/crash_reporter/user_collector_test.cc
@@ -7,8 +7,8 @@
 #include <unistd.h>
 
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/string_split.h"
-#include "base/scoped_temp_dir.h"
 #include "chromeos/syslog_logging.h"
 #include "chromeos/test_helpers.h"
 #include "crash-reporter/user_collector.h"
@@ -464,7 +464,7 @@
 }
 
 TEST_F(UserCollectorTest, ValidateProcFiles) {
-  ScopedTempDir temp_dir;
+  base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   FilePath container_dir = temp_dir.path();
 
@@ -485,7 +485,7 @@
 }
 
 TEST_F(UserCollectorTest, ValidateCoreFile) {
-  ScopedTempDir temp_dir;
+  base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   FilePath container_dir = temp_dir.path();
   FilePath core_file = container_dir.Append("core");