Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(604)

Unified Diff: content/browser/geolocation/gps_location_provider_unittest_linux.cc

Issue 11571036: Linux: use generated library loader for libgps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixlets Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/geolocation/gps_location_provider_unittest_linux.cc
diff --git a/content/browser/geolocation/gps_location_provider_unittest_linux.cc b/content/browser/geolocation/gps_location_provider_unittest_linux.cc
index 4cba2028221b1c35b7057770ea3894957767e685..a3cd198ad37b14d748011a28fb322603d9a44165 100644
--- a/content/browser/geolocation/gps_location_provider_unittest_linux.cc
+++ b/content/browser/geolocation/gps_location_provider_unittest_linux.cc
@@ -86,8 +86,7 @@ void CheckValidPosition(const Geoposition& expected,
MockLibGps* MockLibGps::g_instance_ = NULL;
MockLibGps::MockLibGps()
- : LibGps(NULL, gps_open_stub, gps_close_stub, gps_read_stub),
- get_position_calls_(0),
+ : get_position_calls_(0),
get_position_ret_(true),
gps_open_calls_(0),
gps_open_ret_(0),
@@ -96,6 +95,11 @@ MockLibGps::MockLibGps()
get_position_.error_code = Geoposition::ERROR_CODE_POSITION_UNAVAILABLE;
EXPECT_FALSE(g_instance_);
g_instance_ = this;
+#if defined(USE_LIBGPS)
+ libgps_loader_.gps_open = gps_open_stub;
+ libgps_loader_.gps_close = gps_close_stub;
+ libgps_loader_.gps_read = gps_read_stub;
+#endif // defined(USE_LIBGPS)
}
MockLibGps::~MockLibGps() {
« no previous file with comments | « content/browser/geolocation/gps_location_provider_linux.cc ('k') | content/browser/geolocation/libgps_wrapper_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698