Provide real GPUSupport to ash for Chrome

A recent refactor to extract src/content dependencies from ash broke
GPU feature detection for panel fitting on Chrome OS. In particular the
OutputConfigurator was set up using a stub GPUSupport object.

Fix injection of the GPUSupport object -- move its creation to the
ash::ShellDelegate interface.

BUG=chrome-os-partner:25204,chrome-os-partner:24868
TEST=existing ash_unittests

Review URL: https://codereview.chromium.org/132173006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248226 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 3 insertions, 34 deletions

diff --git a/ash/content_support/gpu_support_impl.h b/ash/content_support/gpu_support_impl.h
index ee82d06..7842a29 100644
--- a/ash/content_support/gpu_support_impl.h
+++ b/ash/content_support/gpu_support_impl.h
@@ -5,11 +5,13 @@
 #ifndef ASH_CONTENT_SUPPORT_GPU_SUPPORT_IMPL_H_
 #define ASH_CONTENT_SUPPORT_GPU_SUPPORT_IMPL_H_
 
+#include "ash/content_support/ash_with_content_export.h"
 #include "ash/gpu_support.h"
 
 namespace ash {
 
-class GPUSupportImpl : public GPUSupport {
+// Support for a real GPU, which relies on access to src/content.
+class ASH_WITH_CONTENT_EXPORT GPUSupportImpl : public GPUSupport {
  public:
   GPUSupportImpl();
   virtual ~GPUSupportImpl();
diff --git a/ash/content_support/inject.cc b/ash/content_support/inject.cc
deleted file mode 100644
index ba9f95a..0000000
--- a/ash/content_support/inject.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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 "ash/content_support/inject.h"
-
-#include "ash/content_support/gpu_support_impl.h"
-#include "ash/shell.h"
-
-namespace ash {
-
-void InitContentSupport() {
-  scoped_ptr<GPUSupport> gpu_support(new GPUSupportImpl);
-  Shell::GetInstance()->SetGPUSupport(gpu_support.Pass());
-}
-
-}  // namespace ash
diff --git a/ash/content_support/inject.h b/ash/content_support/inject.h
deleted file mode 100644
index b821029..0000000
--- a/ash/content_support/inject.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// 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.
-
-#ifndef ASH_CONTENT_SUPPORT_INJECT_H_
-#define ASH_CONTENT_SUPPORT_INJECT_H_
-
-#include "ash/content_support/ash_with_content_export.h"
-
-namespace ash {
-
-ASH_WITH_CONTENT_EXPORT void InitContentSupport();
-
-}  // namespace ash
-
-#endif  // ASH_CONTENT_SUPPORT_INJECT_H_