Commit 61cf5c7a authored by Ayu Ishii's avatar Ayu Ishii Committed by Commit Bot

Convert base::Bind and base::Callback in components/assist_ranker to Once/Repeating

Bug: 1007667
Change-Id: I9323b7df3b276263bc5e09acb3e8aa5aae36b265
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1979012Reviewed-by: default avatarAndrew Moylan <amoylan@chromium.org>
Commit-Queue: Ayu Ishii <ayui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728063}
parent d3fab8cc
...@@ -52,9 +52,9 @@ BinaryClassifierPredictorTest::InitPredictor( ...@@ -52,9 +52,9 @@ BinaryClassifierPredictorTest::InitPredictor(
std::unique_ptr<BinaryClassifierPredictor> predictor( std::unique_ptr<BinaryClassifierPredictor> predictor(
new BinaryClassifierPredictor(config)); new BinaryClassifierPredictor(config));
auto fake_model_loader = std::make_unique<FakeRankerModelLoader>( auto fake_model_loader = std::make_unique<FakeRankerModelLoader>(
base::Bind(&BinaryClassifierPredictor::ValidateModel), base::BindRepeating(&BinaryClassifierPredictor::ValidateModel),
base::Bind(&BinaryClassifierPredictor::OnModelAvailable, base::BindRepeating(&BinaryClassifierPredictor::OnModelAvailable,
base::Unretained(predictor.get())), base::Unretained(predictor.get())),
std::move(ranker_model)); std::move(ranker_model));
predictor->LoadModel(std::move(fake_model_loader)); predictor->LoadModel(std::move(fake_model_loader));
return predictor; return predictor;
......
...@@ -56,9 +56,9 @@ std::unique_ptr<ClassifierPredictor> ClassifierPredictorTest::InitPredictor( ...@@ -56,9 +56,9 @@ std::unique_ptr<ClassifierPredictor> ClassifierPredictorTest::InitPredictor(
std::unique_ptr<ClassifierPredictor> predictor( std::unique_ptr<ClassifierPredictor> predictor(
new ClassifierPredictor(config)); new ClassifierPredictor(config));
auto fake_model_loader = std::make_unique<FakeRankerModelLoader>( auto fake_model_loader = std::make_unique<FakeRankerModelLoader>(
base::Bind(&ClassifierPredictor::ValidateModel), base::BindRepeating(&ClassifierPredictor::ValidateModel),
base::Bind(&ClassifierPredictor::OnModelAvailable, base::BindRepeating(&ClassifierPredictor::OnModelAvailable,
base::Unretained(predictor.get())), base::Unretained(predictor.get())),
std::move(ranker_model)); std::move(ranker_model));
predictor->LoadModel(std::move(fake_model_loader)); predictor->LoadModel(std::move(fake_model_loader));
return predictor; return predictor;
......
...@@ -168,10 +168,10 @@ bool RankerModelLoaderImplTest::IsEquivalent(const RankerModel& m1, ...@@ -168,10 +168,10 @@ bool RankerModelLoaderImplTest::IsEquivalent(const RankerModel& m1,
bool RankerModelLoaderImplTest::DoLoaderTest(const base::FilePath& model_path, bool RankerModelLoaderImplTest::DoLoaderTest(const base::FilePath& model_path,
const GURL& model_url) { const GURL& model_url) {
auto loader = std::make_unique<RankerModelLoaderImpl>( auto loader = std::make_unique<RankerModelLoaderImpl>(
base::Bind(&RankerModelLoaderImplTest::ValidateModel, base::BindRepeating(&RankerModelLoaderImplTest::ValidateModel,
base::Unretained(this)), base::Unretained(this)),
base::Bind(&RankerModelLoaderImplTest::OnModelAvailable, base::BindRepeating(&RankerModelLoaderImplTest::OnModelAvailable,
base::Unretained(this)), base::Unretained(this)),
test_shared_loader_factory_, model_path, model_url, test_shared_loader_factory_, model_path, model_url,
"RankerModelLoaderImplTest"); "RankerModelLoaderImplTest");
loader->NotifyOfRankerActivity(); loader->NotifyOfRankerActivity();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment