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

Side by Side Diff: content/renderer/media/android/media_info_loader_unittest.cc

Issue 408873004: Fix for cross-origin video check for webgl on android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix clang warnings Created 6 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "content/renderer/media/android/media_info_loader.h" 7 #include "content/renderer/media/android/media_info_loader.h"
8 #include "content/test/mock_webframeclient.h" 8 #include "content/test/mock_webframeclient.h"
9 #include "content/test/mock_weburlloader.h" 9 #include "content/test/mock_weburlloader.h"
10 #include "third_party/WebKit/public/platform/WebMediaPlayer.h" 10 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 blink::WebURLRequest new_request(redirect_url); 79 blink::WebURLRequest new_request(redirect_url);
80 blink::WebURLResponse redirect_response(gurl_); 80 blink::WebURLResponse redirect_response(gurl_);
81 81
82 loader_->willSendRequest(url_loader_, new_request, redirect_response); 82 loader_->willSendRequest(url_loader_, new_request, redirect_response);
83 83
84 base::MessageLoop::current()->RunUntilIdle(); 84 base::MessageLoop::current()->RunUntilIdle();
85 } 85 }
86 86
87 void SendResponse( 87 void SendResponse(
88 int http_status, MediaInfoLoader::Status expected_status) { 88 int http_status, MediaInfoLoader::Status expected_status) {
89 EXPECT_CALL(*this, ReadyCallback(expected_status)); 89 EXPECT_CALL(*this, ReadyCallback(expected_status, _, _, _));
90 EXPECT_CALL(*url_loader_, cancel()); 90 EXPECT_CALL(*url_loader_, cancel());
91 91
92 WebURLResponse response(gurl_); 92 WebURLResponse response(gurl_);
93 response.setHTTPHeaderField(WebString::fromUTF8("Content-Length"), 93 response.setHTTPHeaderField(WebString::fromUTF8("Content-Length"),
94 WebString::fromUTF8("0")); 94 WebString::fromUTF8("0"));
95 response.setExpectedContentLength(0); 95 response.setExpectedContentLength(0);
96 response.setHTTPStatusCode(http_status); 96 response.setHTTPStatusCode(http_status);
97 loader_->didReceiveResponse(url_loader_, response); 97 loader_->didReceiveResponse(url_loader_, response);
98 } 98 }
99 99
100 void FailLoad() { 100 void FailLoad() {
101 EXPECT_CALL(*this, ReadyCallback(MediaInfoLoader::kFailed)); 101 EXPECT_CALL(*this, ReadyCallback(
102 MediaInfoLoader::kFailed, _, _, _));
102 loader_->didFail(url_loader_, WebURLError()); 103 loader_->didFail(url_loader_, WebURLError());
103 } 104 }
104 105
105 MOCK_METHOD1(ReadyCallback, void(MediaInfoLoader::Status)); 106 MOCK_METHOD4(ReadyCallback,
107 void(MediaInfoLoader::Status, const GURL&, const GURL&, bool));
106 108
107 protected: 109 protected:
108 GURL gurl_; 110 GURL gurl_;
109 111
110 scoped_ptr<MediaInfoLoader> loader_; 112 scoped_ptr<MediaInfoLoader> loader_;
111 NiceMock<MockWebURLLoader>* url_loader_; 113 NiceMock<MockWebURLLoader>* url_loader_;
112 114
113 MockWebFrameClient client_; 115 MockWebFrameClient client_;
114 WebView* view_; 116 WebView* view_;
115 WebLocalFrame* frame_; 117 WebLocalFrame* frame_;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 } 194 }
193 195
194 TEST_F(MediaInfoLoaderTest, CORSAccessCheckFailed) { 196 TEST_F(MediaInfoLoaderTest, CORSAccessCheckFailed) {
195 Initialize(kHttpUrl, blink::WebMediaPlayer::CORSModeUseCredentials); 197 Initialize(kHttpUrl, blink::WebMediaPlayer::CORSModeUseCredentials);
196 Start(); 198 Start();
197 SendResponse(kHttpNotFound, MediaInfoLoader::kFailed); 199 SendResponse(kHttpNotFound, MediaInfoLoader::kFailed);
198 EXPECT_FALSE(loader_->DidPassCORSAccessCheck()); 200 EXPECT_FALSE(loader_->DidPassCORSAccessCheck());
199 } 201 }
200 202
201 } // namespace content 203 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698