Implement Harmony-style consistent button widths for Collected Cookies.

ui/views/window/dialog_client_view_unittest.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 "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/style/platform_style.h"
 #include "ui/views/test/test_views.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace views {
+namespace test {
 
 class TestDialogClientView : public DialogClientView {
  public:
   explicit TestDialogClientView(DialogDelegateView* dialog_delegate_view)
-      : DialogClientView(dialog_delegate_view),
-        dialog_delegate_view_(dialog_delegate_view) {}
+      : DialogClientView(nullptr, dialog_delegate_view),
+        dialog_delegate_view_(dialog_delegate_view) {
+    // Clear button insets from the ViewsDelegate.
+    button_row_insets_ = gfx::Insets();
+  }
   ~TestDialogClientView() override {}
 
   // DialogClientView implementation.
   DialogDelegate* GetDialogDelegate() const override {
     return dialog_delegate_view_;
   }
 
   View* GetContentsView() { return contents_view(); }
 
-  void CreateExtraViews() {
-    CreateExtraView();
-  }
-
  private:
   DialogDelegateView* dialog_delegate_view_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDialogClientView);
 };
 
+}  // namespace test
+
+using test::TestDialogClientView;
+
 // Base class for tests. Also acts as the dialog delegate and contents view for
 // TestDialogClientView.
 class DialogClientViewTest : public ViewsTestBase,
                              public DialogDelegateView {
  public:
   DialogClientViewTest()
       : dialog_buttons_(ui::DIALOG_BUTTON_NONE),
         extra_view_(nullptr) {}
   ~DialogClientViewTest() override {}
 
   // testing::Test implementation.
   void SetUp() override {
+    ViewsTestBase::SetUp();
     dialog_buttons_ = ui::DIALOG_BUTTON_NONE;
     client_view_.reset(new TestDialogClientView(this));
     // Add this i.e. the contents view as a child of |client_view_|. This is
     // generally done when the client view is added to the view hierarchy.
     client_view_->AddChildViewAt(this, 0);
-    ViewsTestBase::SetUp();
   }
 
   // DialogDelegateView implementation.
   View* CreateExtraView() override { return extra_view_; }
   bool GetExtraViewPadding(int* padding) override {
     if (extra_view_padding_)
       *padding = *extra_view_padding_;
     return extra_view_padding_.get() != nullptr;
   }
   int GetDialogButtons() const override { return dialog_buttons_; }
@@ skipping 19 matching lines @@
   // Sets the buttons to show in the dialog and refreshes the dialog.
   void SetDialogButtons(int dialog_buttons) {
     dialog_buttons_ = dialog_buttons;
     client_view_->UpdateDialogButtons();
   }
 
   // Sets the extra view.
   void SetExtraView(View* view) {
     DCHECK(!extra_view_);
     extra_view_ = view;
-    client_view_->CreateExtraViews();
   }
 
   // Sets the extra view padding.
   void SetExtraViewPadding(int padding) {
     DCHECK(!extra_view_padding_);
     extra_view_padding_.reset(new int(padding));
     client_view_->Layout();
   }
 
   TestDialogClientView* client_view() { return client_view_.get(); }
@@ skipping 112 matching lines @@
 // Test the effect of the button strip on layout.
 TEST_F(DialogClientViewTest, LayoutWithButtons) {
   SetDialogButtons(ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL);
   CheckContentsIsSetToPreferredSize();
   EXPECT_LT(GetContentsView()->bounds().bottom(),
             client_view()->bounds().bottom());
   gfx::Size no_extra_view_size = client_view()->bounds().size();
 
   View* extra_view = new StaticSizedView(gfx::Size(200, 200));
   SetExtraView(extra_view);
+  client_view()->UpdateDialogButtons();
   CheckContentsIsSetToPreferredSize();
   EXPECT_GT(client_view()->bounds().height(), no_extra_view_size.height());
   int width_of_dialog = client_view()->bounds().width();
   int width_of_extra_view = extra_view->bounds().width();
 
   // Try with an adjusted padding for the extra view.
   SetExtraViewPadding(250);
   CheckContentsIsSetToPreferredSize();
   EXPECT_GT(client_view()->bounds().width(), width_of_dialog);
 
   // Visibility of extra view is respected.
   extra_view->SetVisible(false);
   CheckContentsIsSetToPreferredSize();
   EXPECT_EQ(no_extra_view_size.height(), client_view()->bounds().height());
   EXPECT_EQ(no_extra_view_size.width(), client_view()->bounds().width());
 
   // Try with a reduced-size dialog.
   extra_view->SetVisible(true);
   client_view()->SetBoundsRect(gfx::Rect(gfx::Point(0, 0), no_extra_view_size));
   client_view()->Layout();
   EXPECT_GT(width_of_extra_view, extra_view->bounds().width());
 }
 
 }  // namespace views