Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/geolocation_handler_unittest.cc

 // Copyright (c) 2013 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 "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_manager_client.h"
@@ skipping 39 matching lines @@
         base::StringPrintf("%02X:%02X:%02X:%02X:%02X:%02X",
                            idx, 0, 0, 0, 0, 0);
     std::string channel = base::StringPrintf("%d", idx);
     std::string strength = base::StringPrintf("%d", idx * 10);
     properties.SetStringWithoutPathExpansion(
         shill::kGeoMacAddressProperty, mac_address);
     properties.SetStringWithoutPathExpansion(
         shill::kGeoChannelProperty, channel);
     properties.SetStringWithoutPathExpansion(
         shill::kGeoSignalStrengthProperty, strength);
-    manager_test_->AddGeoNetwork(flimflam::kTypeWifi, properties);
+    manager_test_->AddGeoNetwork(shill::kTypeWifi, properties);
     message_loop_.RunUntilIdle();
   }
 
  protected:
   base::MessageLoopForUI message_loop_;
   scoped_ptr<GeolocationHandler> geolocation_handler_;
   ShillManagerClient::TestInterface* manager_test_;
   WifiAccessPointVector wifi_access_points_;
 
  private:
@@ skipping 32 matching lines @@
   EXPECT_FALSE(GetWifiAccessPoints());
   message_loop_.RunUntilIdle();
   // Second call should return true since we have an access point.
   EXPECT_TRUE(GetWifiAccessPoints());
   ASSERT_EQ(3u, wifi_access_points_.size());
   EXPECT_EQ("02:00:00:00:00:00", wifi_access_points_[1].mac_address);
   EXPECT_EQ(3, wifi_access_points_[2].channel);
 }
 
 }  // namespace chromeos