Add CHECKs to catch invalid builtin manifest resources earlier

content/browser/service_manager/service_manager_context.cc

 // Copyright 2015 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 "content/browser/service_manager/service_manager_context.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 207 matching lines @@
       { kRendererServiceName, IDR_MOJO_CONTENT_RENDERER_MANIFEST },
       { kUtilityServiceName, IDR_MOJO_CONTENT_UTILITY_MANIFEST },
       { "service:catalog", IDR_MOJO_CATALOG_MANIFEST },
       { file::kFileServiceName, IDR_MOJO_FILE_MANIFEST }
     };
 
     for (size_t i = 0; i < arraysize(kManifests); ++i) {
       std::string contents = GetContentClient()->GetDataResource(
           kManifests[i].resource_id,
           ui::ScaleFactor::SCALE_FACTOR_NONE).as_string();
-      DCHECK(!contents.empty());
+      base::debug::Alias(&i);
+      CHECK(!contents.empty());
+
       std::unique_ptr<base::Value> manifest_value =
           base::JSONReader::Read(contents);
+      base::debug::Alias(&contents);
+      CHECK(manifest_value);
+
       std::unique_ptr<base::Value> overlay_value =
           GetContentClient()->browser()->GetServiceManifestOverlay(
               kManifests[i].name);
       if (overlay_value) {
         base::DictionaryValue* manifest_dictionary = nullptr;
         CHECK(manifest_value->GetAsDictionary(&manifest_dictionary));
         base::DictionaryValue* overlay_dictionary = nullptr;
         CHECK(overlay_value->GetAsDictionary(&overlay_dictionary));
         MergeDictionary(manifest_dictionary, overlay_dictionary);
       }
+
       manifest_provider->AddManifestValue(kManifests[i].name,
                                           std::move(manifest_value));
     }
     in_process_context_ = new InProcessServiceManagerContext;
     request = in_process_context_->Start(std::move(manifest_provider));
   }
   ServiceManagerConnection::SetForProcess(ServiceManagerConnection::Create(
       std::move(request),
       BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)));
 
@@ skipping 53 matching lines @@
                           base::Bind(&DestroyConnectorOnIOThread));
 }
 
 // static
 service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return g_io_thread_connector.Get().get();
 }
 
 }  // namespace content