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

chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

 // 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/cocoa/omnibox/omnibox_popup_view_mac.h"
 
 #include <cmath>
 
 #include "base/stl_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 266 matching lines @@
 // Return the currently highlighted row.  Returns -1 if no row is
 // highlighted.
 - (NSInteger)highlightedRow;
 
 @end
 
 OmniboxPopupViewMac::OmniboxPopupViewMac(OmniboxViewMac* omnibox_view,
                                          AutocompleteEditModel* edit_model,
                                          Profile* profile,
                                          NSTextField* field)
-    : model_(new AutocompletePopupModel(this, edit_model, profile)),
-      omnibox_view_(omnibox_view),
+    : omnibox_view_(omnibox_view),
+      model_(new AutocompletePopupModel(this, edit_model)),
+      profile_(profile),
       field_(field),
       popup_(nil),
       opt_in_controller_(nil),
       targetPopupFrame_(NSZeroRect) {
   DCHECK(omnibox_view);
   DCHECK(edit_model);
   DCHECK(profile);
 }
 
 OmniboxPopupViewMac::~OmniboxPopupViewMac() {
@@ skipping 243 matching lines @@
   // relevant match out to make sure it stays alive until the call
   // completes.
   AutocompleteMatch match = model_->result().match_at(row);
   string16 keyword;
   const bool is_keyword_hint = model_->GetKeywordForMatch(match, &keyword);
   omnibox_view_->OpenMatch(match, disposition, GURL(), row,
                            is_keyword_hint ? string16() : keyword);
 }
 
 void OmniboxPopupViewMac::UserPressedOptIn(bool opt_in) {
-  PromoCounter* counter = model_->profile()->GetInstantPromoCounter();
+  PromoCounter* counter = profile_->GetInstantPromoCounter();
   DCHECK(counter);
   counter->Hide();
   if (opt_in) {
-    browser::ShowInstantConfirmDialogIfNecessary([field_ window],
-                                                 model_->profile());
+    browser::ShowInstantConfirmDialogIfNecessary([field_ window], profile_);
   }
 
   // This call will remove and delete |opt_in_controller_|.
   UpdatePopupAppearance();
 }
 
 bool OmniboxPopupViewMac::ShouldShowInstantOptIn() {
-  PromoCounter* counter = model_->profile()->GetInstantPromoCounter();
+  PromoCounter* counter = profile_->GetInstantPromoCounter();
   return (counter && counter->ShouldShow(base::Time::Now()));
 }
 
 @implementation AutocompleteButtonCell
 
 - (id)init {
   self = [super init];
   if (self) {
     [self setImagePosition:NSImageLeft];
     [self setBordered:NO];
@@ skipping 244 matching lines @@
                         bottomLeftCornerRadius:kPopupRoundingRadius
                        bottomRightCornerRadius:kPopupRoundingRadius];
 
   // Draw the matrix clipped to our border.
   gfx::ScopedNSGraphicsContextSaveGState scopedGState;
   [path addClip];
   [super drawRect:rect];
 }
 
 @end