Factor iOS native image loading into a utility function.

ios/chrome/browser/ui/omnibox/location_bar_view_ios.mm

 // Copyright (c) 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 <UIKit/UIKit.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
@@ skipping 11 matching lines @@
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
 #import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoFontLoader.h"
 #include "ios/web/public/navigation_item.h"
 #include "ios/web/public/navigation_manager.h"
 #include "ios/web/public/ssl_status.h"
 #include "ios/web/public/web_state/web_state.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/image/image.h"
 
 namespace {
 const CGFloat kClearTextButtonWidth = 28;
 const CGFloat kClearTextButtonHeight = 28;
 
 // Workaround for https://crbug.com/527084 . If there is connection
 // information, always show the icon. Remove this once connection info
 // is available via other UI: https://crbug.com/533581
 bool DoesCurrentPageHaveCertInfo(web::WebState* webState) {
   if (!webState)
@@ skipping 208 matching lines @@
 ToolbarModel* LocationBarViewIOS::GetToolbarModel() {
   return [delegate_ toolbarModel];
 }
 
 web::WebState* LocationBarViewIOS::GetWebState() {
   return [delegate_ getWebState];
 }
 
 void LocationBarViewIOS::InstallLocationIcon() {
   // Set the placeholder for empty omnibox.
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  gfx::Image magImage = rb.GetNativeImageNamed(IDR_IOS_OMNIBOX_SEARCH);
   UIButton* button = [UIButton buttonWithType:UIButtonTypeCustom];
-  UIImage* image = magImage.ToUIImage();
+  UIImage* image = NativeImage(IDR_IOS_OMNIBOX_SEARCH);
   [button setImage:image forState:UIControlStateNormal];
   [button setFrame:CGRectMake(0, 0, image.size.width, image.size.height)];
   [button addTarget:nil
                 action:@selector(chromeExecuteCommand:)
       forControlEvents:UIControlEventTouchUpInside];
   [button setTag:IDC_SHOW_PAGE_INFO];
   SetA11yLabelAndUiAutomationName(
       button, IDS_IOS_PAGE_INFO_SECURITY_BUTTON_ACCESSIBILITY_LABEL,
       @"Page Security Info");
   [button setIsAccessibilityElement:YES];
 
   // Set chip text options.
   [button setTitleColor:[UIColor colorWithWhite:0.631 alpha:1]
                forState:UIControlStateNormal];
   [button titleLabel].font =
       [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:12];
   [field_ setLeftView:button];
 
   // The placeholder image is only shown when in edit mode on iPhone, and always
   // shown on iPad.
   if (IsIPadIdiom())
     [field_ setLeftViewMode:UITextFieldViewModeAlways];
   else
     [field_ setLeftViewMode:UITextFieldViewModeNever];
 }
 
 void LocationBarViewIOS::CreateClearTextIcon(bool is_incognito) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   UIButton* button = [UIButton buttonWithType:UIButtonTypeCustom];
-  UIImage* omniBoxClearImage =
-      is_incognito
-          ? rb.GetNativeImageNamed(IDR_IOS_OMNIBOX_CLEAR_OTR).ToUIImage()
-          : rb.GetNativeImageNamed(IDR_IOS_OMNIBOX_CLEAR).ToUIImage();
+  UIImage* omniBoxClearImage = is_incognito
+                                   ? NativeImage(IDR_IOS_OMNIBOX_CLEAR_OTR)
+                                   : NativeImage(IDR_IOS_OMNIBOX_CLEAR);
   UIImage* omniBoxClearPressedImage =
-      is_incognito
-          ? rb.GetNativeImageNamed(IDR_IOS_OMNIBOX_CLEAR_OTR_PRESSED)
-                .ToUIImage()
-          : rb.GetNativeImageNamed(IDR_IOS_OMNIBOX_CLEAR_PRESSED).ToUIImage();
+      is_incognito ? NativeImage(IDR_IOS_OMNIBOX_CLEAR_OTR_PRESSED)
+                   : NativeImage(IDR_IOS_OMNIBOX_CLEAR_PRESSED);
   [button setImage:omniBoxClearImage forState:UIControlStateNormal];
   [button setImage:omniBoxClearPressedImage forState:UIControlStateHighlighted];
 
   CGRect frame = CGRectZero;
   frame.size = CGSizeMake(kClearTextButtonWidth, kClearTextButtonHeight);
   [button setFrame:frame];
 
   clear_button_bridge_.reset(
       [[OmniboxClearButtonBridge alloc] initWithOmniboxView:edit_view_.get()]);
   [button addTarget:clear_button_bridge_
@@ skipping 13 matching lines @@
     if (IsIPadIdiom())
       [field_ setRightView:nil];
   } else if ([field_ displayedText].empty() &&
              ![field_ isShowingQueryRefinementChip]) {
     [field_ setRightView:nil];
   } else {
     [field_ setRightView:clear_text_button_];
     [clear_text_button_ setAlpha:1];
   }
 }