diff options
Diffstat (limited to 'chrome/browser/chromeos')
6 files changed, 0 insertions, 58 deletions
diff --git a/chrome/browser/chromeos/cros/mock_network_library.h b/chrome/browser/chromeos/cros/mock_network_library.h index d2c5192..d9144c5 100644 --- a/chrome/browser/chromeos/cros/mock_network_library.h +++ b/chrome/browser/chromeos/cros/mock_network_library.h @@ -167,10 +167,6 @@ class MockNetworkLibrary : public NetworkLibrary { MOCK_METHOD3(GetIPConfigs, void(const std::string&, HardwareAddressFormat, const NetworkGetIPConfigsCallback&)); - MOCK_METHOD3(GetIPConfigsAndBlock, - NetworkIPConfigVector(const std::string&, - std::string*, - HardwareAddressFormat)); MOCK_METHOD6(SetIPParameters, void(const std::string&, const std::string&, const std::string&, diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h index d8ec9f4..c69029d 100644 --- a/chrome/browser/chromeos/cros/network_library.h +++ b/chrome/browser/chromeos/cros/network_library.h @@ -1628,16 +1628,6 @@ class NetworkLibrary { HardwareAddressFormat format, const NetworkGetIPConfigsCallback& callback) = 0; - // DEPRECATED: DO NOT USE. Instead, use the asynchronous GetIPConfigs above. - // Fetches IP configs and hardware address for a given device_path. The - // hardware address is usually a MAC address like "0011AA22BB33". - // |hardware_address| will be an empty string, if no hardware address is - // found. - virtual NetworkIPConfigVector GetIPConfigsAndBlock( - const std::string& device_path, - std::string* hardware_address, - HardwareAddressFormat) = 0; - // Sets the configuration of the IP parameters. This is called when user // changes IP settings from dhcp to static or vice versa or when user changes // the ip config info. If nothing is changed, this method does nothing. diff --git a/chrome/browser/chromeos/cros/network_library_impl_cros.cc b/chrome/browser/chromeos/cros/network_library_impl_cros.cc index 6683bba..6109aa7 100644 --- a/chrome/browser/chromeos/cros/network_library_impl_cros.cc +++ b/chrome/browser/chromeos/cros/network_library_impl_cros.cc @@ -544,34 +544,6 @@ void NetworkLibraryImplCros::GetIPConfigs( format)); } -NetworkIPConfigVector NetworkLibraryImplCros::GetIPConfigsAndBlock( - const std::string& device_path, - std::string* hardware_address, - HardwareAddressFormat format) { - NetworkIPConfigVector ipconfig_vector; - CrosListIPConfigsAndBlock(device_path, - &ipconfig_vector, - NULL, - hardware_address); - - for (size_t i = 0; i < hardware_address->size(); ++i) - (*hardware_address)[i] = toupper((*hardware_address)[i]); - if (format == FORMAT_COLON_SEPARATED_HEX) { - if (hardware_address->size() % 2 == 0) { - std::string output; - for (size_t i = 0; i < hardware_address->size(); ++i) { - if ((i != 0) && (i % 2 == 0)) - output.push_back(':'); - output.push_back((*hardware_address)[i]); - } - *hardware_address = output; - } - } else { - DCHECK_EQ(format, FORMAT_RAW_HEX); - } - return ipconfig_vector; -} - void NetworkLibraryImplCros::SetIPParameters(const std::string& service_path, const std::string& address, const std::string& netmask, diff --git a/chrome/browser/chromeos/cros/network_library_impl_cros.h b/chrome/browser/chromeos/cros/network_library_impl_cros.h index 8c2f560..c81c1c9 100644 --- a/chrome/browser/chromeos/cros/network_library_impl_cros.h +++ b/chrome/browser/chromeos/cros/network_library_impl_cros.h @@ -75,10 +75,6 @@ class NetworkLibraryImplCros : public NetworkLibraryImplBase { const std::string& device_path, HardwareAddressFormat format, const NetworkGetIPConfigsCallback& callback) OVERRIDE; - virtual NetworkIPConfigVector GetIPConfigsAndBlock( - const std::string& device_path, - std::string* hardware_address, - HardwareAddressFormat format) OVERRIDE; virtual void SetIPParameters(const std::string& service_path, const std::string& address, const std::string& netmask, diff --git a/chrome/browser/chromeos/cros/network_library_impl_stub.cc b/chrome/browser/chromeos/cros/network_library_impl_stub.cc index bccfb1b..3df19fb 100644 --- a/chrome/browser/chromeos/cros/network_library_impl_stub.cc +++ b/chrome/browser/chromeos/cros/network_library_impl_stub.cc @@ -735,14 +735,6 @@ void NetworkLibraryImplStub::GetIPConfigs( callback.Run(ip_configs_, hardware_address_); } -NetworkIPConfigVector NetworkLibraryImplStub::GetIPConfigsAndBlock( - const std::string& device_path, - std::string* hardware_address, - HardwareAddressFormat format) { - *hardware_address = hardware_address_; - return ip_configs_; -} - void NetworkLibraryImplStub::SetIPParameters(const std::string& service_path, const std::string& address, const std::string& netmask, diff --git a/chrome/browser/chromeos/cros/network_library_impl_stub.h b/chrome/browser/chromeos/cros/network_library_impl_stub.h index 2b456c96..3501a8b 100644 --- a/chrome/browser/chromeos/cros/network_library_impl_stub.h +++ b/chrome/browser/chromeos/cros/network_library_impl_stub.h @@ -75,10 +75,6 @@ class NetworkLibraryImplStub : public NetworkLibraryImplBase { const std::string& device_path, HardwareAddressFormat format, const NetworkGetIPConfigsCallback& callback) OVERRIDE; - virtual NetworkIPConfigVector GetIPConfigsAndBlock( - const std::string& device_path, - std::string* hardware_address, - HardwareAddressFormat format) OVERRIDE; virtual void SetIPParameters(const std::string& service_path, const std::string& address, const std::string& netmask, |