Reland 2:Geolocation: move from content/browser to device/

blimp/engine/feature/geolocation/engine_geolocation_feature_unittest.cc

Index: blimp/engine/feature/geolocation/engine_geolocation_feature_unittest.cc
diff --git a/blimp/engine/feature/geolocation/engine_geolocation_feature_unittest.cc b/blimp/engine/feature/geolocation/engine_geolocation_feature_unittest.cc
index 3aaa65be24c530a8f3fea6d47b8a64c4c3555da5..d74f7e8162071eb0e106d7458c3b728bb9e56e16 100644
--- a/blimp/engine/feature/geolocation/engine_geolocation_feature_unittest.cc
+++ b/blimp/engine/feature/geolocation/engine_geolocation_feature_unittest.cc
@@ -13,8 +13,9 @@
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/common/proto/geolocation.pb.h"
 #include "blimp/net/test_common.h"
-#include "content/public/browser/location_provider.h"
-#include "content/public/common/geoposition.h"
+#include "device/geolocation/geolocation_delegate.h"
+#include "device/geolocation/geoposition.h"
+#include "device/geolocation/location_provider.h"
 #include "net/base/test_completion_callback.h"
 #include "net/test/gtest_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -107,8 +108,8 @@ class EngineGeolocationFeatureTest : public testing::Test {
     location_provider_->SetUpdateCallback(mock_callback_);
   }
 
-  void OnLocationUpdate(const content::LocationProvider* provider,
-                        const content::Geoposition& geoposition) {
+  void OnLocationUpdate(const device::LocationProvider* provider,
+                        const device::Geoposition& geoposition) {
     received_position = geoposition;
   }
 
@@ -117,14 +118,14 @@ class EngineGeolocationFeatureTest : public testing::Test {
   MockBlimpMessageProcessor* out_processor_;
 
   EngineGeolocationFeature feature_;
-  std::unique_ptr<content::LocationProvider> location_provider_;
-  content::LocationProvider::LocationProviderUpdateCallback mock_callback_;
-  content::Geoposition received_position;
+  std::unique_ptr<device::LocationProvider> location_provider_;
+  device::LocationProvider::LocationProviderUpdateCallback mock_callback_;
+  device::Geoposition received_position;
 };
 
 TEST_F(EngineGeolocationFeatureTest, LocationReceived) {
   SendMockLocationMessage(&feature_);
-  EXPECT_EQ(content::Geoposition::ERROR_CODE_NONE,
+  EXPECT_EQ(device::Geoposition::ERROR_CODE_NONE,
             received_position.error_code);
   EXPECT_EQ(-42.0, received_position.latitude);
   EXPECT_EQ(17.3, received_position.longitude);
@@ -135,13 +136,13 @@ TEST_F(EngineGeolocationFeatureTest, LocationReceived) {
 TEST_F(EngineGeolocationFeatureTest, ErrorRecieved) {
   SendMockErrorMessage(&feature_, GeolocationErrorMessage::PERMISSION_DENIED,
                        "PERMISSION_DENIED");
-  EXPECT_EQ(content::Geoposition::ERROR_CODE_PERMISSION_DENIED,
+  EXPECT_EQ(device::Geoposition::ERROR_CODE_PERMISSION_DENIED,
             received_position.error_code);
   EXPECT_EQ("PERMISSION_DENIED", received_position.error_message);
 
   SendMockErrorMessage(&feature_, GeolocationErrorMessage::POSITION_UNAVAILABLE,
                        "POSITION_UNAVAILABLE");
-  EXPECT_EQ(content::Geoposition::ERROR_CODE_POSITION_UNAVAILABLE,
+  EXPECT_EQ(device::Geoposition::ERROR_CODE_POSITION_UNAVAILABLE,
             received_position.error_code);
   EXPECT_EQ("POSITION_UNAVAILABLE", received_position.error_message);
 }