Several cleanup items, and one visible change:

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

Index: chrome/browser/ui/views/omnibox/omnibox_views.cc
===================================================================
--- chrome/browser/ui/views/omnibox/omnibox_views.cc	(revision 202226)
+++ chrome/browser/ui/views/omnibox/omnibox_views.cc	(working copy)
@@ -18,12 +18,14 @@
       static_cast<OmniboxViewViews*>(view) : NULL;
 }
 
+OmniboxViewWin* GetOmniboxViewWin(OmniboxView* view) {
 #if defined(OS_WIN) && !defined(USE_AURA)
-OmniboxViewWin* GetOmniboxViewWin(OmniboxView* view) {
   return views::Textfield::IsViewsTextfieldEnabled() ?
       NULL : static_cast<OmniboxViewWin*>(view);
+#else
+  return NULL;
+#endif
 }
-#endif
 
 OmniboxView* CreateOmniboxView(OmniboxEditController* controller,
                                ToolbarModel* toolbar_model,