Index: components/ranker/ranker_model_loader.cc |
diff --git a/components/translate/core/browser/ranker_model_loader.cc b/components/ranker/ranker_model_loader.cc |
similarity index 93% |
rename from components/translate/core/browser/ranker_model_loader.cc |
rename to components/ranker/ranker_model_loader.cc |
index eb8175977c4f284b7204288d514ca2d79e88b13b..777f5f895c3d3eb657c80e06980d07c20e4fc435 100644 |
--- a/components/translate/core/browser/ranker_model_loader.cc |
+++ b/components/ranker/ranker_model_loader.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "components/translate/core/browser/ranker_model_loader.h" |
+#include "components/ranker/ranker_model_loader.h" |
#include <utility> |
@@ -20,18 +20,13 @@ |
#include "base/task_runner_util.h" |
#include "base/task_scheduler/post_task.h" |
#include "base/threading/sequenced_task_runner_handle.h" |
-#include "components/translate/core/browser/proto/ranker_model.pb.h" |
-#include "components/translate/core/browser/ranker_model.h" |
-#include "components/translate/core/browser/translate_url_fetcher.h" |
+#include "components/ranker/proto/ranker_model.pb.h" |
+#include "components/ranker/ranker_model.h" |
+#include "components/ranker/ranker_url_fetcher.h" |
-namespace translate { |
+namespace ranker { |
namespace { |
-using chrome_intelligence::RankerModel; |
-using chrome_intelligence::RankerModelProto; |
- |
-constexpr int kUrlFetcherId = 2; |
- |
// The minimum duration, in minutes, between download attempts. |
constexpr int kMinRetryDelayMins = 3; |
@@ -107,7 +102,7 @@ RankerModelLoader::RankerModelLoader( |
model_path_(std::move(model_path)), |
model_url_(std::move(model_url)), |
uma_prefix_(std::move(uma_prefix)), |
- url_fetcher_(base::MakeUnique<TranslateURLFetcher>(kUrlFetcherId)), |
+ url_fetcher_(base::MakeUnique<RankerURLFetcher>()), |
weak_ptr_factory_(this) {} |
RankerModelLoader::~RankerModelLoader() { |
@@ -233,9 +228,7 @@ void RankerModelLoader::StartLoadFromURL() { |
} |
} |
-void RankerModelLoader::OnURLFetched(int /* id */, |
- bool success, |
- const std::string& data) { |
+void RankerModelLoader::OnURLFetched(bool success, const std::string& data) { |
DCHECK(sequence_checker_.CalledOnValidSequence()); |
DCHECK_EQ(state_, LoaderState::LOADING_FROM_URL); |
@@ -280,8 +273,8 @@ void RankerModelLoader::OnURLFetched(int /* id */, |
on_model_available_cb_.Run(std::move(model)); |
} |
-std::unique_ptr<chrome_intelligence::RankerModel> |
-RankerModelLoader::CreateAndValidateModel(const std::string& data) { |
+std::unique_ptr<RankerModel> RankerModelLoader::CreateAndValidateModel( |
+ const std::string& data) { |
DCHECK(sequence_checker_.CalledOnValidSequence()); |
MyScopedHistogramTimer timer(uma_prefix_ + kParsetimerHistogram); |
auto model = RankerModel::FromString(data); |
@@ -306,4 +299,4 @@ RankerModelStatus RankerModelLoader::ReportModelStatus( |
return model_status; |
} |
-} // namespace translate |
+} // namespace ranker |