This updates the StaticIP configuration UI to match new mocks.

chrome/browser/chromeos/cros/network_library_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 <cert.h>
 #include <pk11pub.h>
 
 #include <vector>
 #include <string>
 
@@ skipping 13 matching lines @@
 #include "net/base/x509_certificate.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Return;
 
 namespace chromeos {
 
 namespace {
 
-int32 GetPrefixLength(std::string netmask) {
-  return NetworkIPConfig(std::string(), IPCONFIG_TYPE_UNKNOWN, std::string(),
-      netmask, std::string(), std::string()).GetPrefixLength();
-}
-
 // Have to do a stub here because MOCK can't handle closure arguments.
 class StubEnrollmentDelegate : public EnrollmentDelegate {
  public:
   explicit StubEnrollmentDelegate(OncNetworkParser* parser)
     : did_enroll(false), correct_args(false), parser_(parser) {}
 
   void Enroll(const std::vector<std::string>& uri_list,
               const base::Closure& closure) {
     std::vector<std::string> expected_uri_list;
     expected_uri_list.push_back("http://youtu.be/dQw4w9WgXcQ");
@@ skipping 20 matching lines @@
 void WifiNetworkConnectCallback(NetworkLibrary* cros, WifiNetwork* wifi) {
   cros->ConnectToWifiNetwork(wifi);
 }
 
 void VirtualNetworkConnectCallback(NetworkLibrary* cros, VirtualNetwork* vpn) {
   cros->ConnectToVirtualNetwork(vpn);
 }
 
 }  // namespace
 
-TEST(NetworkLibraryTest, NetmaskToPrefixlen) {
-  // Valid netmasks
-  EXPECT_EQ(32, GetPrefixLength("255.255.255.255"));
-  EXPECT_EQ(31, GetPrefixLength("255.255.255.254"));
-  EXPECT_EQ(30, GetPrefixLength("255.255.255.252"));
-  EXPECT_EQ(29, GetPrefixLength("255.255.255.248"));
-  EXPECT_EQ(28, GetPrefixLength("255.255.255.240"));
-  EXPECT_EQ(27, GetPrefixLength("255.255.255.224"));
-  EXPECT_EQ(26, GetPrefixLength("255.255.255.192"));
-  EXPECT_EQ(25, GetPrefixLength("255.255.255.128"));
-  EXPECT_EQ(24, GetPrefixLength("255.255.255.0"));
-  EXPECT_EQ(23, GetPrefixLength("255.255.254.0"));
-  EXPECT_EQ(22, GetPrefixLength("255.255.252.0"));
-  EXPECT_EQ(21, GetPrefixLength("255.255.248.0"));
-  EXPECT_EQ(20, GetPrefixLength("255.255.240.0"));
-  EXPECT_EQ(19, GetPrefixLength("255.255.224.0"));
-  EXPECT_EQ(18, GetPrefixLength("255.255.192.0"));
-  EXPECT_EQ(17, GetPrefixLength("255.255.128.0"));
-  EXPECT_EQ(16, GetPrefixLength("255.255.0.0"));
-  EXPECT_EQ(15, GetPrefixLength("255.254.0.0"));
-  EXPECT_EQ(14, GetPrefixLength("255.252.0.0"));
-  EXPECT_EQ(13, GetPrefixLength("255.248.0.0"));
-  EXPECT_EQ(12, GetPrefixLength("255.240.0.0"));
-  EXPECT_EQ(11, GetPrefixLength("255.224.0.0"));
-  EXPECT_EQ(10, GetPrefixLength("255.192.0.0"));
-  EXPECT_EQ(9, GetPrefixLength("255.128.0.0"));
-  EXPECT_EQ(8, GetPrefixLength("255.0.0.0"));
-  EXPECT_EQ(7, GetPrefixLength("254.0.0.0"));
-  EXPECT_EQ(6, GetPrefixLength("252.0.0.0"));
-  EXPECT_EQ(5, GetPrefixLength("248.0.0.0"));
-  EXPECT_EQ(4, GetPrefixLength("240.0.0.0"));
-  EXPECT_EQ(3, GetPrefixLength("224.0.0.0"));
-  EXPECT_EQ(2, GetPrefixLength("192.0.0.0"));
-  EXPECT_EQ(1, GetPrefixLength("128.0.0.0"));
-  EXPECT_EQ(0, GetPrefixLength("0.0.0.0"));
-  // Invalid netmasks
-  EXPECT_EQ(-1, GetPrefixLength("255.255.255"));
-  EXPECT_EQ(-1, GetPrefixLength("255.255.255.255.255"));
-  EXPECT_EQ(-1, GetPrefixLength("255.255.255.255.0"));
-  EXPECT_EQ(-1, GetPrefixLength("255.255.255.256"));
-  EXPECT_EQ(-1, GetPrefixLength("255.255.255.1"));
-  EXPECT_EQ(-1, GetPrefixLength("255.255.240.255"));
-  EXPECT_EQ(-1, GetPrefixLength("255.0.0.255"));
-  EXPECT_EQ(-1, GetPrefixLength("255.255.255.FF"));
-  EXPECT_EQ(-1, GetPrefixLength("255,255,255,255"));
-  EXPECT_EQ(-1, GetPrefixLength("255 255 255 255"));
-}
-
 TEST(NetworkLibraryTest, DecodeNonAsciiSSID) {
 
   // Sets network name.
   {
     std::string wifi_setname = "SSID TEST";
     std::string wifi_setname_result = "SSID TEST";
     WifiNetwork* wifi = new WifiNetwork("fw");
     wifi->SetName(wifi_setname);
     EXPECT_EQ(wifi->name(), wifi_setname_result);
     delete wifi;
@@ skipping 287 matching lines @@
 
 // TODO(stevenjb): Test network profiles.
 
 // TODO(stevenjb): Test network devices.
 
 // TODO(stevenjb): Test data plans.
 
 // TODO(stevenjb): Test monitor network / device.
 
 }  // namespace chromeos