Use extension match pattern syntax in content settings extension API

chrome/browser/extensions/extension_content_settings_api.cc

 // Copyright (c) 2011 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 "chrome/browser/extensions/extension_content_settings_api.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 151 matching lines @@
 bool SetContentSettingFunction::RunImpl() {
   std::string content_type_str;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &content_type_str));
   ContentSettingsType content_type =
       helpers::StringToContentSettingsType(content_type_str);
   EXTENSION_FUNCTION_VALIDATE(content_type != CONTENT_SETTINGS_TYPE_DEFAULT);
 
   DictionaryValue* details = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &details));
 
-  DictionaryValue* top_level_pattern_dict = NULL;
+  std::string top_level_pattern_str;
+  std::string top_level_error;
   EXTENSION_FUNCTION_VALIDATE(
-      details->GetDictionary(keys::kTopLevelPatternKey,
-                             &top_level_pattern_dict));
-  std::string top_level_pattern_str;
+      details->GetString(keys::kTopLevelPatternKey, &top_level_pattern_str));
+  ContentSettingsPattern top_level_pattern =
+      helpers::ParseExtensionPattern(top_level_pattern_str, &top_level_error);
+  if (!top_level_pattern.IsValid()) {
+    error_ = top_level_error;
+    return false;
+  }
+
+  std::string embedded_pattern_str;
+  std::string embedded_error;
   EXTENSION_FUNCTION_VALIDATE(
-      top_level_pattern_dict->GetString(keys::kPatternKey,
-                                        &top_level_pattern_str));
-  ContentSettingsPattern top_level_pattern =
-      ContentSettingsPattern::FromString(top_level_pattern_str);
-  EXTENSION_FUNCTION_VALIDATE(top_level_pattern.IsValid());
-
-  DictionaryValue* embedded_pattern_dict = NULL;
-  EXTENSION_FUNCTION_VALIDATE(
-      details->GetDictionary(keys::kEmbeddedPatternKey,
-                             &embedded_pattern_dict));
-  std::string embedded_pattern_str;
-  EXTENSION_FUNCTION_VALIDATE(
-      embedded_pattern_dict->GetString(keys::kPatternKey,
-                                       &embedded_pattern_str));
+      details->GetString(keys::kEmbeddedPatternKey, &embedded_pattern_str));
   ContentSettingsPattern embedded_pattern =
-      ContentSettingsPattern::FromString(embedded_pattern_str);
-  EXTENSION_FUNCTION_VALIDATE(embedded_pattern.IsValid());
+      helpers::ParseExtensionPattern(embedded_pattern_str, &embedded_error);
+  if (!embedded_pattern.IsValid()) {
+    error_ = embedded_error;
+    return false;
+  }
 
   std::string resource_identifier;
   if (details->HasKey(keys::kResourceIdentifierKey)) {
     DictionaryValue* resource_identifier_dict = NULL;
     EXTENSION_FUNCTION_VALIDATE(
         details->GetDictionary(keys::kResourceIdentifierKey,
                                &resource_identifier_dict));
     EXTENSION_FUNCTION_VALIDATE(
         resource_identifier_dict->GetString(keys::kIdKey,
                                             &resource_identifier));
@@ skipping 93 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, base::Bind(
           &GetResourceIdentifiersFunction::SendResponse, this, true));
 }
 
 // static
 void GetResourceIdentifiersFunction::SetPluginListForTesting(
     webkit::npapi::PluginList* plugin_list) {
   g_plugin_list = plugin_list;
 }