| Index: extensions/common/permissions/manifest_permission_set_unittest.cc
|
| diff --git a/extensions/common/permissions/manifest_permission_set_unittest.cc b/extensions/common/permissions/manifest_permission_set_unittest.cc
|
| index 244f90d150afb484f7c7dee6c7820f312dde91f6..7716c9afa2c9b301c3a6d26c5a36dd320c305ca9 100644
|
| --- a/extensions/common/permissions/manifest_permission_set_unittest.cc
|
| +++ b/extensions/common/permissions/manifest_permission_set_unittest.cc
|
| @@ -17,46 +17,37 @@ class MockManifestPermission : public ManifestPermission {
|
| : name_(name) {
|
| }
|
|
|
| - virtual std::string name() const override {
|
| - return name_;
|
| - }
|
| + std::string name() const override { return name_; }
|
|
|
| - virtual std::string id() const override {
|
| - return name();
|
| - }
|
| + std::string id() const override { return name(); }
|
|
|
| - virtual bool HasMessages() const override {
|
| - return false;
|
| - }
|
| + bool HasMessages() const override { return false; }
|
|
|
| - virtual PermissionMessages GetMessages() const override {
|
| + PermissionMessages GetMessages() const override {
|
| return PermissionMessages();
|
| }
|
|
|
| - virtual bool FromValue(const base::Value* value) override { return true; }
|
| + bool FromValue(const base::Value* value) override { return true; }
|
|
|
| - virtual scoped_ptr<base::Value> ToValue() const override {
|
| + scoped_ptr<base::Value> ToValue() const override {
|
| return make_scoped_ptr(base::Value::CreateNullValue());
|
| }
|
|
|
| - virtual ManifestPermission* Diff(const ManifestPermission* rhs)
|
| - const override {
|
| + ManifestPermission* Diff(const ManifestPermission* rhs) const override {
|
| const MockManifestPermission* other =
|
| static_cast<const MockManifestPermission*>(rhs);
|
| EXPECT_EQ(name_, other->name_);
|
| return NULL;
|
| }
|
|
|
| - virtual ManifestPermission* Union(const ManifestPermission* rhs)
|
| - const override {
|
| + ManifestPermission* Union(const ManifestPermission* rhs) const override {
|
| const MockManifestPermission* other =
|
| static_cast<const MockManifestPermission*>(rhs);
|
| EXPECT_EQ(name_, other->name_);
|
| return new MockManifestPermission(name_);
|
| }
|
|
|
| - virtual ManifestPermission* Intersect(const ManifestPermission* rhs)
|
| - const override {
|
| + ManifestPermission* Intersect(const ManifestPermission* rhs) const override {
|
| const MockManifestPermission* other =
|
| static_cast<const MockManifestPermission*>(rhs);
|
| EXPECT_EQ(name_, other->name_);
|
|
|