summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-21 23:02:01 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-21 23:02:01 +0000
commit45e9e90c4c7b6cb70f1cfdb647b726fcdbd5e9fa (patch)
tree93d3081b9ab9d64a5a9fd9bb18bac8d5b22a8bf8
parent98436857ed2060699f43987cddf7b3664983bfeb (diff)
downloadchromium_src-45e9e90c4c7b6cb70f1cfdb647b726fcdbd5e9fa.zip
chromium_src-45e9e90c4c7b6cb70f1cfdb647b726fcdbd5e9fa.tar.gz
chromium_src-45e9e90c4c7b6cb70f1cfdb647b726fcdbd5e9fa.tar.bz2
Fix for error in chromium-os tests from changes for chromium-os:7864.
BUG=chromium-os:7864 TEST=run chromium-os tests, make sure they run Review URL: http://codereview.chromium.org/4043003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63446 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/cros/network_library.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index 79c86d9..896f35c 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -471,13 +471,11 @@ class NetworkLibraryImpl : public NetworkLibrary {
}
~NetworkLibraryImpl() {
- if (EnsureCrosLoaded()) {
- if (network_status_connection_) {
- DisconnectMonitorNetwork(network_status_connection_);
- }
- if (data_plan_monitor_) {
- DisconnectDataPlanUpdateMonitor(data_plan_monitor_);
- }
+ if (network_status_connection_) {
+ DisconnectMonitorNetwork(network_status_connection_);
+ }
+ if (data_plan_monitor_) {
+ DisconnectDataPlanUpdateMonitor(data_plan_monitor_);
}
}