cros: Fix initiating wifi connection caused chrome crash

ash/system/tray/hover_highlight_view.cc

 // Copyright 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 "ash/system/tray/hover_highlight_view.h"
 
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ash/system/tray/tri_view.h"
@@ skipping 39 matching lines @@
 void HoverHighlightView::SetRightViewVisible(bool visible) {
   if (!right_view_)
     return;
 
   right_view_->SetVisible(visible);
   Layout();
 }
 
 void HoverHighlightView::SetSubText(const base::string16& sub_text) {
   DCHECK(text_label_);
-  DCHECK(!sub_text.empty());
 
-  if (!sub_text_label_) {
+  if (!sub_text.empty()) {
     sub_text_label_ = TrayPopupUtils::CreateDefaultLabel();

[stevenjb, 2017/05/04 17:25:58]

You still need the if (!sub_text_label_) test here, otherwise multiple labels
will be added if this is called more than once.

It looks like the change should actually just be:

if (sub_text.empty()) {
  if (sub_text_label_)
    ... remove the label ...
  return;
}

?

+    sub_text_label_->SetText(sub_text);
+    TrayPopupItemStyle sub_style(TrayPopupItemStyle::FontStyle::CAPTION);
+    sub_style.set_color_style(TrayPopupItemStyle::ColorStyle::INACTIVE);
+    sub_style.SetupLabel(sub_text_label_);
     tri_view_->AddView(TriView::Container::CENTER, sub_text_label_);
   }
-
-  TrayPopupItemStyle sub_style(TrayPopupItemStyle::FontStyle::CAPTION);
-  sub_style.set_color_style(TrayPopupItemStyle::ColorStyle::INACTIVE);
-  sub_style.SetupLabel(sub_text_label_);
-  sub_text_label_->SetText(sub_text);
 }
 
 void HoverHighlightView::AddIconAndLabel(const gfx::ImageSkia& image,
                                          const base::string16& text) {
   DoAddIconAndLabel(image, text,
                     TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL);
 }
 
 void HoverHighlightView::AddIconAndLabels(const gfx::ImageSkia& image,
                                           const base::string16& text,
@@ skipping 120 matching lines @@
   if (right_view_)
     right_view_->SetEnabled(enabled());
 }
 
 void HoverHighlightView::OnFocus() {
   ScrollRectToVisible(gfx::Rect(gfx::Point(), size()));
   ActionableView::OnFocus();
 }
 
 }  // namespace ash