Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/network_connection_handler.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_NETWORK_CONNECTION_HANDLER_H_
 #define CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_
 
 #include <set>
 #include <string>
 
@@ skipping 73 matching lines @@
   static const char kErrorConnectCanceled[];
 
   // Constants for |error_name| from |error_callback| for Disconnect.
   static const char kErrorNotConnected[];
 
   virtual ~NetworkConnectionHandler();
 
   // ConnectToNetwork() will start an asynchronous connection attempt.
   // On success, |success_callback| will be called.
   // On failure, |error_callback| will be called with |error_name| one of the
-  //   constants defined above, or flimflam::kErrorConnectFailed or
-  //   flimflam::kErrorBadPassphrase if the Shill Error property (from a
+  //   constants defined above, or shill::kErrorConnectFailed or
+  //   shill::kErrorBadPassphrase if the Shill Error property (from a
   //   previous connect attempt) was set to one of those.
   // |error_message| will contain an additional error string for debugging.
   // If |check_error_state| is true, the current state of the network is
   //  checked for errors, otherwise current state is ignored (e.g. for recently
   //  configured networks or repeat attempts).
   void ConnectToNetwork(const std::string& service_path,
                         const base::Closure& success_callback,
                         const network_handler::ErrorCallback& error_callback,
                         bool check_error_state);
 
@@ skipping 96 matching lines @@
   // Track certificate loading state.
   bool logged_in_;
   bool certificates_loaded_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_