commit 47e52cfdc5d5c89dc141d9d3efce66ca487b2a5f
author Ben Chan <benchan@chromium.org> Mon Feb 10 21:25:40 2014
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Feb 11 05:26:12 2014
tree 3c84ea120639ca2adaecc7d5ce6445f8da2bbddb
parent 4abf73302249f61fe9b79ae1e18559f8028cbdd0

Update to build against libchrome-242728.

BUG=chromium:341521
CQ-DEPEND=CL:185723
TEST=`FEATURES=test emerge-{x86,amd64,arm}-generic chromeos-imageburner`

Change-Id: I66b1a45afb4d9c0bbe0fff340a5159274b400760
Reviewed-on: https://chromium-review.googlesource.com/185722
Reviewed-by: Toni Barzic <tbarzic@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>

Makefile

diff --git a/Makefile b/Makefile
index 6f61f66..4307ccb 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 CXXFLAGS ?= -Wall -Werror -g
 PKG_CONFIG ?= pkg-config
 
-BASE_VER ?= 180609
+BASE_VER ?= 242728
 PC_DEPS = dbus-1 dbus-glib-1 gobject-2.0 \
 	libchrome-$(BASE_VER) libchromeos-$(BASE_VER)
 PC_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(PC_DEPS))

image_burner_main.cc

diff --git a/image_burner_main.cc b/image_burner_main.cc
index 97cbb0d..1ae2d57 100644
--- a/image_burner_main.cc
+++ b/image_burner_main.cc
@@ -6,16 +6,21 @@
 #include "image_burner_impl.h"
 #include "image_burner_utils.h"
 #include <base/command_line.h>
+#include <base/files/file_path.h>
 #include <base/logging.h>
 
 int main(int argc, char* argv[]) {
   CommandLine::Init(argc, argv);
 
-  logging::InitLogging("/var/log/image_burner.log",
-                       logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
-                       logging::LOCK_LOG_FILE,
-                       logging::DELETE_OLD_LOG_FILE,
-                       logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
+  logging::LoggingSettings settings;
+  settings.logging_dest = logging::LOG_TO_ALL;
+  settings.log_file = FILE_PATH_LITERAL("/var/log/image_burner.log");
+  settings.lock_log = logging::LOCK_LOG_FILE;
+  settings.delete_old = logging::DELETE_OLD_LOG_FILE;
+  settings.dcheck_state =
+      logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
+  logging::InitLogging(settings);
+
   g_type_init();
 
   imageburn::BurnWriter writer;