Use SafeJsonParser in WebResourceService and Management extension API.

BUG=437972

Review URL: https://codereview.chromium.org/817283002

Cr-Commit-Position: refs/heads/master@{#310008}

2 files changed, 9 insertions, 4 deletions

diff --git a/extensions/browser/api/management/management_api.cc b/extensions/browser/api/management/management_api.cc
index ea6d6c5..8f5b579 100644
--- a/extensions/browser/api/management/management_api.cc
+++ b/extensions/browser/api/management/management_api.cc
@@ -356,13 +356,18 @@ bool ManagementGetPermissionWarningsByManifestFunction::RunAsync() {
 }
 
 void ManagementGetPermissionWarningsByManifestFunction::OnParseSuccess(
-    scoped_ptr<base::DictionaryValue> parsed_manifest) {
-  CHECK(parsed_manifest.get());
+    scoped_ptr<base::Value> value) {
+  if (!value->IsType(base::Value::TYPE_DICTIONARY)) {
+    OnParseFailure(keys::kManifestParseError);
+    return;
+  }
+  const base::DictionaryValue* parsed_manifest =
+      static_cast<const base::DictionaryValue*>(value.get());
 
   scoped_refptr<Extension> extension =
       Extension::Create(base::FilePath(), Manifest::INVALID_LOCATION,
                         *parsed_manifest, Extension::NO_FLAGS, &error_);
-  if (!extension.get()) {
+  if (!extension) {
     OnParseFailure(keys::kExtensionCreateError);
     return;
   }
diff --git a/extensions/browser/api/management/management_api.h b/extensions/browser/api/management/management_api.h
index b695470..ab7fb84 100644
--- a/extensions/browser/api/management/management_api.h
+++ b/extensions/browser/api/management/management_api.h
@@ -83,7 +83,7 @@ class ManagementGetPermissionWarningsByManifestFunction
                              MANAGEMENT_GETPERMISSIONWARNINGSBYMANIFEST);
 
   // Called when utility process finishes.
-  void OnParseSuccess(scoped_ptr<base::DictionaryValue> parsed_manifest);
+  void OnParseSuccess(scoped_ptr<base::Value> value);
   void OnParseFailure(const std::string& error);
 
  protected: