Add new shill client for VPN

chromeos/dbus/shill_manager_client_unittest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/values.h"
 #include "chromeos/dbus/shill_client_unittest_base.h"
 #include "chromeos/dbus/shill_manager_client.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
@@ skipping 255 matching lines @@
 }
 
 TEST_F(ShillManagerClientTest, ConfigureService) {
   // Create response.
   const dbus::ObjectPath object_path("/");
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   writer.AppendObjectPath(object_path);
   // Create the argument dictionary.
   scoped_ptr<base::DictionaryValue> arg(CreateExampleServiceProperties());
+  // Use a variant valued dictionary rather than a string valued one.
+  const bool string_valued = false;
   // Set expectations.
-  PrepareForMethodCall(shill::kConfigureServiceFunction,
-                       base::Bind(&ExpectDictionaryValueArgument, arg.get()),
-                       response.get());
+  PrepareForMethodCall(
+      shill::kConfigureServiceFunction,
+      base::Bind(&ExpectDictionaryValueArgument, arg.get(), string_valued),
+      response.get());
   // Call method.
   MockErrorCallback mock_error_callback;
   client_->ConfigureService(*arg,
                             base::Bind(&ExpectObjectPathResultWithoutStatus,
                                        object_path),
                             mock_error_callback.GetCallback());
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillManagerClientTest, GetService) {
   // Create response.
   const dbus::ObjectPath object_path("/");
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   writer.AppendObjectPath(object_path);
   // Create the argument dictionary.
   scoped_ptr<base::DictionaryValue> arg(CreateExampleServiceProperties());
+  // Use a variant valued dictionary rather than a string valued one.
+  const bool string_valued = false;
   // Set expectations.
-  PrepareForMethodCall(shill::kGetServiceFunction,
-                       base::Bind(&ExpectDictionaryValueArgument, arg.get()),
-                       response.get());
+  PrepareForMethodCall(
+      shill::kGetServiceFunction,
+      base::Bind(&ExpectDictionaryValueArgument, arg.get(), string_valued),
+      response.get());
   // Call method.
   MockErrorCallback mock_error_callback;
   client_->GetService(*arg,
                       base::Bind(&ExpectObjectPathResultWithoutStatus,
                                  object_path),
                       mock_error_callback.GetCallback());
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
   message_loop_.RunUntilIdle();
@@ skipping 117 matching lines @@
       arguments[7],
       base::Bind(&ExpectStringResultWithoutStatus, expected),
       mock_error_callback.GetCallback());
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 }  // namespace chromeos