2 files changed, 11 insertions, 12 deletions

diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc
index 20baabe..fa2b8f2 100644
--- a/ui/views/focus/focus_manager.cc
+++ b/ui/views/focus/focus_manager.cc
@@ -143,7 +143,7 @@ bool FocusManager::OnKeyEvent(const KeyEvent& event) {
        key_code == ui::VKEY_LEFT || key_code == ui::VKEY_RIGHT)) {
     bool next = (key_code == ui::VKEY_RIGHT || key_code == ui::VKEY_DOWN);
     std::vector<View*> views;
-    focused_view_->parent()->GetViewsWithGroup(focused_view_->group(), &views);
+    focused_view_->parent()->GetViewsInGroup(focused_view_->group(), &views);
     std::vector<View*>::const_iterator iter = std::find(views.begin(),
                                                         views.end(),
                                                         focused_view_);
diff --git a/ui/views/focus/focus_search.cc b/ui/views/focus/focus_search.cc
index c8093fd0..083fc7c 100644
--- a/ui/views/focus/focus_search.cc
+++ b/ui/views/focus/focus_search.cc
@@ -24,7 +24,7 @@ View* FocusSearch::FindNextFocusableView(View* starting_view,
   *focus_traversable = NULL;
   *focus_traversable_view = NULL;
 
-  if (root_->child_count() == 0) {
+  if (root_->children_empty()) {
     NOTREACHED();
     // Nothing to focus on here.
     return NULL;
@@ -39,14 +39,14 @@ View* FocusSearch::FindNextFocusableView(View* starting_view,
     // Default to the first/last child
     starting_view =
         reverse ?
-        root_->GetChildViewAt(root_->child_count() - 1) :
-        root_->GetChildViewAt(0);
+        root_->child_at(root_->children_size() - 1) :
+        root_->child_at(0);
     // If there was no starting view, then the one we select is a potential
     // focus candidate.
     check_starting_view = true;
   } else {
     // The starting view should be a direct or indirect child of the root.
-    DCHECK(root_->Contains(starting_view));
+    DCHECK(root_->Contains(*starting_view));
   }
 
   View* v = NULL;
@@ -70,7 +70,7 @@ View* FocusSearch::FindNextFocusableView(View* starting_view,
   }
 
   // Don't set the focus to something outside of this view hierarchy.
-  if (v && v != root_ && !root_->Contains(v))
+  if (v && v != root_ && !root_->Contains(*v))
     v = NULL;
 
   // If |cycle_| is true, prefer to keep cycling rather than returning NULL.
@@ -121,7 +121,7 @@ View* FocusSearch::FindSelectedViewForGroup(View* view) const {
 }
 
 View* FocusSearch::GetParent(View* v) const {
-  return root_->Contains(v) ? v->parent() : NULL;
+  return root_->Contains(*v) ? v->parent() : NULL;
 }
 
 // Strategy for finding the next focusable view:
@@ -158,8 +158,8 @@ View* FocusSearch::FindNextFocusableViewImpl(
 
   // First let's try the left child.
   if (can_go_down) {
-    if (starting_view->child_count() > 0) {
-      View* v = FindNextFocusableViewImpl(starting_view->GetChildViewAt(0),
+    if (!starting_view->children_empty()) {
+      View* v = FindNextFocusableViewImpl(starting_view->child_at(0),
                                           true, false, true, skip_group_id,
                                           focus_traversable,
                                           focus_traversable_view);
@@ -223,9 +223,8 @@ View* FocusSearch::FindPreviousFocusableViewImpl(
       return NULL;
     }
 
-    if (starting_view->child_count() > 0) {
-      View* view =
-          starting_view->GetChildViewAt(starting_view->child_count() - 1);
+    if (!starting_view->children_empty()) {
+      View* view = starting_view->child_at(starting_view->children_size() - 1);
       View* v = FindPreviousFocusableViewImpl(view, true, false, true,
                                               skip_group_id,
                                               focus_traversable,