Fix focus traversal cycle.

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 867 matching lines @@
   for (int i = 0; i < 3; ++i) {
     for (int j = 0; j < arraysize(kTraversalIDs); j++) {
       GetFocusManager()->AdvanceFocus(false);
       View* focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
         EXPECT_EQ(kTraversalIDs[j], focused_view->GetID());
     }
   }
 
-  // Focus the 1st item.
-  GetFocusManager()->SetFocusedView(
-      content_view_->GetViewByID(kTraversalIDs[0]));
-
   // Let's traverse in reverse order.
+  GetFocusManager()->SetFocusedView(NULL);
   for (int i = 0; i < 3; ++i) {
     for (int j = arraysize(kTraversalIDs) - 1; j >= 0; --j) {
       GetFocusManager()->AdvanceFocus(true);
       View* focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
         EXPECT_EQ(kTraversalIDs[j], focused_view->GetID());
     }
   }
 }
@@ skipping 21 matching lines @@
     if (v)
       v->SetEnabled(false);
   }
 
   // Uncomment the following line if you want to test manually the UI of this
   // test.
   // MessageLoopForUI::current()->Run(new AcceleratorHandler());
 
   View* focused_view;
   // Let's do one traversal (several times, to make sure it loops ok).
+  GetFocusManager()->SetFocusedView(NULL);
   for (int i = 0; i < 3; ++i) {
     for (int j = 0; j < arraysize(kTraversalIDs); j++) {
       GetFocusManager()->AdvanceFocus(false);
       focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
         EXPECT_EQ(kTraversalIDs[j], focused_view->GetID());
     }
   }
 
-  // Focus the 1st item.
-  GetFocusManager()->AdvanceFocus(false);
-  focused_view = GetFocusManager()->GetFocusedView();
-  EXPECT_TRUE(focused_view != NULL);
-  if (focused_view)
-    EXPECT_EQ(kTraversalIDs[0], focused_view->GetID());
-
   // Same thing in reverse.
+  GetFocusManager()->SetFocusedView(NULL);
   for (int i = 0; i < 3; ++i) {
     for (int j = arraysize(kTraversalIDs) - 1; j >= 0; --j) {
       GetFocusManager()->AdvanceFocus(true);
       focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
         EXPECT_EQ(kTraversalIDs[j], focused_view->GetID());
     }
   }
 }
@@ skipping 154 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