Make Clone, Contains, Equal and IPC function non-virtual and implement in manifest_permission.cc

extensions/common/permissions/manifest_permission_set_unittest.cc

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 d40c097decadf0f1dd8bef2fad2046d822d432fd..6401368d9675d384738a506e882a32bb0cccecc7 100644
--- a/extensions/common/permissions/manifest_permission_set_unittest.cc
+++ b/extensions/common/permissions/manifest_permission_set_unittest.cc
@@ -5,6 +5,7 @@
 #include "base/pickle.h"
 #include "base/values.h"
 #include "extensions/common/extension_messages.h"
+#include "extensions/common/manifest_handler.h"
 #include "extensions/common/permissions/manifest_permission.h"
 #include "extensions/common/permissions/manifest_permission_set.h"
 #include "ipc/ipc_message.h"
@@ -34,16 +35,10 @@ class MockManifestPermission : public ManifestPermission {
     return PermissionMessages();
   }
 
-  virtual bool FromValue(const base::Value* value) OVERRIDE {
-    return false;
-  }
+  virtual bool FromValue(const base::Value* value) OVERRIDE { return true; }
 
   virtual scoped_ptr<base::Value> ToValue() const OVERRIDE {
-    return scoped_ptr<base::Value>(base::Value::CreateNullValue());
-  }
-
-  virtual ManifestPermission* Clone() const OVERRIDE {
-    return new MockManifestPermission(name_);
+    return make_scoped_ptr(base::Value::CreateNullValue());
   }
 
   virtual ManifestPermission* Diff(const ManifestPermission* rhs)
@@ -70,41 +65,38 @@ class MockManifestPermission : public ManifestPermission {
     return new MockManifestPermission(name_);
   }
 
-  virtual bool Contains(const ManifestPermission* rhs) const OVERRIDE {
-    const MockManifestPermission* other =
-        static_cast<const MockManifestPermission*>(rhs);
-    EXPECT_EQ(name_, other->name_);
-    return true;
-  }
+ private:
+  std::string name_;
+};
 
-  virtual bool Equal(const ManifestPermission* rhs) const OVERRIDE {
-    const MockManifestPermission* other =
-        static_cast<const MockManifestPermission*>(rhs);
-    EXPECT_EQ(name_, other->name_);
-    return true;
+class MockManifestHandlerRegistry : public ManifestHandlerRegistry {
+ public:
+  MockManifestHandlerRegistry() {
+    old_registry_ = ManifestHandlerRegistry::SetForTesting(this);
   }
 
-  virtual void Write(IPC::Message* m) const OVERRIDE {
-    IPC::WriteParam(m, name_);
+  ~MockManifestHandlerRegistry() {
+    ManifestHandlerRegistry::SetForTesting(old_registry_);
   }
 
-  virtual bool Read(const IPC::Message* m, PickleIterator* iter) OVERRIDE {
-    std::string read_name;
-    bool result = IPC::ReadParam(m, iter, &read_name);
-    if (!result)
-      return result;
-    EXPECT_EQ(read_name, name_);
-    return true;
+  virtual ManifestPermission* CreatePermission(
+      const std::string& name) OVERRIDE {
+    return new MockManifestPermission(name);
   }
 
-  virtual void Log(std::string* log) const OVERRIDE {
-  }
+ private:
+  ManifestHandlerRegistry* old_registry_;
+};
+
+class ManifestPermissionSetTest : public testing::Test {
+ public:
+  ManifestPermissionSetTest() {}
 
  private:
-  std::string name_;
+  MockManifestHandlerRegistry registry_;
 };
 
-TEST(ManifestPermissionSetTest, General) {
+TEST_F(ManifestPermissionSetTest, General) {
   ManifestPermissionSet set;
   set.insert(new MockManifestPermission("p1"));
   set.insert(new MockManifestPermission("p2"));
@@ -124,7 +116,7 @@ TEST(ManifestPermissionSetTest, General) {
   EXPECT_EQ(set.size(), 4u);
 }
 
-TEST(ManifestPermissionSetTest, CreateUnion) {
+TEST_F(ManifestPermissionSetTest, CreateUnion) {
   ManifestPermissionSet permissions1;
   ManifestPermissionSet permissions2;
   ManifestPermissionSet expected_permissions;
@@ -188,7 +180,7 @@ TEST(ManifestPermissionSetTest, CreateUnion) {
   EXPECT_EQ(expected_permissions, result);
 }
 
-TEST(ManifestPermissionSetTest, CreateIntersection) {
+TEST_F(ManifestPermissionSetTest, CreateIntersection) {
   ManifestPermissionSet permissions1;
   ManifestPermissionSet permissions2;
   ManifestPermissionSet expected_permissions;
@@ -231,7 +223,7 @@ TEST(ManifestPermissionSetTest, CreateIntersection) {
   EXPECT_EQ(expected_permissions, result);
 }
 
-TEST(ManifestPermissionSetTest, CreateDifference) {
+TEST_F(ManifestPermissionSetTest, CreateDifference) {
   ManifestPermissionSet permissions1;
   ManifestPermissionSet permissions2;
   ManifestPermissionSet expected_permissions;