Formatting fix.

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/prefs/pref_service.h"
+#include "chrome/browser/search/search.cc"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/metrics/entropy_provider.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 72 matching lines @@
 
  private:
   scoped_ptr<base::FieldTrialList> field_trial_list_;
 };
 
 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());
+  EXPECT_EQ(1ul, EmbeddedSearchPageVersion(NULL));
 #else
-  EXPECT_EQ(2ul, EmbeddedSearchPageVersion());
+  EXPECT_EQ(2ul, EmbeddedSearchPageVersion(NULL));
 #endif
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, EnabledViaFinchFlag) {
   ASSERT_TRUE(base::FieldTrialList::CreateTrialsFromString(
       "InstantExtended/Group1 espv:42/"));
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_FALSE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(42ul, EmbeddedSearchPageVersion());
+  EXPECT_EQ(42ul, EmbeddedSearchPageVersion(NULL));
 }
 
 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());
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(NULL));
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, LocalOnlyEnabledViaCommandLineFlag) {
   GetCommandLine()->AppendSwitch(switches::kEnableLocalOnlyInstantExtendedAPI);
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_TRUE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(0ul, EmbeddedSearchPageVersion());
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(NULL));
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, LocalOnlyEnabledViaFinch) {
   ASSERT_TRUE(base::FieldTrialList::CreateTrialsFromString(
       "InstantExtended/Group1 local_only:1/"));
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_TRUE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(0ul, EmbeddedSearchPageVersion());
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(NULL));
 }
 
 TEST_F(InstantExtendedAPIEnabledTest,
        LocalOnlyCommandLineTrumpedByCommandLine) {
   GetCommandLine()->AppendSwitch(switches::kEnableLocalOnlyInstantExtendedAPI);
   GetCommandLine()->AppendSwitch(switches::kDisableInstantExtendedAPI);
   EXPECT_FALSE(IsInstantExtendedAPIEnabled());
   EXPECT_FALSE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(0ul, EmbeddedSearchPageVersion());
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(NULL));
 }
 
 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());
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(NULL));
 }
 
 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());
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(NULL));
 }
 
 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());
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(NULL));
 }
 
 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());
+  EXPECT_EQ(2ul, EmbeddedSearchPageVersion(NULL));
 }
 
 class SearchTest : public BrowserWithTestWindowTest {
  protected:
   virtual void SetUp() OVERRIDE {
     BrowserWithTestWindowTest::SetUp();
     TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
         profile(), &TemplateURLServiceFactory::BuildInstanceFor);
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(profile());
@@ skipping 127 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"},
   {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(
+      kEmbeddedPageVersionDisabled, 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 223 matching lines @@
   profile()->GetPrefs()->SetBoolean(prefs::kSearchSuggestEnabled, true);
 
   // Now that suggest is back on and the instant url is good, the checkbox
   // should be enabled and checked again.
   EXPECT_TRUE(IsInstantCheckboxEnabled(profile()));
   EXPECT_TRUE(IsInstantCheckboxChecked(profile()));
 }
 
 
 }  // namespace chrome