Rearrange several omnibox icons.

The bookmark star was for many years the rightmost icon and still
is on !CrOS. We mistakenly added the intent picker icon on its right,
besides fixing that, reevaluating the order of the first 4 icons.

More precisely, this CL rearranges the first 4 rightmost icons in this
order (rightmost first):
- bookmarks icon
- zoom icon
- find icon
- intent picker icon

Bug: None.
Test: Build, manual test.
Change-Id: I5676a9550dbf383a446a19854a3b810bf961fc2b
Reviewed-on: https://chromium-review.googlesource.com/958085Reviewed-by: Evan Stade <estade@chromium.org>
Commit-Queue: David Jacobo <djacobo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542832}

chrome/browser/ui/views/location_bar/location_bar_view.cc

@@ -569,18 +569,18 @@ void LocationBarView::Layout() {
     }
   };
 
+  if (star_view_)
+    add_trailing_decoration(star_view_);
+  add_trailing_decoration(zoom_view_);
+  add_trailing_decoration(find_bar_icon_);
 #if defined(OS_CHROMEOS)
   if (intent_picker_view_)
     add_trailing_decoration(intent_picker_view_);
 #endif
-  if (star_view_)
-    add_trailing_decoration(star_view_);
-  add_trailing_decoration(find_bar_icon_);
   add_trailing_decoration(translate_icon_view_);
   if (save_credit_card_icon_view_)
     add_trailing_decoration(save_credit_card_icon_view_);
   add_trailing_decoration(manage_passwords_icon_view_);
-  add_trailing_decoration(zoom_view_);
   for (ContentSettingViews::const_reverse_iterator i(
            content_setting_views_.rbegin());
        i != content_setting_views_.rend(); ++i) {