Add unit test for the "aborted by shutdown" case.

This unit test would crash the code that is on the current dev branch, however with the addition of the DataTypeManager this is no longer a problem on trunk.  In the dev version, the PSS would try to try to stop a data type in mid startp causing it to abort, which then rasies and error and tries to stop the same data type again.  With the DTM, it knows how to handle aborting a data type startup at shutdown by not letting an aborted stop raise an error.

BUG=37243

Review URL: http://codereview.chromium.org/668183

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40904 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 0 deletions

diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index af0d578..fd550f6 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -441,6 +441,19 @@ TEST_F(ProfileSyncServiceTest, InitialState) {
   ExpectModelMatch();
 }
 
+TEST_F(ProfileSyncServiceTest, AbortedByShutdown) {
+  service_.reset(new TestProfileSyncService(&factory_, profile_.get(), false));
+  EXPECT_CALL(factory_, CreateDataTypeManager(_)).
+      WillOnce(MakeDataTypeManager());
+  EXPECT_CALL(factory_, CreateBookmarkSyncComponents(_, _)).Times(0);
+  service_->RegisterDataTypeController(
+      new browser_sync::BookmarkDataTypeController(&factory_,
+                                                   profile_.get(),
+                                                   service_.get()));
+  service_->Initialize();
+  service_.reset();
+}
+
 TEST_F(ProfileSyncServiceTest, BookmarkModelOperations) {
   LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE);
   StartSyncService();