commit 3d92265ae951c1ce0392366d28bad708ccab6938
author Ben Chan <benchan@chromium.org> Mon Jun 04 11:05:32 2012 -0700
committer Gerrit <chrome-bot@google.com> Mon Jun 04 15:55:35 2012 -0700
tree a380bf7dc756f71d15ac59e00bf04aaf0a3d4b43
parent 480ddfa079ebd01ed87e495332dec121d9ae781f

Enable auto-update over WiMAX connections.

BUG=chrome-os-partner:9585
TEST=Build and run unit tests.

Change-Id: I66273c4559bb121cb823793ff309a9dc40ee7184
Reviewed-on: https://gerrit.chromium.org/gerrit/24400
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Ready: Ben Chan <benchan@chromium.org>

flimflam_proxy.h

diff --git a/flimflam_proxy.h b/flimflam_proxy.h
index d5e5ff7..b571100 100644
--- a/flimflam_proxy.h
+++ b/flimflam_proxy.h
@@ -39,10 +39,10 @@
                                 NetworkConnectionType* out_type);
 
   static bool IsExpensiveConnectionType(NetworkConnectionType type) {
-    return type == kNetWimax || type == kNetBluetooth || type == kNetCellular;
+    return type == kNetBluetooth || type == kNetCellular;
   }
   static const char* StringForConnectionType(NetworkConnectionType type);
-  
+
  private:
   // Should never be allocated
   DISALLOW_IMPLICIT_CONSTRUCTORS(FlimFlamProxy);

flimflam_proxy_unittest.cc

diff --git a/flimflam_proxy_unittest.cc b/flimflam_proxy_unittest.cc
index d98e64d..fbc5b86 100644
--- a/flimflam_proxy_unittest.cc
+++ b/flimflam_proxy_unittest.cc
@@ -177,7 +177,7 @@
 TEST_F(FlimFlamProxyTest, ExpensiveConnectionsTest) {
   EXPECT_FALSE(FlimFlamProxy::IsExpensiveConnectionType(kNetEthernet));
   EXPECT_FALSE(FlimFlamProxy::IsExpensiveConnectionType(kNetWifi));
-  EXPECT_TRUE(FlimFlamProxy::IsExpensiveConnectionType(kNetWimax));
+  EXPECT_FALSE(FlimFlamProxy::IsExpensiveConnectionType(kNetWimax));
   EXPECT_TRUE(FlimFlamProxy::IsExpensiveConnectionType(kNetBluetooth));
   EXPECT_TRUE(FlimFlamProxy::IsExpensiveConnectionType(kNetCellular));
 }