Introduce WorkerStoragePartitionId and use it in SharedWorkerInstance.

content/browser/devtools/shared_worker_devtools_manager_unittest.cc

 // Copyright 2014 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 "content/browser/devtools/shared_worker_devtools_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "content/browser/browser_thread_impl.h"
@@ skipping 28 matching lines @@
       : ui_thread_(BrowserThread::UI, &message_loop_),
         browser_context_(new TestBrowserContext()),
         partition_(
             new WorkerStoragePartition(browser_context_->GetRequestContext(),
                                        NULL,
                                        NULL,
                                        NULL,
                                        NULL,
                                        NULL,
                                        NULL,
-                                       NULL)) {}
+                                       NULL)),
+        partition_id_(*partition_.get()) {}
 
  protected:
   virtual void SetUp() OVERRIDE {
     manager_ = SharedWorkerDevToolsManager::GetInstance();
   }
   virtual void TearDown() OVERRIDE {
     SharedWorkerDevToolsManager::GetInstance()->ResetForTesting();
   }
 
   void CheckWorkerState(int worker_process_id,
@@ skipping 24 matching lines @@
   }
 
   void ClientHostClosing(DevToolsClientHost* client_host) {
     DevToolsManagerImpl::GetInstance()->ClientHostClosing(client_host);
   }
 
   base::MessageLoopForIO message_loop_;
   BrowserThreadImpl ui_thread_;
   scoped_ptr<TestBrowserContext> browser_context_;
   scoped_ptr<WorkerStoragePartition> partition_;
+  const WorkerStoragePartitionId partition_id_;
   SharedWorkerDevToolsManager* manager_;
 };
 
 TEST_F(SharedWorkerDevToolsManagerTest, BasicTest) {
   scoped_refptr<DevToolsAgentHost> agent_host;
 
   SharedWorkerInstance instance1(GURL("http://example.com/w.js"),
                                  base::string16(),
                                  base::string16(),
                                  blink::WebContentSecurityPolicyTypeReport,
                                  browser_context_->GetResourceContext(),
-                                 *partition_.get());
+                                 partition_id_);
 
   agent_host = manager_->GetDevToolsAgentHostForWorker(1, 1);
   EXPECT_FALSE(agent_host.get());
 
   // Created -> Started -> Destroyed
   CheckWorkerNotExist(1, 1);
   manager_->WorkerCreated(1, 1, instance1);
   CheckWorkerState(1, 1, SharedWorkerDevToolsManager::WORKER_UNINSPECTED);
   manager_->WorkerContextStarted(1, 1);
   CheckWorkerState(1, 1, SharedWorkerDevToolsManager::WORKER_UNINSPECTED);
@@ skipping 59 matching lines @@
 
 TEST_F(SharedWorkerDevToolsManagerTest, AttachTest) {
   scoped_refptr<DevToolsAgentHost> agent_host1;
   scoped_refptr<DevToolsAgentHost> agent_host2;
 
   SharedWorkerInstance instance1(GURL("http://example.com/w1.js"),
                                  base::string16(),
                                  base::string16(),
                                  blink::WebContentSecurityPolicyTypeReport,
                                  browser_context_->GetResourceContext(),
-                                 *partition_.get());
+                                 partition_id_);
   SharedWorkerInstance instance2(GURL("http://example.com/w2.js"),
                                  base::string16(),
                                  base::string16(),
                                  blink::WebContentSecurityPolicyTypeReport,
                                  browser_context_->GetResourceContext(),
-                                 *partition_.get());
+                                 partition_id_);
 
   // Created -> GetDevToolsAgentHost -> Register -> Started -> Destroyed
   scoped_ptr<TestDevToolsClientHost> client_host1(new TestDevToolsClientHost());
   CheckWorkerNotExist(2, 1);
   manager_->WorkerCreated(2, 1, instance1);
   CheckWorkerState(2, 1, SharedWorkerDevToolsManager::WORKER_UNINSPECTED);
   agent_host1 = manager_->GetDevToolsAgentHostForWorker(2, 1);
   EXPECT_TRUE(agent_host1.get());
   CheckWorkerState(2, 1, SharedWorkerDevToolsManager::WORKER_INSPECTED);
   EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 1));
@@ skipping 52 matching lines @@
   EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 5));
   ClientHostClosing(client_host2.get());
   CheckWorkerCount(1);
   agent_host2 = NULL;
   CheckWorkerCount(1);
   manager_->WorkerDestroyed(2, 5);
   CheckWorkerCount(0);
 }
 
 }  // namespace content