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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/presentation/presentation_service_impl_unittest.cc

Issue 2622993002: [Presentation API] Move presentation.mojom to content/common/presentation (Closed)
Patch Set: Fix #include and OWNERS Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/presentation/presentation_service_impl.cc ('k') | content/browser/presentation/presentation_type_converters.h » ('j') | content/public/common/presentation_session.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/presentation/presentation_service_impl_unittest.cc
diff --git a/content/browser/presentation/presentation_service_impl_unittest.cc b/content/browser/presentation/presentation_service_impl_unittest.cc
index fbe3bb79509d1e72c75466c80c1345e1d80d6435..be68bf00c6c0cac84f21f61e953559d115e8ce89 100644
--- a/content/browser/presentation/presentation_service_impl_unittest.cc
+++ b/content/browser/presentation/presentation_service_impl_unittest.cc
@@ -45,7 +45,7 @@ MATCHER_P(Equals, expected, "") {
// Matches PresentationSessionInfo passed by reference.
MATCHER_P(SessionInfoEquals, expected, "") {
- blink::mojom::PresentationSessionInfo& expected_value = expected;
+ content::mojom::PresentationSessionInfo& expected_value = expected;
return expected_value.Equals(arg);
}
@@ -54,8 +54,8 @@ const char kPresentationUrl1[] = "http://foo.com/index.html";
const char kPresentationUrl2[] = "http://example.com/index.html";
const char kPresentationUrl3[] = "http://example.net/index.html";
-void DoNothing(blink::mojom::PresentationSessionInfoPtr info,
- blink::mojom::PresentationErrorPtr error) {}
+void DoNothing(content::mojom::PresentationSessionInfoPtr info,
+ content::mojom::PresentationErrorPtr error) {}
} // namespace
@@ -148,55 +148,57 @@ class MockPresentationServiceDelegate : public PresentationServiceDelegate {
};
class MockPresentationServiceClient
- : public blink::mojom::PresentationServiceClient {
+ : public content::mojom::PresentationServiceClient {
public:
MOCK_METHOD2(OnScreenAvailabilityUpdated,
void(const GURL& url, bool available));
void OnConnectionStateChanged(
- blink::mojom::PresentationSessionInfoPtr connection,
- blink::mojom::PresentationConnectionState new_state) override {
+ content::mojom::PresentationSessionInfoPtr connection,
+ content::mojom::PresentationConnectionState new_state) override {
OnConnectionStateChanged(*connection, new_state);
}
MOCK_METHOD2(OnConnectionStateChanged,
- void(const blink::mojom::PresentationSessionInfo& connection,
- blink::mojom::PresentationConnectionState new_state));
+ void(const content::mojom::PresentationSessionInfo& connection,
+ content::mojom::PresentationConnectionState new_state));
void OnConnectionClosed(
- blink::mojom::PresentationSessionInfoPtr connection,
- blink::mojom::PresentationConnectionCloseReason reason,
+ content::mojom::PresentationSessionInfoPtr connection,
+ content::mojom::PresentationConnectionCloseReason reason,
const std::string& message) override {
OnConnectionClosed(*connection, reason, message);
}
MOCK_METHOD3(OnConnectionClosed,
- void(const blink::mojom::PresentationSessionInfo& connection,
- blink::mojom::PresentationConnectionCloseReason reason,
+ void(const content::mojom::PresentationSessionInfo& connection,
+ content::mojom::PresentationConnectionCloseReason reason,
const std::string& message));
MOCK_METHOD1(OnScreenAvailabilityNotSupported, void(const GURL& url));
void OnConnectionMessagesReceived(
- blink::mojom::PresentationSessionInfoPtr session_info,
- std::vector<blink::mojom::ConnectionMessagePtr> messages) override {
+ content::mojom::PresentationSessionInfoPtr session_info,
+ std::vector<content::mojom::ConnectionMessagePtr> messages) override {
messages_received_ = std::move(messages);
MessagesReceived();
}
MOCK_METHOD0(MessagesReceived, void());
void OnDefaultSessionStarted(
- blink::mojom::PresentationSessionInfoPtr session_info) override {
+ content::mojom::PresentationSessionInfoPtr session_info) override {
OnDefaultSessionStarted(*session_info);
}
- MOCK_METHOD1(OnDefaultSessionStarted,
- void(const blink::mojom::PresentationSessionInfo& session_info));
+ MOCK_METHOD1(
+ OnDefaultSessionStarted,
+ void(const content::mojom::PresentationSessionInfo& session_info));
void OnReceiverConnectionAvailable(
- blink::mojom::PresentationSessionInfoPtr session_info) override {
+ content::mojom::PresentationSessionInfoPtr session_info) override {
OnReceiverConnectionAvailable(*session_info);
}
- MOCK_METHOD1(OnReceiverConnectionAvailable,
- void(const blink::mojom::PresentationSessionInfo& session_info));
+ MOCK_METHOD1(
+ OnReceiverConnectionAvailable,
+ void(const content::mojom::PresentationSessionInfo& session_info));
- std::vector<blink::mojom::ConnectionMessagePtr> messages_received_;
+ std::vector<content::mojom::ConnectionMessagePtr> messages_received_;
};
class PresentationServiceImplTest : public RenderViewHostImplTestHarness {
@@ -217,9 +219,9 @@ class PresentationServiceImplTest : public RenderViewHostImplTestHarness {
render_frame_host, contents(), &mock_delegate_));
service_impl_->Bind(std::move(request));
- blink::mojom::PresentationServiceClientPtr client_ptr;
+ content::mojom::PresentationServiceClientPtr client_ptr;
client_binding_.reset(
- new mojo::Binding<blink::mojom::PresentationServiceClient>(
+ new mojo::Binding<content::mojom::PresentationServiceClient>(
&mock_client_, mojo::MakeRequest(&client_ptr)));
service_impl_->SetClient(std::move(client_ptr));
@@ -292,8 +294,8 @@ class PresentationServiceImplTest : public RenderViewHostImplTestHarness {
}
void ExpectNewSessionCallbackSuccess(
- blink::mojom::PresentationSessionInfoPtr info,
- blink::mojom::PresentationErrorPtr error) {
+ content::mojom::PresentationSessionInfoPtr info,
+ content::mojom::PresentationErrorPtr error) {
EXPECT_FALSE(info.is_null());
EXPECT_TRUE(error.is_null());
if (!run_loop_quit_closure_.is_null())
@@ -301,8 +303,8 @@ class PresentationServiceImplTest : public RenderViewHostImplTestHarness {
}
void ExpectNewSessionCallbackError(
- blink::mojom::PresentationSessionInfoPtr info,
- blink::mojom::PresentationErrorPtr error) {
+ content::mojom::PresentationSessionInfoPtr info,
+ content::mojom::PresentationErrorPtr error) {
EXPECT_TRUE(info.is_null());
EXPECT_FALSE(error.is_null());
if (!run_loop_quit_closure_.is_null())
@@ -310,8 +312,8 @@ class PresentationServiceImplTest : public RenderViewHostImplTestHarness {
}
void ExpectConnectionMessages(
- const std::vector<blink::mojom::ConnectionMessagePtr>& expected_msgs,
- const std::vector<blink::mojom::ConnectionMessagePtr>& actual_msgs) {
+ const std::vector<content::mojom::ConnectionMessagePtr>& expected_msgs,
+ const std::vector<content::mojom::ConnectionMessagePtr>& actual_msgs) {
EXPECT_EQ(expected_msgs.size(), actual_msgs.size());
for (size_t i = 0; i < actual_msgs.size(); ++i)
EXPECT_TRUE(expected_msgs[i].Equals(actual_msgs[i]));
@@ -327,16 +329,16 @@ class PresentationServiceImplTest : public RenderViewHostImplTestHarness {
void RunListenForConnectionMessages(const std::string& text_msg,
const std::vector<uint8_t>& binary_data,
bool pass_ownership) {
- std::vector<blink::mojom::ConnectionMessagePtr> expected_msgs(2);
- expected_msgs[0] = blink::mojom::ConnectionMessage::New();
- expected_msgs[0]->type = blink::mojom::PresentationMessageType::TEXT;
+ std::vector<content::mojom::ConnectionMessagePtr> expected_msgs(2);
+ expected_msgs[0] = content::mojom::ConnectionMessage::New();
+ expected_msgs[0]->type = content::mojom::PresentationMessageType::TEXT;
expected_msgs[0]->message = text_msg;
- expected_msgs[1] = blink::mojom::ConnectionMessage::New();
- expected_msgs[1]->type = blink::mojom::PresentationMessageType::BINARY;
+ expected_msgs[1] = content::mojom::ConnectionMessage::New();
+ expected_msgs[1]->type = content::mojom::PresentationMessageType::BINARY;
expected_msgs[1]->data = binary_data;
- blink::mojom::PresentationSessionInfoPtr session(
- blink::mojom::PresentationSessionInfo::New());
+ content::mojom::PresentationSessionInfoPtr session(
+ content::mojom::PresentationSessionInfo::New());
session->url = presentation_url1_;
session->id = kPresentationId;
@@ -361,7 +363,7 @@ class PresentationServiceImplTest : public RenderViewHostImplTestHarness {
message->data.reset(new std::vector<uint8_t>(binary_data));
messages.push_back(std::move(message));
- std::vector<blink::mojom::ConnectionMessagePtr> actual_msgs;
+ std::vector<content::mojom::ConnectionMessagePtr> actual_msgs;
{
base::RunLoop run_loop;
EXPECT_CALL(mock_client_, MessagesReceived())
@@ -375,10 +377,10 @@ class PresentationServiceImplTest : public RenderViewHostImplTestHarness {
MockPresentationServiceDelegate mock_delegate_;
std::unique_ptr<PresentationServiceImpl> service_impl_;
- mojo::InterfacePtr<blink::mojom::PresentationService> service_ptr_;
+ mojo::InterfacePtr<content::mojom::PresentationService> service_ptr_;
MockPresentationServiceClient mock_client_;
- std::unique_ptr<mojo::Binding<blink::mojom::PresentationServiceClient>>
+ std::unique_ptr<mojo::Binding<content::mojom::PresentationServiceClient>>
client_binding_;
base::Closure run_loop_quit_closure_;
@@ -475,7 +477,7 @@ TEST_F(PresentationServiceImplTest, SetDefaultPresentationUrls) {
.WillOnce(SaveArg<3>(&callback));
service_impl_->SetDefaultPresentationUrls(more_urls);
- blink::mojom::PresentationSessionInfo session_info;
+ content::mojom::PresentationSessionInfo session_info;
session_info.url = presentation_url2_;
session_info.id = kPresentationId;
@@ -495,7 +497,7 @@ TEST_F(PresentationServiceImplTest,
kPresentationId);
content::PresentationConnectionStateChangedCallback state_changed_cb;
// Trigger state change. It should be propagated back up to |mock_client_|.
- blink::mojom::PresentationSessionInfo presentation_connection;
+ content::mojom::PresentationSessionInfo presentation_connection;
presentation_connection.url = presentation_url1_;
presentation_connection.id = kPresentationId;
@@ -504,7 +506,7 @@ TEST_F(PresentationServiceImplTest,
EXPECT_CALL(mock_client_,
OnConnectionStateChanged(
SessionInfoEquals(ByRef(presentation_connection)),
- blink::mojom::PresentationConnectionState::CONNECTED));
+ content::mojom::PresentationConnectionState::CONNECTED));
service_impl_->ListenForConnectionStateChangeAndChangeState(connection);
{
@@ -512,7 +514,7 @@ TEST_F(PresentationServiceImplTest,
EXPECT_CALL(mock_client_,
OnConnectionStateChanged(
SessionInfoEquals(ByRef(presentation_connection)),
- blink::mojom::PresentationConnectionState::TERMINATED))
+ content::mojom::PresentationConnectionState::TERMINATED))
.WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
state_changed_cb.Run(PresentationConnectionStateChangeInfo(
PRESENTATION_CONNECTION_STATE_TERMINATED));
@@ -530,7 +532,7 @@ TEST_F(PresentationServiceImplTest, ListenForConnectionClose) {
// Trigger connection close. It should be propagated back up to
// |mock_client_|.
- blink::mojom::PresentationSessionInfo presentation_connection;
+ content::mojom::PresentationSessionInfo presentation_connection;
presentation_connection.url = presentation_url1_;
presentation_connection.id = kPresentationId;
{
@@ -544,7 +546,8 @@ TEST_F(PresentationServiceImplTest, ListenForConnectionClose) {
mock_client_,
OnConnectionClosed(
SessionInfoEquals(ByRef(presentation_connection)),
- blink::mojom::PresentationConnectionCloseReason::WENT_AWAY, "Foo"))
+ content::mojom::PresentationConnectionCloseReason::WENT_AWAY,
+ "Foo"))
.WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
state_changed_cb.Run(closed_info);
run_loop.Run();
@@ -683,13 +686,13 @@ TEST_F(PresentationServiceImplTest, StartSessionInProgress) {
TEST_F(PresentationServiceImplTest, SendStringMessage) {
std::string message("Test presentation session message");
- blink::mojom::PresentationSessionInfoPtr session(
- blink::mojom::PresentationSessionInfo::New());
+ content::mojom::PresentationSessionInfoPtr session(
+ content::mojom::PresentationSessionInfo::New());
session->url = presentation_url1_;
session->id = kPresentationId;
- blink::mojom::ConnectionMessagePtr message_request(
- blink::mojom::ConnectionMessage::New());
- message_request->type = blink::mojom::PresentationMessageType::TEXT;
+ content::mojom::ConnectionMessagePtr message_request(
+ content::mojom::ConnectionMessage::New());
+ message_request->type = content::mojom::PresentationMessageType::TEXT;
message_request->message = message;
service_ptr_->SendConnectionMessage(
std::move(session), std::move(message_request),
@@ -724,13 +727,13 @@ TEST_F(PresentationServiceImplTest, SendArrayBuffer) {
std::vector<uint8_t> data;
data.assign(buffer, buffer + sizeof(buffer));
- blink::mojom::PresentationSessionInfoPtr session(
- blink::mojom::PresentationSessionInfo::New());
+ content::mojom::PresentationSessionInfoPtr session(
+ content::mojom::PresentationSessionInfo::New());
session->url = presentation_url1_;
session->id = kPresentationId;
- blink::mojom::ConnectionMessagePtr message_request(
- blink::mojom::ConnectionMessage::New());
- message_request->type = blink::mojom::PresentationMessageType::BINARY;
+ content::mojom::ConnectionMessagePtr message_request(
+ content::mojom::ConnectionMessage::New());
+ message_request->type = content::mojom::PresentationMessageType::BINARY;
message_request->data = data;
service_ptr_->SendConnectionMessage(
std::move(session), std::move(message_request),
@@ -770,13 +773,13 @@ TEST_F(PresentationServiceImplTest, SendArrayBufferWithExceedingLimit) {
std::vector<uint8_t> data;
data.assign(buffer, buffer + sizeof(buffer));
- blink::mojom::PresentationSessionInfoPtr session(
- blink::mojom::PresentationSessionInfo::New());
+ content::mojom::PresentationSessionInfoPtr session(
+ content::mojom::PresentationSessionInfo::New());
session->url = presentation_url1_;
session->id = kPresentationId;
- blink::mojom::ConnectionMessagePtr message_request(
- blink::mojom::ConnectionMessage::New());
- message_request->type = blink::mojom::PresentationMessageType::BINARY;
+ content::mojom::ConnectionMessagePtr message_request(
+ content::mojom::ConnectionMessage::New());
+ message_request->type = content::mojom::PresentationMessageType::BINARY;
message_request->data = data;
service_ptr_->SendConnectionMessage(
std::move(session), std::move(message_request),
@@ -802,13 +805,13 @@ TEST_F(PresentationServiceImplTest, SendBlobData) {
std::vector<uint8_t> data;
data.assign(buffer, buffer + sizeof(buffer));
- blink::mojom::PresentationSessionInfoPtr session(
- blink::mojom::PresentationSessionInfo::New());
+ content::mojom::PresentationSessionInfoPtr session(
+ content::mojom::PresentationSessionInfo::New());
session->url = presentation_url1_;
session->id = kPresentationId;
- blink::mojom::ConnectionMessagePtr message_request(
- blink::mojom::ConnectionMessage::New());
- message_request->type = blink::mojom::PresentationMessageType::BINARY;
+ content::mojom::ConnectionMessagePtr message_request(
+ content::mojom::ConnectionMessage::New());
+ message_request->type = content::mojom::PresentationMessageType::BINARY;
message_request->data = data;
service_ptr_->SendConnectionMessage(
std::move(session), std::move(message_request),
« no previous file with comments | « content/browser/presentation/presentation_service_impl.cc ('k') | content/browser/presentation/presentation_type_converters.h » ('j') | content/public/common/presentation_session.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698