Alphabetise PageActionIconTypes

This CL is a simple code-shuffle that orders the PageActionIconType
enum alphabetically and updates the OmniboxPageActionIconContainerView
members to match the enum names consistently.

Note that this does not change the order of the icons visually, that
is determined by the order they appear in
|OmniboxPageActionIconContainerView::Params::types_enabled|.

Bug: 788051
Change-Id: I73160acd67aec5fe760b3b5ff64a252aedda1c36
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1808945
Commit-Queue: Alan Cutter <alancutter@chromium.org>
Reviewed-by: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697865}

chrome/browser/ui/page_action/page_action_icon_type.h

@@ -6,10 +6,14 @@
 #define CHROME_BROWSER_UI_PAGE_ACTION_PAGE_ACTION_ICON_TYPE_H_
 
 enum class PageActionIconType {
+  kBookmarkStar,
+  kClickToCall,
+  kCookieControls,
   kFind,
+  kIntentPicker,
   kLocalCardMigration,
   kManagePasswords,
-  kIntentPicker,
+  kNativeFileSystemAccess,
   kPwaInstall,
   kReaderMode,
   kSaveCard,
@@ -17,10 +21,6 @@ enum class PageActionIconType {
   kSharedClipboard,
   kTranslate,
   kZoom,
-  kNativeFileSystemAccess,
-  kClickToCall,
-  kCookieControls,
-  kBookmarkStar,
 };
 
 #endif  // CHROME_BROWSER_UI_PAGE_ACTION_PAGE_ACTION_ICON_TYPE_H_

chrome/browser/ui/views/page_action/omnibox_page_action_icon_container_view.h

@@ -89,23 +89,21 @@ class OmniboxPageActionIconContainerView
   // Updates the view for the zoom icon when default zoom levels change.
   void OnDefaultZoomLevelChanged() override;
 
-  ZoomView* zoom_view_ = nullptr;
-  FindBarIcon* find_bar_icon_ = nullptr;
+  StarView* bookmark_star_icon_ = nullptr;
+  SharingIconView* click_to_call_icon_ = nullptr;
+  CookieControlsIconView* cookie_controls_icon_ = nullptr;
+  FindBarIcon* find_icon_ = nullptr;
+  IntentPickerView* intent_picker_icon_ = nullptr;
+  autofill::LocalCardMigrationIconView* local_card_migration_icon_ = nullptr;
   ManagePasswordsIconViews* manage_passwords_icon_ = nullptr;
-  IntentPickerView* intent_picker_view_ = nullptr;
-  PwaInstallView* pwa_install_view_ = nullptr;
-  CookieControlsIconView* cookie_view_ = nullptr;
-  send_tab_to_self::SendTabToSelfIconView* send_tab_to_self_icon_view_ =
-      nullptr;
-  TranslateIconView* translate_icon_ = nullptr;
-  NativeFileSystemAccessIconView* native_file_system_icon_ = nullptr;
+  NativeFileSystemAccessIconView* native_file_system_access_icon_ = nullptr;
+  PwaInstallView* pwa_install_icon_ = nullptr;
   ReaderModeIconView* reader_mode_icon_ = nullptr;
-  SharingIconView* click_to_call_icon_view_ = nullptr;
-  SharingIconView* shared_clipboard_icon_view_ = nullptr;
-  autofill::LocalCardMigrationIconView* local_card_migration_icon_view_ =
-      nullptr;
-  autofill::SaveCardIconView* save_card_icon_view_ = nullptr;
-  StarView* star_view_ = nullptr;
+  autofill::SaveCardIconView* save_card_icon_ = nullptr;
+  send_tab_to_self::SendTabToSelfIconView* send_tab_to_self_icon_ = nullptr;
+  SharingIconView* shared_clipboard_icon_ = nullptr;
+  TranslateIconView* translate_icon_ = nullptr;
+  ZoomView* zoom_icon_ = nullptr;
 
   std::vector<PageActionIconView*> page_action_icons_;