Converts some of the omnibox related classes to support multiple

chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc

Index: chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
index 759728130d57c1c0a407b5d8cf5302e2e534f043..03b7b0b7cf223a91ff07361506a4c08bd6d11285 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
@@ -383,7 +383,8 @@ ui::EventResult OmniboxPopupContentsView::OnGestureEvent(
 
 void OmniboxPopupContentsView::PaintResultViews(gfx::Canvas* canvas) {
   canvas->DrawColor(OmniboxResultView::GetColor(
-      OmniboxResultView::NORMAL, OmniboxResultView::BACKGROUND));
+      GetNativeTheme(), OmniboxResultView::NORMAL,
+      OmniboxResultView::BACKGROUND));
   View::PaintChildren(canvas);
 }
 
@@ -486,7 +487,7 @@ void OmniboxPopupContentsView::MakeCanvasTransparent(gfx::Canvas* canvas) {
   SkAlpha alpha = GetThemeProvider()->ShouldUseNativeFrame() ?
       kGlassPopupAlpha : kOpaquePopupAlpha;
   canvas->DrawColor(SkColorSetA(
-      OmniboxResultView::GetColor(OmniboxResultView::NORMAL,
+      OmniboxResultView::GetColor(GetNativeTheme(), OmniboxResultView::NORMAL,
           OmniboxResultView::BACKGROUND), alpha), SkXfermode::kDstIn_Mode);
 }