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

chrome/common/service_process_util_unittest.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 "chrome/common/service_process_util.h"
 
 #include "base/basictypes.h"
 
 #if !defined(OS_MACOSX)
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "testing/multiprocess_func_list.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #endif
 
 #if defined(OS_LINUX)
+#include "chrome/common/auto_start_linux.h"
 #include <glib.h>
-#include "chrome/common/auto_start_linux.h"
 #endif
 
 namespace {
 
 bool g_good_shutdown = false;
 
 void ShutdownTask(MessageLoop* loop) {
   // Quit the main message loop.
   ASSERT_FALSE(g_good_shutdown);
   g_good_shutdown = true;
@@ skipping 185 matching lines @@
 
 #include <CoreFoundation/CoreFoundation.h>
 
 #include <launch.h>
 #include <sys/stat.h>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/message_loop.h"
+#include "base/scoped_temp_dir.h"
 #include "base/stringprintf.h"
 #include "base/sys_string_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread.h"
 #include "chrome/common/launchd_mac.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // TODO(dmaclach): Write this in terms of a real mock.
 // http://crbug.com/76923
 class MockLaunchd : public Launchd {
@@ skipping 294 matching lines @@
   ScopedAttributesRestorer restorer(bundle_path(), 0777);
   GetIOMessageLoopProxy()->PostTask(
       FROM_HERE,
       NewRunnableFunction(&ChangeAttr, bundle_path(), 0222));
   Run();
   ASSERT_TRUE(mock_launchd()->remove_called());
   ASSERT_TRUE(mock_launchd()->delete_called());
 }
 
 #endif  // !OS_MACOSX