Add DisplayLayoutManagerMulti (WIP)

chrome/browser/extensions/component_loader.cc

Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index ac23b3847fef3117d583b2597656262fa7bc478f..5163a0cee08d97b3a18b89976c13dca87885d1cd 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -85,7 +85,10 @@ std::string GenerateId(const base::DictionaryValue* manifest,
                        const base::FilePath& path) {
   std::string raw_key;
   std::string id_input;
-  CHECK(manifest->GetString(manifest_keys::kPublicKey, &raw_key));
+  if (!manifest->GetString(manifest_keys::kPublicKey, &raw_key)) {
+    LOG(ERROR) << "No PublicKey property for: " << path.value();
+    return "";
+  }
   CHECK(Extension::ParsePEMKeyBytes(raw_key, &id_input));
   std::string id = crx_file::id_util::GenerateId(id_input);
   return id;
@@ -789,7 +792,7 @@ void ComponentLoader::FinishAddWithManifestFile(
       manifest.release(),
       root_directory,
       false);
-  CHECK_EQ(extension_id, actual_extension_id);
+  DCHECK_EQ(extension_id, actual_extension_id);
   if (!done_cb.is_null())
     done_cb.Run();
 }