Componentize URLFixerUpper.

chrome/browser/autocomplete/history_url_provider_unittest.cc

 // Copyright (c) 2012 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/autocomplete/history_url_provider.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
 #include "chrome/browser/autocomplete/history_quick_provider.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/common/net/url_fixer_upper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/url_fixer/url_fixer.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
 using base::Time;
 using base::TimeDelta;
 
 using content::TestBrowserThreadBundle;
 
 struct TestURLInfo {
@@ skipping 604 matching lines @@
     { "gooey/a", 1400 },
     { "gooey/a b", 1400 },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
     SCOPED_TRACE(test_cases[i].input);
     if (test_cases[i].relevance == 0) {
       RunTest(ASCIIToUTF16(test_cases[i].input), base::string16(), false,
               NULL, 0);
     } else {
       const UrlAndLegalDefault output[] = {
-        { URLFixerUpper::FixupURL(test_cases[i].input, std::string()).spec(),
-          true }
-      };
+          {url_fixer::FixupURL(test_cases[i].input, std::string()).spec(),
+           true}};
       ASSERT_NO_FATAL_FAILURE(RunTest(ASCIIToUTF16(test_cases[i].input),
                               base::string16(), false,
                               output, arraysize(output)));
       // Actual relevance should be at least what test_cases expects and
       // and no more than 10 more.
       EXPECT_LE(test_cases[i].relevance, matches_[0].relevance);
       EXPECT_LT(matches_[0].relevance, test_cases[i].relevance + 10);
     }
   }
 }
 
 TEST_F(HistoryURLProviderTest, IntranetURLsWithRefs) {
   struct TestCase {
     const char* input;
     int relevance;
     AutocompleteInput::Type type;
   } test_cases[] = {
     { "gooey", 1410, metrics::OmniboxInputType::UNKNOWN },
     { "gooey/", 1410, metrics::OmniboxInputType::URL },
     { "gooey#", 1200, metrics::OmniboxInputType::UNKNOWN },
     { "gooey/#", 1200, metrics::OmniboxInputType::URL },
     { "gooey#foo", 1200, metrics::OmniboxInputType::UNKNOWN },
     { "gooey/#foo", 1200, metrics::OmniboxInputType::URL },
     { "gooey# foo", 1200, metrics::OmniboxInputType::UNKNOWN },
     { "gooey/# foo", 1200, metrics::OmniboxInputType::URL },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
     SCOPED_TRACE(test_cases[i].input);
     const UrlAndLegalDefault output[] = {
-      { URLFixerUpper::FixupURL(test_cases[i].input, std::string()).spec(),
-        true }
-    };
+        {url_fixer::FixupURL(test_cases[i].input, std::string()).spec(), true}};
     AutocompleteInput::Type type;
     ASSERT_NO_FATAL_FAILURE(
         RunTest(ASCIIToUTF16(test_cases[i].input),
                 base::string16(), false, output, arraysize(output), &type));
     // Actual relevance should be at least what test_cases expects and
     // and no more than 10 more.
     EXPECT_LE(test_cases[i].relevance, matches_[0].relevance);
     EXPECT_LT(matches_[0].relevance, test_cases[i].relevance + 10);
     // Input type should be what we expect.  This is important because
     // this provider counts on SearchProvider to give queries a relevance
@@ skipping 288 matching lines @@
     { "7.com/5", max_1100_visit_typed_decays,
       {{"7.com/5", 1203, 1203}, {"7.com/5a", 1202, 50}, {NULL, 0, 0}} },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
     SCOPED_TRACE(test_cases[i].input);
     UrlAndLegalDefault output[kMaxMatches];
     int max_matches;
     for (max_matches = 0; max_matches < kMaxMatches; ++max_matches) {
       if (test_cases[i].matches[max_matches].url == NULL)
         break;
-      output[max_matches].url = URLFixerUpper::FixupURL(
-          test_cases[i].matches[max_matches].url, std::string()).spec();
+      output[max_matches].url =
+          url_fixer::FixupURL(test_cases[i].matches[max_matches].url,
+                              std::string()).spec();
       output[max_matches].allowed_to_be_default_match = true;
     }
     autocomplete_->scoring_params_ = test_cases[i].scoring_params;
 
     // Test the control (scoring disabled).
     autocomplete_->scoring_params_.experimental_scoring_enabled = false;
     ASSERT_NO_FATAL_FAILURE(
         RunTest(ASCIIToUTF16(test_cases[i].input),
                 base::string16(), false, output, max_matches));
     for (int j = 0; j < max_matches; ++j) {
       EXPECT_EQ(test_cases[i].matches[j].control_relevance,
                 matches_[j].relevance);
     }
 
     // Test the experiment (scoring enabled).
     autocomplete_->scoring_params_.experimental_scoring_enabled = true;
     ASSERT_NO_FATAL_FAILURE(
         RunTest(ASCIIToUTF16(test_cases[i].input),
                 base::string16(), false, output, max_matches));
     for (int j = 0; j < max_matches; ++j) {
       EXPECT_EQ(test_cases[i].matches[j].experiment_relevance,
                 matches_[j].relevance);
     }
   }
 }