| Index: chrome/common/extensions/permissions/set_disjunction_permission.h | 
| diff --git a/chrome/common/extensions/permissions/set_disjunction_permission.h b/chrome/common/extensions/permissions/set_disjunction_permission.h | 
| deleted file mode 100644 | 
| index b05917f3ef4b8e0f3ebe3392830aeb1b0f14787e..0000000000000000000000000000000000000000 | 
| --- a/chrome/common/extensions/permissions/set_disjunction_permission.h | 
| +++ /dev/null | 
| @@ -1,170 +0,0 @@ | 
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| -// Use of this source code is governed by a BSD-style license that can be | 
| -// found in the LICENSE file. | 
| - | 
| -#ifndef CHROME_COMMON_EXTENSIONS_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ | 
| -#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ | 
| - | 
| -#include <algorithm> | 
| -#include <set> | 
| -#include <string> | 
| - | 
| -#include "base/memory/scoped_ptr.h" | 
| -#include "base/values.h" | 
| -#include "extensions/common/extension_messages.h" | 
| -#include "extensions/common/permissions/api_permission.h" | 
| -#include "ipc/ipc_message.h" | 
| -#include "ipc/ipc_message_utils.h" | 
| - | 
| -namespace extensions { | 
| - | 
| -// An abstract base class for permissions that are represented by the | 
| -// disjunction of a set of conditions.  Each condition is represented by a | 
| -// |PermissionDataType| (e.g. SocketPermissionData).  If an | 
| -// APIPermission::CheckParam matches any of the conditions in the set, the | 
| -// permission is granted. | 
| -// | 
| -// For an example of how to use this class, see SocketPermission. | 
| -template <class PermissionDataType, class DerivedType> | 
| -class SetDisjunctionPermission : public APIPermission { | 
| - public: | 
| -  explicit SetDisjunctionPermission(const APIPermissionInfo* info) | 
| -    : APIPermission(info) { | 
| -  } | 
| - | 
| -  ~SetDisjunctionPermission() { | 
| -  } | 
| - | 
| -  // APIPermission overrides | 
| -  virtual bool HasMessages() const OVERRIDE { | 
| -    return !data_set_.empty(); | 
| -  } | 
| - | 
| -  virtual bool Check(const APIPermission::CheckParam* param) const OVERRIDE { | 
| -    for (typename std::set<PermissionDataType>::const_iterator i = | 
| -        data_set_.begin(); i != data_set_.end(); ++i) { | 
| -      if (i->Check(param)) | 
| -        return true; | 
| -    } | 
| -    return false; | 
| -  } | 
| - | 
| -  virtual bool Contains(const APIPermission* rhs) const OVERRIDE { | 
| -    CHECK(rhs->info() == info()); | 
| -    const SetDisjunctionPermission* perm = | 
| -        static_cast<const SetDisjunctionPermission*>(rhs); | 
| -    return std::includes( | 
| -        data_set_.begin(), data_set_.end(), | 
| -        perm->data_set_.begin(), perm->data_set_.end()); | 
| -  } | 
| - | 
| -  virtual bool Equal(const APIPermission* rhs) const OVERRIDE { | 
| -    CHECK(rhs->info() == info()); | 
| -    const SetDisjunctionPermission* perm = | 
| -        static_cast<const SetDisjunctionPermission*>(rhs); | 
| -    return data_set_ == perm->data_set_; | 
| -  } | 
| - | 
| -  virtual APIPermission* Clone() const OVERRIDE { | 
| -    SetDisjunctionPermission* result = new DerivedType(info()); | 
| -    result->data_set_ = data_set_; | 
| -    return result; | 
| -  } | 
| - | 
| -  virtual APIPermission* Diff(const APIPermission* rhs) const OVERRIDE { | 
| -    CHECK(rhs->info() == info()); | 
| -    const SetDisjunctionPermission* perm = | 
| -        static_cast<const SetDisjunctionPermission*>(rhs); | 
| -    scoped_ptr<SetDisjunctionPermission> result(new DerivedType(info())); | 
| -    std::set_difference( | 
| -        data_set_.begin(), data_set_.end(), | 
| -        perm->data_set_.begin(), perm->data_set_.end(), | 
| -        std::inserter<std::set<PermissionDataType> >( | 
| -            result->data_set_, result->data_set_.begin())); | 
| -    return result->data_set_.empty() ? NULL : result.release(); | 
| -  } | 
| - | 
| -  virtual APIPermission* Union(const APIPermission* rhs) const OVERRIDE { | 
| -    CHECK(rhs->info() == info()); | 
| -    const SetDisjunctionPermission* perm = | 
| -        static_cast<const SetDisjunctionPermission*>(rhs); | 
| -    scoped_ptr<SetDisjunctionPermission> result(new DerivedType(info())); | 
| -    std::set_union( | 
| -        data_set_.begin(), data_set_.end(), | 
| -        perm->data_set_.begin(), perm->data_set_.end(), | 
| -        std::inserter<std::set<PermissionDataType> >( | 
| -            result->data_set_, result->data_set_.begin())); | 
| -    return result.release(); | 
| -  } | 
| - | 
| -  virtual APIPermission* Intersect(const APIPermission* rhs) const OVERRIDE { | 
| -    CHECK(rhs->info() == info()); | 
| -    const SetDisjunctionPermission* perm = | 
| -        static_cast<const SetDisjunctionPermission*>(rhs); | 
| -    scoped_ptr<SetDisjunctionPermission> result(new DerivedType(info())); | 
| -    std::set_intersection( | 
| -        data_set_.begin(), data_set_.end(), | 
| -        perm->data_set_.begin(), perm->data_set_.end(), | 
| -        std::inserter<std::set<PermissionDataType> >( | 
| -            result->data_set_, result->data_set_.begin())); | 
| -    return result->data_set_.empty() ? NULL : result.release(); | 
| -  } | 
| - | 
| -  virtual bool FromValue(const base::Value* value, | 
| -                         std::string* error) OVERRIDE { | 
| -    data_set_.clear(); | 
| -    const base::ListValue* list = NULL; | 
| - | 
| -    if (!value || !value->GetAsList(&list) || list->GetSize() == 0) { | 
| -      if (error) | 
| -        *error = "NULL or empty permission list"; | 
| -      return false; | 
| -    } | 
| - | 
| -    for (size_t i = 0; i < list->GetSize(); ++i) { | 
| -      const base::Value* item_value = NULL; | 
| -      bool got_item = list->Get(i, &item_value); | 
| -      DCHECK(got_item); | 
| -      DCHECK(item_value); | 
| - | 
| -      PermissionDataType data; | 
| -      if (!data.FromValue(item_value)) { | 
| -        if (error) | 
| -          *error = "Cannot parse an item from the permission list"; | 
| -        return false; | 
| -      } | 
| - | 
| -      data_set_.insert(data); | 
| -    } | 
| -    return true; | 
| -  } | 
| - | 
| -  virtual scoped_ptr<base::Value> ToValue() const OVERRIDE { | 
| -    base::ListValue* list = new base::ListValue(); | 
| -    typename std::set<PermissionDataType>::const_iterator i; | 
| -    for (i = data_set_.begin(); i != data_set_.end(); ++i) { | 
| -      scoped_ptr<base::Value> item_value(i->ToValue()); | 
| -      list->Append(item_value.release()); | 
| -    } | 
| -    return scoped_ptr<base::Value>(list); | 
| -  } | 
| - | 
| -  virtual void Write(IPC::Message* m) const OVERRIDE { | 
| -    IPC::WriteParam(m, data_set_); | 
| -  } | 
| - | 
| -  virtual bool Read(const IPC::Message* m, PickleIterator* iter) OVERRIDE { | 
| -    return IPC::ReadParam(m, iter, &data_set_); | 
| -  } | 
| - | 
| -  virtual void Log(std::string* log) const OVERRIDE { | 
| -    IPC::LogParam(data_set_, log); | 
| -  } | 
| - | 
| - protected: | 
| -  std::set<PermissionDataType> data_set_; | 
| -}; | 
| - | 
| -}  // namespace extensions | 
| - | 
| -#endif  // CHROME_COMMON_EXTENSIONS_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ | 
|  |