Revert 278845 "Ensure all members of OriginChipInfo/OriginChipVi..."

trunk/src/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_service.h"
@@ skipping 63 matching lines @@
   if (host == chrome::kChromeUISettingsHost)
     return IDS_SETTINGS_TITLE;
   if (host == chrome::kChromeUIVersionHost)
     return IDS_ABOUT_VERSION_TITLE;
 
   return -1;
 }
 
 }  // namespace
 
-OriginChipInfo::OriginChipInfo(extensions::IconImage::Observer* owner,
-                               Profile* profile)
+OriginChipInfo::OriginChipInfo(
+    extensions::IconImage::Observer* owner,
+    Profile* profile)
     : owner_(owner),
-      profile_(profile),
-      security_level_(ToolbarModel::NONE),
-      is_url_malware_(false),
-      icon_(IDR_PRODUCT_LOGO_16) {
-}
+      profile_(profile) {}
 
-OriginChipInfo::~OriginChipInfo() {
-}
+OriginChipInfo::~OriginChipInfo() {}
 
 bool OriginChipInfo::Update(const content::WebContents* web_contents,
                             const ToolbarModel* toolbar_model) {
   GURL displayed_url = toolbar_model->GetURL();
   ToolbarModel::SecurityLevel security_level =
       toolbar_model->GetSecurityLevel(true);
   bool is_url_malware = OriginChip::IsMalware(displayed_url, web_contents);
 
   if ((displayed_url_ == displayed_url) &&
       (security_level_ == security_level) &&
@@ skipping 147 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());
 }