convert //gpu to std::unique_ptr

gpu/tools/compositor_model_bench/compositor_model_bench.cc

 // Copyright (c) 2012 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.
 
 // This tool is used to benchmark the render model used by the compositor
 
 // Most of this file is derived from the source of the tile_render_bench tool,
 // and has been changed to  support running a sequence of independent
 // simulations for our different render models and test cases.
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/keysym.h>

[Mostyn Bramley-Moore, 2016/04/05 21:35:33]

Moved this block back to the original location.

 #include <stdio.h>
 #include <sys/dir.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <X11/keysym.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
 
+#include <memory>

[no sievers, 2016/04/05 19:02:42]

unused

[Mostyn Bramley-Moore, 2016/04/05 21:35:33]

Removed.

 #include <queue>
 #include <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "gpu/tools/compositor_model_bench/render_model_utils.h"
 #include "gpu/tools/compositor_model_bench/render_models.h"
 #include "gpu/tools/compositor_model_bench/render_tree.h"
 #include "ui/gl/gl_surface.h"
 
 using base::TimeTicks;
@@ skipping 352 matching lines @@
     }
   } else {
     LOG(INFO) << "(input path is a file)";
     sim.QueueTest(inPath);
   }
 
   sim.Run();
 
   return 0;
 }