Move scoped_temp_dir and scoped_native_library back from base/memory to base.

content/gpu/gpu_info_collector_win.cc

 // 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.
 
 #include "content/gpu/gpu_info_collector.h"
 
+#include <windows.h>
 #include <d3d9.h>
 #include <setupapi.h>
-#include <windows.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
-#include "base/memory/scoped_native_library.h"
+#include "base/scoped_native_library.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "ui/gfx/gl/gl_implementation.h"
 #include "ui/gfx/gl/gl_surface_egl.h"
 
 // ANGLE seems to require that main.h be included before any other ANGLE header.
+#include "libEGL/Display.h"
 #include "libEGL/main.h"
-#include "libEGL/Display.h"
 
 namespace {
 
 // The version number stores the major and minor version in the least 16 bits;
 // for example, 2.5 is 0x00000205.
 // Returned string is in the format of "major.minor".
 std::string VersionNumberToString(uint32 version_number) {
   int hi = (version_number >> 8) & 0xff;
   int low = version_number & 0xff;
   return base::IntToString(hi) + "." + base::IntToString(low);
@@ skipping 233 matching lines @@
 
   size_t pos = gl_version_string.find_last_not_of("0123456789.");
   if (pos != std::string::npos && pos < gl_version_string.length() - 1) {
     gpu_info->driver_version = gl_version_string.substr(pos + 1);
     return true;
   }
   return false;
 }
 
 }  // namespace gpu_info_collector