Fix for WebView accessible resources.

extensions/common/manifest_handlers/webview_info.cc

 // 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.
 
 #include "extensions/common/manifest_handlers/webview_info.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/pattern.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 40 matching lines @@
   URLPatternSet accessible_resources_;
 };
 
 WebviewInfo::WebviewInfo(const std::string& extension_id)
     : extension_id_(extension_id) {
 }
 
 WebviewInfo::~WebviewInfo() {
 }
 
+// static
 bool WebviewInfo::IsResourceWebviewAccessible(
     const Extension* extension,
     const std::string& partition_id,
-    const std::string& relative_path) const {
-  if (!extension || extension->id() != extension_id_)
+    const std::string& relative_path) {
+  if (!extension)
     return false;
 
-  DCHECK_EQ(this,
-            extension->GetManifestData(keys::kWebviewAccessibleResources));
+  const WebviewInfo* webview_info = static_cast<const WebviewInfo*>(
+      extension->GetManifestData(keys::kWebviewAccessibleResources));
+  if (!webview_info)
+    return false;
 
-  for (size_t i = 0; i < partition_items_.size(); ++i) {
-    const PartitionItem* const item = partition_items_[i];
+  for (const PartitionItem* item : webview_info->partition_items_) {
     if (item->Matches(partition_id) &&
         extension->ResourceMatches(item->accessible_resources(),
                                    relative_path)) {
       return true;
     }
   }
 
   return false;
 }
 
@@ skipping 79 matching lines @@
 
   extension->SetManifestData(keys::kWebviewAccessibleResources, info.release());
   return true;
 }
 
 const std::vector<std::string> WebviewHandler::Keys() const {
   return SingleKey(keys::kWebview);
 }
 
 }  // namespace extensions