Revert of Mus+Ash: propagate Surface ID to parents

services/ui/ws/frame_generator_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 "services/ui/ws/frame_generator.h"
 
 #include <memory>
 
 #include "base/test/test_message_loop.h"
 #include "cc/quads/render_pass.h"
@@ skipping 18 matching lines @@
       window->GetOrCreateSurfaceManager();
   surface_manager->CreateSurface(mojom::SurfaceType::DEFAULT,
                                  mojo::InterfaceRequest<mojom::Surface>(),
                                  mojom::SurfaceClientPtr());
 }
 
 }  // namespace
 
 class FrameGeneratorTest : public testing::Test {
  public:
-  FrameGeneratorTest() : display_compositor_(new DisplayCompositor(nullptr)) {}
+  FrameGeneratorTest() : display_compositor_(new DisplayCompositor()) {}
   ~FrameGeneratorTest() override {}
 
   // Calls DrawWindowTree() on |frame_generator_|
   void DrawWindowTree(cc::RenderPass* pass);
 
   ServerWindow* root_window() {
     return frame_generator_delegate_->GetRootWindow();
   }
 
   TestServerWindowDelegate* test_window_delegate() { return &window_delegate_; }
@@ skipping 73 matching lines @@
   EXPECT_EQ(3u, quad_state_list->size());
   auto it = quad_state_list->begin();
   EXPECT_EQ(child_opacity * root_opacity, (*it)->opacity);
   EXPECT_EQ(child_opacity * root_opacity, (*++it)->opacity);
   EXPECT_EQ(root_opacity, (*++it)->opacity);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui