Update defaults for InstantExtended.

chrome/browser/omnibox/omnibox_field_trial_unittest.cc

 // Copyright (c) 2013 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/omnibox/omnibox_field_trial.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
@@ skipping 228 matching lines @@
     params["rule4:4:0"] = "rule4-4-0-value";  // OTHER
     // Add a malformed rule to make sure it doesn't screw things up.
     params["unrecognized"] = "unrecognized-value";
     ASSERT_TRUE(chrome_variations::AssociateVariationParams(
         OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A", params));
   }
 
   base::FieldTrialList::CreateFieldTrial(
       OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A");
 
-  // Tests with Instant Extended disabled.
+  // Instant Extended only works on non-mobile platforms.
+#if defined(OS_IOS) || defined(OS_ANDROID)
   // Tests for rule 1.
   ExpectRuleValue("rule1-1-0-value",
                   "rule1", AutocompleteInput::NTP);  // exact match
   ExpectRuleValue("rule1-1-0-value",
                   "rule1", AutocompleteInput::NTP);  // exact match
   ExpectRuleValue("rule1-*-*-value",
                   "rule1", AutocompleteInput::BLANK);      // fallback to global
   ExpectRuleValue("rule1-3-0-value",
                   "rule1", AutocompleteInput::HOME_PAGE);  // exact match
   ExpectRuleValue("rule1-4-*-value",
@@ skipping 18 matching lines @@
   ExpectRuleValue("",
                   "rule4", AutocompleteInput::BLANK);      // no global fallback
   ExpectRuleValue("",
                   "rule4", AutocompleteInput::HOME_PAGE);  // no global fallback
   ExpectRuleValue("rule4-4-0-value",
                   "rule4", AutocompleteInput::OTHER);      // exact match
 
   // Tests for rule 5 (a missing rule).
   ExpectRuleValue("",
                   "rule5", AutocompleteInput::OTHER);      // no rule at all
-
-  // Now change the Instant Extended state and run analogous tests.
-  // Instant Extended only works on non-mobile platforms.
-#if !defined(OS_IOS) && !defined(OS_ANDROID)
-  chrome::ResetInstantExtendedOptInStateGateForTest();
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableInstantExtendedAPI);
-
+#else
   // Tests with Instant Extended enabled.
   // Tests for rule 1.
   ExpectRuleValue("rule1-4-1-value",
                   "rule1", AutocompleteInput::OTHER);      // exact match
   ExpectRuleValue("rule1-*-1-value",
                   "rule1", AutocompleteInput::BLANK);      // partial fallback
   ExpectRuleValue("rule1-*-1-value",
                   "rule1",
                   AutocompleteInput::NTP);        // partial fallback
 
@@ skipping 12 matching lines @@
 
   // Tests for rule 4.
   ExpectRuleValue("",
                   "rule4", AutocompleteInput::BLANK);      // no global fallback
   ExpectRuleValue("",
                   "rule4", AutocompleteInput::HOME_PAGE);  // no global fallback
 
   // Tests for rule 5 (a missing rule).
   ExpectRuleValue("",
                   "rule5", AutocompleteInput::OTHER);      // no rule at all
-#endif  // !defined(OS_IOS) && !defined(OS_ANDROID)
+#endif  // defined(OS_IOS) || defined(OS_ANDROID)
 }