Merge FavoriteState into NetworkState

chromeos/dbus/fake_shill_profile_client.cc

Index: chromeos/dbus/fake_shill_profile_client.cc
diff --git a/chromeos/dbus/fake_shill_profile_client.cc b/chromeos/dbus/fake_shill_profile_client.cc
index 55caad8f05a875cb65cacc9a3e85803138b11f3a..2a5f9ca4b5573c62e81035ffa8afe5fca35f96eb 100644
--- a/chromeos/dbus/fake_shill_profile_client.cc
+++ b/chromeos/dbus/fake_shill_profile_client.cc
@@ -145,7 +145,7 @@ void FakeShillProfileClient::AddEntry(const std::string& profile_path,
   DCHECK(profile);
   profile->entries.SetWithoutPathExpansion(entry_path, properties.DeepCopy());
   DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
-      AddManagerService(entry_path, false /* visible */);
+      AddManagerService(entry_path);
 }
 
 bool FakeShillProfileClient::AddService(const std::string& profile_path,
@@ -153,14 +153,12 @@ bool FakeShillProfileClient::AddService(const std::string& profile_path,
   ProfileProperties* profile = GetProfile(dbus::ObjectPath(profile_path),
                                           ErrorCallback());
   if (!profile) {
-    LOG(ERROR) << "AddService: No matching profile: " << profile_path;
+    LOG(ERROR) << "AddService: No matching profile: " << profile_path
+               << " for: " << service_path;
     return false;
   }
-  if (profile->entries.HasKey(service_path)) {
-    LOG(ERROR) << "AddService: Profile: " << profile_path
-               << " already contains Service: " << service_path;
+  if (profile->entries.HasKey(service_path))
     return false;
-  }
   return AddOrUpdateServiceImpl(profile_path, service_path, profile);
 }
 
@@ -169,7 +167,8 @@ bool FakeShillProfileClient::UpdateService(const std::string& profile_path,
   ProfileProperties* profile = GetProfile(dbus::ObjectPath(profile_path),
                                           ErrorCallback());
   if (!profile) {
-    LOG(ERROR) << "UpdateService: No matching profile: " << profile_path;
+    LOG(ERROR) << "UpdateService: No matching profile: " << profile_path
+               << " for: " << service_path;
     return false;
   }
   if (!profile->entries.HasKey(service_path)) {