Make unknown extension subpermissions warnings instead of errors.

extensions/common/permissions/set_disjunction_permission.h

 // Copyright 2014 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 EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_
 #define EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_
 
 #include <algorithm>
 #include <set>
 #include <string>
 
+#include "base/json/json_writer.h"
 #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
@@ skipping 83 matching lines @@
     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 {
+  virtual bool FromValue(
+      const base::Value* value,
+      std::string* error,
+      std::vector<std::string>* unhandled_permissions) 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;
     }
 
+    bool unhandled = 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;
+      if (data.FromValue(item_value)) {
+        data_set_.insert(data);
+      } else {
+        unhandled = true;

[vandebo (ex-Chrome), 2014/04/01 23:11:04]

This is the meat of the change.

+        if (unhandled_permissions) {
+          std::string unknown_permission;
+          base::JSONWriter::Write(item_value, &unknown_permission);
+          unhandled_permissions->push_back(unknown_permission);
+        }
       }
-
-      data_set_.insert(data);
+    }
+    if (unhandled && !unhandled_permissions) {

[Yoyo Zhou, 2014/04/02 00:31:31]

Seems like you can put this inside the for loop and do away with the bool
unhandled.

[vandebo (ex-Chrome), 2014/04/02 16:46:59]

Done.

+      if (error)
+        *error = "Cannot parse an item from the permission list";
+      return false;
     }
     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());
@@ skipping 13 matching lines @@
     IPC::LogParam(data_set_, log);
   }
 
  protected:
   std::set<PermissionDataType> data_set_;
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_