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

tools/sort-headers.py

Index: tools/sort-headers.py
diff --git a/tools/sort-headers.py b/tools/sort-headers.py
index b18ac6c4a83147e85a1051df45fa7f8e4206ac6e..3b309c4288a0632328399acd33c5c752dece2f1c 100755
--- a/tools/sort-headers.py
+++ b/tools/sort-headers.py
@@ -34,10 +34,16 @@ def IncludeCompareKey(line):
   """
   for prefix in ('#include ', '#import '):
     if line.startswith(prefix):
-      return line[len(prefix):]
+      line = line[len(prefix):]
+      break
+  # <windows.h> needs to be before other includes, so return a key
+  # that's less than all other keys.
+  if line.find('<windows.h>') != -1:
+    return ''
   return line
 
 
+
 def IsInclude(line):
   """Returns True if the line is an #include/#import line."""
   return line.startswith('#include ') or line.startswith('#import ')