[Sync] Refactor GetEncryptedTypes usage.

chrome/browser/sync/profile_sync_service_bookmark_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.
 
 // TODO(akalin): This file is basically just a unit test for
 // BookmarkChangeProcessor.  Write unit tests for
 // BookmarkModelAssociator separately.
 
 #include <stack>
 #include <vector>
@@ skipping 23 matching lines @@
 #include "sync/internal_api/public/change_record.h"
 #include "sync/internal_api/public/read_node.h"
 #include "sync/internal_api/public/read_transaction.h"
 #include "sync/internal_api/public/test/test_user_share.h"
 #include "sync/internal_api/public/write_node.h"
 #include "sync/internal_api/public/write_transaction.h"
 #include "sync/syncable/mutable_entry.h"  // TODO(tim): Remove. Bug 131130.
 #include "sync/test/engine/test_id_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "sync/test/fake_sync_encryption_handler.h"
 
 namespace browser_sync {
 
 using content::BrowserThread;
 using syncer::BaseNode;
 using testing::_;
 using testing::InvokeWithoutArgs;
 using testing::Mock;
 using testing::StrictMock;
 
@@ skipping 284 matching lines @@
         model_(NULL) {
   }
 
   virtual ~ProfileSyncServiceBookmarkTest() {
     StopSync();
     UnloadBookmarkModel();
   }
 
   virtual void SetUp() {
     test_user_share_.SetUp();
-    SetUpEncryption();
   }
 
   virtual void TearDown() {
     test_user_share_.TearDown();
   }
 
-  void SetUpEncryption() {
-    syncer::ReadTransaction trans(FROM_HERE, test_user_share_.user_share());
-    fake_encryption_handler_.set_cryptographer(trans.GetCryptographer());
-    trans.GetCryptographer()->SetNigoriHandler(&fake_encryption_handler_);
-  }
-
   // Load (or re-load) the bookmark model.  |load| controls use of the
   // bookmarks file on disk.  |save| controls whether the newly loaded
   // bookmark model will write out a bookmark file as it goes.
   void LoadBookmarkModel(LoadOption load, SaveOption save) {
     bool delete_bookmarks = load == DELETE_EXISTING_STORAGE;
     profile_.CreateBookmarkModel(delete_bookmarks);
     model_ = BookmarkModelFactory::GetForProfile(&profile_);
     // Wait for the bookmarks model to load.
     profile_.BlockUntilBookmarkModelLoaded();
     // This noticeably speeds up the unit tests that request it.
@@ skipping 194 matching lines @@
   content::TestBrowserThread file_thread_;
 
   TestingProfile profile_;
   scoped_ptr<TestBookmarkModelAssociator> model_associator_;
 
  protected:
   BookmarkModel* model_;
   syncer::TestUserShare test_user_share_;
   scoped_ptr<BookmarkChangeProcessor> change_processor_;
   StrictMock<DataTypeErrorHandlerMock> mock_error_handler_;
-  syncer::FakeSyncEncryptionHandler fake_encryption_handler_;
 };
 
 TEST_F(ProfileSyncServiceBookmarkTest, InitialState) {
   LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE);
   StartSync();
 
   EXPECT_TRUE(other_bookmarks_id());
   EXPECT_TRUE(bookmark_bar_id());
   EXPECT_TRUE(mobile_bookmarks_id());
 
@@ skipping 920 matching lines @@
   EXPECT_EQ(1, observer.get_started());
   EXPECT_EQ(0, observer.get_completed_count_at_started());
   EXPECT_EQ(1, observer.get_completed());
 
   model_->RemoveObserver(&observer);
 }
 
 }  // namespace
 
 }  // namespace browser_sync