| Index: chrome/browser/extensions/api/device_permissions_manager_unittest.cc
|
| diff --git a/chrome/browser/extensions/api/device_permissions_manager_unittest.cc b/chrome/browser/extensions/api/device_permissions_manager_unittest.cc
|
| index 3990933c1c3b8023af770cde4a36611924f7dc3f..89f7fac764d8fcc6a00e571fa291fac5ce9191c6 100644
|
| --- a/chrome/browser/extensions/api/device_permissions_manager_unittest.cc
|
| +++ b/chrome/browser/extensions/api/device_permissions_manager_unittest.cc
|
| @@ -37,7 +37,7 @@ class MockUsbDevice : public UsbDevice {
|
| MOCK_METHOD1(GetManufacturer, bool(base::string16*));
|
| MOCK_METHOD1(GetProduct, bool(base::string16*));
|
|
|
| - virtual bool GetSerialNumber(base::string16* serial_number) OVERRIDE {
|
| + virtual bool GetSerialNumber(base::string16* serial_number) override {
|
| if (serial_number_.empty()) {
|
| return false;
|
| }
|
| @@ -58,7 +58,7 @@ class MockUsbDevice : public UsbDevice {
|
|
|
| class DevicePermissionsManagerTest : public testing::Test {
|
| protected:
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| testing::Test::SetUp();
|
| env_.GetExtensionPrefs(); // Force creation before adding extensions.
|
| extension_ = env_.MakeExtension(*base::test::ParseJson(
|
|
|