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

content/gpu/gpu_info_collector_win.cc

Index: content/gpu/gpu_info_collector_win.cc
diff --git a/content/gpu/gpu_info_collector_win.cc b/content/gpu/gpu_info_collector_win.cc
index a3283d5d4179797f3ae22555c7eff2c30198b690..4e32805ebb68f5672d18dc8538e0cb0dd72bebd1 100644
--- a/content/gpu/gpu_info_collector_win.cc
+++ b/content/gpu/gpu_info_collector_win.cc
@@ -4,21 +4,21 @@
 
 #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/main.h"
 #include "libEGL/Display.h"
+#include "libEGL/main.h"
 
 namespace {