Merge FavoriteState into NetworkState

chromeos/dbus/fake_shill_profile_client.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/dbus/fake_shill_profile_client.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 127 matching lines @@
 }
 
 void FakeShillProfileClient::AddEntry(const std::string& profile_path,
                                       const std::string& entry_path,
                                       const base::DictionaryValue& properties) {
   ProfileProperties* profile = GetProfile(dbus::ObjectPath(profile_path),
                                           ErrorCallback());
   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,
                                         const std::string& service_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);
 }
 
 bool FakeShillProfileClient::UpdateService(const std::string& profile_path,
                                            const std::string& service_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)) {
     LOG(ERROR) << "UpdateService: Profile: " << profile_path
                << " does not contain Service: " << service_path;
     return false;
   }
   return AddOrUpdateServiceImpl(profile_path, service_path, profile);
 }
 
@@ skipping 66 matching lines @@
   if (found == profiles_.end()) {
     if (!error_callback.is_null())
       error_callback.Run("Error.InvalidProfile", "Invalid profile");
     return NULL;
   }
 
   return found->second;
 }
 
 }  // namespace chromeos