diff options
author | bryner@chromium.org <bryner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 23:24:33 +0000 |
---|---|---|
committer | bryner@chromium.org <bryner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 23:24:33 +0000 |
commit | 7e924251f1eecb17902d1c3b92be9af8978e0622 (patch) | |
tree | 002843f271d8fcffc5b22f9b21e914751ea94479 | |
parent | 77f5e5ff51a18417cf93dbf4a67a957533e64717 (diff) | |
download | chromium_src-7e924251f1eecb17902d1c3b92be9af8978e0622.zip chromium_src-7e924251f1eecb17902d1c3b92be9af8978e0622.tar.gz chromium_src-7e924251f1eecb17902d1c3b92be9af8978e0622.tar.bz2 |
Fix the clock values in PhishingDOMFeatureExtractorTest.Continuation.
These had gotten out of sync with the comments and intended behavior when we reduced the max time per chunk to 20ms.
BUG=none
TEST=PhishingDOMFeaturExtractorTest.Continuation
Review URL: http://codereview.chromium.org/7981027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102195 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc index e18d938..548c172 100644 --- a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc @@ -255,7 +255,7 @@ TEST_F(PhishingDOMFeatureExtractorTest, Continuation) { response.append("<form action=\"http://host2.com/\"></form></body></html>"); responses_["http://host.com/"] = response; - // Advance the clock 8 ms every 10 elements processed, 10 ms between chunks. + // Advance the clock 12 ms every 10 elements processed, 10 ms between chunks. // Note that this assumes kClockCheckGranularity = 10 and // kMaxTimePerChunkMs = 20. base::TimeTicks now = base::TimeTicks::Now(); @@ -265,27 +265,27 @@ TEST_F(PhishingDOMFeatureExtractorTest, Continuation) { // Time check at the start of the first chunk of work. .WillOnce(Return(now)) // Time check after the first 10 elements. - .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(8))) + .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(12))) // Time check after the next 10 elements. This is over the chunk // time limit, so a continuation task will be posted. - .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(16))) + .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(24))) // Time check at the start of the second chunk of work. - .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(26))) + .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(34))) // Time check after resuming iteration for the second chunk. - .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(28))) - // Time check after the next 10 elements. .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(36))) + // Time check after the next 10 elements. + .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(48))) // Time check after the next 10 elements. This will trigger another // continuation task. - .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(44))) + .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(60))) // Time check at the start of the third chunk of work. - .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(54))) + .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(70))) // Time check after resuming iteration for the third chunk. - .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(56))) + .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(72))) // Time check after the last 10 elements. - .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(64))) + .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(84))) // A final time check for the histograms. - .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(66))); + .WillOnce(Return(now + base::TimeDelta::FromMilliseconds(86))); FeatureMap expected_features; expected_features.AddBooleanFeature(features::kPageHasForms); |