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

chrome/browser/worker_host/worker_process_host.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/worker_host/worker_process_host.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 320 matching lines @@
        i != titles.end(); ++i) {
     if (!display_title.empty())
       display_title += ", ";
     display_title += *i;
   }
 
   set_name(ASCIIToWide(display_title));
 }
 
 void WorkerProcessHost::OnLookupSharedWorker(const GURL& url,
-                                                 const string16& name,
-                                                 unsigned long long document_id,
-                                                 int* route_id,
-                                                 bool* url_mismatch) {
+                                             const string16& name,
+                                             unsigned long long document_id,
+                                             int* route_id,
+                                             bool* url_mismatch) {
   int new_route_id = WorkerService::GetInstance()->next_worker_route_id();
+  // TODO(atwilson): Add code to merge document sets for nested shared workers.
   bool worker_found = WorkerService::GetInstance()->LookupSharedWorker(
-      url, name, document_id, this, new_route_id, url_mismatch);
+      url, name, instances_.front().is_off_the_record(), document_id, this,
+      new_route_id, url_mismatch);
   *route_id = worker_found ? new_route_id : MSG_ROUTING_NONE;
 }
 
 void WorkerProcessHost::OnCreateWorker(const GURL& url,
                                        bool is_shared,
                                        const string16& name,
                                        int render_view_route_id,
                                        int* route_id) {
   DCHECK(instances_.size() == 1);  // Only called when one process per worker.
   *route_id = WorkerService::GetInstance()->next_worker_route_id();
   WorkerService::GetInstance()->CreateWorker(
-      url, is_shared, name, instances_.front().renderer_id(),
+      url, is_shared, instances_.front().is_off_the_record(), name,
+      instances_.front().renderer_id(),
       instances_.front().render_view_route_id(), this, *route_id);
+  // TODO(atwilson): Add code to merge document sets for nested shared workers.
 }
 
 void WorkerProcessHost::OnCancelCreateDedicatedWorker(int route_id) {
   WorkerService::GetInstance()->CancelCreateDedicatedWorker(this, route_id);
 }
 
 void WorkerProcessHost::OnForwardToWorker(const IPC::Message& message) {
   WorkerService::GetInstance()->ForwardMessage(message, this);
 }
 
@@ skipping 12 matching lines @@
         i = instances_.erase(i);
       } else {
         ++i;
       }
     }
   }
 }
 
 WorkerProcessHost::WorkerInstance::WorkerInstance(const GURL& url,
                                                   bool is_shared,
+                                                  bool is_off_the_record,
                                                   const string16& name,
                                                   int renderer_id,
                                                   int render_view_route_id,
                                                   int worker_route_id)
     : url_(url),
       shared_(is_shared),
+      off_the_record_(is_off_the_record),
       closed_(false),
       name_(name),
       renderer_id_(renderer_id),
       render_view_route_id_(render_view_route_id),
       worker_route_id_(worker_route_id) {
 }
 
 // Compares an instance based on the algorithm in the WebWorkers spec - an
 // instance matches if the origins of the URLs match, and:
 // a) the names are non-empty and equal
 // -or-
 // b) the names are both empty, and the urls are equal
 bool WorkerProcessHost::WorkerInstance::Matches(
-    const GURL& match_url, const string16& match_name) const {
+    const GURL& match_url, const string16& match_name,
+    bool off_the_record) const {
   // Only match open shared workers.
   if (!shared_ || closed_)
     return false;
 
+  // Incognito workers don't match non-incognito workers.
+  if (off_the_record_ != off_the_record)
+    return false;
+
   if (url_.GetOrigin() != match_url.GetOrigin())
     return false;
 
   if (name_.empty() && match_name.empty())
     return url_ == match_url;
 
   return name_ == match_name;
 }
 
 void WorkerProcessHost::WorkerInstance::AddToDocumentSet(
@@ skipping 79 matching lines @@
   }
   return false;
 }
 
 WorkerProcessHost::WorkerInstance::SenderInfo
 WorkerProcessHost::WorkerInstance::GetSender() const {
   DCHECK(NumSenders() == 1);
   return *senders_.begin();
 }