summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 23:36:19 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 23:36:19 +0000
commitca7d4e275f63f448258f6cd805d076340543221c (patch)
tree6698ecc8d0e9c151ff583d19b3827ca773267e70 /ash
parentce8a1de39eb5d1f5119466ec78279946e18e3dd1 (diff)
downloadchromium_src-ca7d4e275f63f448258f6cd805d076340543221c.zip
chromium_src-ca7d4e275f63f448258f6cd805d076340543221c.tar.gz
chromium_src-ca7d4e275f63f448258f6cd805d076340543221c.tar.bz2
Clean up shill fake implementations
This is in preparation of merging NetworkState and FavoriteState, crbug.com/375955. The merge will involve a number of changes to ShillPropertyHandler and in the process of making those changes some additional logging and test cleanup was necessary that isn't directly related to the merge itself. BUG=none For trivial changes to chrome/browser/ui/webui/options/ TBR=dbeam@chromium.org Review URL: https://codereview.chromium.org/299403012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/system/chromeos/network/network_state_notifier_unittest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/system/chromeos/network/network_state_notifier_unittest.cc b/ash/system/chromeos/network/network_state_notifier_unittest.cc
index 998db5a..945bca3 100644
--- a/ash/system/chromeos/network/network_state_notifier_unittest.cc
+++ b/ash/system/chromeos/network/network_state_notifier_unittest.cc
@@ -70,12 +70,11 @@ class NetworkStateNotifierTest : public AshTestBase {
ShillServiceClient::TestInterface* service_test =
DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
service_test->ClearServices();
- const bool add_to_watchlist = true;
const bool add_to_visible = true;
// Create wifi and cellular networks and set to online.
service_test->AddService("wifi1", "wifi1",
shill::kTypeWifi, shill::kStateIdle,
- add_to_visible, add_to_watchlist);
+ add_to_visible);
service_test->SetServiceProperty("wifi1",
shill::kSecurityProperty,
base::StringValue(shill::kSecurityWep));