Reenables (and fixs) two mash tests

ash/mus/app_launch_unittest.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/run_loop.h"
 #include "mash/quick_launch/public/interfaces/constants.mojom.h"
 #include "services/service_manager/public/cpp/service_test.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
@@ skipping 14 matching lines @@
 
  private:
   void SetUp() override {
     base::CommandLine::ForCurrentProcess()->AppendSwitch("use-test-config");
     ServiceTest::SetUp();
   }
 
   DISALLOW_COPY_AND_ASSIGN(AppLaunchTest);
 };
 
-// Fails when the Ash material design shelf is enabled by default
-// (ash::MaterialDesignController::IsShelfMaterial()). See
-// crbug.com/660194 and crbug.com/642879.
-// TODO(rockot): Reenable this test.
-TEST_F(AppLaunchTest, DISABLED_TestQuickLaunch) {
+TEST_F(AppLaunchTest, TestQuickLaunch) {
   connector()->Connect("ash");
   connector()->Connect(mash::quick_launch::mojom::kServiceName);
 
   ui::mojom::WindowServerTestPtr test_interface;
   connector()->ConnectToInterface(ui::mojom::kServiceName, &test_interface);
 
   base::RunLoop run_loop;
   bool success = false;
   test_interface->EnsureClientHasDrawnWindow(
       mash::quick_launch::mojom::kServiceName,
       base::Bind(&RunCallback, &success, run_loop.QuitClosure()));
   run_loop.Run();
   EXPECT_TRUE(success);
 }
 
 }  // namespace mus
 }  // namespace ash