Create TemplateUrlData to base::Dictionary utility functions

chrome/browser/android/locale/special_locale_handler_unittest.cc

 // Copyright (c) 2016 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/android/locale/special_locale_handler.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url_service_test_util.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/search_engines/prepopulated_engines.h"
 #include "components/search_engines/template_url.h"
+#include "components/search_engines/template_url_data_util.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class MockSpecialLocaleHandler : public SpecialLocaleHandler {
  public:
   MockSpecialLocaleHandler(Profile* profile,
                            std::string locale,
                            TemplateURLService* service)
       : SpecialLocaleHandler(profile, locale, service) {}
 
   ~MockSpecialLocaleHandler() override {}
 
  protected:
   std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(
       Profile* profile) override {
     std::vector<std::unique_ptr<TemplateURLData>> result;
-    result.push_back(
-        TemplateURLPrepopulateData::MakeTemplateURLDataFromPrepopulatedEngine(
-            TemplateURLPrepopulateData::so_360));
-    result.push_back(
-        TemplateURLPrepopulateData::MakeTemplateURLDataFromPrepopulatedEngine(
-            TemplateURLPrepopulateData::naver));
+    result.push_back(TemplateURLDataFromPrepopulatedEngine(
+        TemplateURLPrepopulateData::so_360));
+    result.push_back(TemplateURLDataFromPrepopulatedEngine(
+        TemplateURLPrepopulateData::naver));
     return result;
   }
 
   int GetDesignatedSearchEngine() override {
     return TemplateURLPrepopulateData::naver.id;
   }
 };
 
 class SpecialLocaleHandlerTest : public testing::Test {
 public:
@@ skipping 70 matching lines @@
   // Set one of the local search engine as default.
   handler()->OverrideDefaultSearchProvider(NULL, JavaParamRef<jobject>(NULL));
   ASSERT_EQ(TemplateURLPrepopulateData::naver.id,
             model()->GetDefaultSearchProvider()->prepopulate_id());
 
   // Revert the default search engine tweak.
   handler()->SetGoogleAsDefaultSearch(NULL, JavaParamRef<jobject>(NULL));
   ASSERT_EQ(TemplateURLPrepopulateData::google.id,
             model()->GetDefaultSearchProvider()->prepopulate_id());
 }