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

base/base.gypi

 # 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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
     },
     'target_conditions': [
@@ skipping 120 matching lines @@
           'memory/memory_debug.cc',
           'memory/memory_debug.h',
           'memory/mru_cache.h',
           'memory/raw_scoped_refptr_mismatch_checker.h',
           'memory/ref_counted.cc',
           'memory/ref_counted.h',
           'memory/ref_counted_memory.cc',
           'memory/ref_counted_memory.h',
           'memory/scoped_callback_factory.h',
           'memory/scoped_handle.h',
-          'memory/scoped_native_library.cc',
-          'memory/scoped_native_library.h',
           'memory/scoped_nsobject.h',
           'memory/scoped_open_process.h',
           'memory/scoped_ptr.h',
-          'memory/scoped_temp_dir.cc',
-          'memory/scoped_temp_dir.h',
           'memory/scoped_vector.h',
           'memory/singleton.h',
           'memory/weak_ptr.cc',
           'memory/weak_ptr.h',
           'message_loop.cc',
           'message_loop.h',
           'message_loop_proxy.cc',
           'message_loop_proxy.h',
           'message_loop_proxy_impl.cc',
           'message_loop_proxy_impl.h',
@@ skipping 40 matching lines @@
           'process_win.cc',
           'rand_util.cc',
           'rand_util.h',
           'rand_util_posix.cc',
           'rand_util_win.cc',
           'resource_util.cc',
           'resource_util.h',
           'safe_strerror_posix.cc',
           'safe_strerror_posix.h',
           'scoped_ptr.h',
+          'scoped_native_library.cc',
+          'scoped_native_library.h',
+          'scoped_temp_dir.cc',
+          'scoped_temp_dir.h',
           'sha1.h',
           'sha1_portable.cc',
           'sha1_win.cc',
           'shared_memory.h',
           'shared_memory_posix.cc',
           'shared_memory_win.cc',
           'spin_wait.h',
           'stack_container.h',
           'stl_util-inl.h',
           'string_number_conversions.cc',
@@ skipping 466 matching lines @@
             'third_party/xdg_mime/xdgmimemagic.c',
             'third_party/xdg_mime/xdgmimemagic.h',
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
         },
       ],
     }],
   ],
 }