Add DisplayLayoutManagerMulti (WIP)

chrome/browser/extensions/component_loader.cc

 // Copyright (c) 2012 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/component_loader.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 67 matching lines @@
 namespace extensions {
 
 namespace {
 
 static bool enable_background_extensions_during_testing = false;
 
 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;
 }
 
 #if defined(OS_CHROMEOS)
 scoped_ptr<base::DictionaryValue>
 LoadManifestOnFileThread(
     const base::FilePath& root_directory,
     const base::FilePath::CharType* manifest_filename) {
@@ skipping 683 matching lines @@
     const char* extension_id,
     const base::Closure& done_cb,
     scoped_ptr<base::DictionaryValue> manifest) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!manifest)
     return;  // Error already logged.
   std::string actual_extension_id = Add(
       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();
 }
 #endif
 
 }  // namespace extensions