[Cleanup] Remove some expired omnibox field trials.

components/omnibox/browser/omnibox_field_trial_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/omnibox/browser/omnibox_field_trial.h"
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
@@ skipping 13 matching lines @@
     ResetFieldTrialList();
   }
 
   void ResetFieldTrialList() {
     // Destroy the existing FieldTrialList before creating a new one to avoid
     // a DCHECK.
     field_trial_list_.reset();
     field_trial_list_.reset(new base::FieldTrialList(
         new metrics::SHA1EntropyProvider("foo")));
     variations::testing::ClearAllVariationParams();
-    OmniboxFieldTrial::ActivateDynamicTrials();
   }
 
   // Creates and activates a field trial.
   static base::FieldTrial* CreateTestTrial(const std::string& name,
                                            const std::string& group_name) {
     base::FieldTrial* trial = base::FieldTrialList::CreateFieldTrial(
         name, group_name);
     trial->group();
     return trial;
   }
@@ skipping 87 matching lines @@
   EXPECT_EQ(expected_from_last_keystroke, from_last_keystroke);
   EXPECT_EQ(expected_delay_ms, delay_ms);
 }
 
 // Test if GetDisabledProviderTypes() properly parses various field trial
 // group names.
 TEST_F(OmniboxFieldTrialTest, GetDisabledProviderTypes) {
   EXPECT_EQ(0, OmniboxFieldTrial::GetDisabledProviderTypes());
 
   {
-    SCOPED_TRACE("Outside the bundled field trial.");
-    CreateTestTrial("AutocompleteDynamicTrial_0", "DisabledProviders_123");
-    EXPECT_EQ(0, OmniboxFieldTrial::GetDisabledProviderTypes());
-  }
-
-  {
     SCOPED_TRACE("Valid field trial, missing param.");
     ResetFieldTrialList();
     std::map<std::string, std::string> params;
     ASSERT_TRUE(variations::AssociateVariationParams(
         OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A", params));
     base::FieldTrialList::CreateFieldTrial(
         OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A");
     EXPECT_EQ(0, OmniboxFieldTrial::GetDisabledProviderTypes());
   }
 
@@ skipping 357 matching lines @@
       NULL, NULL, false,
       OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs);
 
   // Valid params.
   VerifySuggestPollingStrategy("true", "50", true, 50);
   VerifySuggestPollingStrategy(NULL, "35", false, 35);
   VerifySuggestPollingStrategy(
       "true", NULL, true,
       OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs);
 }