p2p: Update for libchrome-242728.
BUG=none
TEST=builds and tests pass
CQ-DEPEND=I528fd1b8ed6737abee147500372fe1284956c741
Change-Id: Ief090efa90e20a03e6456dd50a1593ea30bb812d
Reviewed-on: https://chromium-review.googlesource.com/191440
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Daniel Erat <derat@chromium.org>
Tested-by: Daniel Erat <derat@chromium.org>
Reviewed-by: David Zeuthen <zeuthen@chromium.org>
diff --git a/client/main.cc b/client/main.cc
index 3549347..98ba5d0 100644
--- a/client/main.cc
+++ b/client/main.cc
@@ -24,7 +24,7 @@
#include <base/logging.h>
#include <base/memory/scoped_ptr.h>
#include <base/rand_util.h>
-#include <base/string_number_conversions.h>
+#include <base/strings/string_number_conversions.h>
#include <metrics/metrics_library.h>
using std::cout;
@@ -90,11 +90,11 @@
g_type_init();
CommandLine::Init(argc, argv);
- logging::InitLogging(NULL,
- logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
- logging::LOCK_LOG_FILE,
- logging::APPEND_TO_OLD_LOG_FILE,
- logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
+ logging::LoggingSettings logging_settings;
+ logging_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
+ logging_settings.lock_log = logging::LOCK_LOG_FILE;
+ logging_settings.delete_old = logging::APPEND_TO_OLD_LOG_FILE;
+ logging::InitLogging(logging_settings);
p2p::util::SetupSyslog("p2p-client", true /* include_pid */);
CommandLine* cl = CommandLine::ForCurrentProcess();
diff --git a/client/testrunner.cc b/client/testrunner.cc
index b86e05c..f39b543 100644
--- a/client/testrunner.cc
+++ b/client/testrunner.cc
@@ -19,11 +19,11 @@
CommandLine::Init(argc, argv);
- logging::InitLogging(NULL,
- logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
- logging::LOCK_LOG_FILE,
- logging::APPEND_TO_OLD_LOG_FILE,
- logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
+ logging::LoggingSettings logging_settings;
+ logging_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
+ logging_settings.lock_log = logging::LOCK_LOG_FILE;
+ logging_settings.delete_old = logging::APPEND_TO_OLD_LOG_FILE;
+ logging::InitLogging(logging_settings);
LOG(INFO) << "initializing gmock and gtest";
::testing::InitGoogleMock(&argc, argv);
diff --git a/common/clock_interface.h b/common/clock_interface.h
index ee82feb..131711d 100644
--- a/common/clock_interface.h
+++ b/common/clock_interface.h
@@ -5,7 +5,7 @@
#ifndef P2P_COMMON_CLOCK_INTERFACE_H__
#define P2P_COMMON_CLOCK_INTERFACE_H__
-#include <base/time.h>
+#include <base/time/time.h>
namespace p2p {
diff --git a/common/server_message.cc b/common/server_message.cc
index 18cf3f1..eddf67c 100644
--- a/common/server_message.cc
+++ b/common/server_message.cc
@@ -12,8 +12,8 @@
#include <inttypes.h>
#include <base/logging.h>
-#include <base/string_number_conversions.h>
-#include <base/stringprintf.h>
+#include <base/strings/string_number_conversions.h>
+#include <base/strings/stringprintf.h>
using std::string;
diff --git a/common/testrunner.cc b/common/testrunner.cc
index b86e05c..f39b543 100644
--- a/common/testrunner.cc
+++ b/common/testrunner.cc
@@ -19,11 +19,11 @@
CommandLine::Init(argc, argv);
- logging::InitLogging(NULL,
- logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
- logging::LOCK_LOG_FILE,
- logging::APPEND_TO_OLD_LOG_FILE,
- logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
+ logging::LoggingSettings logging_settings;
+ logging_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
+ logging_settings.lock_log = logging::LOCK_LOG_FILE;
+ logging_settings.delete_old = logging::APPEND_TO_OLD_LOG_FILE;
+ logging::InitLogging(logging_settings);
LOG(INFO) << "initializing gmock and gtest";
::testing::InitGoogleMock(&argc, argv);
diff --git a/common/testutil.cc b/common/testutil.cc
index 4689d9c..d29569c 100644
--- a/common/testutil.cc
+++ b/common/testutil.cc
@@ -21,7 +21,7 @@
#include <cstdlib>
#include <base/logging.h>
-#include <base/string_number_conversions.h>
+#include <base/strings/string_number_conversions.h>
#include <gtest/gtest.h>
using std::string;
diff --git a/common/testutil.h b/common/testutil.h
index 0ad9a98..39090d9 100644
--- a/common/testutil.h
+++ b/common/testutil.h
@@ -11,8 +11,8 @@
#include <vector>
#include <base/callback.h>
-#include <base/file_path.h>
-#include <base/stringprintf.h>
+#include <base/files/file_path.h>
+#include <base/strings/stringprintf.h>
#include <gtest/gtest.h>
namespace p2p {
diff --git a/common/testutil_unittest.cc b/common/testutil_unittest.cc
index 2b31fbd..1240548 100644
--- a/common/testutil_unittest.cc
+++ b/common/testutil_unittest.cc
@@ -59,8 +59,7 @@
0, "echo -n xyz > %s", testdir.Append("file.txt").value().c_str());
string contents;
- EXPECT_TRUE(
- file_util::ReadFileToString(testdir.Append("file.txt"), &contents));
+ EXPECT_TRUE(base::ReadFileToString(testdir.Append("file.txt"), &contents));
EXPECT_EQ(contents, "xyz");
TeardownTestDir(testdir);
diff --git a/common/util.h b/common/util.h
index e95a9fa..c5ed399 100644
--- a/common/util.h
+++ b/common/util.h
@@ -5,7 +5,7 @@
#ifndef P2P_COMMON_UTIL_H__
#define P2P_COMMON_UTIL_H__
-#include <base/file_path.h>
+#include <base/files/file_path.h>
namespace p2p {
diff --git a/configure.ac b/configure.ac
index a1b5ee8..62260f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
PKG_CHECK_MODULES(GLIB, [gio-2.0])
PKG_CHECK_MODULES(AVAHI_GLIB, [avahi-glib])
PKG_CHECK_MODULES(AVAHI_CLIENT, [avahi-client])
-PKG_CHECK_MODULES(LIBCHROME, [libchrome-180609])
+PKG_CHECK_MODULES(LIBCHROME, [libchrome-242728])
AC_CHECK_LIB([attr], [setxattr])
AC_CHECK_HEADERS([attr/xattr.h])
diff --git a/http_server/connection_delegate.cc b/http_server/connection_delegate.cc
index 768e376..fd25fde 100644
--- a/http_server/connection_delegate.cc
+++ b/http_server/connection_delegate.cc
@@ -31,9 +31,9 @@
#include <vector>
#include <iomanip>
-#include <base/time.h>
+#include <base/files/file_path.h>
#include <base/logging.h>
-#include <base/file_path.h>
+#include <base/time/time.h>
using std::map;
using std::string;
diff --git a/http_server/connection_delegate_unittest.cc b/http_server/connection_delegate_unittest.cc
index f2d5f2e..9e473b9 100644
--- a/http_server/connection_delegate_unittest.cc
+++ b/http_server/connection_delegate_unittest.cc
@@ -23,11 +23,11 @@
#include <vector>
#include <base/command_line.h>
-#include <base/file_path.h>
#include <base/file_util.h>
+#include <base/files/file_path.h>
#include <base/logging.h>
#include <base/threading/simple_thread.h>
-#include <base/string_number_conversions.h>
+#include <base/strings/string_number_conversions.h>
#include <gtest/gtest.h>
using std::string;
diff --git a/http_server/main.cc b/http_server/main.cc
index 6d3d9b9..6b131d7 100644
--- a/http_server/main.cc
+++ b/http_server/main.cc
@@ -18,7 +18,7 @@
#include <base/command_line.h>
#include <base/logging.h>
-#include <base/file_path.h>
+#include <base/files/file_path.h>
using std::cerr;
using std::cout;
@@ -47,11 +47,11 @@
CommandLine::Init(argc, argv);
CommandLine* cl = CommandLine::ForCurrentProcess();
- logging::InitLogging(NULL,
- logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
- logging::LOCK_LOG_FILE,
- logging::APPEND_TO_OLD_LOG_FILE,
- logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
+ logging::LoggingSettings logging_settings;
+ logging_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
+ logging_settings.lock_log = logging::LOCK_LOG_FILE;
+ logging_settings.delete_old = logging::APPEND_TO_OLD_LOG_FILE;
+ logging::InitLogging(logging_settings);
p2p::util::SetupSyslog(p2p::constants::kHttpServerBinaryName,
false /* include_pid */);
diff --git a/http_server/server.cc b/http_server/server.cc
index dfd4d61..2a03af9 100644
--- a/http_server/server.cc
+++ b/http_server/server.cc
@@ -31,9 +31,9 @@
#include <vector>
#include <iomanip>
-#include <base/time.h>
#include <base/logging.h>
-#include <base/file_path.h>
+#include <base/files/file_path.h>
+#include <base/time/time.h>
using std::string;
diff --git a/http_server/server.h b/http_server/server.h
index ada9474..27bceef 100644
--- a/http_server/server.h
+++ b/http_server/server.h
@@ -15,7 +15,7 @@
#include <glib.h>
#include <base/command_line.h>
-#include <base/file_path.h>
+#include <base/files/file_path.h>
#include <base/memory/scoped_ptr.h>
#include <base/threading/simple_thread.h>
diff --git a/http_server/server_unittest.cc b/http_server/server_unittest.cc
index 9c4e72b..ec4dbe7 100644
--- a/http_server/server_unittest.cc
+++ b/http_server/server_unittest.cc
@@ -31,10 +31,10 @@
#include <base/bind.h>
#include <base/command_line.h>
-#include <base/file_path.h>
+#include <base/files/file_path.h>
#include <base/logging.h>
-#include <base/string_util.h>
-#include <base/stringprintf.h>
+#include <base/strings/string_util.h>
+#include <base/strings/stringprintf.h>
#include <base/synchronization/condition_variable.h>
#include <base/threading/simple_thread.h>
#include <gtest/gtest.h>
diff --git a/http_server/testrunner.cc b/http_server/testrunner.cc
index b86e05c..f39b543 100644
--- a/http_server/testrunner.cc
+++ b/http_server/testrunner.cc
@@ -19,11 +19,11 @@
CommandLine::Init(argc, argv);
- logging::InitLogging(NULL,
- logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
- logging::LOCK_LOG_FILE,
- logging::APPEND_TO_OLD_LOG_FILE,
- logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
+ logging::LoggingSettings logging_settings;
+ logging_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
+ logging_settings.lock_log = logging::LOCK_LOG_FILE;
+ logging_settings.delete_old = logging::APPEND_TO_OLD_LOG_FILE;
+ logging::InitLogging(logging_settings);
LOG(INFO) << "initializing gmock and gtest";
::testing::InitGoogleMock(&argc, argv);
diff --git a/server/fake_file_watcher.h b/server/fake_file_watcher.h
index 8079e45..0e5e96c 100644
--- a/server/fake_file_watcher.h
+++ b/server/fake_file_watcher.h
@@ -11,7 +11,7 @@
#include <utility>
#include <glib.h>
-#include "base/file_util.h"
+#include <base/file_util.h>
namespace p2p {
diff --git a/server/fake_http_server.h b/server/fake_http_server.h
index 6ed66cb..e895da8 100644
--- a/server/fake_http_server.h
+++ b/server/fake_http_server.h
@@ -11,7 +11,7 @@
#include <base/basictypes.h>
#include <base/callback.h>
-#include <base/file_path.h>
+#include <base/files/file_path.h>
namespace p2p {
diff --git a/server/file_watcher.h b/server/file_watcher.h
index 858016d..ce609b1 100644
--- a/server/file_watcher.h
+++ b/server/file_watcher.h
@@ -9,7 +9,7 @@
#include <string>
#include <base/callback.h>
-#include <base/file_path.h>
+#include <base/files/file_path.h>
namespace p2p {
diff --git a/server/file_watcher_unittest.cc b/server/file_watcher_unittest.cc
index 5ebbdc3..bed9049 100644
--- a/server/file_watcher_unittest.cc
+++ b/server/file_watcher_unittest.cc
@@ -30,10 +30,10 @@
#include <base/bind.h>
#include <base/command_line.h>
+#include <base/files/file_path.h>
#include <base/logging.h>
-#include <base/file_path.h>
+#include <base/strings/stringprintf.h>
#include <base/threading/simple_thread.h>
-#include <base/stringprintf.h>
using std::vector;
diff --git a/server/http_server.h b/server/http_server.h
index a1c8e36..2635178 100644
--- a/server/http_server.h
+++ b/server/http_server.h
@@ -9,7 +9,7 @@
#include <base/basictypes.h>
#include <base/callback.h>
-#include <base/file_path.h>
+#include <base/files/file_path.h>
#include <metrics/metrics_library.h>
namespace p2p {
diff --git a/server/http_server_unittest.cc b/server/http_server_unittest.cc
index 8e58133..f9c6e14 100644
--- a/server/http_server_unittest.cc
+++ b/server/http_server_unittest.cc
@@ -18,7 +18,7 @@
#include <base/bind.h>
#include <base/threading/simple_thread.h>
-#include <base/stringprintf.h>
+#include <base/strings/stringprintf.h>
#include <metrics/metrics_library_mock.h>
using testing::_;
@@ -109,7 +109,7 @@
port_);
EXPECT_COMMAND(0, "cmp -l -b %s/file.p2p %s/dl_%d", dir, dir, num_);
- string name = StringPrintf("dl_%d", num_);
+ string name = base::StringPrintf("dl_%d", num_);
ExpectFileSize(testdir_path_, name.c_str(), 2000);
}
diff --git a/server/main.cc b/server/main.cc
index a17ac0c..242e88c 100644
--- a/server/main.cc
+++ b/server/main.cc
@@ -24,9 +24,9 @@
#include <avahi-common/error.h>
#include <avahi-client/publish.h>
+#include <base/bind.h>
#include <base/command_line.h>
#include <base/logging.h>
-#include <base/bind.h>
#include <metrics/metrics_library.h>
using std::ostream;
@@ -59,11 +59,11 @@
CommandLine::Init(argc, argv);
- logging::InitLogging(NULL,
- logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
- logging::LOCK_LOG_FILE,
- logging::APPEND_TO_OLD_LOG_FILE,
- logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
+ logging::LoggingSettings logging_settings;
+ logging_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
+ logging_settings.lock_log = logging::LOCK_LOG_FILE;
+ logging_settings.delete_old = logging::APPEND_TO_OLD_LOG_FILE;
+ logging::InitLogging(logging_settings);
p2p::util::SetupSyslog(p2p::constants::kServerBinaryName,
false /* include_pid */);
diff --git a/server/mock_http_server.h b/server/mock_http_server.h
index 7c02286..0f9fa4c 100644
--- a/server/mock_http_server.h
+++ b/server/mock_http_server.h
@@ -13,7 +13,7 @@
#include <base/basictypes.h>
#include <base/callback.h>
-#include <base/file_path.h>
+#include <base/files/file_path.h>
namespace p2p {
diff --git a/server/peer_update_manager.cc b/server/peer_update_manager.cc
index 4721e6b..cd32711 100644
--- a/server/peer_update_manager.cc
+++ b/server/peer_update_manager.cc
@@ -14,8 +14,8 @@
#include <string>
-#include <base/logging.h>
#include <base/bind.h>
+#include <base/logging.h>
using std::string;
diff --git a/server/service_publisher.cc b/server/service_publisher.cc
index 17a9094..517d78f 100644
--- a/server/service_publisher.cc
+++ b/server/service_publisher.cc
@@ -18,7 +18,7 @@
#include <map>
#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <base/strings/stringprintf.h>
using std::map;
using std::string;
diff --git a/server/testrunner.cc b/server/testrunner.cc
index b86e05c..f39b543 100644
--- a/server/testrunner.cc
+++ b/server/testrunner.cc
@@ -19,11 +19,11 @@
CommandLine::Init(argc, argv);
- logging::InitLogging(NULL,
- logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
- logging::LOCK_LOG_FILE,
- logging::APPEND_TO_OLD_LOG_FILE,
- logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
+ logging::LoggingSettings logging_settings;
+ logging_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
+ logging_settings.lock_log = logging::LOCK_LOG_FILE;
+ logging_settings.delete_old = logging::APPEND_TO_OLD_LOG_FILE;
+ logging::InitLogging(logging_settings);
LOG(INFO) << "initializing gmock and gtest";
::testing::InitGoogleMock(&argc, argv);
