Fix SizeLabelToMinWidth() function such that no unnecessary space between warning label and Discard…

chrome/browser/ui/views/download/download_item_view.h

Index: chrome/browser/ui/views/download/download_item_view.h
diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h
index f0396ecb8b4e7a48a34cf04c7eea2b068d8e3e4f..228a8bbb95d73f3bce936113c4a3e67c7ca05cff 100644
--- a/chrome/browser/ui/views/download/download_item_view.h
+++ b/chrome/browser/ui/views/download/download_item_view.h
@@ -138,6 +138,9 @@ class DownloadItemView : public views::InkDropHostView,
   void OnBlur() override;
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(DownloadItemViewDangerousDownloadLabelTest,
+                           AdjustTextAndGetSize);
+
   enum State { NORMAL = 0, HOT, PUSHED };
   class DropDownButton;
 
@@ -199,7 +202,7 @@ class DownloadItemView : public views::InkDropHostView,
   // Reverts from dangerous mode to normal download mode.
   void ClearWarningDialog();
 
-  // Start displaying the dangerous download warning or the malicious download
+  // Starts displaying the dangerous download warning or the malicious download
   // warning.
   void ShowWarningDialog();
 
@@ -216,6 +219,12 @@ class DownloadItemView : public views::InkDropHostView,
   // and simply returned on subsequent calls.
   void SizeLabelToMinWidth();
 
+  // Given a multiline |label|, decides whether it should be displayed on one
+  // line (if short), or broken across two lines.  In the latter case,
+  // linebreaks near the middle of the string and sets the label's text
+  // accordingly.  Returns the preferred size for the label.
+  static gfx::Size AdjustTextAndGetSize(views::Label* label);
+
   // Reenables the item after it has been disabled when a user clicked it to
   // open the downloaded file.
   void Reenable();