commit 9893d9c59f596e621463c8e97bb3933f8fa7edf6
author Darin Petkov <petkov@chromium.org> Thu May 17 15:27:31 2012 -0700
committer Gerrit <chrome-bot@google.com> Fri May 18 15:15:37 2012 -0700
tree e6c59551827665136a5e6fd060aad8d2adc04c59
parent 37b9003adc0775363460431544304551475b1bc0

shill: Update WiMAX DBus proxy interfaces and classes.

Adds WiMaxManager.Network proxy. Creates WiMaxService objects based on
the available WiMax networks thus adding initial support for multiple
active WiMAX services. Adds a "Scanning" property to the WiMax device,
similar to WiFi and Cellular.

BUG=chrome-os-partner:9782
TEST=Build and run unit tests.
CQ-DEPEND=I97ce1351436afb3aeac0d2a48a8f51e1501e7466

Change-Id: Ie3f919846114f63414788c5b970fa0dff2e2d06a
Reviewed-on: https://gerrit.chromium.org/gerrit/23008
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Ready: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>

mock_wimax_device_proxy.h

diff --git a/mock_wimax_device_proxy.h b/mock_wimax_device_proxy.h
index d1824dd..307b268 100644
--- a/mock_wimax_device_proxy.h
+++ b/mock_wimax_device_proxy.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_WIMAX_DEVICE_PROXY_H_
-#define SHILL_WIMAX_DEVICE_PROXY_H_
+#ifndef SHILL_MOCK_WIMAX_DEVICE_PROXY_H_
+#define SHILL_MOCK_WIMAX_DEVICE_PROXY_H_
 
 #include <base/basictypes.h>
 #include <gmock/gmock.h>
@@ -23,12 +23,17 @@
   MOCK_METHOD3(Disable, void(Error *error,
                              const ResultCallback &callback,
                              int timeout));
+  MOCK_METHOD3(ScanNetworks, void(Error *error,
+                                  const ResultCallback &callback,
+                                  int timeout));
   MOCK_METHOD3(Connect, void(Error *error,
                              const ResultCallback &callback,
                              int timeout));
   MOCK_METHOD3(Disconnect, void(Error *error,
                                 const ResultCallback &callback,
                                 int timeout));
+  MOCK_METHOD1(set_networks_changed_callback,
+               void(const NetworksChangedCallback &callback));
   MOCK_METHOD1(Index, uint8(Error *error));
   MOCK_METHOD1(Name, std::string(Error *error));
 
@@ -37,4 +42,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_WIMAX_DEVICE_PROXY_H_
+#endif  // SHILL_MOCK_WIMAX_DEVICE_PROXY_H_