[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_);
   }
 
+
   if (displayed_url_.SchemeIs(extensions::kExtensionScheme)) {
-    icon_ = IDR_EXTENSIONS_FAVICON;
-
     const extensions::Extension* extension =
         extensions::ExtensionSystem::Get(profile_)->extension_service()->
             extensions()->GetExtensionOrAppByURL(displayed_url_);
-    extension_icon_image_.reset(
-        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())
-      owner_->OnExtensionIconImageChanged(extension_icon_image_.get());
-  } else {
-    if (extension_icon_image_) {
-      extension_icon_image_.reset();
-      owner_->OnExtensionIconImageChanged(NULL);
+    if (extension) {
+      icon_ = IDR_EXTENSIONS_FAVICON;
+      extension_icon_image_.reset(
+          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())
+        owner_->OnExtensionIconImageChanged(extension_icon_image_.get());
+
+      return true;
     }
+  }
 
-    icon_ = (displayed_url_.is_empty() ||
-             displayed_url_.SchemeIs(content::kChromeUIScheme)) ?
-        IDR_PRODUCT_LOGO_16 :
-        toolbar_model->GetIconForSecurityLevel(security_level_);
+  if (extension_icon_image_) {
+    extension_icon_image_.reset();
+    owner_->OnExtensionIconImageChanged(NULL);
   }
 
+  icon_ = (displayed_url_.is_empty() ||
+           displayed_url_.SchemeIs(content::kChromeUIScheme)) ?
+      IDR_PRODUCT_LOGO_16 :
+      toolbar_model->GetIconForSecurityLevel(security_level_);
+
   return true;
 }
 
 base::string16 OriginChipInfo::Tooltip() const {
   return base::UTF8ToUTF16(displayed_url_.spec());
 }
 
 // static
 bool OriginChip::IsMalware(const GURL& url, const content::WebContents* tab) {
   DCHECK(tab);
@@ skipping 88 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());
 }