summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-18 20:29:40 +0000
committervrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-18 20:29:40 +0000
commit94dde4b7d804f3e8c92fbbaf56251717f9a2cc40 (patch)
tree14c98e6eb1f1ec99742e52f409a7e661dbd67d6d
parentcda2bc85c8e2807c54d2347316c81996cb418cab (diff)
downloadchromium_src-94dde4b7d804f3e8c92fbbaf56251717f9a2cc40.zip
chromium_src-94dde4b7d804f3e8c92fbbaf56251717f9a2cc40.tar.gz
chromium_src-94dde4b7d804f3e8c92fbbaf56251717f9a2cc40.tar.bz2
Fix test_shell_test breakage due to missing SetBufferedBytes expectation
SetBufferedBytes may be called independent of having a valid total bytes size for the media element. Update test to reflect this. BUG=NONE TEST=test_shell_tests TBR=acolwell Review URL: http://codereview.chromium.org/8566046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110743 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/media/buffered_data_source_unittest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/media/buffered_data_source_unittest.cc b/webkit/media/buffered_data_source_unittest.cc
index b7dcb90..ce14c7a 100644
--- a/webkit/media/buffered_data_source_unittest.cc
+++ b/webkit/media/buffered_data_source_unittest.cc
@@ -192,13 +192,13 @@ class BufferedDataSourceTest : public testing::Test {
// Expected loaded or not.
EXPECT_CALL(host_, SetLoaded(loaded));
- if (instance_size != -1) {
+ if (instance_size != -1)
EXPECT_CALL(host_, SetTotalBytes(instance_size));
- if (loaded)
- EXPECT_CALL(host_, SetBufferedBytes(instance_size));
- else
- EXPECT_CALL(host_, SetBufferedBytes(0));
- }
+
+ if (loaded)
+ EXPECT_CALL(host_, SetBufferedBytes(instance_size));
+ else
+ EXPECT_CALL(host_, SetBufferedBytes(0));
if (!partial_response || instance_size == -1)
EXPECT_CALL(host_, SetStreaming(true));