PersonalDataManagerTest should delete temporary directory AFTER WebDataServiceBackend stops using i…

components/autofill/core/browser/personal_data_manager_unittest.cc

 // Copyright 2013 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 "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 65 matching lines @@
         new AutofillWebDataService(web_database_,
                                    base::MessageLoopProxy::current(),
                                    base::MessageLoopProxy::current(),
                                    WebDataServiceBase::ProfileErrorCallback());
     autofill_database_service_->Init();
 
     test::DisableSystemServices(prefs_.get());
     ResetPersonalDataManager(USER_MODE_NORMAL);
   }
 
-  virtual void TearDown() {
-    // Destruction order is imposed explicitly here.
-    personal_data_.reset(NULL);
-
-    autofill_database_service_->ShutdownOnUIThread();
-    web_database_->ShutdownDatabase();
-    autofill_database_service_ = NULL;
-    web_database_ = NULL;
-  }
-
   void ResetPersonalDataManager(UserMode user_mode) {
     bool is_incognito = (user_mode == USER_MODE_INCOGNITO);
     personal_data_.reset(new PersonalDataManager("en-US"));
     personal_data_->Init(
         scoped_refptr<AutofillWebDataService>(autofill_database_service_),
         prefs_.get(),
         is_incognito);
     personal_data_->AddObserver(&personal_data_observer_);
 
     // Verify that the web database has been updated and the notification sent.
     EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
         .WillOnce(QuitMainMessageLoop());
     base::MessageLoop::current()->Run();
   }
 
+  // Directory should be deleted at the end to ensure that

[Ilya Sherman, 2014/09/10 19:24:10]

nit: "Directory" -> "The temporary directory"

+  // files are not used anymore and deletion succeeds.
+  base::ScopedTempDir temp_dir_;
   base::MessageLoopForUI message_loop_;
   scoped_ptr<PrefService> prefs_;
   scoped_refptr<AutofillWebDataService> autofill_database_service_;
   scoped_refptr<WebDatabaseService> web_database_;
-  base::ScopedTempDir temp_dir_;
+  PersonalDataLoadedObserverMock personal_data_observer_;
   scoped_ptr<PersonalDataManager> personal_data_;
-  PersonalDataLoadedObserverMock personal_data_observer_;
 };
 
 TEST_F(PersonalDataManagerTest, AddProfile) {
   // Add profile0 to the database.
   AutofillProfile profile0(autofill::test::GetFullProfile());
   profile0.SetRawInfo(EMAIL_ADDRESS, ASCIIToUTF16("j@s.com"));
   personal_data_->AddProfile(profile0);
 
   // Reload the database.
   ResetPersonalDataManager(USER_MODE_NORMAL);
@@ skipping 2555 matching lines @@
 
   prefs_->SetBoolean(prefs::kAutofillEnabled, true);
   EXPECT_TRUE(personal_data_->ShouldShowAccessAddressBookSuggestion(type));
 
   prefs_->SetBoolean(prefs::kAutofillEnabled, false);
   EXPECT_FALSE(personal_data_->ShouldShowAccessAddressBookSuggestion(type));
 }
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 
 }  // namespace autofill