Revert 111288 - Possibly broke media_unittests on Mac

chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.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/autocomplete/autocomplete_popup_contents_view.h"
 
 #if defined(OS_WIN)
 #include <commctrl.h>
 #include <dwmapi.h>
 #include <objidl.h>
@@ skipping 155 matching lines @@
     layout->AddView(CreateButton(IDS_INSTANT_OPT_IN_NO_THANKS, button_font));
   }
 
   virtual void ButtonPressed(views::Button* sender, const views::Event& event) {
     contents_view_->UserPressedOptIn(
         sender->tag() == IDS_INSTANT_OPT_IN_ENABLE);
     // WARNING: we've been deleted.
   }
 
   virtual void OnPaint(gfx::Canvas* canvas) {
-    gfx::Rect paint_rect(GetLocalBounds());
-    paint_rect.Inset(kOptInBackgroundHInset, kOptInBackgroundVInset);
     canvas->Save();
-    canvas->Translate(paint_rect.origin());
-    bg_painter_->Paint(paint_rect.width(), paint_rect.height(), canvas);
-    canvas->DrawRect(paint_rect, ResourceBundle::toolbar_separator_color);
+    canvas->Translate(gfx::Point(kOptInBackgroundHInset,
+                                 kOptInBackgroundVInset));
+    bg_painter_->Paint(width() - kOptInBackgroundHInset * 2,
+                       height() - kOptInBackgroundVInset * 2, canvas);
+    canvas->DrawRectInt(ResourceBundle::toolbar_separator_color, 0, 0,
+                        width() - kOptInBackgroundHInset * 2,
+                        height() - kOptInBackgroundVInset * 2);
     canvas->Restore();
   }
 
  private:
   // Creates and returns a button configured for the opt-in promo.
   views::View* CreateButton(int id, const gfx::Font& font) {
     // NOTE: we can't use NativeButton as the popup is a layered window and
     // native buttons don't draw  in layered windows.
     // TODO(sky): these buttons look crap. Figure out the right
     // border/background to use.
@@ skipping 494 matching lines @@
   opt_in_view_ = NULL;
   PromoCounter* counter = profile_->GetInstantPromoCounter();
   DCHECK(counter);
   counter->Hide();
   if (opt_in) {
     browser::ShowInstantConfirmDialogIfNecessary(
         location_bar_->GetWidget()->GetNativeWindow(), profile_);
   }
   UpdatePopupAppearance();
 }