OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chromeos/dbus/shill_client_unittest_base.h" | 5 #include "chromeos/dbus/shill_client_unittest_base.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "chromeos/network/shill_property_util.h" | 10 #include "chromeos/network/shill_property_util.h" |
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 base::DictionaryValue* properties = new base::DictionaryValue; | 340 base::DictionaryValue* properties = new base::DictionaryValue; |
341 properties->SetWithoutPathExpansion( | 341 properties->SetWithoutPathExpansion( |
342 shill::kGuidProperty, | 342 shill::kGuidProperty, |
343 new base::StringValue("00000000-0000-0000-0000-000000000000")); | 343 new base::StringValue("00000000-0000-0000-0000-000000000000")); |
344 properties->SetWithoutPathExpansion( | 344 properties->SetWithoutPathExpansion( |
345 shill::kModeProperty, new base::StringValue(shill::kModeManaged)); | 345 shill::kModeProperty, new base::StringValue(shill::kModeManaged)); |
346 properties->SetWithoutPathExpansion(shill::kTypeProperty, | 346 properties->SetWithoutPathExpansion(shill::kTypeProperty, |
347 new base::StringValue(shill::kTypeWifi)); | 347 new base::StringValue(shill::kTypeWifi)); |
348 shill_property_util::SetSSID("testssid", properties); | 348 shill_property_util::SetSSID("testssid", properties); |
349 properties->SetWithoutPathExpansion( | 349 properties->SetWithoutPathExpansion( |
350 shill::kSecurityProperty, new base::StringValue(shill::kSecurityPsk)); | 350 shill::kSecurityClassProperty, |
| 351 new base::StringValue(shill::kSecurityPsk)); |
351 return properties; | 352 return properties; |
352 } | 353 } |
353 | 354 |
354 | 355 |
355 // static | 356 // static |
356 void ShillClientUnittestBase::ExpectNoResultValue( | 357 void ShillClientUnittestBase::ExpectNoResultValue( |
357 DBusMethodCallStatus call_status) { | 358 DBusMethodCallStatus call_status) { |
358 EXPECT_EQ(DBUS_METHOD_CALL_SUCCESS, call_status); | 359 EXPECT_EQ(DBUS_METHOD_CALL_SUCCESS, call_status); |
359 } | 360 } |
360 | 361 |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
464 | 465 |
465 void ShillClientUnittestBase::OnCallMethodWithErrorCallback( | 466 void ShillClientUnittestBase::OnCallMethodWithErrorCallback( |
466 dbus::MethodCall* method_call, | 467 dbus::MethodCall* method_call, |
467 int timeout_ms, | 468 int timeout_ms, |
468 const dbus::ObjectProxy::ResponseCallback& response_callback, | 469 const dbus::ObjectProxy::ResponseCallback& response_callback, |
469 const dbus::ObjectProxy::ErrorCallback& error_callback) { | 470 const dbus::ObjectProxy::ErrorCallback& error_callback) { |
470 OnCallMethod(method_call, timeout_ms, response_callback); | 471 OnCallMethod(method_call, timeout_ms, response_callback); |
471 } | 472 } |
472 | 473 |
473 } // namespace chromeos | 474 } // namespace chromeos |
OLD | NEW |