Add device location reporting

content/browser/geolocation/geolocation_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.
 
 #include "content/browser/geolocation/geolocation_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/callback.h"
+#include "base/location.h"
+#include "base/logging.h"
+#include "base/message_loop.h"

[Joao da Silva, 2012/04/23 10:19:57]

Nit: order

[bartfab (slow), 2012/04/23 12:21:28]

Done.

 #include "base/memory/singleton.h"
-#include "base/threading/thread_restrictions.h"
 #include "content/browser/geolocation/location_arbitrator.h"
+#include "content/public/browser/browser_thread.h"
 
 GeolocationProvider* GeolocationProvider::GetInstance() {
+  DCHECK(OnIOThread());
   return Singleton<GeolocationProvider>::get();
 }
 
 GeolocationProvider::GeolocationProvider()
     : base::Thread("Geolocation"),
-      client_loop_(base::MessageLoopProxy::current()),
       is_permission_granted_(false),
       arbitrator_(NULL) {
+  DCHECK(OnIOThread());
 }
 
 GeolocationProvider::~GeolocationProvider() {
   DCHECK(observers_.empty());  // observers must unregister.
   Stop();
   DCHECK(!arbitrator_);
 }
 
 void GeolocationProvider::AddObserver(GeolocationObserver* observer,
     const GeolocationObserverOptions& update_options) {
-  DCHECK(OnClientThread());
+  DCHECK(OnIOThread());
   observers_[observer] = update_options;
   OnObserversChanged();
   if (position_.IsInitialized())
     observer->OnLocationUpdate(position_);
 }
 
 bool GeolocationProvider::RemoveObserver(GeolocationObserver* observer) {
-  DCHECK(OnClientThread());
+  DCHECK(OnIOThread());
   size_t remove = observers_.erase(observer);
   OnObserversChanged();
   return remove > 0;
 }
 
 void GeolocationProvider::OnObserversChanged() {
-  DCHECK(OnClientThread());
+  DCHECK(OnIOThread());
   base::Closure task;
   if (observers_.empty()) {
     DCHECK(IsRunning());
     task = base::Bind(&GeolocationProvider::StopProviders,
                       base::Unretained(this));
   } else {
     if (!IsRunning()) {
       Start();
       if (HasPermissionBeenGranted())
         InformProvidersPermissionGranted();
     }
 
     // The high accuracy requirement may have changed.
     task = base::Bind(&GeolocationProvider::StartProviders,
                       base::Unretained(this),
                       GeolocationObserverOptions::Collapse(observers_));
   }
 
   message_loop()->PostTask(FROM_HERE, task);
 }
 
 void GeolocationProvider::NotifyObservers(const Geoposition& position) {
-  DCHECK(OnClientThread());
+  DCHECK(OnIOThread());
   DCHECK(position.IsInitialized());
   position_ = position;
   ObserverMap::const_iterator it = observers_.begin();
   while (it != observers_.end()) {
     // Advance iterator before callback to guard against synchronous unregister.
     GeolocationObserver* observer = it->first;
     ++it;
     observer->OnLocationUpdate(position_);
   }
 }
 
 void GeolocationProvider::StartProviders(
     const GeolocationObserverOptions& options) {
   DCHECK(OnGeolocationThread());
   DCHECK(arbitrator_);
   arbitrator_->StartProviders(options);
 }
 
 void GeolocationProvider::StopProviders() {
   DCHECK(OnGeolocationThread());
   DCHECK(arbitrator_);
   arbitrator_->StopProviders();
 }
 
 void GeolocationProvider::OnPermissionGranted() {
-  DCHECK(OnClientThread());
+  DCHECK(OnIOThread());
   is_permission_granted_ = true;
   if (IsRunning())
     InformProvidersPermissionGranted();
 }
 
 void GeolocationProvider::InformProvidersPermissionGranted() {
   DCHECK(IsRunning());
   if (!OnGeolocationThread()) {
     message_loop()->PostTask(
         FROM_HERE,
@@ skipping 13 matching lines @@
 }
 
 void GeolocationProvider::CleanUp() {
   DCHECK(OnGeolocationThread());
   delete arbitrator_;
   arbitrator_ = NULL;
 }
 
 void GeolocationProvider::OnLocationUpdate(const Geoposition& position) {
   DCHECK(OnGeolocationThread());
-  client_loop_->PostTask(
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(&GeolocationProvider::NotifyObservers,
                  base::Unretained(this), position));
 }
 
 bool GeolocationProvider::HasPermissionBeenGranted() const {
-  DCHECK(OnClientThread());
+  DCHECK(OnIOThread());
   return is_permission_granted_;
 }
 
-bool GeolocationProvider::OnClientThread() const {
-  return client_loop_->BelongsToCurrentThread();
+// static
+bool GeolocationProvider::OnIOThread() {
+  return content::BrowserThread::CurrentlyOn(content::BrowserThread::IO);

[Joao da Silva, 2012/04/23 10:19:57]

It's common to just 

DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));

It's also common to declare

using content::BrowserThread;

I'd remove OnIOThread() and spare this unnecessary symbol in release builds.

[bartfab (slow), 2012/04/23 12:21:28]

Done. Since you say it is common to add a using line for content::BrowserThread,
I did the same in device_status_location_helper.cc.

 }
 
 bool GeolocationProvider::OnGeolocationThread() const {
   return MessageLoop::current() == message_loop();
 }