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

Unified Diff: components/view_manager/view_manager_service_unittest.cc

Issue 1121783003: Move navigations with POST or referrer to the shell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/view_manager/view_manager_service_impl.cc ('k') | mandoline/ui/aura/surface_binding.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/view_manager/view_manager_service_unittest.cc
diff --git a/components/view_manager/view_manager_service_unittest.cc b/components/view_manager/view_manager_service_unittest.cc
index ba6414a8b413ba634f84e8f4930e9dc57aca59a6..7ed94d4e07380aa9d1dbefedfd1b6c21b6f75f6b 100644
--- a/components/view_manager/view_manager_service_unittest.cc
+++ b/components/view_manager/view_manager_service_unittest.cc
@@ -147,10 +147,10 @@ class TestConnectionManagerDelegate : public ConnectionManagerDelegate {
mojo::InterfaceRequest<mojo::ViewManagerService> service_request,
mojo::ConnectionSpecificId creator_id,
const std::string& creator_url,
- const std::string& url,
+ mojo::URLRequestPtr request,
const ViewId& root_id) override {
scoped_ptr<ViewManagerServiceImpl> service(new ViewManagerServiceImpl(
- connection_manager, creator_id, creator_url, url, root_id));
+ connection_manager, creator_id, creator_url, request->url, root_id));
last_connection_ = new TestClientConnection(service.Pass());
return last_connection_;
}
@@ -292,8 +292,9 @@ void SetUpAnimate1(ViewManagerServiceTest* test, ViewId* embed_view_id) {
EXPECT_TRUE(test->wm_connection()->SetViewVisibility(*embed_view_id, true));
EXPECT_TRUE(test->wm_connection()->AddView(*(test->wm_connection()->root()),
*embed_view_id));
- test->wm_connection()->EmbedUrl(std::string(), *embed_view_id, nullptr,
- nullptr);
+ mojo::URLRequestPtr request(mojo::URLRequest::New());
+ test->wm_connection()->EmbedRequest(request.Pass(), *embed_view_id, nullptr,
+ nullptr);
ViewManagerServiceImpl* connection1 =
test->connection_manager()->GetConnectionWithRoot(*embed_view_id);
ASSERT_TRUE(connection1 != nullptr);
@@ -429,7 +430,9 @@ TEST_F(ViewManagerServiceTest, CloneAndAnimateLargerDepth) {
EXPECT_TRUE(wm_connection()->SetViewVisibility(embed_view_id, true));
EXPECT_TRUE(
wm_connection()->AddView(*(wm_connection()->root()), embed_view_id));
- wm_connection()->EmbedUrl(std::string(), embed_view_id, nullptr, nullptr);
+ mojo::URLRequestPtr request(mojo::URLRequest::New());
+ wm_connection()->EmbedRequest(request.Pass(), embed_view_id, nullptr,
+ nullptr);
ViewManagerServiceImpl* connection1 =
connection_manager()->GetConnectionWithRoot(embed_view_id);
ASSERT_TRUE(connection1 != nullptr);
@@ -476,7 +479,9 @@ TEST_F(ViewManagerServiceTest, FocusOnPointer) {
EXPECT_TRUE(
wm_connection()->AddView(*(wm_connection()->root()), embed_view_id));
connection_manager()->root()->SetBounds(gfx::Rect(0, 0, 100, 100));
- wm_connection()->EmbedUrl(std::string(), embed_view_id, nullptr, nullptr);
+ mojo::URLRequestPtr request(mojo::URLRequest::New());
+ wm_connection()->EmbedRequest(request.Pass(), embed_view_id, nullptr,
+ nullptr);
ViewManagerServiceImpl* connection1 =
connection_manager()->GetConnectionWithRoot(embed_view_id);
ASSERT_TRUE(connection1 != nullptr);
« no previous file with comments | « components/view_manager/view_manager_service_impl.cc ('k') | mandoline/ui/aura/surface_binding.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698