webkit/media/buffered_resource_loader_unittest.cc - Issue 15462003: Update references to Blink's Platform API headers

Side by Side Diff: webkit/media/buffered_resource_loader_unittest.cc

Issue 15462003: Update references to Blink's Platform API headers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 7 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/media/buffered_resource_loader.cc ('k') | webkit/media/cache_util.cc » ('j') | no next file with comments »

OLD	NEW
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 #include <algorithm>	5 #include <algorithm>

6 #include <string>	6 #include <string>

7	7

8 #include "base/bind.h"	8 #include "base/bind.h"

9 #include "base/format_macros.h"	9 #include "base/format_macros.h"

10 #include "base/message_loop.h"	10 #include "base/message_loop.h"

11 #include "base/stringprintf.h"	11 #include "base/stringprintf.h"

12 #include "media/base/media_log.h"	12 #include "media/base/media_log.h"

13 #include "media/base/seekable_buffer.h"	13 #include "media/base/seekable_buffer.h"

14 #include "net/base/net_errors.h"	14 #include "net/base/net_errors.h"

15 #include "net/http/http_request_headers.h"	15 #include "net/http/http_request_headers.h"

16 #include "net/http/http_util.h"	16 #include "net/http/http_util.h"

17 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"	17 #include "third_party/WebKit/public/platform/WebString.h"

18 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h"	18 #include "third_party/WebKit/public/platform/WebURLError.h"

19 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h"	19 #include "third_party/WebKit/public/platform/WebURLRequest.h"

20 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h"	20 #include "third_party/WebKit/public/platform/WebURLResponse.h"

21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"	21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"

22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"	22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"

23 #include "webkit/media/buffered_resource_loader.h"	23 #include "webkit/media/buffered_resource_loader.h"

24 #include "webkit/mocks/mock_webframeclient.h"	24 #include "webkit/mocks/mock_webframeclient.h"

25 #include "webkit/mocks/mock_weburlloader.h"	25 #include "webkit/mocks/mock_weburlloader.h"

26	26

27 using ::testing::_;	27 using ::testing::_;

28 using ::testing::InSequence;	28 using ::testing::InSequence;

29 using ::testing::Return;	29 using ::testing::Return;

30 using ::testing::Truly;	30 using ::testing::Truly;

(...skipping 1091 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1122 ExpectContentRangeFailure("bytes 20-10/400");	1122 ExpectContentRangeFailure("bytes 20-10/400");

1123	1123

1124 ExpectContentRangeSuccess("bytes 0-499/500", 0, 499, 500);	1124 ExpectContentRangeSuccess("bytes 0-499/500", 0, 499, 500);

1125 ExpectContentRangeSuccess("bytes 0-0/500", 0, 0, 500);	1125 ExpectContentRangeSuccess("bytes 0-0/500", 0, 0, 500);

1126 ExpectContentRangeSuccess("bytes 10-11/50", 10, 11, 50);	1126 ExpectContentRangeSuccess("bytes 10-11/50", 10, 11, 50);

1127 ExpectContentRangeSuccess("bytes 10-11/*", 10, 11,	1127 ExpectContentRangeSuccess("bytes 10-11/*", 10, 11,

1128 kPositionNotSpecified);	1128 kPositionNotSpecified);

1129 }	1129 }

1130	1130

1131 } // namespace webkit_media	1131 } // namespace webkit_media

OLD	NEW