Initial work on making extensions work in incognito mode.

chrome/browser/extensions/incognito_noscript_apitest.cc

Index: chrome/browser/extensions/incognito_noscript_apitest.cc
diff --git a/chrome/browser/extensions/incognito_noscript_apitest.cc b/chrome/browser/extensions/incognito_noscript_apitest.cc
index fa78e67755b01fafcbb532b9ff72fcc0ac45cca8..1a63d88b018dc4d6df1c28f0c1851d6fcc40d167 100755
--- a/chrome/browser/extensions/incognito_noscript_apitest.cc
+++ b/chrome/browser/extensions/incognito_noscript_apitest.cc
@@ -6,8 +6,11 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
+#include "chrome/browser/extensions/extensions_service.h"
+#include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/ui_test_utils.h"
 #include "net/base/mock_host_resolver.h"
@@ -18,28 +21,50 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, IncognitoNoScript) {
 
   // Loads a simple extension which attempts to change the title of every page
   // that loads to "modified".
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kEnableExperimentalExtensionApis);
   FilePath extension_path = test_data_dir_.AppendASCII("api_test")
       .AppendASCII("incognito_no_script");
   ASSERT_TRUE(LoadExtension(extension_path));
 
   // Open incognito window and navigate to test page.
-  Browser::OpenURLOffTheRecord(browser()->profile(),
-      GURL("http://www.foo.com:1337/files/extensions/test_file.html"));
-  Profile* off_the_record_profile =
-      browser()->profile()->GetOffTheRecordProfile();
-  Browser* otr_browser = Browser::Create(off_the_record_profile);
-  otr_browser->AddTabWithURL(
-      GURL("http://www.foo.com:1337/files/extensions/test_file.html"),
-      GURL(),
-      PageTransition::LINK,
-      true,
-      -1,
-      false,
-      NULL);
-  otr_browser->window()->Show();
-  ui_test_utils::WaitForNavigationInCurrentTab(otr_browser);
+  ui_test_utils::OpenURLOffTheRecord(browser()->profile(),
+      GURL("http://www.example.com:1337/files/extensions/test_file.html"));
+  Browser* otr_browser = BrowserList::FindBrowserWithType(
+      browser()->profile()->GetOffTheRecordProfile(), Browser::TYPE_NORMAL);
 
   string16 title;
   ui_test_utils::GetCurrentTabTitle(otr_browser, &title);
   ASSERT_EQ("Unmodified", UTF16ToASCII(title));
 }
+
+IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, IncognitoYesScript) {
+  host_resolver()->AddRule("*", "127.0.0.1");
+  StartHTTPServer();
+
+  // Loads a simple extension which attempts to change the title of every page
+  // that loads to "modified".
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kEnableExperimentalExtensionApis);
+  FilePath extension_path = test_data_dir_.AppendASCII("api_test")
+      .AppendASCII("incognito_no_script");
+  ASSERT_TRUE(LoadExtension(extension_path));
+
+  // Now enable the extension in incognito mode, and ensure that page titles
+  // are modified.
+  ExtensionsService* service = browser()->profile()->GetExtensionsService();
+  service->extension_prefs()->SetIsIncognitoEnabled(
+      service->extensions()->at(0)->id(), true);
+  browser()->profile()->GetUserScriptMaster()->ReloadExtensionForTesting(
+      service->extensions()->at(0));
+
+  // Open incognito window and navigate to test page.
+  ui_test_utils::OpenURLOffTheRecord(browser()->profile(),
+      GURL("http://www.example.com:1337/files/extensions/test_file.html"));
+  Browser* otr_browser = BrowserList::FindBrowserWithType(
+      browser()->profile()->GetOffTheRecordProfile(), Browser::TYPE_NORMAL);
+
+  string16 title;
+  ui_test_utils::GetCurrentTabTitle(otr_browser, &title);
+  ASSERT_EQ("modified", UTF16ToASCII(title));
+}