Cleanup in components/search and chrome/browser/search

components/search/search_unittest.cc

 // Copyright 2014 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/search/search.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
@@ skipping 87 matching lines @@
                                                      "Group78 foo:5"));
   EXPECT_TRUE(GetFieldTrialInfo(&flags));
   EXPECT_EQ(1ul, flags.size());
   EXPECT_EQ(6ul, GetUInt64ValueForFlagWithDefault("foo", 9999, flags));
 }
 
 TEST_F(EmbeddedSearchFieldTrialTest, GetFieldTrialInfoLotsOfFlags) {
   FieldTrialFlags flags;
 
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch", "Group77 bar:1 baz:7 cat:dogs"));
+      "EmbeddedSearch", "Group77 baz:7 cat:dogs"));
   EXPECT_TRUE(GetFieldTrialInfo(&flags));
-  EXPECT_EQ(3ul, flags.size());
-  EXPECT_EQ(true, GetBoolValueForFlagWithDefault("bar", false, flags));
+  EXPECT_EQ(2ul, flags.size());
   EXPECT_EQ(7ul, GetUInt64ValueForFlagWithDefault("baz", 0, flags));
-  EXPECT_EQ("dogs",
-            GetStringValueForFlagWithDefault("cat", std::string(), flags));
-  EXPECT_EQ("default",
-            GetStringValueForFlagWithDefault("moose", "default", flags));
 }
 
 TEST_F(EmbeddedSearchFieldTrialTest, GetFieldTrialInfoDisabled) {
   FieldTrialFlags flags;
 
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "EmbeddedSearch", "Group77 bar:1 baz:7 cat:dogs DISABLED"));
   EXPECT_FALSE(GetFieldTrialInfo(&flags));
   EXPECT_EQ(0ul, flags.size());
 }
 
 TEST_F(EmbeddedSearchFieldTrialTest, GetFieldTrialInfoControlFlags) {
   FieldTrialFlags flags;
 
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "EmbeddedSearch", "Control77 bar:1 baz:7 cat:dogs"));
   EXPECT_TRUE(GetFieldTrialInfo(&flags));
   EXPECT_EQ(3ul, flags.size());
 }
 
 #if !defined(OS_IOS) && !defined(OS_ANDROID)
 typedef EmbeddedSearchFieldTrialTest SearchTest;
 
 TEST_F(SearchTest, ShouldPrefetchSearchResults_InstantExtendedAPIEnabled) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch",
                                                      "Group1 espv:2"));
   EXPECT_EQ(2ul, EmbeddedSearchPageVersion());
-  EXPECT_TRUE(ShouldPrefetchSearchResults());
-}
-
-TEST_F(SearchTest, ShouldPrefetchSearchResults_Default) {
-  EXPECT_TRUE(ShouldPrefetchSearchResults());
-}
-
-TEST_F(SearchTest, ShouldReuseInstantSearchBasePage_Default) {
-  EXPECT_TRUE(ShouldReuseInstantSearchBasePage());
+  EXPECT_TRUE(IsInstantExtendedAPIEnabled());
 }
 
 TEST_F(SearchTest, ForceInstantResultsParam) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch",
                                                      "Group1 espv:2"));
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_EQ("ion=1&", ForceInstantResultsParam(true));
   EXPECT_EQ(std::string(), ForceInstantResultsParam(false));
 }
 
 typedef EmbeddedSearchFieldTrialTest InstantExtendedEnabledParamTest;
 
 TEST_F(InstantExtendedEnabledParamTest, QueryExtractionDisabled) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch",
                                                      "Group1 espv:12"));
   EXPECT_EQ("espv=12&", InstantExtendedEnabledParam());
 }
 
 TEST_F(InstantExtendedEnabledParamTest, UseDefaultEmbeddedSearchPageVersion) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "EmbeddedSearch", "Group1 espv:-1"));
   EXPECT_EQ("espv=2&", InstantExtendedEnabledParam());
 }
 
 #endif  // !defined(OS_IOS) && !defined(OS_ANDROID)
 
 }  // namespace search