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

chrome/browser/process_singleton.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROCESS_SINGLETON_H_
 #define CHROME_BROWSER_PROCESS_SINGLETON_H_
 #pragma once
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif  // defined(OS_WIN)
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_POSIX)
 #include "base/file_path.h"
 #endif  // defined(OS_POSIX)
 
 #if defined(USE_X11)
-#include "base/memory/scoped_temp_dir.h"
+#include "base/scoped_temp_dir.h"
 #endif  // defined(USE_X11)
 
 class CommandLine;
 class FilePath;
 
 // ProcessSingleton ----------------------------------------------------------
 //
 // This class allows different browser processes to communicate with
 // each other.  It is named according to the user data directory, so
 // we can be sure that no more than one copy of the application can be
@@ skipping 135 matching lines @@
   // File descriptor associated with the lockfile, valid between
   // |Create()| and |Cleanup()|.  Two instances cannot have a lock on
   // the same file at the same time.
   int lock_fd_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ProcessSingleton);
 };
 
 #endif  // CHROME_BROWSER_PROCESS_SINGLETON_H_