views: Add unittests for View::GetViewsWithGroup() method.

Also, rename it to GetViewsInGroup().

BUG=72040
TEST=views_unittests --gtest_filter=ViewTest.GetViewByID

R=ben@chromium.org,sky@chromium.org

Review URL: http://codereview.chromium.org/7328031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92430 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 9 deletions

diff --git a/views/controls/button/native_button_gtk.cc b/views/controls/button/native_button_gtk.cc
index 079bc4c..7ded060 100644
--- a/views/controls/button/native_button_gtk.cc
+++ b/views/controls/button/native_button_gtk.cc
@@ -251,7 +251,7 @@ void NativeRadioButtonGtk::ViewHierarchyChanged(bool is_add,
       container = container->parent();
     if (container) {
       Views other;
-      container->GetViewsWithGroup(native_button_->GetGroup(), &other);
+      container->GetViewsInGroup(native_button_->GetGroup(), &other);
       for (Views::iterator i(other.begin()); i != other.end(); ++i) {
         if (*i != native_button_) {
           if ((*i)->GetClassName() != NativeRadioButton::kViewClassName) {
diff --git a/views/controls/button/radio_button.cc b/views/controls/button/radio_button.cc
index bc6b762..7850a0b 100644
--- a/views/controls/button/radio_button.cc
+++ b/views/controls/button/radio_button.cc
@@ -43,7 +43,7 @@ void NativeRadioButton::SetChecked(bool checked) {
       container = container->parent();
     if (container) {
       Views other;
-      container->GetViewsWithGroup(GetGroup(), &other);
+      container->GetViewsInGroup(GetGroup(), &other);
       for (Views::iterator i(other.begin()); i != other.end(); ++i) {
         if (*i != this) {
           if ((*i)->GetClassName() != kViewClassName) {
@@ -68,9 +68,9 @@ void NativeRadioButton::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_RADIOBUTTON;
 }
 
-View* NativeRadioButton::GetSelectedViewForGroup(int group_id) {
+View* NativeRadioButton::GetSelectedViewForGroup(int group) {
   Views views;
-  GetWidget()->GetRootView()->GetViewsWithGroup(group_id, &views);
+  GetWidget()->GetRootView()->GetViewsInGroup(group, &views);
   if (views.empty())
     return NULL;
 
@@ -140,7 +140,7 @@ void RadioButton::SetChecked(bool checked) {
       container = container->parent();
     if (container) {
       Views other;
-      container->GetViewsWithGroup(GetGroup(), &other);
+      container->GetViewsInGroup(GetGroup(), &other);
       for (Views::iterator i(other.begin()); i != other.end(); ++i) {
         if (*i != this) {
           if ((*i)->GetClassName() != kViewClassName) {
@@ -166,9 +166,9 @@ void RadioButton::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_RADIOBUTTON;
 }
 
-View* RadioButton::GetSelectedViewForGroup(int group_id) {
+View* RadioButton::GetSelectedViewForGroup(int group) {
   Views views;
-  GetWidget()->GetRootView()->GetViewsWithGroup(group_id, &views);
+  GetWidget()->GetRootView()->GetViewsInGroup(group, &views);
   if (views.empty())
     return NULL;
 
diff --git a/views/controls/button/radio_button.h b/views/controls/button/radio_button.h
index 77f5821..bf51249 100644
--- a/views/controls/button/radio_button.h
+++ b/views/controls/button/radio_button.h
@@ -26,7 +26,7 @@ class NativeRadioButton : public NativeCheckbox {
 
   // Overridden from View:
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
-  virtual View* GetSelectedViewForGroup(int group_id) OVERRIDE;
+  virtual View* GetSelectedViewForGroup(int group) OVERRIDE;
   virtual bool IsGroupFocusTraversable() const OVERRIDE;
   virtual void OnMouseReleased(const MouseEvent& event) OVERRIDE;
   virtual void OnMouseCaptureLost() OVERRIDE;
@@ -59,7 +59,7 @@ class RadioButton : public Checkbox {
   // Overridden from View:
   virtual std::string GetClassName() const OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
-  virtual View* GetSelectedViewForGroup(int group_id) OVERRIDE;
+  virtual View* GetSelectedViewForGroup(int group) OVERRIDE;
   virtual bool IsGroupFocusTraversable() const OVERRIDE;
   virtual void OnFocus() OVERRIDE;