summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbenchan@chromium.org <benchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-23 14:59:27 +0000
committerbenchan@chromium.org <benchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-23 14:59:27 +0000
commiteeb2f12288e1a07ac1666255d042a70a53b92765 (patch)
tree9e63e683e32d47b213e215216f6eed37052238c0
parentbbdcf3daa561b8add07f95399b88ac5459ffbd40 (diff)
downloadchromium_src-eeb2f12288e1a07ac1666255d042a70a53b92765.zip
chromium_src-eeb2f12288e1a07ac1666255d042a70a53b92765.tar.gz
chromium_src-eeb2f12288e1a07ac1666255d042a70a53b92765.tar.bz2
Migrate DBus service constants from flimflam namespace to shill namespace.
All shill DBus service constants have been moved from the flimflam namespace to the shill namespace. This CL makes the corresponding changes on the Chrome side. Related CLs: https://chromium-review.googlesource.com/#/c/170123/ https://chromium-review.googlesource.com/#/c/170205/ https://chromium-review.googlesource.com/#/c/170206/ https://chromium-review.googlesource.com/#/c/170207/ https://chromium-review.googlesource.com/#/c/170208/ https://chromium-review.googlesource.com/#/c/170209/ https://chromium-review.googlesource.com/#/c/170223/ https://chromium-review.googlesource.com/#/c/170230/ https://chromium-review.googlesource.com/#/c/170231/ BUG=295425 R=joth@chromium.org,stevenjb@chromium.org Review URL: https://chromiumcodereview.appspot.com/24349002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224714 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc b/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc
index 541b284..f9deb66 100644
--- a/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc
+++ b/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc
@@ -54,7 +54,7 @@ class GeolocationChromeOsWifiDataProviderTest : public testing::Test {
shill::kGeoChannelProperty, channel);
properties.SetStringWithoutPathExpansion(
shill::kGeoSignalStrengthProperty, strength);
- manager_test_->AddGeoNetwork(flimflam::kTypeWifi, properties);
+ manager_test_->AddGeoNetwork(shill::kTypeWifi, properties);
}
}
message_loop_.RunUntilIdle();