Refactor to make BlimpLocationProvider accessible to content layer.

content/browser/geolocation/mock_location_provider.cc

 // Copyright (c) 2012 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.
 
 // This file implements a mock location provider and the factory functions for
 // various ways of creating it.
 
 #include "content/browser/geolocation/mock_location_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_task_runner_handle.h"
 
 namespace content {
-MockLocationProvider* MockLocationProvider::instance_ = NULL;
 
-MockLocationProvider::MockLocationProvider(MockLocationProvider** self_ref)
+MockLocationProvider::MockLocationProvider()
     : state_(STOPPED),
       is_permission_granted_(false),
-      self_ref_(self_ref),
-      provider_task_runner_(base::ThreadTaskRunnerHandle::Get()) {
-  CHECK(self_ref_);
-  CHECK(*self_ref_ == NULL);
-  *self_ref_ = this;
-}
+      provider_task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
 
-MockLocationProvider::~MockLocationProvider() {
-  CHECK(*self_ref_ == this);
-  *self_ref_ = NULL;
-}
+MockLocationProvider::~MockLocationProvider() {}
 
 void MockLocationProvider::HandlePositionChanged(const Geoposition& position) {
   if (provider_task_runner_->BelongsToCurrentThread()) {
     // The location arbitrator unit tests rely on this method running
     // synchronously.
     position_ = position;
     NotifyCallback(position_);
   } else {
     provider_task_runner_->PostTask(
         FROM_HERE, base::Bind(&MockLocationProvider::HandlePositionChanged,
@@ skipping 18 matching lines @@
   is_permission_granted_ = true;
 }
 
 // Mock location provider that automatically calls back its client at most
 // once, when StartProvider or OnPermissionGranted is called. Use
 // |requires_permission_to_start| to select which event triggers the callback.
 class AutoMockLocationProvider : public MockLocationProvider {
  public:
   AutoMockLocationProvider(bool has_valid_location,
                            bool requires_permission_to_start)
-      : MockLocationProvider(&instance_),
-        weak_factory_(this),
+      : weak_factory_(this),
         requires_permission_to_start_(requires_permission_to_start),
         listeners_updated_(false) {
     if (has_valid_location) {
       position_.accuracy = 3;
       position_.latitude = 4.3;
       position_.longitude = -7.8;
       // Webkit compares the timestamp to wall clock time, so we need it to be
       // contemporary.
       position_.timestamp = base::Time::Now();
     } else {
@@ skipping 16 matching lines @@
   }
 
   void UpdateListenersIfNeeded() {
     if (!listeners_updated_) {
       listeners_updated_ = true;
       base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, base::Bind(&MockLocationProvider::HandlePositionChanged,
                                 weak_factory_.GetWeakPtr(), position_));
     }
   }
 

[Kevin M, 2016/06/09 20:36:44]

make these private

[CJ, 2016/06/09 23:07:06]

Done.

   base::WeakPtrFactory<MockLocationProvider> weak_factory_;

[Kevin M, 2016/06/09 20:36:44]

I know this isn't your module, but here are a few suggestions for making it a
little spiffier while we're here. At the same time, there's so much that I want
to comment on here :F

nit: weak factory should always be the final field in the list
nit: DISALLOW_COPY_AND_ASSIGN()
nit: I don't know if weak factory is even useful here, because this is test code
and destruction order is easier to control. you can try changing the
"weak_factory_.GetWeakPtr()" call with "base::Unretained(this)" and see if the
test code continues to work.

[CJ, 2016/06/09 23:07:06]

Done.

   const bool requires_permission_to_start_;
   bool listeners_updated_;
 };
 
 LocationProvider* NewMockLocationProvider() {
-  return new MockLocationProvider(&MockLocationProvider::instance_);
+  return new MockLocationProvider;
 }
 
 LocationProvider* NewAutoSuccessMockLocationProvider() {
   return new AutoMockLocationProvider(true, false);
 }
 
 LocationProvider* NewAutoFailMockLocationProvider() {
   return new AutoMockLocationProvider(false, false);
 }
 
 LocationProvider* NewAutoSuccessMockNetworkLocationProvider() {
   return new AutoMockLocationProvider(true, true);
 }
 
 }  // namespace content