Move ownership of PowerSaveBlocker from WakeLockServiceContext to WakeLockServiceImpl

content/browser/wake_lock/wake_lock_context_host.cc

 // Copyright 2017 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/wake_lock/wake_lock_context_host.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/lazy_instance.h"
 #include "content/public/common/service_manager_connection.h"
 #include "device/wake_lock/public/interfaces/wake_lock_context_provider.mojom.h"
@@ skipping 23 matching lines @@
 
   // Connect to a WakeLockContext, associating it with |id_| (note that in some
   // testing contexts, the service manager connection isn't initialized).
   if (ServiceManagerConnection::GetForProcess()) {
     service_manager::Connector* connector =
         ServiceManagerConnection::GetForProcess()->GetConnector();
     DCHECK(connector);
     device::mojom::WakeLockContextProviderPtr context_provider;
     connector->BindInterface(device::mojom::kServiceName,
                              mojo::MakeRequest(&context_provider));
-    context_provider->GetContext(id_, mojo::MakeRequest(&wake_lock_context_));
+    context_provider->GetWakeLockContextForID(

[blundell, 2017/05/02 11:27:43]

nit: Let's make this naming change in the CL that introduces the corresponding
method for getting a wake lock without context.

[ke.he, 2017/05/04 11:54:13]

Done.

+        id_, mojo::MakeRequest(&wake_lock_context_));
   }
 }
 
 WakeLockContextHost::~WakeLockContextHost() {
   g_id_to_context_host.Get().erase(id_);
 }
 
 // static
 gfx::NativeView WakeLockContextHost::GetNativeViewForContext(int context_id) {
   WakeLockContextHost* context_host = ContextHostFromId(context_id);
   if (context_host)
     return context_host->web_contents_->GetNativeView();
   return nullptr;
 }
 
 }  // namespace content