[reland] Makes MaterialDesignController initialization explicit

ui/views/controls/button/label_button_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/controls/button/label_button.h"
 
+#include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/test/material_design_controller_test_api.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/animation/button_ink_drop_delegate.h"
 #include "ui/views/style/platform_style.h"
 #include "ui/views/test/views_test_base.h"
@@ skipping 420 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(InkDropLabelButton);
 };
 
 // Test fixture for a LabelButton that has an ink drop configured.
 class InkDropLabelButtonTest : public ViewsTestBase {
  public:
   InkDropLabelButtonTest() {}
 
   // ViewsTestBase:
   void SetUp() override {
-    ui::test::MaterialDesignControllerTestAPI::SetMode(
-        ui::MaterialDesignController::MATERIAL_NORMAL);
-
+    base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+        switches::kTopChromeMD, switches::kTopChromeMDMaterial);
     ViewsTestBase::SetUp();
 
     // Create a widget so that the CustomButton can query the hover state
     // correctly.
     widget_.reset(new Widget);
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     params.bounds = gfx::Rect(0, 0, 20, 20);
     widget_->Init(params);
     widget_->Show();
 
     button_ = new InkDropLabelButton();
     widget_->SetContentsView(button_);
   }
 
   void TearDown() override {
     widget_.reset();
     ViewsTestBase::TearDown();
-    ui::test::MaterialDesignControllerTestAPI::UninitializeMode();
+    ui::test::MaterialDesignControllerTestAPI::Uninitialize();
   }
 
  protected:
   // Required to host the test target.
   std::unique_ptr<Widget> widget_;
 
   // The test target.
   InkDropLabelButton* button_ = nullptr;
 
  private:
@@ skipping 19 matching lines @@
 
 // Verifies the target event handler View is the |LabelButton| and not any of
 // the child Views.
 TEST_F(InkDropLabelButtonTest, TargetEventHandler) {
   View* target_view = widget_->GetRootView()->GetEventHandlerForPoint(
       button_->bounds().CenterPoint());
   EXPECT_EQ(button_, target_view);
 }
 
 }  // namespace views