[OriginChip] Don't crash for invalid extension URL

chrome/browser/ui/toolbar/origin_chip_info.cc

Index: chrome/browser/ui/toolbar/origin_chip_info.cc
diff --git a/chrome/browser/ui/toolbar/origin_chip_info.cc b/chrome/browser/ui/toolbar/origin_chip_info.cc
index 84572f9e5ab5f1bdeab5f4a58776a3cdb494b3c7..d062209643a41b3b48b99686f7bb0e6c07588049 100644
--- a/chrome/browser/ui/toolbar/origin_chip_info.cc
+++ b/chrome/browser/ui/toolbar/origin_chip_info.cc
@@ -111,12 +111,16 @@ bool OriginChipInfo::Update(const content::WebContents* web_contents,
                                         label_);
   }
 
-  if (displayed_url_.SchemeIs(extensions::kExtensionScheme)) {
-    icon_ = IDR_EXTENSIONS_FAVICON;
+  const extensions::Extension* extension = NULL;
 
-    const extensions::Extension* extension =
+  if (displayed_url_.SchemeIs(extensions::kExtensionScheme)) {
+    extension =
         extensions::ExtensionSystem::Get(profile_)->extension_service()->
             extensions()->GetExtensionOrAppByURL(displayed_url_);
+  }
+
+  if (extension) {
+    icon_ = IDR_EXTENSIONS_FAVICON;
     extension_icon_image_.reset(

[Peter Kasting, 2014/05/22 17:30:29]

It seems like an even simpler change would have been to just conditionalize this
code, so we would have:

  if (displayed_url_.SchemeIs(extensions::kExtensionScheme)) {
    extension = ...;
    if (extension) {
      icon_ = IDR_EXTENSIONS_FAVICON;
      extension_icon_image_.reset(...);
      ...
      return true;
    }
  }

  if (extension_icon_image_) {
    ...

[groby-ooo-7-16, 2014/05/22 23:13:00]

Done.

         new extensions::IconImage(profile_,
                                   extension,