Formatting fix.

chrome/browser/search/search_unittest.cc

Index: chrome/browser/search/search_unittest.cc
diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc
index f8bc6287a2231520ace3d4a67d2e6ac5b2b4151b..5f41d2959aef189ee12802f44a841b562ddee5d7 100644
--- a/chrome/browser/search/search_unittest.cc
+++ b/chrome/browser/search/search_unittest.cc
@@ -5,6 +5,7 @@
 #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"
@@ -97,9 +98,9 @@ TEST_F(InstantExtendedAPIEnabledTest, EnabledViaCommandLineFlag) {
   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
 }
 
@@ -108,7 +109,7 @@ TEST_F(InstantExtendedAPIEnabledTest, EnabledViaFinchFlag) {
       "InstantExtended/Group1 espv:42/"));
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_FALSE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(42ul, EmbeddedSearchPageVersion());
+  EXPECT_EQ(42ul, EmbeddedSearchPageVersion(NULL));
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, DisabledViaCommandLineFlag) {
@@ -117,14 +118,14 @@ TEST_F(InstantExtendedAPIEnabledTest, DisabledViaCommandLineFlag) {
       "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) {
@@ -132,7 +133,7 @@ TEST_F(InstantExtendedAPIEnabledTest, LocalOnlyEnabledViaFinch) {
       "InstantExtended/Group1 local_only:1/"));
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_TRUE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(0ul, EmbeddedSearchPageVersion());
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(NULL));
 }
 
 TEST_F(InstantExtendedAPIEnabledTest,
@@ -141,7 +142,7 @@ TEST_F(InstantExtendedAPIEnabledTest,
   GetCommandLine()->AppendSwitch(switches::kDisableInstantExtendedAPI);
   EXPECT_FALSE(IsInstantExtendedAPIEnabled());
   EXPECT_FALSE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(0ul, EmbeddedSearchPageVersion());
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(NULL));
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, LocalOnlyCommandLineTrumpsFinch) {
@@ -150,7 +151,7 @@ TEST_F(InstantExtendedAPIEnabledTest, LocalOnlyCommandLineTrumpsFinch) {
       "InstantExtended/Group1 espv:2/"));
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_TRUE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(0ul, EmbeddedSearchPageVersion());
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(NULL));
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, LocalOnlyFinchTrumpedByCommandLine) {
@@ -159,7 +160,7 @@ TEST_F(InstantExtendedAPIEnabledTest, LocalOnlyFinchTrumpedByCommandLine) {
   GetCommandLine()->AppendSwitch(switches::kDisableInstantExtendedAPI);
   EXPECT_FALSE(IsInstantExtendedAPIEnabled());
   EXPECT_FALSE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(0ul, EmbeddedSearchPageVersion());
+  EXPECT_EQ(0ul, EmbeddedSearchPageVersion(NULL));
 }
 
 TEST_F(InstantExtendedAPIEnabledTest, LocalOnlyFinchTrumpsFinch) {
@@ -167,7 +168,7 @@ TEST_F(InstantExtendedAPIEnabledTest, LocalOnlyFinchTrumpsFinch) {
       "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) {
@@ -176,7 +177,7 @@ TEST_F(InstantExtendedAPIEnabledTest, LocalOnlyDisabledViaCommandLineFlag) {
       "InstantExtended/Group1 espv:2/"));
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_FALSE(IsLocalOnlyInstantExtendedAPIEnabled());
-  EXPECT_EQ(2ul, EmbeddedSearchPageVersion());
+  EXPECT_EQ(2ul, EmbeddedSearchPageVersion(NULL));
 }
 
 class SearchTest : public BrowserWithTestWindowTest {
@@ -324,12 +325,23 @@ const SearchTestCase kInstantNTPTestCases[] = {
   {"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"));