Dispatch geolocation IPCs on the UI thread. Aside from simplifying the code to avoid a lot of threa…

chrome/test/base/ui_test_utils.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 "chrome/test/base/ui_test_utils.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 543 matching lines @@
 
 #endif  // defined(OS_WIN)
 
 void OverrideGeolocation(double latitude, double longitude) {
   content::Geoposition position;
   position.latitude = latitude;
   position.longitude = longitude;
   position.altitude = 0.;
   position.accuracy = 0.;
   position.timestamp = base::Time::Now();
-  scoped_refptr<content::MessageLoopRunner> runner =
-      new content::MessageLoopRunner;
-
-  content::GeolocationProvider::OverrideLocationForTesting(
-      position, runner->QuitClosure());
-
-  runner->Run();
+  content::GeolocationProvider::GetInstance()->OverrideLocationForTesting(
+      position);
 }
 
 HistoryEnumerator::HistoryEnumerator(Profile* profile) {
   scoped_refptr<content::MessageLoopRunner> message_loop_runner =
       new content::MessageLoopRunner;
 
   HistoryService* hs = HistoryServiceFactory::GetForProfile(
       profile, Profile::EXPLICIT_ACCESS);
   hs->QueryHistory(
       base::string16(),
       history::QueryOptions(),
       &consumer_,
       base::Bind(&HistoryEnumerator::HistoryQueryComplete,
                  base::Unretained(this), message_loop_runner->QuitClosure()));
   message_loop_runner->Run();
 }
 
 HistoryEnumerator::~HistoryEnumerator() {}
 
 void HistoryEnumerator::HistoryQueryComplete(
     const base::Closure& quit_task,
     HistoryService::Handle request_handle,
     history::QueryResults* results) {
   for (size_t i = 0; i < results->size(); ++i)
     urls_.push_back((*results)[i].url());
   quit_task.Run();
 }
 
 }  // namespace ui_test_utils