Merge 46390 - Prevent chrome extension URL overrides from applying in incogni...

chrome/browser/extensions/extension_override_apitest.cc

 // Copyright (c) 2009 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/browser.h"
+#include "chrome/browser/browser_list.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_dom_ui.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/common/url_constants.h"
 #include "chrome/test/ui_test_utils.h"
 
 class ExtensionOverrideTest : public ExtensionApiTest {
  protected:
   bool CheckHistoryOverridesContainsNoDupes() {
     // There should be no duplicate entries in the preferences.
     const DictionaryValue* overrides =
         browser()->profile()->GetPrefs()->GetDictionary(
             ExtensionDOMUI::kExtensionURLOverrides);
 
@@ skipping 17 matching lines @@
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideNewtab) {
   ASSERT_TRUE(RunExtensionTest("override/newtab")) << message_;
   {
     ResultCatcher catcher;
     // Navigate to the new tab page.  The overridden new tab page
     // will call chrome.test.notifyPass() .
     ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab/"));
+    TabContents* tab = browser()->GetSelectedTabContents();
+    ASSERT_TRUE(tab->controller().GetActiveEntry());
+    EXPECT_TRUE(tab->controller().GetActiveEntry()->url().
+                SchemeIs(chrome::kExtensionScheme));
+
     ASSERT_TRUE(catcher.GetNextResult());
   }
 
   // TODO(erikkay) Load a second extension with the same override.
   // Verify behavior, then unload the first and verify behavior, etc.
 }
 
+IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideNewtabIncognito) {
+  ASSERT_TRUE(RunExtensionTest("override/newtab")) << message_;
+
+  // Navigate an incognito tab to the new tab page.  We should get the actual
+  // new tab page because we can't load chrome-extension URLs in incognito.
+  ui_test_utils::OpenURLOffTheRecord(browser()->profile(),
+                                     GURL("chrome://newtab/"));
+  Browser* otr_browser = BrowserList::FindBrowserWithType(
+      browser()->profile()->GetOffTheRecordProfile(), Browser::TYPE_NORMAL,
+      false);
+  TabContents* tab = otr_browser->GetSelectedTabContents();
+  ASSERT_TRUE(tab->controller().GetActiveEntry());
+  EXPECT_FALSE(tab->controller().GetActiveEntry()->url().
+               SchemeIs(chrome::kExtensionScheme));
+}
+
 IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideHistory) {
   ASSERT_TRUE(RunExtensionTest("override/history")) << message_;
   {
     ResultCatcher catcher;
     // Navigate to the history page.  The overridden history page
     // will call chrome.test.notifyPass() .
     ui_test_utils::NavigateToURL(browser(), GURL("chrome://history/"));
     ASSERT_TRUE(catcher.GetNextResult());
   }
 }
@@ skipping 25 matching lines @@
 
   browser()->profile()->GetPrefs()->GetMutableDictionary(
       ExtensionDOMUI::kExtensionURLOverrides)->Set(L"history", list);
 
   ASSERT_FALSE(CheckHistoryOverridesContainsNoDupes());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("override/history")));
 
   ASSERT_TRUE(CheckHistoryOverridesContainsNoDupes());
 }