Harmony: Apply the upper bound on equal-sized button widths in DialogClientView.

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 "ui/views/window/dialog_client_view.h"
 
+#include <map>
+
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "ui/base/test/material_design_controller_test_api.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/controls/button/checkbox.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/widget_test.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace views {
@@ skipping 103 matching lines @@
   }
 
   View* FocusableViewAfter(View* view) {
     const bool dont_loop = false;
     const bool reverse = false;
     return GetFocusManager()->GetNextFocusableView(view, GetWidget(), reverse,
                                                    dont_loop);
   }
 
   // Set a longer than normal Cancel label so that the minimum button width is
-  // exceeded.
+  // exceeded. The resulting width is around 160 pixels, but depends on system
+  // fonts.
   void SetLongCancelLabel() {
     cancel_label_ = base::ASCIIToUTF16("Cancel Cancel Cancel");
   }
 
   DialogClientView* client_view() { return client_view_; }
 
  private:
   // The dialog Widget.
   Widget* widget_ = nullptr;
 
@@ skipping 10 matching lines @@
 
   gfx::Size preferred_size_;
   gfx::Size min_size_;
   gfx::Size max_size_;
 
   base::string16 cancel_label_;  // If set, the label for the Cancel button.
 
   DISALLOW_COPY_AND_ASSIGN(DialogClientViewTest);
 };
 
+// Helper to test LayoutProvider metric overrides.
+class TestLayoutProvider : public LayoutProvider {

[msw, 2017/05/05 18:07:43]

nit: Can you move this to its own file and use that in
bubble_frame_view_unittest.cc?

[tapted, 2017/05/08 06:53:57]

Done.

+ public:
+  TestLayoutProvider() {}
+
+  void Set(int metric, int value) { metrics_[metric] = value; }
+
+  // LayoutProvider:
+  int GetDistanceMetric(int metric) const override {
+    if (metrics_.count(metric))
+      return metrics_.find(metric)->second;
+    return LayoutProvider::GetDistanceMetric(metric);
+  }
+
+ private:
+  std::map<int, int> metrics_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestLayoutProvider);
+};
+
 TEST_F(DialogClientViewTest, UpdateButtons) {
   // This dialog should start with no buttons.
   EXPECT_EQ(GetDialogButtons(), ui::DIALOG_BUTTON_NONE);
   EXPECT_EQ(NULL, client_view()->ok_button());
   EXPECT_EQ(NULL, client_view()->cancel_button());
   const int height_without_buttons = GetUpdatedClientBounds().height();
 
   // Update to use both buttons.
   SetDialogButtons(ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL);
   EXPECT_TRUE(client_view()->ok_button()->is_default());
@@ skipping 178 matching lines @@
   EXPECT_EQ(gfx::Size(400, 450 + buttons_size.height()),
             client_view()->GetMinimumSize());
   EXPECT_EQ(gfx::Size(500, 550 + buttons_size.height()),
             client_view()->GetPreferredSize());
   EXPECT_EQ(gfx::Size(600, 650 + buttons_size.height()),
             client_view()->GetMaximumSize());
 }
 
 // Ensure button widths are linked under MD.
 TEST_F(DialogClientViewTest, LinkedWidths) {
-  ui::test::MaterialDesignControllerTestAPI md_test_api(
-      ui::MaterialDesignController::MATERIAL_NORMAL);
-  md_test_api.SetSecondaryUiMaterial(true);
+  TestLayoutProvider layout_provider;
+  layout_provider.Set(DISTANCE_BUTTON_MAX_LINKABLE_WIDTH, 200);
   SetLongCancelLabel();
 
   SetDialogButtons(ui::DIALOG_BUTTON_OK);
   CheckContentsIsSetToPreferredSize();
   const int ok_button_only_width = client_view()->ok_button()->width();
 
   SetDialogButtons(ui::DIALOG_BUTTON_CANCEL);
   CheckContentsIsSetToPreferredSize();
   const int cancel_button_width = client_view()->cancel_button()->width();
 
   // Ensure the single buttons have different preferred widths when alone, and
   // that the Cancel button is bigger (so that it dominates the size).
   EXPECT_GT(cancel_button_width, ok_button_only_width);
 
   SetDialogButtons(ui::DIALOG_BUTTON_CANCEL | ui::DIALOG_BUTTON_OK);
   CheckContentsIsSetToPreferredSize();
 
   // OK button should now match the bigger, cancel button.
   EXPECT_EQ(cancel_button_width, client_view()->ok_button()->width());
 
-  // But not under non-MD.
-  md_test_api.SetSecondaryUiMaterial(false);
+  // But not when the size of the cancel button exceeds the max linkable width.
+  layout_provider.Set(DISTANCE_BUTTON_MAX_LINKABLE_WIDTH, 100);

[msw, 2017/05/05 18:07:43]

nit: EXPECT_GT(cancel_button_width, 100)?

[tapted, 2017/05/08 06:53:57]

Done.

   client_view()->UpdateDialogButtons();
   CheckContentsIsSetToPreferredSize();
   EXPECT_EQ(ok_button_only_width, client_view()->ok_button()->width());
-  md_test_api.SetSecondaryUiMaterial(true);
+  layout_provider.Set(DISTANCE_BUTTON_MAX_LINKABLE_WIDTH, 200);
 
   // The extra view should also match, if it's a matching button type.
   LabelButton* extra_button = new LabelButton(nullptr, base::string16());
   SetExtraView(extra_button);
   CheckContentsIsSetToPreferredSize();
   EXPECT_EQ(cancel_button_width, extra_button->width());
 
   // Remove |extra_button| from the View hierarchy so that it can be replaced.
   delete extra_button;
 
   // Checkbox extends LabelButton, but it should not participate in linking.
   extra_button = new Checkbox(base::string16());
   SetExtraView(extra_button);
   CheckContentsIsSetToPreferredSize();
   EXPECT_NE(cancel_button_width, extra_button->width());
 
   // Remove |extra_button| from the View hierarchy so that it can be replaced.
   delete extra_button;
 
   // Non-buttons should always be sized to their preferred size.
   View* boring_view = new StaticSizedView(gfx::Size(20, 20));
   SetExtraView(boring_view);
   CheckContentsIsSetToPreferredSize();
   EXPECT_EQ(20, boring_view->width());
 }
 
 }  // namespace views