Revise NativeWidgetWin focus hack; force focus on restore.

ui/views/bubble/bubble_delegate_unittest.cc

Index: ui/views/bubble/bubble_delegate_unittest.cc
diff --git a/ui/views/bubble/bubble_delegate_unittest.cc b/ui/views/bubble/bubble_delegate_unittest.cc
index 919166632468c8a377eb7db6e452dbc672f00c10..b9d6574d31007c5c684169df38f32d751fa3ce9c 100644
--- a/ui/views/bubble/bubble_delegate_unittest.cc
+++ b/ui/views/bubble/bubble_delegate_unittest.cc
@@ -176,14 +176,8 @@ TEST_F(BubbleDelegateTest, InitiallyFocusedView) {
   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();
 }