| Index: chrome/browser/extensions/component_loader_unittest.cc
|
| diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc
|
| index 742fa2c6c4aa6f040b479e3b6ebd06d2350569a0..dbe01a17e36f6dcfe6d7c408282c0b3a77a4e4a8 100644
|
| --- a/chrome/browser/extensions/component_loader_unittest.cc
|
| +++ b/chrome/browser/extensions/component_loader_unittest.cc
|
| @@ -36,7 +36,7 @@ class MockExtensionService : public TestExtensionService {
|
| MockExtensionService() : ready_(false), unloaded_count_(0) {
|
| }
|
|
|
| - virtual void AddComponentExtension(const Extension* extension) OVERRIDE {
|
| + virtual void AddComponentExtension(const Extension* extension) override {
|
| EXPECT_FALSE(extension_set_.Contains(extension->id()));
|
| // ExtensionService must become the owner of the extension object.
|
| extension_set_.Insert(extension);
|
| @@ -44,7 +44,7 @@ class MockExtensionService : public TestExtensionService {
|
|
|
| virtual void UnloadExtension(
|
| const std::string& extension_id,
|
| - UnloadedExtensionInfo::Reason reason) OVERRIDE {
|
| + UnloadedExtensionInfo::Reason reason) override {
|
| ASSERT_TRUE(extension_set_.Contains(extension_id));
|
| // Remove the extension with the matching id.
|
| extension_set_.Remove(extension_id);
|
| @@ -52,15 +52,15 @@ class MockExtensionService : public TestExtensionService {
|
| }
|
|
|
| virtual void RemoveComponentExtension(const std::string & extension_id)
|
| - OVERRIDE {
|
| + override {
|
| UnloadExtension(extension_id, UnloadedExtensionInfo::REASON_DISABLE);
|
| }
|
|
|
| - virtual bool is_ready() OVERRIDE {
|
| + virtual bool is_ready() override {
|
| return ready_;
|
| }
|
|
|
| - virtual const ExtensionSet* extensions() const OVERRIDE {
|
| + virtual const ExtensionSet* extensions() const override {
|
| return &extension_set_;
|
| }
|
|
|
| @@ -90,7 +90,7 @@ class ComponentLoaderTest : public testing::Test {
|
| &profile_) {
|
| }
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| extension_path_ =
|
| GetBasePath().AppendASCII("good")
|
| .AppendASCII("Extensions")
|
|
|