Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Side by Side Diff: webkit/glue/media/buffered_data_source_unittest.cc

Issue 7591001: Log BufferedResourceLoader events to MediaLog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Picking nits. Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/glue/media/buffered_data_source.cc ('k') | webkit/glue/media/buffered_resource_loader.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <algorithm> 5 #include <algorithm>
6 6
7 #include "base/test/test_timeouts.h" 7 #include "base/test/test_timeouts.h"
8 #include "media/base/media_log.h"
8 #include "media/base/mock_callback.h" 9 #include "media/base/mock_callback.h"
9 #include "media/base/mock_filter_host.h" 10 #include "media/base/mock_filter_host.h"
10 #include "media/base/mock_filters.h" 11 #include "media/base/mock_filters.h"
11 #include "net/base/net_errors.h" 12 #include "net/base/net_errors.h"
12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
13 #include "webkit/glue/media/buffered_data_source.h" 14 #include "webkit/glue/media/buffered_data_source.h"
14 #include "webkit/mocks/mock_webframeclient.h" 15 #include "webkit/mocks/mock_webframeclient.h"
15 16
16 using ::testing::_; 17 using ::testing::_;
17 using ::testing::Assign; 18 using ::testing::Assign;
(...skipping 25 matching lines...) Expand all
43 NONE, 44 NONE,
44 LOADED, 45 LOADED,
45 LOADING 46 LOADING
46 }; 47 };
47 48
48 // A mock BufferedDataSource to inject mock BufferedResourceLoader through 49 // A mock BufferedDataSource to inject mock BufferedResourceLoader through
49 // CreateResourceLoader() method. 50 // CreateResourceLoader() method.
50 class MockBufferedDataSource : public BufferedDataSource { 51 class MockBufferedDataSource : public BufferedDataSource {
51 public: 52 public:
52 MockBufferedDataSource(MessageLoop* message_loop, WebFrame* frame) 53 MockBufferedDataSource(MessageLoop* message_loop, WebFrame* frame)
53 : BufferedDataSource(message_loop, frame) { 54 : BufferedDataSource(message_loop, frame, new media::MediaLog()) {
54 } 55 }
55 56
56 virtual base::TimeDelta GetTimeoutMilliseconds() { 57 virtual base::TimeDelta GetTimeoutMilliseconds() {
57 return base::TimeDelta::FromMilliseconds( 58 return base::TimeDelta::FromMilliseconds(
58 TestTimeouts::tiny_timeout_ms()); 59 TestTimeouts::tiny_timeout_ms());
59 } 60 }
60 61
61 MOCK_METHOD2(CreateResourceLoader, 62 MOCK_METHOD2(CreateResourceLoader,
62 BufferedResourceLoader*(int64 first_position, 63 BufferedResourceLoader*(int64 first_position,
63 int64 last_position)); 64 int64 last_position));
64 65
65 private: 66 private:
66 DISALLOW_COPY_AND_ASSIGN(MockBufferedDataSource); 67 DISALLOW_COPY_AND_ASSIGN(MockBufferedDataSource);
67 }; 68 };
68 69
69 class MockBufferedResourceLoader : public BufferedResourceLoader { 70 class MockBufferedResourceLoader : public BufferedResourceLoader {
70 public: 71 public:
71 MockBufferedResourceLoader() : BufferedResourceLoader(GURL(), 0, 0) { 72 MockBufferedResourceLoader()
73 : BufferedResourceLoader(GURL(), 0, 0, new media::MediaLog()) {
72 } 74 }
73 75
74 MOCK_METHOD3(Start, void(net::CompletionCallback* read_callback, 76 MOCK_METHOD3(Start, void(net::CompletionCallback* read_callback,
75 NetworkEventCallback* network_callback, 77 NetworkEventCallback* network_callback,
76 WebFrame* frame)); 78 WebFrame* frame));
77 MOCK_METHOD0(Stop, void()); 79 MOCK_METHOD0(Stop, void());
78 MOCK_METHOD4(Read, void(int64 position, int read_size, uint8* buffer, 80 MOCK_METHOD4(Read, void(int64 position, int read_size, uint8* buffer,
79 net::CompletionCallback* callback)); 81 net::CompletionCallback* callback));
80 MOCK_METHOD0(content_length, int64()); 82 MOCK_METHOD0(content_length, int64());
81 MOCK_METHOD0(instance_size, int64()); 83 MOCK_METHOD0(instance_size, int64());
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 // single Read() request. 579 // single Read() request.
578 TEST_F(BufferedDataSourceTest, BoundedCacheMisses) { 580 TEST_F(BufferedDataSourceTest, BoundedCacheMisses) {
579 InitializeDataSource(kHttpUrl, net::OK, true, 1024, LOADING); 581 InitializeDataSource(kHttpUrl, net::OK, true, 1024, LOADING);
580 582
581 ReadDataSourceAlwaysCacheMiss(0, 10); 583 ReadDataSourceAlwaysCacheMiss(0, 10);
582 584
583 StopDataSource(); 585 StopDataSource();
584 } 586 }
585 587
586 } // namespace webkit_glue 588 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/media/buffered_data_source.cc ('k') | webkit/glue/media/buffered_resource_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698