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

Unified Diff: mojo/services/view_manager/view_manager_connection_unittest.cc

Issue 322923002: Pass embedding app identity through at embed time (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 6 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 | « mojo/services/view_manager/view_manager_connection.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/view_manager/view_manager_connection_unittest.cc
diff --git a/mojo/services/view_manager/view_manager_connection_unittest.cc b/mojo/services/view_manager/view_manager_connection_unittest.cc
index 431affade9e5bfb8752bcf1750d20c90dfc620a3..8dcafec51f7606d1ac9e28128da1b1c7fabfd0c3 100644
--- a/mojo/services/view_manager/view_manager_connection_unittest.cc
+++ b/mojo/services/view_manager/view_manager_connection_unittest.cc
@@ -279,10 +279,11 @@ class TestViewManagerClientConnection
// IViewMangerClient:
virtual void OnViewManagerConnectionEstablished(
ConnectionSpecificId connection_id,
+ const String& creator_url,
Id next_server_change_id,
Array<INodePtr> nodes) OVERRIDE {
tracker_.OnViewManagerConnectionEstablished(
- connection_id, next_server_change_id, nodes.Pass());
+ connection_id, creator_url, next_server_change_id, nodes.Pass());
}
virtual void OnRootsAdded(Array<INodePtr> nodes) OVERRIDE {
tracker_.OnRootsAdded(nodes.Pass());
@@ -441,7 +442,8 @@ class ViewManagerConnectionTest : public testing::Test {
EstablishSecondConnectionWithRoots(BuildNodeId(1, 1), 0));
const std::vector<Change>& changes(connection2_->changes());
ASSERT_EQ(1u, changes.size());
- EXPECT_EQ("OnConnectionEstablished", ChangesToDescription1(changes)[0]);
+ EXPECT_EQ("OnConnectionEstablished creator=mojo:test_url",
+ ChangesToDescription1(changes)[0]);
if (create_initial_node) {
EXPECT_EQ("[node=1,1 parent=null view=null]",
ChangeNodeDescription(changes));
@@ -466,7 +468,9 @@ class ViewManagerConnectionTest : public testing::Test {
// Verifies client gets a valid id.
TEST_F(ViewManagerConnectionTest, ValidId) {
- EXPECT_EQ("OnConnectionEstablished",
+ // TODO(beng): this should really have the URL of the application that
+ // connected to ViewManagerInit.
+ EXPECT_EQ("OnConnectionEstablished creator=",
ChangesToDescription1(connection_->changes())[0]);
// All these tests assume 1 for the client id. The only real assertion here is
@@ -480,7 +484,7 @@ TEST_F(ViewManagerConnectionTest, ValidId) {
// Verifies two clients/connections get different ids.
TEST_F(ViewManagerConnectionTest, TwoClientsGetDifferentConnectionIds) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
- EXPECT_EQ("OnConnectionEstablished",
+ EXPECT_EQ("OnConnectionEstablished creator=mojo:test_url",
ChangesToDescription1(connection2_->changes())[0]);
// It isn't strickly necessary that the second connection gets 2, but these
@@ -1044,7 +1048,7 @@ TEST_F(ViewManagerConnectionTest, SetRoots) {
BuildNodeId(1, 1), BuildNodeId(1, 3)));
const Changes changes(ChangesToDescription1(connection2_->changes()));
ASSERT_EQ(1u, changes.size());
- EXPECT_EQ("OnConnectionEstablished", changes[0]);
+ EXPECT_EQ("OnConnectionEstablished creator=mojo:test_url", changes[0]);
EXPECT_EQ("[node=1,1 parent=null view=null],"
"[node=1,3 parent=null view=null]",
ChangeNodeDescription(connection2_->changes()));
« no previous file with comments | « mojo/services/view_manager/view_manager_connection.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698