Launch HQP & HUP score changes.

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 "components/omnibox/browser/history_url_provider.h"
 
 #include <algorithm>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 735 matching lines @@
   sort_matches_ = true;
 
   const UrlAndLegalDefault expected1[] = {
     { "http://intra/three", true },
     { "http://intra/two", true }
   };
   ASSERT_NO_FATAL_FAILURE(RunTest(ASCIIToUTF16("intra/t"), std::string(), false,
                                   expected1, arraysize(expected1)));
   EXPECT_LE(1410, matches_[0].relevance);
   EXPECT_LT(matches_[0].relevance, 1420);
-  EXPECT_EQ(matches_[0].relevance - 1, matches_[1].relevance);
+  // It uses the default scoring.
+  EXPECT_EQ(matches_[1].relevance, 1203);
 
   const UrlAndLegalDefault expected2[] = {
     { "http://moo/b", true },
     { "http://moo/bar", true }
   };
   ASSERT_NO_FATAL_FAILURE(RunTest(ASCIIToUTF16("moo/b"), std::string(), false,
                                   expected2, arraysize(expected2)));
   // The url what you typed match should be around 1400, otherwise the
   // search what you typed match is going to be first.
   EXPECT_LE(1400, matches_[0].relevance);
@@ skipping 275 matching lines @@
       if (test_cases[i].matches[max_matches].url == NULL)
         break;
       output[max_matches].url =
           url_formatter::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),
-                                    std::string(), 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).
+    // Test the experiment (scoring enabled). When scoring is disabled, it uses
+    // the default experimental scoring.
     autocomplete_->scoring_params_.experimental_scoring_enabled = true;
     ASSERT_NO_FATAL_FAILURE(RunTest(ASCIIToUTF16(test_cases[i].input),
                                     std::string(), false, output, max_matches));
     for (int j = 0; j < max_matches; ++j) {
       EXPECT_EQ(test_cases[i].matches[j].experiment_relevance,
                 matches_[j].relevance);
     }
   }
 }