[Omnibox] Move result view elements into children.

This CL is a step toward making views children manage their views. This
step moves the data members, but still does the layout in the result
view. A later Cl will move the layout.

Bug: None
Change-Id: I82c498c0ae648b57d750828f687d9064ccee29dd
Reviewed-on: https://chromium-review.googlesource.com/994243
Commit-Queue: Dave Schuyler <dschuyler@chromium.org>
Reviewed-by: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547929}

chrome/browser/ui/views/omnibox/omnibox_result_view.h

@@ -130,22 +130,8 @@ class OmniboxResultView : public views::View,
   // Weak pointers for easy reference.
   OmniboxSuggestionView* suggestion_view_;  // The leading (or left) view.
   OmniboxSeparatedLineView* keyword_view_;  // The trailing (or right) view.
-
-  // TODO(dschuyler): Move these views into either suggestion_view_ or
-  // keyword_view_. I intend to do so by May, 2018.
-
-  views::ImageView* suggestion_icon_view_;   // Small icon. e.g. favicon.
-  views::ImageView* suggestion_image_view_;  // For rich suggestions.
-  OmniboxTextView* suggestion_content_view_;
-  OmniboxTextView* suggestion_description_view_;
-  OmniboxTextView* suggestion_separator_view_;  // e.g. A hyphen.
   std::unique_ptr<OmniboxTabSwitchButton> suggestion_tab_switch_button_;
 
-  views::ImageView* keyword_icon_view_;  // An icon resembling a '>'.
-  OmniboxTextView* keyword_content_view_;
-  OmniboxTextView* keyword_description_view_;
-  OmniboxTextView* keyword_separator_view_;
-
   DISALLOW_COPY_AND_ASSIGN(OmniboxResultView);
 };