rAc: split TestableAutofillDialogView implementation into its own class

chrome/browser/ui/views/autofill/autofill_dialog_views.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/autofill/autofill_dialog_views.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 1423 matching lines @@
 
 void AutofillDialogViews::ModelChanged() {
   menu_runner_.reset();
 
   for (DetailGroupMap::const_iterator iter = detail_groups_.begin();
        iter != detail_groups_.end(); ++iter) {
     UpdateDetailsGroupState(iter->second);
   }
 }
 
-TestableAutofillDialogView* AutofillDialogViews::GetTestableView() {
-  return this;
-}
-
 void AutofillDialogViews::OnSignInResize(const gfx::Size& pref_size) {
   sign_in_web_view_->SetPreferredSize(pref_size);
   ContentsPreferredSizeChanged();
 }
 
-void AutofillDialogViews::SubmitForTesting() {
-  Accept();
-}
-
-void AutofillDialogViews::CancelForTesting() {
-  GetDialogClientView()->CancelWindow();
-}
-
-base::string16 AutofillDialogViews::GetTextContentsOfInput(
-    ServerFieldType type) {
-  views::Textfield* textfield = TextfieldForType(type);
-  if (textfield)
-    return textfield->text();
-
-  views::Combobox* combobox = ComboboxForType(type);
-  if (combobox)
-    return combobox->model()->GetItemAt(combobox->selected_index());
-
-  NOTREACHED();
-  return base::string16();
-}
-
-void AutofillDialogViews::SetTextContentsOfInput(
-    ServerFieldType type,
-    const base::string16& contents) {
-  views::Textfield* textfield = TextfieldForType(type);
-  if (textfield) {
-    textfield->SetText(contents);
-    return;
-  }
-
-  views::Combobox* combobox = ComboboxForType(type);
-  if (combobox) {
-    SelectComboboxValueOrSetToDefault(combobox, contents);
-    return;
-  }
-
-  NOTREACHED();
-}
-
-void AutofillDialogViews::SetTextContentsOfSuggestionInput(
-    DialogSection section,
-    const base::string16& text) {
-  GroupForSection(section)->suggested_info->decorated_textfield()->
-      SetText(text);
-}
-
-void AutofillDialogViews::ActivateInput(ServerFieldType type) {
-  InputEditedOrActivated(type, gfx::Rect(), false);
-}
-
-gfx::Size AutofillDialogViews::GetSize() const {
-  return GetWidget() ? GetWidget()->GetRootView()->size() : gfx::Size();
-}
-
-content::WebContents* AutofillDialogViews::GetSignInWebContents() {
-  return sign_in_web_view_->web_contents();
-}
-
-bool AutofillDialogViews::IsShowingOverlay() const {
-  return overlay_view_->visible();
-}
-
 gfx::Size AutofillDialogViews::GetPreferredSize() {
   if (preferred_size_.IsEmpty())
     preferred_size_ = CalculatePreferredSize(false);
 
   return preferred_size_;
 }
 
 gfx::Size AutofillDialogViews::GetMinimumSize() {
   return CalculatePreferredSize(true);
 }
@@ skipping 751 matching lines @@
 
   return all_valid;
 }
 
 void AutofillDialogViews::InputEditedOrActivated(ServerFieldType type,
                                                  const gfx::Rect& bounds,
                                                  bool was_edit) {
   DCHECK_NE(UNKNOWN_TYPE, type);
 
   DecoratedTextfield* decorated = TextfieldForType(type);
-  DetailsGroup* group = decorated ?
-      GroupForView(decorated) : GroupForView(ComboboxForType(type));
+  views::Combobox* combobox = ComboboxForType(type);
+  DCHECK_NE(!!combobox, !!decorated);

[Dan Beam, 2014/01/28 18:04:48]

nit: DCHECK_NE(!combobox, !decorated) does the same thing, i guess you felt !!
was less odd?

[Evan Stade, 2014/01/28 18:45:26]

easier to read as english imho

[groby-ooo-7-16, 2014/01/28 20:54:14]

If you like English, DCHECK(combobox || decorated) works well :)

[Evan Stade, 2014/01/28 22:05:55]

the intended operation is XOR

+  DetailsGroup* group = decorated ? GroupForView(decorated) :
+                                    GroupForView(combobox);
+  base::string16 text = decorated ?
+      decorated->text() :
+      combobox->model()->GetItemAt(combobox->selected_index());
   DCHECK(group);
 
   delegate_->UserEditedOrActivatedInput(group->section,
                                         type,
                                         GetWidget()->GetNativeView(),
                                         bounds,
-                                        GetTextContentsOfInput(type),
+                                        text,
                                         was_edit);
 
   // If the field is a textfield and is invalid, check if the text is now valid.
   // Many fields (i.e. CC#) are invalid for most of the duration of editing,
   // so flagging them as invalid prematurely is not helpful. However,
   // correcting a minor mistake (i.e. a wrong CC digit) should immediately
   // result in validation - positive user feedback.
   if (decorated && decorated->invalid() && was_edit) {
     SetValidityForInput(
         decorated,
@@ skipping 207 matching lines @@
 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section)
     : section(section),
       container(NULL),
       manual_input(NULL),
       suggested_info(NULL),
       suggested_button(NULL) {}
 
 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
 
 }  // namespace autofill