Revise NativeWidgetWin focus hack; force focus on restore.

ui/views/bubble/bubble_delegate_unittest.cc

 // Copyright (c) 2012 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 "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/test/test_widget_observer.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 158 matching lines @@
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   scoped_ptr<Widget> anchor_widget(new Widget);
   anchor_widget->Init(params);
   anchor_widget->Show();
 
   TestBubbleDelegateView* bubble_delegate =
       new TestBubbleDelegateView(anchor_widget->GetContentsView());
   Widget* bubble_widget = BubbleDelegateView::CreateBubble(bubble_delegate);
   bubble_widget->Show();
 
-  View* expected_view = bubble_delegate->GetInitiallyFocusedView();
-  // TODO(ben|msw): The NativeWidgetWin::RestoreFocusOnActivate() workaround for
-  // http://crbug.com/125976 breaks this simple test by clearing proper focus.
-#if defined(OS_WIN) && !defined(USE_AURA)
-  expected_view = NULL;
-#endif
-
-  EXPECT_EQ(expected_view, bubble_widget->GetFocusManager()->GetFocusedView());
+  EXPECT_EQ(bubble_delegate->GetInitiallyFocusedView(),
+            bubble_widget->GetFocusManager()->GetFocusedView());
   bubble_widget->CloseNow();
 }
 
 }  // namespace views