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

Side by Side Diff: media/filters/file_data_source.h

Issue 10091001: Remove unneeded friend tests from media::FileDataSource. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: Created 8 years, 8 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 | « no previous file | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef MEDIA_FILTERS_FILE_DATA_SOURCE_H_ 5 #ifndef MEDIA_FILTERS_FILE_DATA_SOURCE_H_
6 #define MEDIA_FILTERS_FILE_DATA_SOURCE_H_ 6 #define MEDIA_FILTERS_FILE_DATA_SOURCE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 15 matching lines...) Expand all
26 // Implementation of DataSource. 26 // Implementation of DataSource.
27 virtual void set_host(DataSourceHost* host) OVERRIDE; 27 virtual void set_host(DataSourceHost* host) OVERRIDE;
28 virtual void Stop(const base::Closure& callback) OVERRIDE; 28 virtual void Stop(const base::Closure& callback) OVERRIDE;
29 virtual void Read(int64 position, int size, uint8* data, 29 virtual void Read(int64 position, int size, uint8* data,
30 const DataSource::ReadCB& read_cb) OVERRIDE; 30 const DataSource::ReadCB& read_cb) OVERRIDE;
31 virtual bool GetSize(int64* size_out) OVERRIDE; 31 virtual bool GetSize(int64* size_out) OVERRIDE;
32 virtual bool IsStreaming() OVERRIDE; 32 virtual bool IsStreaming() OVERRIDE;
33 virtual void SetBitrate(int bitrate) OVERRIDE; 33 virtual void SetBitrate(int bitrate) OVERRIDE;
34 34
35 private: 35 private:
36 // Only allow factories and tests to create this object.
37 //
38 // TODO(scherkus): I'm getting tired of these factories getting in the way
39 // of my tests!!!
40 FRIEND_TEST_ALL_PREFIXES(FileDataSourceTest, OpenFile);
41 FRIEND_TEST_ALL_PREFIXES(FileDataSourceTest, ReadData);
42 FRIEND_TEST_ALL_PREFIXES(FileDataSourceTest, Seek);
43
44 // Informs the host of changes in total and buffered bytes. 36 // Informs the host of changes in total and buffered bytes.
45 void UpdateHostBytes(); 37 void UpdateHostBytes();
46 38
47 // File handle. NULL if not initialized or an error occurs. 39 // File handle. NULL if not initialized or an error occurs.
48 FILE* file_; 40 FILE* file_;
49 41
50 // Size of the file in bytes. 42 // Size of the file in bytes.
51 int64 file_size_; 43 int64 file_size_;
52 44
53 // True if the FileDataSource should ignore its set file size, false 45 // True if the FileDataSource should ignore its set file size, false
54 // otherwise. 46 // otherwise.
55 bool disable_file_size_; 47 bool disable_file_size_;
56 48
57 // Critical section that protects all of the DataSource methods to prevent 49 // Critical section that protects all of the DataSource methods to prevent
58 // a Stop from happening while in the middle of a file I/O operation. 50 // a Stop from happening while in the middle of a file I/O operation.
59 // TODO(ralphl): Ideally this would use asynchronous I/O or we will know 51 // TODO(ralphl): Ideally this would use asynchronous I/O or we will know
60 // that we will block for a short period of time in reads. Otherwise, we can 52 // that we will block for a short period of time in reads. Otherwise, we can
61 // hang the pipeline Stop. 53 // hang the pipeline Stop.
62 base::Lock lock_; 54 base::Lock lock_;
63 55
64 DISALLOW_COPY_AND_ASSIGN(FileDataSource); 56 DISALLOW_COPY_AND_ASSIGN(FileDataSource);
65 }; 57 };
66 58
67 } // namespace media 59 } // namespace media
68 60
69 #endif // MEDIA_FILTERS_FILE_DATA_SOURCE_H_ 61 #endif // MEDIA_FILTERS_FILE_DATA_SOURCE_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698