Merge 183358

> This adds the remaining extension functions for networkingPrivate.
> 
> BUG=chromium:172996
> TEST=ran new unit and browser tests.
> 
> 
> Review URL: https://chromiumcodereview.appspot.com/12286012

TBR=gspencer@chromium.org
Review URL: https://codereview.chromium.org/12358002

git-svn-id: svn://svn.chromium.org/chrome/branches/1410/src@185013 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 65 insertions, 0 deletions

diff --git a/chromeos/dbus/shill_manager_client.cc b/chromeos/dbus/shill_manager_client.cc
index 4e89c69..2a9723d 100644
--- a/chromeos/dbus/shill_manager_client.cc
+++ b/chromeos/dbus/shill_manager_client.cc
@@ -168,6 +168,71 @@ class ShillManagerClientImpl : public ShillManagerClient {
                                                   error_callback);
   }
 
+  virtual void VerifyDestination(const std::string& certificate,
+                                 const std::string& public_key,
+                                 const std::string& nonce,
+                                 const std::string& signed_data,
+                                 const std::string& device_serial,
+                                 const BooleanCallback& callback,
+                                 const ErrorCallback& error_callback) OVERRIDE {
+    dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
+                                 shill::kVerifyDestinationFunction);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(certificate);
+    writer.AppendString(public_key);
+    writer.AppendString(nonce);
+    writer.AppendString(signed_data);
+    writer.AppendString(device_serial);
+    helper_.CallBooleanMethodWithErrorCallback(&method_call,
+                                               callback,
+                                               error_callback);
+  }
+
+  virtual void VerifyAndSignCredentials(
+      const std::string& certificate,
+      const std::string& public_key,
+      const std::string& nonce,
+      const std::string& signed_data,
+      const std::string& device_serial,
+      const std::string& service_path,
+      const StringCallback& callback,
+      const ErrorCallback& error_callback) OVERRIDE {
+    dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
+                                 shill::kVerifyAndSignCredentialsFunction);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(certificate);
+    writer.AppendString(public_key);
+    writer.AppendString(nonce);
+    writer.AppendString(signed_data);
+    writer.AppendString(device_serial);
+    writer.AppendObjectPath(dbus::ObjectPath(service_path));
+    helper_.CallStringMethodWithErrorCallback(&method_call,
+                                              callback,
+                                              error_callback);
+  }
+
+  virtual void VerifyAndSignData(const std::string& certificate,
+                                 const std::string& public_key,
+                                 const std::string& nonce,
+                                 const std::string& signed_data,
+                                 const std::string& device_serial,
+                                 const std::string& data,
+                                 const StringCallback& callback,
+                                 const ErrorCallback& error_callback) OVERRIDE {
+    dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
+                                 shill::kVerifyAndSignDataFunction);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(certificate);
+    writer.AppendString(public_key);
+    writer.AppendString(nonce);
+    writer.AppendString(signed_data);
+    writer.AppendString(device_serial);
+    writer.AppendString(data);
+    helper_.CallStringMethodWithErrorCallback(&method_call,
+                                              callback,
+                                              error_callback);
+  }
+
   virtual TestInterface* GetTestInterface() OVERRIDE {
     return NULL;
   }