Move scoped_temp_dir from base to base/files

chrome/common/service_process_util_unittest.cc

 // Copyright (c) 2012 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"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/process_util.h"
 
 #if !defined(OS_MACOSX)
 #include "base/at_exit.h"
 #include "base/memory/scoped_ptr.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_POSIX)
+#include <glib.h>
 #include "chrome/common/auto_start_linux.h"
-#include <glib.h>
 #endif
 
 #if defined(USE_AURA)
 // This test fails http://crbug.com/84854, and is very flaky on CrOS and
 // somewhat flaky on other Linux.
 #define MAYBE_ForceShutdown DISABLED_ForceShutdown
 #else
 #if defined(OS_LINUX) || defined(OS_WIN)
 #define MAYBE_ForceShutdown DISABLED_ForceShutdown
 #else
@@ skipping 192 matching lines @@
   EXPECT_TRUE(g_good_shutdown);
   return 0;
 }
 
 #else  // !OS_MACOSX
 
 #include <CoreFoundation/CoreFoundation.h>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/mac/mac_util.h"
-#include "base/scoped_temp_dir.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread.h"
 #include "chrome/common/mac/launchd.h"
 #include "chrome/common/mac/mock_launchd.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class ServiceProcessStateFileManipulationTest : public ::testing::Test {
  protected:
   ServiceProcessStateFileManipulationTest()
       : io_thread_("ServiceProcessStateFileManipulationTest_IO") {
@@ skipping 26 matching lines @@
   const FilePath& executable_path() const { return executable_path_; }
   const FilePath& bundle_path() const { return bundle_path_; }
   const FilePath& GetTempDirPath() const { return temp_dir_.path(); }
 
   base::MessageLoopProxy* GetIOMessageLoopProxy() {
     return io_thread_.message_loop_proxy().get();
   }
   void Run() { loop_.Run(); }
 
  private:
-  ScopedTempDir temp_dir_;
+  base::ScopedTempDir temp_dir_;
   MessageLoopForUI loop_;
   base::Thread io_thread_;
   FilePath executable_path_, bundle_path_;
   scoped_ptr<MockLaunchd> mock_launchd_;
   scoped_ptr<Launchd::ScopedInstance> scoped_launchd_instance_;
   ServiceProcessState service_process_state_;
 };
 
 void DeleteFunc(const FilePath& file) {
   EXPECT_TRUE(file_util::Delete(file, true));
@@ skipping 106 matching lines @@
   ScopedAttributesRestorer restorer(bundle_path(), 0777);
   GetIOMessageLoopProxy()->PostTask(
       FROM_HERE,
       base::Bind(&ChangeAttr, bundle_path(), 0222));
   Run();
   ASSERT_TRUE(mock_launchd()->remove_called());
   ASSERT_TRUE(mock_launchd()->delete_called());
 }
 
 #endif  // !OS_MACOSX