Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/client_cert_resolver_unittest.cc

 // Copyright 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 "chromeos/network/client_cert_resolver.h"
 
 #include <cert.h>
 #include <pk11pub.h>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 127 matching lines @@
         message_loop_.message_loop_proxy());
 
     profile_test_->AddProfile(kUserProfilePath, kUserHash);
   }
 
   void SetupWifi() {
     const bool add_to_visible = true;
     const bool add_to_watchlist = true;
     service_test_->AddService(kWifiStub,
                               kWifiSSID,
-                              flimflam::kTypeWifi,
-                              flimflam::kStateOnline,
+                              shill::kTypeWifi,
+                              shill::kStateOnline,
                               add_to_visible,
                               add_to_watchlist);
     service_test_->SetServiceProperty(
-        kWifiStub, flimflam::kGuidProperty, base::StringValue(kWifiStub));
+        kWifiStub, shill::kGuidProperty, base::StringValue(kWifiStub));
 
     profile_test_->AddService(kUserProfilePath, kWifiStub);
   }
 
   // Setup a policy with a certificate pattern that matches any client cert that
   // is signed by the test CA cert (stored in |test_ca_cert_pem_|). In
   // particular it will match the test client cert.
   void SetupPolicy() {
     const char* kTestPolicyTemplate =
         "[ { \"GUID\": \"wifi_stub\","
@@ skipping 25 matching lines @@
     managed_config_handler_->SetPolicy(
         onc::ONC_SOURCE_USER_POLICY, kUserHash, *policy);
   }
 
   void GetClientCertProperties(std::string* pkcs11_id) {
     pkcs11_id->clear();
     const base::DictionaryValue* properties =
         service_test_->GetServiceProperties(kWifiStub);
     if (!properties)
       return;
-    properties->GetStringWithoutPathExpansion(flimflam::kEapCertIdProperty,
+    properties->GetStringWithoutPathExpansion(shill::kEapCertIdProperty,
                                               pkcs11_id);
   }
 
   ShillServiceClient::TestInterface* service_test_;
   ShillProfileClient::TestInterface* profile_test_;
   std::string test_pkcs11_id_;
   scoped_refptr<net::X509Certificate> test_ca_cert_;
   std::string test_ca_cert_pem_;
   base::MessageLoop message_loop_;
 
@@ skipping 62 matching lines @@
   message_loop_.RunUntilIdle();
 
   // Verify that the resolver positively matched the pattern in the policy with
   // the test client cert and configured the network.
   std::string pkcs11_id;
   GetClientCertProperties(&pkcs11_id);
   EXPECT_EQ(test_pkcs11_id_, pkcs11_id);
 }
 
 }  // namespace chromeos