commit 5d53d498c1ce24503890defbd49c7d5c4b2b5465
author Wade Guthrie <wdg@chromium.org> Wed Nov 07 09:53:31 2012 -0800
committer Gerrit <chrome-bot@google.com> Thu Nov 08 10:41:49 2012 -0800
tree b0bac56e6153d2cf0fef66457424232ce119f987
parent 092b12b0a3aa489455c4c7599d237a708242ca0b

shill: Cleanup of the config80211 code.

BUG=None.
TEST=Manual and unit tests.

Change-Id: Iceba3473b8d7476b5a7340d4a918d7aa6354278c
Reviewed-on: https://gerrit.chromium.org/gerrit/37576
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Commit-Ready: Wade Guthrie <wdg@chromium.org>
Tested-by: Wade Guthrie <wdg@chromium.org>

config80211_unittest.cc

diff --git a/config80211_unittest.cc b/config80211_unittest.cc
index 9bae303..c128793 100644
--- a/config80211_unittest.cc
+++ b/config80211_unittest.cc
@@ -395,7 +395,6 @@
   // Install the callback and subscribe to events using it, wifi down
   // (shouldn't actually send the subscription request until wifi comes up).
   EXPECT_CALL(socket_, AddGroupMembership(_)).Times(0);
-  EXPECT_CALL(socket_, DisableSequenceChecking()).Times(0);
   EXPECT_CALL(socket_, SetNetlinkCallback(_, _)).Times(0);
   EXPECT_CALL(socket_, GetSequenceNumber())
       .WillRepeatedly(Invoke(&MockNl80211Socket::GetNextNumber));
@@ -410,8 +409,6 @@
   // Wifi up, should subscribe to events.
   EXPECT_CALL(socket_, AddGroupMembership(scan_event_string))
       .WillOnce(Return(true));
-  EXPECT_CALL(socket_, DisableSequenceChecking())
-      .WillOnce(Return(true));
   EXPECT_CALL(socket_, SetNetlinkCallback(
       _, ContainsCallback(callback_object.GetCallback())))
       .WillOnce(Return(true));
@@ -419,7 +416,6 @@
 
   // Second subscribe, same event (should do nothing).
   EXPECT_CALL(socket_, AddGroupMembership(_)).Times(0);
-  EXPECT_CALL(socket_, DisableSequenceChecking()).Times(0);
   EXPECT_CALL(socket_, SetNetlinkCallback(_, _)).Times(0);
   EXPECT_TRUE(config80211_->SubscribeToEvents(scan_event));
 
@@ -438,12 +434,9 @@
       .WillOnce(Return(true));
   EXPECT_CALL(socket_, AddGroupMembership(mlme_event_string))
       .WillOnce(Return(true));
-  EXPECT_CALL(socket_, DisableSequenceChecking())
-      .Times(2)
-      .WillRepeatedly(Return(true));
   EXPECT_CALL(socket_, SetNetlinkCallback(
        _, ContainsCallback(callback_object.GetCallback())))
-      .Times(2)
+      .Times(1)
       .WillRepeatedly(Return(true));
   config80211_->SetWifiState(Config80211::kWifiUp);
 }