Changed shared worker code so incognito windows do not have access to non-incognito shared workers.

chrome/worker/worker_uitest.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 "base/string_util.h"
+#include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/worker_host/worker_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_layout_test.h"
 
 static const char kTestCompleteCookie[] = "status";
 static const char kTestCompleteSuccess[] = "OK";
 
 class WorkerTest : public UILayoutTest {
  protected:
   virtual ~WorkerTest() { }
 
   void RunTest(const std::wstring& test_case) {
     scoped_refptr<TabProxy> tab(GetActiveTab());
     ASSERT_TRUE(tab.get());
 
     GURL url = GetTestUrl(L"workers", test_case);
     ASSERT_TRUE(tab->NavigateToURL(url));
 
     std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
         kTestCompleteCookie, kTestIntervalMs, kTestWaitTimeoutMs);
     ASSERT_STREQ(kTestCompleteSuccess, value.c_str());
   }
 
+  void RunIncognitoTest(const std::wstring& test_case) {
+    scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+    // Open an Incognito window.
+    int window_count;
+    ASSERT_TRUE(browser->RunCommand(IDC_NEW_INCOGNITO_WINDOW));
+    scoped_refptr<BrowserProxy> incognito(automation()->GetBrowserWindow(1));
+    scoped_refptr<TabProxy> tab(incognito->GetTab(0));
+    ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
+    ASSERT_EQ(2, window_count);
+
+    GURL url = GetTestUrl(L"workers", test_case);
+    ASSERT_TRUE(tab->NavigateToURL(url));
+
+    std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
+        kTestCompleteCookie, kTestIntervalMs, kTestWaitTimeoutMs);
+
+    // Close the incognito window
+    ASSERT_TRUE(incognito->RunCommand(IDC_CLOSE_WINDOW));
+    ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
+    ASSERT_EQ(1, window_count);
+
+    ASSERT_STREQ(kTestCompleteSuccess, value.c_str());
+  }
+
   bool WaitForProcessCountToBe(int tabs, int workers) {
     // The 1 is for the browser process.
     int number_of_processes = 1 + workers +
         (UITest::in_process_renderer() ? 0 : tabs);
 #if defined(OS_LINUX)
     // On Linux, we also have a zygote process and a sandbox host process.
     number_of_processes += 2;
 #endif
 
     int cur_process_count;
@@ skipping 17 matching lines @@
 #endif
 
 TEST_F(WorkerTest, SingleWorker) {
   RunTest(L"single_worker.html");
 }
 
 TEST_F(WorkerTest, MultipleWorkers) {
   RunTest(L"multi_worker.html");
 }
 
+// Incognito windows should not share workers with non-incognito windows
+// http://crbug.com/27883

[jam, 2009/11/25 23:30:46]

nit: no need to mention the bug number, as it'll be obvious to the reader, and
if someone really wants to know which bug this referenced, they can go through
the svn commit log.

+TEST_F(WorkerTest, IncognitoSharedWorkers) {
+  // Load a non-incognito tab and have it create a shared worker
+  RunTest(L"incognito_worker.html");
+  // Incognito worker should not share with non-incognito
+  RunIncognitoTest(L"incognito_worker.html");
+}
+
 #if defined(OS_LINUX) || defined (OS_MACOSX)
 #define WorkerFastLayoutTests DISABLED_WorkerFastLayoutTests
 #endif
 
 TEST_F(WorkerTest, WorkerFastLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "stress-js-execution.html",
     "use-machine-stack.html",
     "worker-call.html",
     "worker-cloneport.html",
@@ skipping 73 matching lines @@
   FilePath worker_test_dir;
   worker_test_dir = worker_test_dir.AppendASCII("workers");
   InitializeForLayoutTest(fast_test_dir, worker_test_dir, false);
 
   // Worker tests also rely on common files in js/resources.
   FilePath js_dir = fast_test_dir.AppendASCII("js");
   FilePath resource_dir;
   resource_dir = resource_dir.AppendASCII("resources");
   AddResourceForLayoutTest(js_dir, resource_dir);
 
-  for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
+  for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i) {
     RunLayoutTest(kLayoutTestFiles[i], false);
+    // Shared workers will error out if we ever have more than one tab open.
+    int window_count = 0;
+    ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
+    ASSERT_EQ(1, window_count);
+    EXPECT_EQ(1, GetTabCount());
+  }
 }
 
 TEST_F(WorkerTest, WorkerHttpLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "shared-worker-importScripts.html",
     "shared-worker-redirect.html",
     // flakey? BUG 16934 "text-encoding.html",
 #if defined(OS_WIN)
     // Fails on the mac (and linux?):
     // http://code.google.com/p/chromium/issues/detail?id=22599
@@ skipping 135 matching lines @@
     window->AppendTab(url);
 
   // Check that we didn't create more than the max number of workers.
   ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers));
 
   // Now close a page and check that the queued workers were started.
   tab->NavigateToURL(GetTestUrl(L"google", L"google.html"));
 
   ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers));
 }