Use GetToolbarVoiceSearchButtonImages

The deprecated method GetToolbarVoiceSearchButtonImageId() was
confusing and forced client code to check return value. Instead
use GetToolbarVoiceSearchButtonImages() that always return the
correct value to use.

Bug: none
Change-Id: I80b6a8b493950c054374f5faee8c907c2055d44c
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Reviewed-on: https://chromium-review.googlesource.com/952449
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541784}

ios/chrome/browser/ui/toolbar/buttons/toolbar_button_factory.mm

@@ -469,19 +469,9 @@ const int styleCount = 2;
 
 - (NSArray<UIImage*>*)voiceSearchImages {
   // The voice search images can be overridden by the branded image provider.
-  int imageID;
-  if (ios::GetChromeBrowserProvider()
-          ->GetBrandedImageProvider()
-          ->GetToolbarVoiceSearchButtonImageId(&imageID)) {
-    return [NSArray
-        arrayWithObjects:NativeImage(imageID), NativeImage(imageID), nil];
-  }
-  int voiceSearchImages[styleCount][TOOLBAR_STATE_COUNT] =
-      TOOLBAR_IDR_TWO_STATE(VOICE);
-  return [NSArray
-      arrayWithObjects:NativeImage(voiceSearchImages[self.style][DEFAULT]),
-                       NativeImage(voiceSearchImages[self.style][PRESSED]),
-                       nil];
+  return ios::GetChromeBrowserProvider()
+      ->GetBrandedImageProvider()
+      ->GetToolbarVoiceSearchButtonImages(self.style == INCOGNITO);
 }
 
 - (NSArray<UIImage*>*)TTSImages {