InstantExtended: hook up InstantTab in incognito.

chrome/browser/search/search_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 "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/prefs/pref_service.h"
@@ skipping 62 matching lines @@
             GetStringValueForFlagWithDefault("moose", "default", flags));
 
   group_number = 0;
   flags.clear();
   EXPECT_FALSE(GetFieldTrialInfo(
       "Group77 bar:1 baz:7 cat:dogs DISABLED", &flags, &group_number));
   EXPECT_EQ(ZERO, group_number);
   EXPECT_EQ(ZERO, flags.size());
 }
 
-class InstantExtendedAPIEnabledTest : public BrowserWithTestWindowTest {
+class InstantExtendedAPIEnabledTest : public testing::Test {
  public:
   InstantExtendedAPIEnabledTest() : histogram_(NULL) {
   }
  protected:
-  virtual void SetUp() OVERRIDE {
-    BrowserWithTestWindowTest::SetUp();
-
+  virtual void SetUp() {
     field_trial_list_.reset(new base::FieldTrialList(
         new metrics::SHA1EntropyProvider("42")));
-
     base::StatisticsRecorder::Initialize();
     ResetInstantExtendedOptInStateGateForTest();
     previous_metrics_count_.resize(INSTANT_EXTENDED_OPT_IN_STATE_ENUM_COUNT, 0);
     base::HistogramBase* histogram = GetHistogram();
     if (histogram) {
       scoped_ptr<base::HistogramSamples> samples(histogram->SnapshotSamples());
       if (samples.get()) {
         for (int state = INSTANT_EXTENDED_NOT_SET;
              state < INSTANT_EXTENDED_OPT_IN_STATE_ENUM_COUNT; ++state) {
           previous_metrics_count_[state] = samples->GetCount(state);
@@ skipping 35 matching lines @@
   base::HistogramBase* histogram_;
   scoped_ptr<base::FieldTrialList> field_trial_list_;
   std::vector<int> previous_metrics_count_;
 };
 
 TEST_F(InstantExtendedAPIEnabledTest, EnabledViaCommandLineFlag) {
   GetCommandLine()->AppendSwitch(switches::kEnableInstantExtendedAPI);
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_FALSE(IsLocalOnlyInstantExtendedAPIEnabled());
 #if defined(OS_IOS) || defined(OS_ANDROID)
-  EXPECT_EQ(1ul, EmbeddedSearchPageVersion(profile()));
+  EXPECT_EQ(1ul, EmbeddedSearchPageVersion());
 #else
-  EXPECT_EQ(2ul, EmbeddedSearchPageVersion(profile()));
+  EXPECT_EQ(2ul, EmbeddedSearchPageVersion());
 #endif
   ValidateMetrics(INSTANT_EXTENDED_OPT_IN);
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, EnabledViaFinchFlag) {
   ASSERT_TRUE(base::FieldTrialList::CreateTrialsFromString(
       "InstantExtended/Group1 espv:42/"));
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_FALSE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(42ul, EmbeddedSearchPageVersion(profile()));
+  EXPECT_EQ(42ul, EmbeddedSearchPageVersion());
   ValidateMetrics(INSTANT_EXTENDED_NOT_SET);
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, DisabledViaCommandLineFlag) {
   GetCommandLine()->AppendSwitch(switches::kDisableInstantExtendedAPI);
   ASSERT_TRUE(base::FieldTrialList::CreateTrialsFromString(
       "InstantExtended/Group1 espv:2/"));
   EXPECT_FALSE(IsInstantExtendedAPIEnabled());
   EXPECT_FALSE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(profile()));
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion());
   ValidateMetrics(INSTANT_EXTENDED_OPT_OUT);
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, LocalOnlyEnabledViaCommandLineFlag) {
   GetCommandLine()->AppendSwitch(switches::kEnableLocalOnlyInstantExtendedAPI);
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_TRUE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(profile()));
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion());
   ValidateMetrics(INSTANT_EXTENDED_OPT_IN_LOCAL);
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, LocalOnlyEnabledViaFinch) {
   ASSERT_TRUE(base::FieldTrialList::CreateTrialsFromString(
       "InstantExtended/Group1 local_only:1/"));
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_TRUE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(profile()));
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion());
   ValidateMetrics(INSTANT_EXTENDED_NOT_SET);
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, BothLocalAndRegularOptOutCommandLine) {
   GetCommandLine()->AppendSwitch(switches::kDisableLocalOnlyInstantExtendedAPI);
   GetCommandLine()->AppendSwitch(switches::kDisableInstantExtendedAPI);
   EXPECT_FALSE(IsInstantExtendedAPIEnabled());
   EXPECT_FALSE(IsLocalOnlyInstantExtendedAPIEnabled());
   ValidateMetrics(INSTANT_EXTENDED_OPT_OUT_BOTH);
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, BothLocalAndRegularOptInCommandLine) {
   GetCommandLine()->AppendSwitch(switches::kEnableLocalOnlyInstantExtendedAPI);
   GetCommandLine()->AppendSwitch(switches::kEnableInstantExtendedAPI);
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_TRUE(IsLocalOnlyInstantExtendedAPIEnabled());
   ValidateMetrics(INSTANT_EXTENDED_OPT_IN_LOCAL);
 }
 
 TEST_F(InstantExtendedAPIEnabledTest,
        LocalOnlyCommandLineTrumpedByCommandLine) {
   GetCommandLine()->AppendSwitch(switches::kEnableLocalOnlyInstantExtendedAPI);
   GetCommandLine()->AppendSwitch(switches::kDisableInstantExtendedAPI);
   EXPECT_FALSE(IsInstantExtendedAPIEnabled());
   EXPECT_FALSE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(profile()));
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion());
   ValidateMetrics(INSTANT_EXTENDED_OPT_OUT);
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, LocalOnlyCommandLineTrumpsFinch) {
   GetCommandLine()->AppendSwitch(switches::kEnableLocalOnlyInstantExtendedAPI);
   ASSERT_TRUE(base::FieldTrialList::CreateTrialsFromString(
       "InstantExtended/Group1 espv:2/"));
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_TRUE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(profile()));
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion());
   ValidateMetrics(INSTANT_EXTENDED_OPT_IN_LOCAL);
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, LocalOnlyFinchTrumpedByCommandLine) {
   ASSERT_TRUE(base::FieldTrialList::CreateTrialsFromString(
       "InstantExtended/Group1 local_only:1/"));
   GetCommandLine()->AppendSwitch(switches::kDisableInstantExtendedAPI);
   EXPECT_FALSE(IsInstantExtendedAPIEnabled());
   EXPECT_FALSE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(profile()));
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion());
   ValidateMetrics(INSTANT_EXTENDED_OPT_OUT);
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, LocalOnlyFinchTrumpsFinch) {
   ASSERT_TRUE(base::FieldTrialList::CreateTrialsFromString(
       "InstantExtended/Group1 espv:1 local_only:1/"));
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_TRUE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(profile()));
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion());
   ValidateMetrics(INSTANT_EXTENDED_NOT_SET);
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, LocalOnlyDisabledViaCommandLineFlag) {
   GetCommandLine()->AppendSwitch(switches::kDisableLocalOnlyInstantExtendedAPI);
   ASSERT_TRUE(base::FieldTrialList::CreateTrialsFromString(
       "InstantExtended/Group1 espv:2/"));
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_FALSE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(2ul, EmbeddedSearchPageVersion(profile()));
+  EXPECT_EQ(2ul, EmbeddedSearchPageVersion());
   ValidateMetrics(INSTANT_EXTENDED_OPT_OUT_LOCAL);
 }
 
 class ShouldPreloadLocalOnlyNTPtest : public InstantExtendedAPIEnabledTest {
 };
 
 TEST_F(ShouldPreloadLocalOnlyNTPtest, PreloadByDefault) {
   EXPECT_TRUE(ShouldPreloadLocalOnlyNTP());
 }
 
@@ skipping 150 matching lines @@
   {"https://foo.com/url#strk",             true,  "Valid search URL"},
   {"https://foo.com/alt?strk",             true,  "Valid alternative URL"},
   {"https://foo.com/alt#strk",             true,  "Valid alternative URL"},
   {"https://foo.com/url?strk&bar=",        true,  "No query terms"},
   {"https://foo.com/url?strk&q=abc",       true,  "No query terms key"},
   {"https://foo.com/url?strk#bar=abc",     true,  "Query terms key in ref"},
   {"https://foo.com/url?strk&bar=abc",     false, "Has query terms"},
   {"http://foo.com/instant?strk=1",        false, "Insecure URL"},
   {"https://foo.com/instant",              false, "No search term replacement"},
   {"chrome://blank/",                      false, "Chrome scheme"},
-  {"chrome-search://foo",                  false, "Chrome-search scheme"},
+  {"chrome-search://foo",                   false, "Chrome-search scheme"},

[Jered, 2013/06/17 20:55:01]

Extra space.

[samarth, 2013/06/17 21:44:06]

Done.

   {chrome::kChromeSearchLocalNtpUrl,       true,  "Local new tab page"},
   {chrome::kChromeSearchLocalGoogleNtpUrl, true,  "Local new tab page"},
   {"https://bar.com/instant?strk=1",       false, "Random non-search page"},
 };
 
-TEST_F(SearchTest, InstantExtendedEmbeddedSearchDisabledForIncognito) {
-#if !defined(OS_IOS) && !defined(OS_ANDROID)
-  EnableInstantExtendedAPIForTesting();
-  profile()->set_incognito(true);
-  EXPECT_TRUE(IsInstantExtendedAPIEnabled());
-  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(profile()));
-  EXPECT_FALSE(IsQueryExtractionEnabled(profile()));
-#endif  // !defined(OS_IOS) && !defined(OS_ANDROID)
-}
-
 TEST_F(SearchTest, InstantNTPExtendedEnabled) {
   EnableInstantExtendedAPIForTesting();
   AddTab(browser(), GURL("chrome://blank"));
   for (size_t i = 0; i < arraysize(kInstantNTPTestCases); ++i) {
     const SearchTestCase& test = kInstantNTPTestCases[i];
     NavigateAndCommitActiveTab(GURL(test.url));
     SetSearchProvider(test.url == chrome::kChromeSearchLocalGoogleNtpUrl);
     const content::WebContents* contents =
         browser()->tab_strip_model()->GetWebContentsAt(0);
     EXPECT_EQ(test.expected_result, IsInstantNTP(contents))
@@ skipping 234 matching lines @@
 
   // Now that suggest is back on and the instant url is good, the checkbox
   // should be enabled and checked again, but still invisible.
   EXPECT_FALSE(IsInstantCheckboxVisible());
   EXPECT_TRUE(IsInstantCheckboxEnabled(profile()));
   EXPECT_FALSE(IsInstantCheckboxChecked(profile()));
 }
 
 
 }  // namespace chrome