EmbeddedWorker, browser side code

content/browser/service_worker/service_worker_registration_unittest.cc

 // Copyright 2013 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/service_worker/service_worker_registration.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "content/browser/browser_thread_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace content {
 
 class ServiceWorkerRegistrationTest : public testing::Test {
  public:
   ServiceWorkerRegistrationTest()
       : io_thread_(BrowserThread::IO, &message_loop_) {}
 
   virtual void SetUp() OVERRIDE {}
 
  protected:
   base::MessageLoopForIO message_loop_;
   BrowserThreadImpl io_thread_;
 };
 
 TEST_F(ServiceWorkerRegistrationTest, Shutdown) {
-  int64 registration_id = -1L;
+  const int64 registration_id = -1L;
+  const int64 version_id = -1L;
   scoped_refptr<ServiceWorkerRegistration> registration =
       new ServiceWorkerRegistration(
           GURL("http://www.example.com/*"),
           GURL("http://www.example.com/service_worker.js"),
           registration_id);
 
   scoped_refptr<ServiceWorkerVersion> active_version =
-      new ServiceWorkerVersion(registration);
+      new ServiceWorkerVersion(registration, NULL, version_id);
   registration->set_active_version(active_version);
 
   registration->Shutdown();
 
   DCHECK(registration->is_shutdown());
   DCHECK(active_version->is_shutdown());
   DCHECK(registration->HasOneRef());
   DCHECK(active_version->HasOneRef());
 }
 
 // Make sure that activation does not leak
 TEST_F(ServiceWorkerRegistrationTest, ActivatePending) {
   int64 registration_id = -1L;
   scoped_refptr<ServiceWorkerRegistration> registration =
       new ServiceWorkerRegistration(
           GURL("http://www.example.com/*"),
           GURL("http://www.example.com/service_worker.js"),
           registration_id);
 
+  const int version_1_id = 1L;

[alecflett, 2013/12/05 05:18:42]

(I suspect these will need to be long long / int64 to compile?)

[kinuko, 2013/12/09 14:07:42]

Done.

+  const int version_2_id = 2L;
   scoped_refptr<ServiceWorkerVersion> version_1 =
-      new ServiceWorkerVersion(registration);
+      new ServiceWorkerVersion(registration, NULL, version_1_id);
   registration->set_active_version(version_1);
 
   scoped_refptr<ServiceWorkerVersion> version_2 =
-      new ServiceWorkerVersion(registration);
+      new ServiceWorkerVersion(registration, NULL, version_2_id);
   registration->set_pending_version(version_2);
 
   registration->ActivatePendingVersion();
   DCHECK_EQ(version_2, registration->active_version());
   DCHECK(version_1->is_shutdown());
   DCHECK(version_1->HasOneRef());
   version_1 = NULL;
 
   DCHECK(!version_2->is_shutdown());
   DCHECK(!version_2->HasOneRef());
 
   registration->Shutdown();
 
   DCHECK(registration->is_shutdown());
   DCHECK(version_2->is_shutdown());
   DCHECK(registration->HasOneRef());
   DCHECK(version_2->HasOneRef());
 }
 
 }  // namespace content