Update to build against libchrome-242728.
BUG=chromium:341521
CQ-DEPEND=CL:185795
TEST=`FEATURES=test emerge-{x86,amd64,arm}-generic permission_broker`
Change-Id: I28be1adbf755bc7ac61f79f838e47ec79c065d53
diff --git a/Makefile b/Makefile
index c56fbc1..3af03af 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
include common.mk
-BASE_VER ?= 180609
+BASE_VER ?= 242728
PKG_CONFIG ?= pkg-config
CXXFLAGS += -I$(SRC)/..
diff --git a/deny_claimed_usb_device_rule.cc b/deny_claimed_usb_device_rule.cc
index f3cddfd..23ecb2a 100644
--- a/deny_claimed_usb_device_rule.cc
+++ b/deny_claimed_usb_device_rule.cc
@@ -7,7 +7,7 @@
#include <libudev.h>
#include "base/logging.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
namespace permission_broker {
diff --git a/deny_usb_device_class_rule.cc b/deny_usb_device_class_rule.cc
index 0dfb736..5410cc3 100644
--- a/deny_usb_device_class_rule.cc
+++ b/deny_usb_device_class_rule.cc
@@ -6,13 +6,13 @@
#include <libudev.h>
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
namespace permission_broker {
DenyUsbDeviceClassRule::DenyUsbDeviceClassRule(const uint8_t device_class)
: UsbSubsystemUdevRule("DenyUsbDeviceClassRule"),
- device_class_(StringPrintf("%.2x", device_class)) {}
+ device_class_(base::StringPrintf("%.2x", device_class)) {}
DenyUsbDeviceClassRule::~DenyUsbDeviceClassRule() {}
diff --git a/deny_usb_vendor_id_rule.cc b/deny_usb_vendor_id_rule.cc
index ecd3a51..4f71557 100644
--- a/deny_usb_vendor_id_rule.cc
+++ b/deny_usb_vendor_id_rule.cc
@@ -8,13 +8,13 @@
#include <string>
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
namespace permission_broker {
DenyUsbVendorIdRule::DenyUsbVendorIdRule(const uint16_t vendor_id)
: UsbSubsystemUdevRule("DenyUsbVendorIdRule"),
- vendor_id_(StringPrintf("%.4x", vendor_id)) {}
+ vendor_id_(base::StringPrintf("%.4x", vendor_id)) {}
DenyUsbVendorIdRule::~DenyUsbVendorIdRule() {}
diff --git a/permission_broker.cc b/permission_broker.cc
index be0edc7..1beb13f 100644
--- a/permission_broker.cc
+++ b/permission_broker.cc
@@ -21,7 +21,7 @@
#include "base/logging.h"
#include "base/stl_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "chromeos/dbus/dbus.h"
#include "chromeos/dbus/service_constants.h"
#include "permission_broker/rule.h"
@@ -135,10 +135,10 @@
struct udev_enumerate *const enumerate = udev_enumerate_new(udev_);
udev_enumerate_add_match_is_initialized(enumerate);
udev_enumerate_add_match_subsystem(enumerate, "usb");
- udev_enumerate_add_match_sysattr(enumerate, "idVendor", StringPrintf("%.4x",
- vendor_id).c_str());
- udev_enumerate_add_match_sysattr(enumerate, "idProduct", StringPrintf("%.4x",
- product_id).c_str());
+ udev_enumerate_add_match_sysattr(
+ enumerate, "idVendor", base::StringPrintf("%.4x", vendor_id).c_str());
+ udev_enumerate_add_match_sysattr(
+ enumerate, "idProduct", base::StringPrintf("%.4x", product_id).c_str());
udev_enumerate_scan_devices(enumerate);
struct udev_list_entry *entry = NULL;
