Introduce WorkerStoragePartitionId and use it in SharedWorkerInstance.

content/browser/shared_worker/shared_worker_instance_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 "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/shared_worker/shared_worker_instance.h"
 #include "content/browser/worker_host/worker_storage_partition.h"
 #include "content/public/test/test_browser_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 class SharedWorkerInstanceTest : public testing::Test {
  protected:
   SharedWorkerInstanceTest()
       : browser_context_(new TestBrowserContext()),
-        partition_(new WorkerStoragePartition(
-            browser_context_->GetRequestContext(),
-            NULL, NULL, NULL, NULL, NULL, NULL, NULL)) {
-  }
+        partition_(
+            new WorkerStoragePartition(browser_context_->GetRequestContext(),
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       NULL)),
+        partition_id_(*partition_.get()) {}
 
   bool Matches(const SharedWorkerInstance& instance,
                const std::string& url,
                const base::StringPiece& name) {
     return instance.Matches(GURL(url),
                             base::ASCIIToUTF16(name),
-                            *partition_.get(),
+                            partition_id_,
                             browser_context_->GetResourceContext());
   }
 
   scoped_ptr<TestBrowserContext> browser_context_;
   scoped_ptr<WorkerStoragePartition> partition_;
+  const WorkerStoragePartitionId partition_id_;
 
   DISALLOW_COPY_AND_ASSIGN(SharedWorkerInstanceTest);
 };
 
 TEST_F(SharedWorkerInstanceTest, MatchesTest) {
   SharedWorkerInstance instance1(GURL("http://example.com/w.js"),
                                  base::string16(),
                                  base::string16(),
                                  blink::WebContentSecurityPolicyTypeReport,
                                  browser_context_->GetResourceContext(),
-                                 *partition_.get());
+                                 partition_id_);
   EXPECT_TRUE(Matches(instance1, "http://example.com/w.js", ""));
   EXPECT_FALSE(Matches(instance1, "http://example.com/w2.js", ""));
   EXPECT_FALSE(Matches(instance1, "http://example.net/w.js", ""));
   EXPECT_FALSE(Matches(instance1, "http://example.net/w2.js", ""));
   EXPECT_FALSE(Matches(instance1, "http://example.com/w.js", "name"));
   EXPECT_FALSE(Matches(instance1, "http://example.com/w2.js", "name"));
   EXPECT_FALSE(Matches(instance1, "http://example.net/w.js", "name"));
   EXPECT_FALSE(Matches(instance1, "http://example.net/w2.js", "name"));
 
   SharedWorkerInstance instance2(GURL("http://example.com/w.js"),
                                  base::ASCIIToUTF16("name"),
                                  base::string16(),
                                  blink::WebContentSecurityPolicyTypeReport,
                                  browser_context_->GetResourceContext(),
-                                 *partition_.get());
+                                 partition_id_);
   EXPECT_FALSE(Matches(instance2, "http://example.com/w.js", ""));
   EXPECT_FALSE(Matches(instance2, "http://example.com/w2.js", ""));
   EXPECT_FALSE(Matches(instance2, "http://example.net/w.js", ""));
   EXPECT_FALSE(Matches(instance2, "http://example.net/w2.js", ""));
   EXPECT_TRUE(Matches(instance2, "http://example.com/w.js", "name"));
   EXPECT_TRUE(Matches(instance2, "http://example.com/w2.js", "name"));
   EXPECT_FALSE(Matches(instance2, "http://example.net/w.js", "name"));
   EXPECT_FALSE(Matches(instance2, "http://example.net/w2.js", "name"));
   EXPECT_FALSE(Matches(instance2, "http://example.com/w.js", "name2"));
   EXPECT_FALSE(Matches(instance2, "http://example.com/w2.js", "name2"));
   EXPECT_FALSE(Matches(instance2, "http://example.net/w.js", "name2"));
   EXPECT_FALSE(Matches(instance2, "http://example.net/w2.js", "name2"));
 }
 
 }  // namespace content