diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 19:05:29 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 19:05:29 +0000 |
| commit | 262eb2c897b956c8f7cc518ff45437a206f8ffb5 (patch) | |
| tree | 600d7150606d9b057a073a568c139b4f5979ea93 /chrome/browser/geolocation/wifi_data_provider_common.h | |
| parent | 2b5b413290daa6101fb1778363ce93950aa6ecf2 (diff) | |
| download | chromium_src-262eb2c897b956c8f7cc518ff45437a206f8ffb5.zip chromium_src-262eb2c897b956c8f7cc518ff45437a206f8ffb5.tar.gz chromium_src-262eb2c897b956c8f7cc518ff45437a206f8ffb5.tar.bz2 | |
Revert 37989 - unit test failed on Mac builder despite passing on try server
Original change:
Add tests for the geolocation network provider.
Also some small tidy up a few other files.
BUG=http://crbug.com/11246
TEST=unit_tests.exe gtest_filter=NetworkLocationProvider* gtest_break_on_failure
Review URL: http://codereview.chromium.org/556106
TBR=joth@chromium.org
Review URL: http://codereview.chromium.org/570006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation/wifi_data_provider_common.h')
| -rw-r--r-- | chrome/browser/geolocation/wifi_data_provider_common.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/geolocation/wifi_data_provider_common.h b/chrome/browser/geolocation/wifi_data_provider_common.h index 9836b42..f8b9a41 100644 --- a/chrome/browser/geolocation/wifi_data_provider_common.h +++ b/chrome/browser/geolocation/wifi_data_provider_common.h @@ -7,7 +7,6 @@ #include <assert.h> -#include "base/logging.h" #include "base/string16.h" #include "base/basictypes.h" @@ -39,7 +38,7 @@ class GenericPollingPolicy : public PollingPolicyInterface { } else if (polling_interval_ == DEFAULT_INTERVAL) { polling_interval_ = NO_CHANGE_INTERVAL; } else { - DCHECK(polling_interval_ == NO_CHANGE_INTERVAL || + assert(polling_interval_ == NO_CHANGE_INTERVAL || polling_interval_ == TWO_NO_CHANGE_INTERVAL); polling_interval_ = TWO_NO_CHANGE_INTERVAL; } |