Use dark mode Omnibox in dark mode even if themed

Bug: 928311
Change-Id: I743e399fd34d23352c53069d382ac6a47d4b71b3
Reviewed-on: https://chromium-review.googlesource.com/c/1459997Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Leonard Grey <lgrey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630148}

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

@@ -862,8 +862,8 @@ OmniboxPopupView* LocationBarView::GetOmniboxPopupView() {
 
 OmniboxTint LocationBarView::GetTint() {
   ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile());
-  if (theme_service->UsingDefaultTheme()) {
   bool is_dark_mode = GetNativeTheme()->SystemDarkModeEnabled();
+  if (theme_service->UsingDefaultTheme()) {
     return profile()->GetProfileType() == Profile::INCOGNITO_PROFILE ||
                    is_dark_mode
                ? OmniboxTint::DARK
@@ -875,8 +875,7 @@ OmniboxTint LocationBarView::GetTint() {
       theme_service->UsingSystemTheme())
     return OmniboxTint::NATIVE;
 
-  // TODO(tapted): Infer a tint from theme colors?
-  return OmniboxTint::LIGHT;
+  return is_dark_mode ? OmniboxTint::DARK : OmniboxTint::LIGHT;
 }
 
 ////////////////////////////////////////////////////////////////////////////////