Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/managed_state.h

 // 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.
 
 #ifndef CHROMEOS_NETWORK_MANAGED_STATE_H_
 #define CHROMEOS_NETWORK_MANAGED_STATE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 92 matching lines @@
 
  private:
   friend class NetworkChangeNotifierChromeosUpdateTest;
 
   ManagedType managed_type_;
 
   // The path (e.g. service path or device path) of the managed state object.
   std::string path_;
 
   // Common properties shared by all managed state objects.
-  std::string name_;  // flimflam::kNameProperty
-  std::string type_;  // flimflam::kTypeProperty
+  std::string name_;  // shill::kNameProperty
+  std::string type_;  // shill::kTypeProperty
 
   // Set to true when the an update has been received.
   bool update_received_;
 
   // Tracks when an update has been requested.
   bool update_requested_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagedState);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_MANAGED_STATE_H_