Move ranker_model_loader to a new component.

components/ranker/ranker_model_loader_unittest.cc

Index: components/ranker/ranker_model_loader_unittest.cc
diff --git a/components/translate/core/browser/ranker_model_loader_unittest.cc b/components/ranker/ranker_model_loader_unittest.cc
similarity index 91%
rename from components/translate/core/browser/ranker_model_loader_unittest.cc
rename to components/ranker/ranker_model_loader_unittest.cc
index c312c2d09f4d9ec49749cf6bd3a96bf862b32902..32cd9c31c8f426240583c51b5d476483d1c38505 100644
--- a/components/translate/core/browser/ranker_model_loader_unittest.cc
+++ b/components/ranker/ranker_model_loader_unittest.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 <deque>
 #include <initializer_list>
@@ -22,14 +22,11 @@
 #include "base/test/scoped_task_scheduler.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "components/metrics/proto/translate_event.pb.h"
-#include "components/prefs/scoped_user_pref_update.h"
-#include "components/sync_preferences/testing_pref_service_syncable.h"
-#include "components/translate/core/browser/proto/ranker_model.pb.h"
-#include "components/translate/core/browser/proto/translate_ranker_model.pb.h"
-#include "components/translate/core/browser/ranker_model.h"
-#include "components/translate/core/browser/translate_download_manager.h"
-#include "components/translate/core/browser/translate_prefs.h"
+#include "components/ranker/proto/ranker_model.pb.h"
+#include "components/ranker/proto/translate_ranker_model.pb.h"
+#include "components/ranker/ranker_model.h"
+// FIXME
+// #include "components/translate/core/browser/translate_download_manager.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -37,10 +34,9 @@
 namespace {
 
 using base::TaskScheduler;
-using chrome_intelligence::RankerModel;
-using translate::RankerModelLoader;
-using translate::RankerModelStatus;
-using translate::TranslateDownloadManager;
+using ranker::RankerModel;
+using ranker::RankerModelLoader;
+using ranker::RankerModelStatus;
 
 const char kInvalidModelData[] = "not a valid model";
 const int kInvalidModelSize = sizeof(kInvalidModelData) - 1;
@@ -96,9 +92,7 @@ class RankerModelLoaderTest : public ::testing::Test {
   // Temporary directory for model files.
   base::ScopedTempDir scoped_temp_dir_;
 
-  // Cache and reset the application locale for each test.
-  std::string locale_;
-
+  // FIXME

[Roger McFarlane (Chromium), 2017/06/06 09:48:30]

?

[hamelphi, 2017/06/09 18:49:15]

Done.

   // Used to initialize the translate download manager.
   scoped_refptr<net::TestURLRequestContextGetter> request_context_;
 
@@ -136,12 +130,10 @@ RankerModelLoaderTest::RankerModelLoaderTest()
 
 void RankerModelLoaderTest::SetUp() {
   // Setup the translate download manager.
-  locale_ = TranslateDownloadManager::GetInstance()->application_locale();

[Roger McFarlane (Chromium), 2017/06/06 09:48:30]

ah, yes, I remember what this was for... it just made sure that the locale was
restored at the end of the test. Groby had suggested I specifically test in a
locale other than the default en-US.

[hamelphi, 2017/06/09 18:49:15]

Not relevant anymore.

   request_context_ =
       new net::TestURLRequestContextGetter(base::ThreadTaskRunnerHandle::Get());
-  TranslateDownloadManager::GetInstance()->set_application_locale("fr-CA");
-  TranslateDownloadManager::GetInstance()->set_request_context(
-      request_context_.get());
+  // TranslateDownloadManager::GetInstance()->set_request_context(
+  //     request_context_.get());

[Roger McFarlane (Chromium), 2017/06/06 09:48:31]

I would expect this to abort download if not set.

[hamelphi, 2017/06/09 18:49:15]

Not relevant anymore.

 
   ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
   const auto& temp_dir_path = scoped_temp_dir_.GetPath();
@@ -163,8 +155,7 @@ void RankerModelLoaderTest::SetUp() {
 
 void RankerModelLoaderTest::TearDown() {
   base::RunLoop().RunUntilIdle();
-  TranslateDownloadManager::GetInstance()->set_application_locale(locale_);
-  TranslateDownloadManager::GetInstance()->set_request_context(nullptr);
+  // TranslateDownloadManager::GetInstance()->set_request_context(nullptr);
 }
 
 // static