Skip to content

Commit

Permalink
use base::BindRepeating in pref_service_factory_unittest.cc
Browse files Browse the repository at this point in the history
BUG=714018

Change-Id: I2624df444b6e0666c0e975206fea137561040f37
Reviewed-on: https://chromium-review.googlesource.com/837981
Reviewed-by: Sam McNally <sammc@chromium.org>
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Cr-Commit-Position: refs/heads/master@{#525522}
  • Loading branch information
mostynb authored and Commit Bot committed Dec 21, 2017
1 parent 38e8a36 commit fbec8d2
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions services/preferences/pref_service_factory_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ class ServiceTestClient : public service_manager::test::ServiceTestClient,
service_factory_(std::move(service_factory)),
connector_callback_(std::move(connector_callback)) {
registry_.AddInterface<service_manager::mojom::ServiceFactory>(
base::Bind(&ServiceTestClient::Create, base::Unretained(this)));
base::BindRepeating(&ServiceTestClient::Create,
base::Unretained(this)));
}

protected:
Expand Down Expand Up @@ -163,7 +164,7 @@ class PrefServiceFactoryTest : public service_manager::test::ServiceTest {
std::unique_ptr<PrefService>* out) {
ConnectToPrefService(
connector, std::move(pref_registry),
base::Bind(&PrefServiceFactoryTest::OnCreate, callback, out));
base::BindRepeating(&PrefServiceFactoryTest::OnCreate, callback, out));
}

scoped_refptr<PrefRegistrySimple> GetInitialPrefRegistry() {
Expand Down Expand Up @@ -202,7 +203,8 @@ class PrefServiceFactoryTest : public service_manager::test::ServiceTest {
PrefChangeRegistrar registrar;
registrar.Init(pref_service);
base::RunLoop run_loop;
registrar.Add(key, base::Bind(&OnPrefChanged, run_loop.QuitClosure(), key));
registrar.Add(
key, base::BindRepeating(&OnPrefChanged, run_loop.QuitClosure(), key));
run_loop.Run();
}

Expand Down Expand Up @@ -527,7 +529,8 @@ TEST_F(PrefServiceFactoryTest, MultipleClients_SubPrefUpdates_Basic) {
// Watch for an unexpected change to kDictionaryKey.
PrefChangeRegistrar registrar;
registrar.Init(pref_service2.get());
registrar.Add(kDictionaryKey, base::Bind(&Fail, pref_service2.get()));
registrar.Add(kDictionaryKey,
base::BindRepeating(&Fail, pref_service2.get()));

// Make and wait for a change to another pref to ensure an unexpected
// change to kDictionaryKey is detected.
Expand Down Expand Up @@ -597,7 +600,8 @@ TEST_F(PrefServiceFactoryTest,
}
PrefChangeRegistrar registrar;
registrar.Init(pref_service2.get());
registrar.Add(kDictionaryKey, base::Bind(&Fail, pref_service2.get()));
registrar.Add(kDictionaryKey,
base::BindRepeating(&Fail, pref_service2.get()));
pref_service->SetInteger(kKey, kUpdatedValue);
WaitForPrefChange(pref_service2.get(), kKey);
}
Expand Down

0 comments on commit fbec8d2

Please sign in to comment.