Reverts debugging code added to isolate crash. It's as I thought. When

we call off to get the input method window it's causing a focus loss
of the omnibox and the popup is closed.

BUG=92497
TEST=none
R=pkasting@chromium.org
TBR=pkasting@chromium.org

Review URL: http://codereview.chromium.org/7824009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99311 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 26 deletions

diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
index 0e07ae8..10cf688 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"
 
-#include "base/auto_reset.h"
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
@@ -139,18 +138,11 @@ class AutocompletePopupContentsView::AutocompletePopupWidget
     : public views::Widget,
       public base::SupportsWeakPtr<AutocompletePopupWidget> {
  public:
-  AutocompletePopupWidget() : check_on_destroy_(false) {}
-  virtual ~AutocompletePopupWidget() {
-    CHECK(!check_on_destroy_);
-  }
+  AutocompletePopupWidget() {}
+  virtual ~AutocompletePopupWidget() {}
 
  private:
-  // TODO(sky): remove once we figure out 92497.
-  friend class AutocompletePopupContentsView;
-
-  bool check_on_destroy_;
-
-  DISALLOW_COPY_AND_ASSIGN(AutocompletePopupWidget);
+   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupWidget);
 };
 
 class AutocompletePopupContentsView::InstantOptInView
@@ -246,8 +238,7 @@ AutocompletePopupContentsView::AutocompletePopupContentsView(
       result_font_(font.DeriveFont(kEditFontAdjust)),
       result_bold_font_(result_font_.DeriveFont(0, gfx::Font::BOLD)),
       ignore_mouse_drag_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(size_animation_(this)),
-      in_move_above_(false) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(size_animation_(this)) {
   // The following little dance is required because set_border() requires a
   // pointer to a non-const object.
   views::BubbleBorder* bubble_border =
@@ -259,7 +250,6 @@ AutocompletePopupContentsView::AutocompletePopupContentsView(
 }
 
 AutocompletePopupContentsView::~AutocompletePopupContentsView() {
-  CHECK(!in_move_above_);
   // We don't need to do anything with |popup_| here.  The OS either has already
   // closed the window, in which case it's been deleted, or it will soon, in
   // which case there's nothing we need to do.
@@ -314,7 +304,6 @@ void AutocompletePopupContentsView::UpdatePopupAppearance() {
       // triggered by the popup receiving a message (e.g. LBUTTONUP), and
       // destroying the popup would cause us to read garbage when we unwind back
       // to that level.
-      CHECK(!in_move_above_);
       popup_->Close();  // This will eventually delete the popup.
       popup_.reset();
     }
@@ -373,12 +362,8 @@ void AutocompletePopupContentsView::UpdatePopupAppearance() {
     params.bounds = GetPopupBounds();
     popup_->Init(params);
     popup_->SetContentsView(this);
-    {
-      AutoReset<bool> in_move_above_reset(&in_move_above_, true);
-      AutoReset<bool> check_on_destroy_reset(&popup_->check_on_destroy_, true);
-      popup_->MoveAbove(
-          GetRelativeWindowForPopup(omnibox_view_->GetNativeView()));
-    }
+    popup_->MoveAbove(
+        GetRelativeWindowForPopup(omnibox_view_->GetNativeView()));
     popup_->Show();
   } else {
     // Animate the popup shrinking, but don't animate growing larger since that
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
index 76b192b..c49fa6f 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
@@ -174,11 +174,6 @@ class AutocompletePopupContentsView : public views::View,
   gfx::Rect start_bounds_;
   gfx::Rect target_bounds_;
 
-  // Set to true if we're invoking MoveAbove on the popup. Used in tracking
-  // 92497.
-  // TODO(sky): remove when we figure out 92497.
-  bool in_move_above_;
-
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupContentsView);
 };