Cleanup of code in WebDataService unittests

chrome/browser/webdata/web_data_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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
-#include "base/path_service.h"
+#include "base/scoped_temp_dir.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
@@ skipping 46 matching lines @@
 class WebDataServiceTest : public testing::Test {
  public:
   WebDataServiceTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         db_thread_(BrowserThread::DB) {}
 
  protected:
   virtual void SetUp() {
     db_thread_.Start();
 
-    PathService::Get(chrome::DIR_TEST_DATA, &profile_dir_);
-    const std::string test_profile = "WebDataServiceTest";
-    profile_dir_ = profile_dir_.AppendASCII(test_profile);
-    file_util::Delete(profile_dir_, true);
-    file_util::CreateDirectory(profile_dir_);
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     wds_ = new WebDataService();
-    wds_->Init(profile_dir_);
+    wds_->Init(temp_dir_.path());
   }
 
   virtual void TearDown() {
     if (wds_.get())
       wds_->Shutdown();
-    file_util::Delete(profile_dir_, true);
 
     db_thread_.Stop();
     MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask);
     MessageLoop::current()->Run();
   }
 
   MessageLoopForUI message_loop_;
   BrowserThread ui_thread_;
   BrowserThread db_thread_;
   FilePath profile_dir_;
   scoped_refptr<WebDataService> wds_;
+  ScopedTempDir temp_dir_;
 };
 
 class WebDataServiceAutofillTest : public WebDataServiceTest {
  public:
   WebDataServiceAutofillTest()
       : WebDataServiceTest(),
         unique_id1_(1),
         unique_id2_(2),
         test_timeout_(TimeDelta::FromSeconds(kWebDataServiceTimeoutSeconds)),
         done_event_(false, false) {}
@@ skipping 523 matching lines @@
   wds_->GetWebIntents(ASCIIToUTF16("share"), &consumer);
   WebIntentsConsumer::WaitUntilCalled();
   ASSERT_EQ(1U, consumer.intents.size());
 
   intent.type = ASCIIToUTF16("video/*");
   EXPECT_EQ(intent.service_url, consumer.intents[0].service_url);
   EXPECT_EQ(intent.action, consumer.intents[0].action);
   EXPECT_EQ(intent.type, consumer.intents[0].type);
 }