Makes MaterialDesignController initialization explicit

content/public/test/browser_test_base.cc

 // Copyright (c) 2011 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 "content/public/test/browser_test_base.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 12 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/test/test_launcher.h"
 #include "content/public/test/test_utils.h"
 #include "content/test/content_browser_sanity_checker.h"
 #include "net/base/net_errors.h"
 #include "net/base/network_interfaces.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
+#include "ui/base/test/material_design_controller_test_api.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(OS_POSIX)
 #include "base/process/process_handle.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/foundation_util.h"
@@ skipping 129 matching lines @@
 #endif
 
   CHECK(set_up_called_) << "SetUp was not called. This probably means that the "
                            "developer has overridden the method and not called "
                            "the superclass version. In this case, the test "
                            "does not run and reports a false positive result.";
 }
 
 void BrowserTestBase::SetUp() {
   set_up_called_ = true;
+  // ContentTestSuiteBase might have already initialized
+  // MaterialDesignController in browser_tests suite.
+  // Uninitialize here to let the browser process do it.
+  ui::test::MaterialDesignControllerTestAPI::UninitializeMode();

[sky, 2016/04/11 15:32:40]

Is it possible to supply a flag to ContentTestSuiteBase so you don't need the
uninitialize here?

[varkha, 2016/04/11 19:30:58]

Not sure how this would be possible.
The call stack I am dealing here is doing something like this:
base::TestSuite::Run {
  (first calls:)
  -> TestSuite::Initialize() -> MDC::Initialize()

  (and then, still in TestSuite::Run())
  -> testing::UnitTest::Run()
   -> UnitTestImpl::RunAllTests()
    -> ... (browser tests init)
     -> content::BrowserTestBase::SetUp()
      -> ... (BrowserMain initalization)
       -> ChromeBrowserMainParts::PreCreateThreadsImpl()
        -> MDC::Initialize()
That second call to MDC::Init we need in a production browser code. The first
call is in ContentTestSuiteBase and is necessary to make a lot of tests happy
that need to load resource packs first.

More tests have something similar - they load resource packs (and so we need to
kick MDC) and then proceed to use something like a child of ViewsTestBase or
AuraTestBase (which can also be run on their own in aura_unittests or
views_unittests and so need their own MDC::Init call).

I was trying to come up with the fewest number of (necessary and temporary evil)
calls to MaterialDesignControllerTestAPI::UninitializeMode() that would still
get all the bots happy.

 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
   // Override the child process connection timeout since tests can exceed that
   // when sharded.
   command_line->AppendSwitchASCII(
       switches::kIPCConnectionTimeout,
       base::Int64ToString(TestTimeouts::action_max_timeout().InSeconds()));
 
   // The tests assume that file:// URIs can freely access other file:// URIs.
@@ skipping 169 matching lines @@
   use_software_compositing_ = true;
 }
 
 bool BrowserTestBase::UsingOSMesa() const {
   base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
   return cmd->GetSwitchValueASCII(switches::kUseGL) ==
          gfx::kGLImplementationOSMesaName;
 }
 
 }  // namespace content