Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/managed_network_configuration_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 <iostream>
 #include <sstream>
 
 #include "base/message_loop/message_loop.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/mock_dbus_thread_manager.h"
@@ skipping 61 matching lines @@
   }
 
   void AddEntry(const std::string& profile_path,
                 const std::string& entry_path,
                 const base::DictionaryValue& entry) {
     base::DictionaryValue* entries = NULL;
     profile_entries_.GetDictionaryWithoutPathExpansion(profile_path, &entries);
     ASSERT_TRUE(entries);
 
     base::DictionaryValue* new_entry = entry.DeepCopy();
-    new_entry->SetStringWithoutPathExpansion(flimflam::kProfileProperty,
+    new_entry->SetStringWithoutPathExpansion(shill::kProfileProperty,
                                              profile_path);
     entries->SetWithoutPathExpansion(entry_path, new_entry);
   }
 
   void GetProperties(const dbus::ObjectPath& profile_path,
                      const DictionaryValueCallbackWithoutStatus& callback,
                      const ErrorCallback& error_callback) {
     base::DictionaryValue* entries = NULL;
     profile_entries_.GetDictionaryWithoutPathExpansion(profile_path.value(),
                                                        &entries);
     ASSERT_TRUE(entries);
 
     scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue);
     base::ListValue* entry_paths = new base::ListValue;
-    result->SetWithoutPathExpansion(flimflam::kEntriesProperty,
-                                    entry_paths);
+    result->SetWithoutPathExpansion(shill::kEntriesProperty, entry_paths);
     for (base::DictionaryValue::Iterator it(*entries); !it.IsAtEnd();
          it.Advance()) {
       entry_paths->AppendString(it.key());
     }
 
     ASSERT_GT(profile_to_user_.count(profile_path.value()), 0UL);
     const std::string& userhash = profile_to_user_[profile_path.value()];
     result->SetStringWithoutPathExpansion(shill::kUserHashProperty, userhash);
 
     callback.Run(*result);
@@ skipping 296 matching lines @@
              kUser1ProfilePath,
              "old_entry_path");
 
   scoped_ptr<base::DictionaryValue> expected_shill_properties =
       test_utils::ReadTestDictionary(
           "policy/shill_policy_on_unmanaged_user_wifi1.json");
 
   // The passphrase isn't sent again, because it's configured by the user and
   // Shill doesn't sent it on GetProperties calls.
   expected_shill_properties->RemoveWithoutPathExpansion(
-      flimflam::kPassphraseProperty, NULL);
+      shill::kPassphraseProperty, NULL);
 
   EXPECT_CALL(mock_profile_client_,
               GetProperties(dbus::ObjectPath(kUser1ProfilePath), _, _));
 
   EXPECT_CALL(
       mock_profile_client_,
       GetEntry(dbus::ObjectPath(kUser1ProfilePath), "old_entry_path", _, _));
 
   EXPECT_CALL(
       mock_profile_client_,
@@ skipping 15 matching lines @@
              kUser1ProfilePath,
              "old_entry_path");
 
   scoped_ptr<base::DictionaryValue> expected_shill_properties =
       test_utils::ReadTestDictionary(
           "policy/shill_policy_on_unmanaged_user_wifi1.json");
 
   // The passphrase isn't sent again, because it's configured by the user and
   // Shill doesn't sent it on GetProperties calls.
   expected_shill_properties->RemoveWithoutPathExpansion(
-      flimflam::kPassphraseProperty, NULL);
+      shill::kPassphraseProperty, NULL);
 
   EXPECT_CALL(mock_profile_client_,
               GetProperties(dbus::ObjectPath(kUser1ProfilePath), _, _));
 
   EXPECT_CALL(
       mock_profile_client_,
       GetEntry(dbus::ObjectPath(kUser1ProfilePath), "old_entry_path", _, _));
 
   EXPECT_CALL(mock_manager_client_,
               ConfigureServiceForProfile(
@@ skipping 103 matching lines @@
               ConfigureServiceForProfile(
                   dbus::ObjectPath(kUser1ProfilePath),
                   IsEqualTo(expected_shill_properties.get()),
                   _, _));
 
   InitializeStandardProfiles();
   message_loop_.RunUntilIdle();
 }
 
 }  // namespace chromeos