[Sync] Require ProfileSyncService to have an uninitialized backend on shutdown

chrome/browser/sync/profile_sync_service_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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
@@ skipping 57 matching lines @@
     profile->CreateRequestContext();
 
     // We need to set the user agent before the backend host can call
     // webkit_glue::GetUserAgent().
     webkit_glue::SetUserAgent(content::GetContentClient()->GetUserAgent(),
                               false);
   }
 
   void TearDown() {
     // Kill the service before the profile.
+    if (service.get()) {
+      service->Shutdown();
+    }
     service.reset();
     profile.reset();
     // Pump messages posted by the sync thread (which may end up
     // posting on the IO thread).
     ui_loop_.RunAllPending();
     io_thread_.Stop();
     file_thread_.Stop();
     // Ensure that the sync objects destruct to avoid memory leaks.
     ui_loop_.RunAllPending();
   }
@@ skipping 275 matching lines @@
                                                   syncer::STORAGE_ON_DISK);
   EXPECT_FALSE(harness_.service->HasSyncSetupCompleted());
   EXPECT_FALSE(harness_.service->sync_initialized());
 
   // Since we're doing synchronous initialization, backend should be
   // initialized by this call.
   harness_.IssueTestTokens();
 
   // Stop the service so we can read the new Sync Data files that were
   // created.
+  harness_.service->Shutdown();
   harness_.service.reset();
 
   // This file should have been deleted when the whole directory was nuked.
   ASSERT_FALSE(file_util::PathExists(sync_file3));
   ASSERT_FALSE(file_util::PathExists(sync_file1));
 
   // This will still exist, but the text should have changed.
   ASSERT_TRUE(file_util::PathExists(sync_file2));
   std::string file2text;
   ASSERT_TRUE(file_util::ReadFileToString(sync_file2, &file2text));
@@ skipping 158 matching lines @@
 namespace syncer {
 namespace {
 
 // ProfileSyncService should behave just like an invalidator.
 INSTANTIATE_TYPED_TEST_CASE_P(
     ProfileSyncServiceInvalidatorTest, InvalidatorTest,
     ::browser_sync::ProfileSyncServiceInvalidatorTestDelegate);
 
 }  // namespace
 }  // namespace syncer