Add content API for requesting the current geolocation

content/browser/geolocation/geolocation.cc

Index: content/browser/geolocation/geolocation.cc
diff --git a/content/browser/geolocation/geolocation.cc b/content/browser/geolocation/geolocation.cc
index 920ab3130d978aee16f381eea4e4c28fc37ff391..66ff25106625521b3d9b2972cd6fff53d91eb9a7 100644
--- a/content/browser/geolocation/geolocation.cc
+++ b/content/browser/geolocation/geolocation.cc
@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
+#include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop_proxy.h"
 #include "content/browser/geolocation/geolocation_provider.h"
@@ -21,24 +22,54 @@ void OverrideLocationForTestingOnIOThread(
     const Geoposition& position,
     const base::Closure& completion_callback,
     scoped_refptr<base::MessageLoopProxy> callback_loop) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   GeolocationProvider::GetInstance()->OverrideLocationForTesting(position);
   callback_loop->PostTask(FROM_HERE, completion_callback);
 }
 
+void GeolocationUpdateCallbackOnIOThread(
+    const GeolocationUpdateCallback& client_callback,
+    scoped_refptr<base::MessageLoopProxy> client_loop,
+    const Geoposition& position) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  if (base::MessageLoopProxy::current() != client_loop)
+    client_loop->PostTask(FROM_HERE, base::Bind(client_callback, position));
+  else
+    client_callback.Run(position);
+}
+void RequestLocationUpdateOnIOThread(

[jam, 2012/05/03 18:22:19]

nit: blank line before

[bartfab (slow), 2012/05/04 08:30:22]

Done.

+    const GeolocationUpdateCallback& client_callback,
+    scoped_refptr<base::MessageLoopProxy> client_loop) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  GeolocationUpdateCallback io_thread_callback = base::Bind(
+      &GeolocationUpdateCallbackOnIOThread,
+      client_callback,
+      client_loop);
+  GeolocationProvider::GetInstance()->RequestCallback(io_thread_callback);
+}
+
 }  // namespace
 
-void OverrideLocationForTesting(

[jam, 2012/05/03 18:22:19]

nit: no need to change the style in this function. if everyone changed things
that aren't in teh style guide to suit their personal preference, the code would
have a lot of hysteresis and it would be difficult to look at change history.

[bartfab (slow), 2012/05/04 08:30:22]

The intention was not to enforce one style over another. I simply wanted to make
sure that the parts of this function and RequestLocationUpdate() that do the
same also look the same. I undid the changes to this function now - done.

-    const Geoposition& position,
-    const base::Closure& completion_callback) {
+void OverrideLocationForTesting(const Geoposition& position,
+                                const base::Closure& completion_callback) {
   base::Closure closure = base::Bind(&OverrideLocationForTestingOnIOThread,
                                      position,
                                      completion_callback,
                                      base::MessageLoopProxy::current());
-  if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
+  if (!BrowserThread::CurrentlyOn(BrowserThread::IO))
+    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, closure);
+  else
+    closure.Run();
+}
+
+void RequestLocationUpdate(const GeolocationUpdateCallback& callback) {
+  base::Closure closure = base::Bind(&RequestLocationUpdateOnIOThread,
+                                     callback,
+                                     base::MessageLoopProxy::current());
+  if (!BrowserThread::CurrentlyOn(BrowserThread::IO))
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, closure);
-  } else {
+  else
     closure.Run();
-  }
 }
 
 }  // namespace content