[OriginChip] Don't crash for invalid extension URL

chrome/browser/ui/toolbar/origin_chip_info.cc

 // Copyright 2014 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/ui/toolbar/origin_chip_info.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_icon_image.h"
@@ skipping 93 matching lines @@
   security_level_ = security_level;
   is_url_malware_ = is_url_malware;
 
   label_ = OriginChip::LabelFromURLForProfile(displayed_url, profile_);
   if (security_level_ == ToolbarModel::EV_SECURE) {
     label_ = l10n_util::GetStringFUTF16(IDS_SITE_CHIP_EV_SSL_LABEL,
                                         toolbar_model->GetEVCertName(),
                                         label_);
   }
 
+  const extensions::Extension* extension = NULL;
+
   if (displayed_url_.SchemeIs(extensions::kExtensionScheme)) {
-    icon_ = IDR_EXTENSIONS_FAVICON;
-
-    const extensions::Extension* extension =
+    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,
                                   extensions::IconsInfo::GetIcons(extension),
                                   extension_misc::EXTENSION_ICON_BITTY,
                                   extensions::util::GetDefaultAppIcon(),
                                   owner_));
 
     // Forces load of the image.
     extension_icon_image_->image_skia().GetRepresentation(1.0f);
     if (!extension_icon_image_->image_skia().image_reps().empty())
@@ skipping 111 matching lines @@
 
 #if defined(OS_CHROMEOS)
   if (url.SchemeIs(chrome::kCrosScheme) ||
       url.SchemeIs(chrome::kDriveScheme))
     return base::UTF8ToUTF16(url.spec());
 #endif
 
   // If all else fails, return the hostname.
   return base::UTF8ToUTF16(url.host());
 }