Mus Demo: Extract code specific to internal mode into a separate class

services/ui/demo/mus_demo_unittests.cc

 // Copyright 2016 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/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "services/service_manager/public/cpp/service_test.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
@@ skipping 21 matching lines @@
     base::CommandLine::ForCurrentProcess()->AppendSwitch("use-test-config");
     ServiceTest::SetUp();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MusDemoTest);
 };
 
 }  // namespace
 
 TEST_F(MusDemoTest, CheckMusDemoDraws) {

[fwang, 2017/02/14 17:26:05]

Probably we want to rename the test CheckMusDemoInternalDraws (or alternatively
have it check both internal and external modes).

[kylechar, 2017/02/14 18:40:11]

If internal vs external is decided at compile time then it makes sense to leave
the test at MusDemoTest and it will test the appropriate thing for the platform?
Otherwise, one test fixture MusDemoTest is fine but rename the test case
CheckMusDemoInternalDraws.

[fwang, 2017/02/15 13:49:26]

Acknowledged.

-  connector()->Connect("mus_demo");
+  connector()->Connect("mus_demo_internal");
 
   ::ui::mojom::WindowServerTestPtr test_interface;
   connector()->BindInterface(ui::mojom::kServiceName, &test_interface);
 
   base::RunLoop run_loop;
   bool success = false;
   // TODO(kylechar): Fix WindowServer::CreateTreeForWindowManager so that the
   // WindowTree has the correct name instead of an empty name.
   test_interface->EnsureClientHasDrawnWindow(
       "",  // WindowTree name is empty.
       base::Bind(&RunCallback, &success, run_loop.QuitClosure()));
   run_loop.Run();
   EXPECT_TRUE(success);
 }
 
 }  // namespace demo
 }  // namespace ui