mus: Makes ~WindowTreeClient reset context factory

ash/mus/window_manager_unittest.cc

 // Copyright 2015 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 <map>
 #include <memory>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 48 matching lines @@
   std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClientDelegate);
 };
 
 class WindowManagerTest : public service_manager::test::ServiceTest {
  public:
   WindowManagerTest() : service_manager::test::ServiceTest("mash_unittests") {}
   ~WindowManagerTest() override {}
 
-  // service_manager::test::ServiceTest:
-  void SetUp() override {
-    service_manager::test::ServiceTest::SetUp();
-
-    // This test connects to the real mus. This results in
-    // aura::WindowTreeClient resetting the context_factory on Env. As all
-    // tests share the same Env (see mash_test_suite) we need to restore the
-    // context_factory when done.
-    aura::Env* env = aura::Env::GetInstance();
-    initial_context_factory_ = env->context_factory();
-    initial_context_factory_private_ = env->context_factory_private();
-  }
-
-  void TearDown() override {
-    aura::Env* env = aura::Env::GetInstance();
-    env->set_context_factory(initial_context_factory_);
-    env->set_context_factory_private(initial_context_factory_private_);
-  }
-
  private:
-  ui::ContextFactory* initial_context_factory_ = nullptr;
-  ui::ContextFactoryPrivate* initial_context_factory_private_ = nullptr;
-
   DISALLOW_COPY_AND_ASSIGN(WindowManagerTest);
 };
 
 void OnEmbed(bool success) {
   ASSERT_TRUE(success);
 }
 
 TEST_F(WindowManagerTest, OpenWindow) {
   display::ScreenBase screen;
   screen.display_list().AddDisplay(
@@ skipping 27 matching lines @@
   client.Embed(child_window, std::move(tree_client), 0u, base::Bind(&OnEmbed));
   aura::WindowTreeClient child_client(connector(), &window_tree_delegate,
                                       nullptr, std::move(tree_client_request));
   window_tree_delegate.WaitForEmbed();
   ASSERT_TRUE(!child_client.GetRoots().empty());
   window_tree_delegate.DestroyWindowTreeHost();
 }
 
 }  // namespace mus
 }  // namespace ash