Replace all usage of FileAutoDeleter with ScopedTempDir.

chrome/browser/sessions/session_service_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 "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_test_helper.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/browser_with_test_window_test.h"
-#include "chrome/test/file_test_utils.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_type.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class SessionServiceTest : public BrowserWithTestWindowTest,
                            public NotificationObserver {
  public:
   SessionServiceTest() : window_bounds(0, 1, 2, 3), sync_save_count_(0){}
 
  protected:
   virtual void SetUp() {
     BrowserWithTestWindowTest::SetUp();
     std::string b = base::Int64ToString(base::Time::Now().ToInternalValue());
 
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     path_ = temp_dir_.path().Append(FILE_PATH_LITERAL("SessionTestDirs"));
     file_util::CreateDirectory(path_);

[Paweł Hajdan Jr., 2011/05/20 13:48:58]

nit: Check return value.

[lain Merrick, 2011/05/20 14:23:32]

Done.

-    path_deleter_.reset(new FileAutoDeleter(path_));
     path_ = path_.AppendASCII(b);
 
     SessionService* session_service = new SessionService(path_);
     helper_.set_service(session_service);
 
     service()->SetWindowType(window_id, Browser::TYPE_TABBED);
     service()->SetWindowBounds(window_id, window_bounds, false);
   }
 
   // Upon notification, increment the sync_save_count variable
   void Observe(NotificationType type,
                const NotificationSource& source,
                const NotificationDetails& details) {
     ASSERT_EQ(type.value, NotificationType::SESSION_SERVICE_SAVED);
     sync_save_count_++;
   }
 
   virtual void TearDown() {
     helper_.set_service(NULL);
-    path_deleter_.reset();
   }
 
   void UpdateNavigation(const SessionID& window_id,
                         const SessionID& tab_id,
                         const TabNavigation& navigation,
                         int index,
                         bool select) {
     NavigationEntry entry;
     entry.set_url(navigation.virtual_url());
     entry.set_referrer(navigation.referrer());
@@ skipping 55 matching lines @@
 
   const gfx::Rect window_bounds;
 
   SessionID window_id;
 
   int sync_save_count_;
 
   // Path used in testing.
   ScopedTempDir temp_dir_;
   FilePath path_;
-  scoped_ptr<FileAutoDeleter> path_deleter_;
 
   SessionServiceTestHelper helper_;
 };
 
 TEST_F(SessionServiceTest, Basic) {
   SessionID tab_id;
   ASSERT_NE(window_id.id(), tab_id.id());
 
   TabNavigation nav1(0, GURL("http://google.com"),
                      GURL("http://www.referrer.com"),
@@ skipping 507 matching lines @@
 
   helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
   UpdateNavigation(window_id, tab_id, nav1, 0, true);
   service()->TabClosed(window_id, tab_id, true);
 
   ScopedVector<SessionWindow> windows;
   ReadWindows(&(windows.get()));
 
   ASSERT_TRUE(windows->empty());
 }