Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h. (part 2)

gpu/gles2_conform_support/egl/display.h

 // Copyright (c) 2011 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 GPU_GLES2_CONFORM_TEST_DISPLAY_H_
-#define GPU_GLES2_CONFORM_TEST_DISPLAY_H_
+#ifndef GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
+#define GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
 
 #include <EGL/egl.h>
 
 #include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 
 namespace gpu {
 class CommandBufferService;
 class GpuScheduler;
 
 namespace gles2 {
 class GLES2CmdHelper;
 class GLES2Implementation;
 }  // namespace gles2
 }  // namespace gpu
@@ skipping 45 matching lines @@
   // TODO(alokp): Support more than one config, surface, and context.
   scoped_ptr<Config> config_;
   scoped_ptr<Surface> surface_;
   scoped_ptr<gpu::gles2::GLES2Implementation> context_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace egl
 
-#endif  // GPU_GLES2_CONFORM_TEST_DISPLAY_H_
+#endif  // GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_