[Sync] Split encryption state and logic out of PSS and SBHI.

chrome/browser/autocomplete/search_provider_unittest.cc

Index: chrome/browser/autocomplete/search_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index 2ebd33c74cdf3a4b102aa1f3cfbc1d3eb2596bd7..3595a3bd49a7cf5c212360ea973ac0960cec0242 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -3263,13 +3263,15 @@ TEST_F(SearchProviderTest, CanSendURL) {
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(&profile_);
   syncer::ModelTypeSet encrypted_types = service->GetEncryptedDataTypes();
   encrypted_types.Put(syncer::SESSIONS);
-  service->OnEncryptedTypesChanged(encrypted_types, false);
+  service->GetEncryptionObserverForTest()->OnEncryptedTypesChanged(
+      encrypted_types, false);
   EXPECT_FALSE(SearchProvider::CanSendURL(
       GURL("http://www.google.com/search"),
       GURL("https://www.google.com/complete/search"), &google_template_url,
       metrics::OmniboxEventProto::OTHER, SearchTermsData(), &client));
   encrypted_types.Remove(syncer::SESSIONS);
-  service->OnEncryptedTypesChanged(encrypted_types, false);
+  service->GetEncryptionObserverForTest()->OnEncryptedTypesChanged(
+      encrypted_types, false);
 
   // Check that there were no side effects from previous tests.
   EXPECT_TRUE(SearchProvider::CanSendURL(