Revert of [Sync] Stop accessing BrowserContextKeyedServiceFactory on non-UI thread.

chrome/browser/extensions/api/storage/settings_apitest.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 <utility>
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
@@ skipping 95 matching lines @@
 
   void FinalReplyWhenSatisfied(
       Namespace settings_namespace,
       const std::string& normal_action,
       const std::string& incognito_action) {
     MaybeLoadAndReplyWhenSatisfied(
         settings_namespace, normal_action, incognito_action, NULL, true);
   }
 
   syncer::SyncableService* GetSyncableService() {
-    return settings_sync_util::GetSyncableServiceProvider(browser()->profile(),
-                                                          kModelType)
-        .Run()
-        .get();
+    return settings_sync_util::GetSyncableService(browser()->profile(),
+                                                  kModelType);
   }
 
   void InitSync(syncer::SyncChangeProcessor* sync_processor) {
     base::RunLoop().RunUntilIdle();
     InitSyncWithSyncableService(sync_processor, GetSyncableService());
   }
 
   void SendChanges(const syncer::SyncChangeList& change_list) {
     base::RunLoop().RunUntilIdle();
     SendChangesToSyncableService(change_list, GetSyncableService());
@@ skipping 436 matching lines @@
   // Disable the 'managed' namespace.
   StorageFrontend* frontend = StorageFrontend::Get(browser()->profile());
   frontend->DisableStorageForTesting(MANAGED);
   EXPECT_FALSE(frontend->IsStorageEnabled(MANAGED));
   // Now run the extension.
   ASSERT_TRUE(RunExtensionTest("settings/managed_storage_disabled"))
       << message_;
 }
 
 }  // namespace extensions