Remove dependency on BrowserThread::FILE from Sync code

chrome/browser/sync/test/integration/extension_settings_helper.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/extension_settings_helper.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/values.h"
+#include "chrome/browser/extensions/api/storage/backend_task_runner.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/extensions_helper.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_extension_helper.h"
-#include "content/public/browser/browser_thread.h"
 #include "extensions/browser/api/storage/storage_frontend.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/value_store/value_store.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 
-using content::BrowserThread;
 using extensions::ExtensionRegistry;
 using sync_datatype_helper::test;
 
 namespace extension_settings_helper {
 
 namespace {
 
 std::string ToJson(const base::Value& value) {
   std::string json;
   base::JSONWriter::WriteWithOptions(
       value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &json);
   return json;
 }
 
-void GetAllSettingsOnFileThread(base::DictionaryValue* out,
-                                base::WaitableEvent* signal,
-                                ValueStore* storage) {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+void GetAllSettingsOnBackendSequence(base::DictionaryValue* out,
+                                     base::WaitableEvent* signal,
+                                     ValueStore* storage) {
+  EXPECT_TRUE(extensions::GetBackendTaskRunner()->RunsTasksInCurrentSequence());
   out->Swap(&storage->Get()->settings());
   signal->Signal();
 }
 
 std::unique_ptr<base::DictionaryValue> GetAllSettings(Profile* profile,
                                                       const std::string& id) {
   base::WaitableEvent signal(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                              base::WaitableEvent::InitialState::NOT_SIGNALED);
   std::unique_ptr<base::DictionaryValue> settings(new base::DictionaryValue());
   extensions::StorageFrontend::Get(profile)->RunWithStorage(
       ExtensionRegistry::Get(profile)->enabled_extensions().GetByID(id),
       extensions::settings_namespace::SYNC,
-      base::Bind(&GetAllSettingsOnFileThread, settings.get(), &signal));
+      base::Bind(&GetAllSettingsOnBackendSequence, settings.get(), &signal));
   signal.Wait();
   return settings;
 }
 
 bool AreSettingsSame(Profile* expected_profile, Profile* actual_profile) {
   const extensions::ExtensionSet& extensions =
       ExtensionRegistry::Get(expected_profile)->enabled_extensions();
   if (extensions.size() !=
       ExtensionRegistry::Get(actual_profile)->enabled_extensions().size()) {
     ADD_FAILURE();
@@ skipping 11 matching lines @@
         GetAllSettings(actual_profile, id));
     if (!expected->Equals(actual.get())) {
       ADD_FAILURE() <<
           "Expected " << ToJson(*expected) << " got " << ToJson(*actual);
       same = false;
     }
   }
   return same;
 }
 
-void SetSettingsOnFileThread(
-    const base::DictionaryValue* settings,
-    base::WaitableEvent* signal,
-    ValueStore* storage) {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+void SetSettingsOnBackendSequence(const base::DictionaryValue* settings,
+                                  base::WaitableEvent* signal,
+                                  ValueStore* storage) {
+  EXPECT_TRUE(extensions::GetBackendTaskRunner()->RunsTasksInCurrentSequence());
   storage->Set(ValueStore::DEFAULTS, *settings);
   signal->Signal();
 }
 
 }  // namespace
 
 void SetExtensionSettings(
     Profile* profile,
     const std::string& id,
     const base::DictionaryValue& settings) {
   base::WaitableEvent signal(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                              base::WaitableEvent::InitialState::NOT_SIGNALED);
   extensions::StorageFrontend::Get(profile)->RunWithStorage(
       ExtensionRegistry::Get(profile)->enabled_extensions().GetByID(id),
       extensions::settings_namespace::SYNC,
-      base::Bind(&SetSettingsOnFileThread, &settings, &signal));
+      base::Bind(&SetSettingsOnBackendSequence, &settings, &signal));
   signal.Wait();
 }
 
 void SetExtensionSettingsForAllProfiles(
     const std::string& id, const base::DictionaryValue& settings) {
   for (int i = 0; i < test()->num_clients(); ++i)
     SetExtensionSettings(test()->GetProfile(i), id, settings);
   SetExtensionSettings(test()->verifier(), id, settings);
 }
 
 bool AllExtensionSettingsSameAsVerifier() {
   bool all_profiles_same = true;
   for (int i = 0; i < test()->num_clients(); ++i) {
     // &= so that all profiles are tested; analogous to EXPECT over ASSERT.
     all_profiles_same &=
         AreSettingsSame(test()->verifier(), test()->GetProfile(i));
   }
   return all_profiles_same;
 }
 
 }  // namespace extension_settings_helper