Remove frontend code that allows for dynamic profile setting, and read the profile off the browse...

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/command_updater.h"
-#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"
-#include "chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/render_text.h"
 #include "views/border.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/layout/fill_layout.h"
 
+#if defined(TOUCH_UI)
+#include "chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h"
+#else
+#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"
+#endif
+
 namespace {
 
 // Textfield for autocomplete that intercepts events that are necessary
 // for OmniboxViewViews.
 class AutocompleteTextfield : public views::Textfield {
  public:
   explicit AutocompleteTextfield(OmniboxViewViews* omnibox_view)
       : views::Textfield(views::Textfield::STYLE_DEFAULT),
         omnibox_view_(omnibox_view) {
     DCHECK(omnibox_view_);
@@ skipping 644 matching lines @@
 }
 
 AutocompletePopupView* OmniboxViewViews::CreatePopupView(
     Profile* profile,
     const View* location_bar) {
 #if defined(TOUCH_UI)
   typedef TouchAutocompletePopupContentsView AutocompleteContentsView;
 #else
   typedef AutocompletePopupContentsView AutocompleteContentsView;
 #endif
-  return new AutocompleteContentsView(
-      gfx::Font(), this, model_.get(), profile, location_bar);
+  return new AutocompleteContentsView(gfx::Font(), this, model_.get(),
+                                      location_bar);
 }