Variety of tweaks to View API.

views/focus/focus_manager_unittest.cc

 // Copyright (c) 2011 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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 244 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(FocusManagerTest);
 };
 
 // BorderView is a view containing a native window with its own view hierarchy.
 // It is interesting to test focus traversal from a view hierarchy to an inner
 // view hierarchy.
 class BorderView : public NativeViewHost {
  public:
   explicit BorderView(View* child) : child_(child), widget_(NULL) {
     DCHECK(child);
-    SetFocusable(false);
+    set_focusable(false);
   }
 
   virtual ~BorderView() {}
 
   virtual internal::RootView* GetContentsRootView() {
     return static_cast<internal::RootView*>(widget_->GetRootView());
   }
 
   virtual FocusTraversable* GetFocusTraversable() {
     return static_cast<internal::RootView*>(widget_->GetRootView());
@@ skipping 182 matching lines @@
   //     NativeButton      * kThumbnailStarID
   //     NativeButton      * kThumbnailSuperStarID
 
   content_view_->set_background(
       Background::CreateSolidBackground(SK_ColorWHITE));
 
   Checkbox* cb = new Checkbox(L"This is a checkbox");
   content_view_->AddChildView(cb);
   // In this fast paced world, who really has time for non hard-coded layout?
   cb->SetBounds(10, 10, 200, 20);
-  cb->SetID(kTopCheckBoxID);
+  cb->set_id(kTopCheckBoxID);
 
   left_container_ = new PaneView();
   left_container_->set_border(Border::CreateSolidBorder(1, SK_ColorBLACK));
   left_container_->set_background(
       Background::CreateSolidBackground(240, 240, 240));
-  left_container_->SetID(kLeftContainerID);
+  left_container_->set_id(kLeftContainerID);
   content_view_->AddChildView(left_container_);
   left_container_->SetBounds(10, 35, 250, 200);
 
   int label_x = 5;
   int label_width = 50;
   int label_height = 15;
   int text_field_width = 150;
   int y = 10;
   int gap_between_labels = 10;
 
   Label* label = new Label(L"Apple:");
-  label->SetID(kAppleLabelID);
+  label->set_id(kAppleLabelID);
   left_container_->AddChildView(label);
   label->SetBounds(label_x, y, label_width, label_height);
 
   Textfield* text_field = new Textfield();
-  text_field->SetID(kAppleTextfieldID);
+  text_field->set_id(kAppleTextfieldID);
   left_container_->AddChildView(text_field);
   text_field->SetBounds(label_x + label_width + 5, y,
                         text_field_width, label_height);
 
   y += label_height + gap_between_labels;
 
   label = new Label(L"Orange:");
-  label->SetID(kOrangeLabelID);
+  label->set_id(kOrangeLabelID);
   left_container_->AddChildView(label);
   label->SetBounds(label_x, y, label_width, label_height);
 
   text_field = new Textfield();
-  text_field->SetID(kOrangeTextfieldID);
+  text_field->set_id(kOrangeTextfieldID);
   left_container_->AddChildView(text_field);
   text_field->SetBounds(label_x + label_width + 5, y,
                         text_field_width, label_height);
 
   y += label_height + gap_between_labels;
 
   label = new Label(L"Banana:");
-  label->SetID(kBananaLabelID);
+  label->set_id(kBananaLabelID);
   left_container_->AddChildView(label);
   label->SetBounds(label_x, y, label_width, label_height);
 
   text_field = new Textfield();
-  text_field->SetID(kBananaTextfieldID);
+  text_field->set_id(kBananaTextfieldID);
   left_container_->AddChildView(text_field);
   text_field->SetBounds(label_x + label_width + 5, y,
                         text_field_width, label_height);
 
   y += label_height + gap_between_labels;
 
   label = new Label(L"Kiwi:");
-  label->SetID(kKiwiLabelID);
+  label->set_id(kKiwiLabelID);
   left_container_->AddChildView(label);
   label->SetBounds(label_x, y, label_width, label_height);
 
   text_field = new Textfield();
-  text_field->SetID(kKiwiTextfieldID);
+  text_field->set_id(kKiwiTextfieldID);
   left_container_->AddChildView(text_field);
   text_field->SetBounds(label_x + label_width + 5, y,
                         text_field_width, label_height);
 
   y += label_height + gap_between_labels;
 
   NativeButton* button = new NativeButton(NULL, L"Click me");
   button->SetBounds(label_x, y + 10, 80, 30);
-  button->SetID(kFruitButtonID);
+  button->set_id(kFruitButtonID);
   left_container_->AddChildView(button);
   y += 40;
 
   cb =  new Checkbox(L"This is another check box");
   cb->SetBounds(label_x + label_width + 5, y, 180, 20);
-  cb->SetID(kFruitCheckBoxID);
+  cb->set_id(kFruitCheckBoxID);
   left_container_->AddChildView(cb);
   y += 20;
 
   Combobox* combobox =  new Combobox(&combobox_model_);
   combobox->SetBounds(label_x + label_width + 5, y, 150, 30);
-  combobox->SetID(kComboboxID);
+  combobox->set_id(kComboboxID);
   left_container_->AddChildView(combobox);
 
   right_container_ = new PaneView();
   right_container_->set_border(Border::CreateSolidBorder(1, SK_ColorBLACK));
   right_container_->set_background(
       Background::CreateSolidBackground(240, 240, 240));
-  right_container_->SetID(kRightContainerID);
+  right_container_->set_id(kRightContainerID);
   content_view_->AddChildView(right_container_);
   right_container_->SetBounds(270, 35, 300, 200);
 
   y = 10;
   int radio_button_height = 18;
   int gap_between_radio_buttons = 10;
   RadioButton* radio_button = new RadioButton(L"Asparagus", 1);
-  radio_button->SetID(kAsparagusButtonID);
+  radio_button->set_id(kAsparagusButtonID);
   right_container_->AddChildView(radio_button);
   radio_button->SetBounds(5, y, 70, radio_button_height);
-  radio_button->SetGroup(1);
+  radio_button->set_group(1);
   y += radio_button_height + gap_between_radio_buttons;
   radio_button = new RadioButton(L"Broccoli", 1);
-  radio_button->SetID(kBroccoliButtonID);
+  radio_button->set_id(kBroccoliButtonID);
   right_container_->AddChildView(radio_button);
   radio_button->SetBounds(5, y, 70, radio_button_height);
-  radio_button->SetGroup(1);
+  radio_button->set_group(1);
   RadioButton* radio_button_to_check = radio_button;
   y += radio_button_height + gap_between_radio_buttons;
   radio_button = new RadioButton(L"Cauliflower", 1);
-  radio_button->SetID(kCauliflowerButtonID);
+  radio_button->set_id(kCauliflowerButtonID);
   right_container_->AddChildView(radio_button);
   radio_button->SetBounds(5, y, 70, radio_button_height);
-  radio_button->SetGroup(1);
+  radio_button->set_group(1);
   y += radio_button_height + gap_between_radio_buttons;
 
   View* inner_container = new View();
   inner_container->set_border(Border::CreateSolidBorder(1, SK_ColorBLACK));
   inner_container->set_background(
       Background::CreateSolidBackground(230, 230, 230));
-  inner_container->SetID(kInnerContainerID);
+  inner_container->set_id(kInnerContainerID);
   right_container_->AddChildView(inner_container);
   inner_container->SetBounds(100, 10, 150, 180);
 
   ScrollView* scroll_view = new ScrollView();
-  scroll_view->SetID(kScrollViewID);
+  scroll_view->set_id(kScrollViewID);
   inner_container->AddChildView(scroll_view);
   scroll_view->SetBounds(1, 1, 148, 178);
 
   View* scroll_content = new View();
   scroll_content->SetBounds(0, 0, 200, 200);
   scroll_content->set_background(
       Background::CreateSolidBackground(200, 200, 200));
   scroll_view->SetContents(scroll_content);
 
   static const wchar_t* const kTitles[] = {
       L"Rosetta", L"Stupeur et tremblement", L"The diner game",
       L"Ridicule", L"Le placard", L"Les Visiteurs", L"Amelie",
       L"Joyeux Noel", L"Camping", L"Brice de Nice",
       L"Taxi", L"Asterix"
   };
 
   static const int kIDs[] = {
       kRosettaLinkID, kStupeurEtTremblementLinkID, kDinerGameLinkID,
       kRidiculeLinkID, kClosetLinkID, kVisitingLinkID, kAmelieLinkID,
       kJoyeuxNoelLinkID, kCampingLinkID, kBriceDeNiceLinkID,
       kTaxiLinkID, kAsterixLinkID
   };
 
   DCHECK(arraysize(kTitles) == arraysize(kIDs));
 
   y = 5;
   for (size_t i = 0; i < arraysize(kTitles); ++i) {
     Link* link = new Link(kTitles[i]);
     link->SetHorizontalAlignment(Label::ALIGN_LEFT);
-    link->SetID(kIDs[i]);
+    link->set_id(kIDs[i]);
     scroll_content->AddChildView(link);
     link->SetBounds(5, y, 300, 15);
     y += 15;
   }
 
   y = 250;
   int width = 60;
   button = new NativeButton(NULL, L"OK");
-  button->SetID(kOKButtonID);
+  button->set_id(kOKButtonID);
   button->SetIsDefault(true);
 
   content_view_->AddChildView(button);
   button->SetBounds(150, y, width, 30);
 
   button = new NativeButton(NULL, L"Cancel");
-  button->SetID(kCancelButtonID);
+  button->set_id(kCancelButtonID);
   content_view_->AddChildView(button);
   button->SetBounds(220, y, width, 30);
 
   button = new NativeButton(NULL, L"Help");
-  button->SetID(kHelpButtonID);
+  button->set_id(kHelpButtonID);
   content_view_->AddChildView(button);
   button->SetBounds(290, y, width, 30);
 
   y += 40;
 
   // Left bottom box with style checkboxes.
   View* contents = new View();
   contents->set_background(Background::CreateSolidBackground(SK_ColorWHITE));
   cb = new Checkbox(L"Bold");
   contents->AddChildView(cb);
   cb->SetBounds(10, 10, 50, 20);
-  cb->SetID(kBoldCheckBoxID);
+  cb->set_id(kBoldCheckBoxID);
 
   cb = new Checkbox(L"Italic");
   contents->AddChildView(cb);
   cb->SetBounds(70, 10, 50, 20);
-  cb->SetID(kItalicCheckBoxID);
+  cb->set_id(kItalicCheckBoxID);
 
   cb = new Checkbox(L"Underlined");
   contents->AddChildView(cb);
   cb->SetBounds(130, 10, 70, 20);
-  cb->SetID(kUnderlinedCheckBoxID);
+  cb->set_id(kUnderlinedCheckBoxID);
 
   Link* link = new Link(L"Help");
   contents->AddChildView(link);
   link->SetBounds(10, 35, 70, 10);
-  link->SetID(kStyleHelpLinkID);
+  link->set_id(kStyleHelpLinkID);
 
   text_field = new Textfield();
   contents->AddChildView(text_field);
   text_field->SetBounds(10, 50, 100, 20);
-  text_field->SetID(kStyleTextEditID);
+  text_field->set_id(kStyleTextEditID);
 
   style_tab_ = new TabbedPane();
-  style_tab_->SetID(kStyleContainerID);
+  style_tab_->set_id(kStyleContainerID);
   content_view_->AddChildView(style_tab_);
   style_tab_->SetBounds(10, y, 210, 100);
   style_tab_->AddTab(L"Style", contents);
   style_tab_->AddTab(L"Other", new View());
 
   // Right bottom box with search.
   contents = new View();
   contents->set_background(Background::CreateSolidBackground(SK_ColorWHITE));
   text_field = new Textfield();
   contents->AddChildView(text_field);
   text_field->SetBounds(10, 10, 100, 20);
-  text_field->SetID(kSearchTextfieldID);
+  text_field->set_id(kSearchTextfieldID);
 
   button = new NativeButton(NULL, L"Search");
   contents->AddChildView(button);
   button->SetBounds(112, 5, 60, 30);
-  button->SetID(kSearchButtonID);
+  button->set_id(kSearchButtonID);
 
   link = new Link(L"Help");
   link->SetHorizontalAlignment(Label::ALIGN_LEFT);
-  link->SetID(kHelpLinkID);
+  link->set_id(kHelpLinkID);
   contents->AddChildView(link);
   link->SetBounds(175, 10, 30, 20);
 
   search_border_view_ = new BorderView(contents);
-  search_border_view_->SetID(kSearchContainerID);
+  search_border_view_->set_id(kSearchContainerID);
 
   content_view_->AddChildView(search_border_view_);
   search_border_view_->SetBounds(300, y, 240, 50);
 
   y += 60;
 
   contents = new View();
-  contents->SetFocusable(true);
+  contents->set_focusable(true);
   contents->set_background(Background::CreateSolidBackground(SK_ColorBLUE));
-  contents->SetID(kThumbnailContainerID);
+  contents->set_id(kThumbnailContainerID);
   button = new NativeButton(NULL, L"Star");
   contents->AddChildView(button);
   button->SetBounds(5, 5, 50, 30);
-  button->SetID(kThumbnailStarID);
+  button->set_id(kThumbnailStarID);
   button = new NativeButton(NULL, L"SuperStar");
   contents->AddChildView(button);
   button->SetBounds(60, 5, 100, 30);
-  button->SetID(kThumbnailSuperStarID);
+  button->set_id(kThumbnailSuperStarID);
 
   content_view_->AddChildView(contents);
   contents->SetBounds(250, y, 200, 50);
   // We can only call RadioButton::SetChecked() on the radio-button is part of
   // the view hierarchy.
   radio_button_to_check->SetChecked(true);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // The tests
@@ skipping 11 matching lines @@
   }
 
   FocusTestEventType type;
   int view_id;
 };
 
 class SimpleTestView : public View {
  public:
   SimpleTestView(std::vector<FocusTestEvent>* event_list, int view_id)
       : event_list_(event_list) {
-    SetFocusable(true);
-    SetID(view_id);
+    set_focusable(true);
+    set_id(view_id);
   }
 
   virtual void OnFocus() {
-    event_list_->push_back(FocusTestEvent(ON_FOCUS, GetID()));
+    event_list_->push_back(FocusTestEvent(ON_FOCUS, id()));
   }
 
   virtual void OnBlur() {
-    event_list_->push_back(FocusTestEvent(ON_BLUR, GetID()));
+    event_list_->push_back(FocusTestEvent(ON_BLUR, id()));
   }
 
  private:
   std::vector<FocusTestEvent>* event_list_;
 };
 
 // Tests that the appropriate Focus related methods are called when a View
 // gets/loses focus.
 TEST_F(FocusManagerTest, ViewFocusCallbacks) {
   std::vector<FocusTestEvent> event_list;
@@ skipping 35 matching lines @@
   const std::vector<ViewPair>& focus_changes() const { return focus_changes_; }
   void ClearFocusChanges() { focus_changes_.clear(); }
 
  private:
   // A vector of which views lost/gained focus.
   std::vector<ViewPair> focus_changes_;
 };
 
 TEST_F(FocusManagerTest, FocusChangeListener) {
   View* view1 = new View();
-  view1->SetFocusable(true);
+  view1->set_focusable(true);
   View* view2 = new View();
-  view2->SetFocusable(true);
+  view2->set_focusable(true);
   content_view_->AddChildView(view1);
   content_view_->AddChildView(view2);
 
   TestFocusChangeListener listener;
   AddFocusChangeListener(&listener);
 
   // Visual Studio 2010 has problems converting NULL to the null pointer for
   // std::pair.  See http://connect.microsoft.com/VisualStudio/feedback/details/520043/error-converting-from-null-to-a-pointer-type-in-std-pair
   // It will work if we pass nullptr.
 #if defined(_MSC_VER) && _MSC_VER >= 1600
@@ skipping 127 matching lines @@
 #if defined(OS_WIN)
 
 // Test that when activating/deactivating the top window, the focus is stored/
 // restored properly.
 TEST_F(FocusManagerTest, FocusStoreRestore) {
   // Simulate an activate, otherwise the deactivate isn't going to do anything.
   SimulateActivateWindow();
 
   NativeButton* button = new NativeButton(NULL, L"Press me");
   View* view = new View();
-  view->SetFocusable(true);
+  view->set_focusable(true);
 
   content_view_->AddChildView(button);
   button->SetBounds(10, 10, 200, 30);
   content_view_->AddChildView(view);
   message_loop()->RunAllPending();
 
   TestFocusChangeListener listener;
   AddFocusChangeListener(&listener);
 
   view->RequestFocus();
@@ skipping 96 matching lines @@
 
   // Let's traverse the whole focus hierarchy (several times, to make sure it
   // loops OK).
   GetFocusManager()->ClearFocus();
   for (int i = 0; i < 3; ++i) {
     for (size_t 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());
+        EXPECT_EQ(kTraversalIDs[j], focused_view->id());
     }
   }
 
   // Let's traverse in reverse order.
   GetFocusManager()->ClearFocus();
   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());
+        EXPECT_EQ(kTraversalIDs[j], focused_view->id());
     }
   }
 }
 
 TEST_F(FocusTraversalTest, TraversalWithNonEnabledViews) {
   const int kDisabledIDs[] = {
       kBananaTextfieldID, kFruitCheckBoxID, kComboboxID, kAsparagusButtonID,
       kCauliflowerButtonID, kClosetLinkID, kVisitingLinkID, kBriceDeNiceLinkID,
       kTaxiLinkID, kAsterixLinkID, kHelpButtonID, kBoldCheckBoxID,
       kSearchTextfieldID, kHelpLinkID };
@@ skipping 20 matching lines @@
 
   View* focused_view;
   // Let's do one traversal (several times, to make sure it loops ok).
   GetFocusManager()->ClearFocus();
   for (int i = 0; i < 3; ++i) {
     for (size_t 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());
+        EXPECT_EQ(kTraversalIDs[j], focused_view->id());
     }
   }
 
   // Same thing in reverse.
   GetFocusManager()->ClearFocus();
   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());
+        EXPECT_EQ(kTraversalIDs[j], focused_view->id());
     }
   }
 }
 
 TEST_F(FocusTraversalTest, TraversalWithInvisibleViews) {
   const int kInvisibleIDs[] = { kTopCheckBoxID, kOKButtonID,
       kThumbnailContainerID };
 
   const int kTraversalIDs[] = { kAppleTextfieldID, kOrangeTextfieldID,
       kBananaTextfieldID, kKiwiTextfieldID, kFruitButtonID, kFruitCheckBoxID,
@@ skipping 19 matching lines @@
 
   View* focused_view;
   // Let's do one traversal (several times, to make sure it loops ok).
   GetFocusManager()->ClearFocus();
   for (int i = 0; i < 3; ++i) {
     for (size_t 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());
+        EXPECT_EQ(kTraversalIDs[j], focused_view->id());
     }
   }
 
   // Same thing in reverse.
   GetFocusManager()->ClearFocus();
   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());
+        EXPECT_EQ(kTraversalIDs[j], focused_view->id());
     }
   }
 }
 
 TEST_F(FocusTraversalTest, PaneTraversal) {
   // Tests trapping the traversal within a pane - useful for full
   // keyboard accessibility for toolbars.
 
   // First test the left container.
   const int kLeftTraversalIDs[] = {
     kAppleTextfieldID,
     kOrangeTextfieldID, kBananaTextfieldID, kKiwiTextfieldID,
     kFruitButtonID, kFruitCheckBoxID, kComboboxID };
 
   FocusSearch focus_search_left(left_container_, true, false);
   left_container_->EnablePaneFocus(&focus_search_left);
   FindViewByID(kComboboxID)->RequestFocus();
 
   // Traverse the focus hierarchy within the pane several times.
   for (int i = 0; i < 3; ++i) {
     for (size_t j = 0; j < arraysize(kLeftTraversalIDs); j++) {
       GetFocusManager()->AdvanceFocus(false);
       View* focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
-        EXPECT_EQ(kLeftTraversalIDs[j], focused_view->GetID());
+        EXPECT_EQ(kLeftTraversalIDs[j], focused_view->id());
     }
   }
 
   // Traverse in reverse order.
   FindViewByID(kAppleTextfieldID)->RequestFocus();
   for (int i = 0; i < 3; ++i) {
     for (int j = arraysize(kLeftTraversalIDs) - 1; j >= 0; --j) {
       GetFocusManager()->AdvanceFocus(true);
       View* focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
-        EXPECT_EQ(kLeftTraversalIDs[j], focused_view->GetID());
+        EXPECT_EQ(kLeftTraversalIDs[j], focused_view->id());
     }
   }
 
   // Now test the right container, but this time with accessibility mode.
   // Make some links not focusable, but mark one of them as
   // "accessibility focusable", so it should show up in the traversal.
   const int kRightTraversalIDs[] = {
     kBroccoliButtonID, kDinerGameLinkID, kRidiculeLinkID,
     kClosetLinkID, kVisitingLinkID, kAmelieLinkID, kJoyeuxNoelLinkID,
     kCampingLinkID, kBriceDeNiceLinkID, kTaxiLinkID, kAsterixLinkID };
 
   FocusSearch focus_search_right(right_container_, true, true);
   right_container_->EnablePaneFocus(&focus_search_right);
-  FindViewByID(kRosettaLinkID)->SetFocusable(false);
-  FindViewByID(kStupeurEtTremblementLinkID)->SetFocusable(false);
+  FindViewByID(kRosettaLinkID)->set_focusable(false);
+  FindViewByID(kStupeurEtTremblementLinkID)->set_focusable(false);
   FindViewByID(kDinerGameLinkID)->set_accessibility_focusable(true);
-  FindViewByID(kDinerGameLinkID)->SetFocusable(false);
+  FindViewByID(kDinerGameLinkID)->set_focusable(false);
   FindViewByID(kAsterixLinkID)->RequestFocus();
 
   // Traverse the focus hierarchy within the pane several times.
   for (int i = 0; i < 3; ++i) {
     for (size_t j = 0; j < arraysize(kRightTraversalIDs); j++) {
       GetFocusManager()->AdvanceFocus(false);
       View* focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
-        EXPECT_EQ(kRightTraversalIDs[j], focused_view->GetID());
+        EXPECT_EQ(kRightTraversalIDs[j], focused_view->id());
     }
   }
 
   // Traverse in reverse order.
   FindViewByID(kBroccoliButtonID)->RequestFocus();
   for (int i = 0; i < 3; ++i) {
     for (int j = arraysize(kRightTraversalIDs) - 1; j >= 0; --j) {
       GetFocusManager()->AdvanceFocus(true);
       View* focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
-        EXPECT_EQ(kRightTraversalIDs[j], focused_view->GetID());
+        EXPECT_EQ(kRightTraversalIDs[j], focused_view->id());
     }
   }
 
 }
 
 // Counts accelerator calls.
 class TestAcceleratorTarget : public AcceleratorTarget {
  public:
   explicit TestAcceleratorTarget(bool process_accelerator)
       : accelerator_count_(0), process_accelerator_(process_accelerator) {}
@@ skipping 428 matching lines @@
 
   // Focus manager should be the last one to destruct.
   ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());
 
   // Clear window_ so that we don't try to close it again.
   window_ = NULL;
 }
 
 
 }  // namespace views