Relanding focus manager refactoring

views/focus/focus_manager_unittest.cc

 // Copyright (c) 2006-2008 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.
 
 // Disabled right now as this won't work on BuildBots right now as this test
 // require the box it runs on to be unlocked (and no screen-savers).
 // The test actually simulates mouse and key events, so if the screen is locked,
 // the events don't go to the Chrome window.
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 101 matching lines @@
   virtual HWND CreateNativeControl(HWND parent_container) {
     // Create the tab control.
     HWND tab_control = ::CreateWindowEx(GetAdditionalExStyle(),
                                         WC_TABCONTROL,
                                         L"",
                                         WS_CHILD,
                                         0, 0, width(), height(),
                                         parent_container, NULL, NULL, NULL);
     // Create the view container which is a child of the TabControl.
     widget_ = new WidgetWin();
-    widget_->Init(tab_control, gfx::Rect(), false);
+    widget_->Init(tab_control, gfx::Rect());
     widget_->SetContentsView(child_);
     widget_->SetFocusTraversableParentView(this);
     ResizeContents(tab_control);
     return tab_control;
   }
 
   virtual LRESULT OnNotify(int w_param, LPNMHDR l_param) {
     return 0;
   }
 
@@ skipping 70 matching lines @@
   virtual void TearDown() {
     if (focus_change_listener_)
       GetFocusManager()->RemoveFocusChangeListener(focus_change_listener_);
     window_->CloseNow();
 
     // Flush the message loop to make Purify happy.
     message_loop()->RunAllPending();
   }
 
   FocusManager* GetFocusManager() {
-    return FocusManager::GetFocusManager(window_->GetNativeWindow());
+    return FocusManager::GetFocusManagerForNativeView(
+        window_->GetNativeWindow());
   }
 
   // WindowDelegate Implementation.
   virtual View* GetContentsView() {
     if (!content_view_)
       content_view_ = new View();
     return content_view_;
   }
 
   virtual void InitContentView() {
@@ skipping 884 matching lines @@
   EXPECT_EQ(target.accelerator_count(), 1);
   EXPECT_EQ(NULL,
             focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
 
   // Hitting the return key again; nothing should happen.
   EXPECT_FALSE(focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(target.accelerator_count(), 1);
 }
 
 }  // namespace views