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

chrome/browser/extensions/extension_override_apitest.cc

Index: chrome/browser/extensions/extension_override_apitest.cc
===================================================================
--- chrome/browser/extensions/extension_override_apitest.cc	(revision 46398)
+++ chrome/browser/extensions/extension_override_apitest.cc	(working copy)
@@ -3,8 +3,11 @@
 // 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 {
@@ -42,6 +45,11 @@
     // 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());
   }
 
@@ -49,6 +57,22 @@
   // 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_;
   {