Prevent tabs sync during browser shutdown.

chrome/browser/sync/test/integration/sync_test.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/browser/sync/test/integration/sync_test.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 680 matching lines @@
   }
 
   DVLOG(1) << "Done setting up first client for clear.";
   if (!ClearServerData(GetClient(index++))) {
     LOG(FATAL) << "ClearServerData failed.";
     return false;
   }
   return true;
 }
 
+void SyncTest::CloseBrowserWindowAtIndex(size_t index) {
+  size_t init_browser_count = chrome::GetTotalBrowserCount();
+  CloseBrowserSynchronously(browsers_[index]);
+  closed_browsers_indicies_.insert(index);
+  CHECK_EQ(chrome::GetTotalBrowserCount(), init_browser_count - 1);
+}
+
 void SyncTest::TearDownOnMainThread() {
-  for (size_t i = 0; i < clients_.size(); ++i) {
+  for (size_t i = 0; i < 1; ++i) {
     clients_[i]->service()->RequestStop(ProfileSyncService::CLEAR_DATA);
   }
 
   // Closing all browsers created by this test. The calls here block until
   // they are closed. Other browsers created outside SyncTest setup should be
   // closed by the creator of that browser.
   size_t init_browser_count = chrome::GetTotalBrowserCount();
   for (size_t i = 0; i < browsers_.size(); ++i) {
-    CloseBrowserSynchronously(browsers_[i]);
+    if (closed_browsers_indicies_.count(i) == 0)
+      CloseBrowserSynchronously(browsers_[i]);
   }
-  CHECK_EQ(chrome::GetTotalBrowserCount(),
-           init_browser_count - browsers_.size());
+  CHECK_EQ(
+      chrome::GetTotalBrowserCount(),
+      init_browser_count - browsers_.size() + closed_browsers_indicies_.size());
 
   if (fake_server_.get()) {
     std::vector<fake_server::FakeServerInvalidationService*>::const_iterator it;
     for (it = fake_server_invalidation_services_.begin();
          it != fake_server_invalidation_services_.end(); ++it) {
       fake_server_->RemoveObserver(*it);
     }
   }
 
   invalidation_forwarders_.clear();
@@ skipping 456 matching lines @@
 bool SyncTest::ClearServerData(ProfileSyncServiceHarness* harness) {
   // At this point our birthday is good.
   base::RunLoop run_loop;
   harness->service()->ClearServerDataForTest(run_loop.QuitClosure());
   run_loop.Run();
 
   // Our birthday is invalidated on the server here so restart sync to get
   // the new birthday from the server.
   return harness->RestartSyncService();
 }
+
+void SyncTest::TearDownWithSpecificBrowserClose(int index) {
+  clients_[index]->service()->RequestStop(ProfileSyncService::CLEAR_DATA);
+  CloseBrowserSynchronously(browsers_[index]);
+
+  if (fake_server_.get()) {
+    std::vector<fake_server::FakeServerInvalidationService*>::const_iterator it;
+    for (it = fake_server_invalidation_services_.begin();
+         it != fake_server_invalidation_services_.end(); ++it) {
+      fake_server_->RemoveObserver(*it);
+    }
+  }
+
+  invalidation_forwarders_.clear();
+  sync_refreshers_.clear();
+  fake_server_invalidation_services_.clear();
+  clients_.clear();
+}