Converts some of the omnibox related classes to support multiple

chrome/browser/ui/views/omnibox/omnibox_result_view.h

Index: chrome/browser/ui/views/omnibox/omnibox_result_view.h
diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.h b/chrome/browser/ui/views/omnibox/omnibox_result_view.h
index c5d5b7881696e7da047be5a45d7c0c806c5cf2e0..a59b2860ff47a43cbf6f4b73e10c4c43e33501d3 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_result_view.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.h
@@ -47,7 +47,9 @@ class OmniboxResultView : public views::View,
                     const gfx::Font& bold_font);
   virtual ~OmniboxResultView();
 
-  static SkColor GetColor(ResultViewState state, ColorKind kind);
+  static SkColor GetColor(const ui::NativeTheme* theme,
+                          ResultViewState state,
+                          ColorKind kind);
 
   // Updates the match used to paint the contents of this result view. We copy
   // the match so that we can continue to paint the last result even after the
@@ -98,6 +100,10 @@ class OmniboxResultView : public views::View,
   struct RunData;
   typedef std::vector<RunData> Runs;
 
+  // Common initialization code of the colors returned by GetColors().
+  static void CommonInitColors(const ui::NativeTheme* theme,
+                               SkColor colors[][NUM_KINDS]);
+
   // Predicate functions for use when sorting the runs.
   static bool SortRunsLogically(const RunData& lhs, const RunData& rhs);
   static bool SortRunsVisually(const RunData& lhs, const RunData& rhs);