Revert of Introduce components/display_compositor

content/browser/compositor/image_transport_factory_browsertest.cc

 // Copyright 2014 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/browser/compositor/image_transport_factory.h"
 
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "cc/output/context_provider.h"
 #include "content/browser/compositor/owned_mailbox.h"
@@ skipping 83 matching lines @@
 #define MAYBE_LoseOnTearDown LoseOnTearDown
 #endif
 // Checks that upon destruction of the ImageTransportFactory, the observer is
 // called and the created resources are reset.
 IN_PROC_BROWSER_TEST_F(ImageTransportFactoryTearDownBrowserTest,
                        MAYBE_LoseOnTearDown) {
   // This test doesn't make sense in software compositing mode.
   if (!GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor())
     return;
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
-  display_compositor::GLHelper* helper = factory->GetGLHelper();
+  GLHelper* helper = factory->GetGLHelper();
   ASSERT_TRUE(helper);
   mailbox_ = new OwnedMailbox(helper);
   EXPECT_FALSE(mailbox_->mailbox().IsZero());
 }
 
 }  // anonymous namespace
 }  // namespace content