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

Side by Side Diff: blimp/engine/browser_tests/engine_browsertest.cc

Issue 2256363003: Clean up thread handling in Blimp browser tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wez feedback Created 4 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/memory/ptr_util.h" 5 #include "base/memory/ptr_util.h"
6 #include "blimp/client/core/contents/ime_feature.h" 6 #include "blimp/client/core/contents/ime_feature.h"
7 #include "blimp/client/core/contents/mock_ime_feature_delegate.h" 7 #include "blimp/client/core/contents/mock_ime_feature_delegate.h"
8 #include "blimp/client/core/contents/mock_navigation_feature_delegate.h" 8 #include "blimp/client/core/contents/mock_navigation_feature_delegate.h"
9 #include "blimp/client/core/contents/navigation_feature.h" 9 #include "blimp/client/core/contents/navigation_feature.h"
10 #include "blimp/client/core/contents/tab_control_feature.h" 10 #include "blimp/client/core/contents/tab_control_feature.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 testing::InSequence s; 63 testing::InSequence s;
64 64
65 EXPECT_TRUE(embedded_test_server()->Start()); 65 EXPECT_TRUE(embedded_test_server()->Start());
66 GURL url = embedded_test_server()->GetURL("/hello.html"); 66 GURL url = embedded_test_server()->GetURL("/hello.html");
67 67
68 EXPECT_CALL(client_rw_feature_delegate_, OnRenderWidgetCreated(1)); 68 EXPECT_CALL(client_rw_feature_delegate_, OnRenderWidgetCreated(1));
69 EXPECT_CALL(client_nav_feature_delegate_, 69 EXPECT_CALL(client_nav_feature_delegate_,
70 OnTitleChanged(kDummyTabId, url.GetContent())); 70 OnTitleChanged(kDummyTabId, url.GetContent()));
71 EXPECT_CALL(client_nav_feature_delegate_, 71 EXPECT_CALL(client_nav_feature_delegate_,
72 OnTitleChanged(kDummyTabId, "hello")) 72 OnTitleChanged(kDummyTabId, "hello"))
73 .WillOnce(InvokeWithoutArgs(this, &EngineBrowserTest::QuitRunLoop)); 73 .WillOnce(InvokeWithoutArgs(this, &EngineBrowserTest::SignalCompletion));
74 74
75 // Skip assigner. Engine info is already available. 75 // Skip assigner. Engine info is already available.
76 client_session_->ConnectWithAssignment(client::ASSIGNMENT_REQUEST_RESULT_OK, 76 client_session_->ConnectWithAssignment(client::ASSIGNMENT_REQUEST_RESULT_OK,
77 GetAssignment()); 77 GetAssignment());
78 client_session_->GetTabControlFeature()->SetSizeAndScale(gfx::Size(100, 100), 78 client_session_->GetTabControlFeature()->SetSizeAndScale(gfx::Size(100, 100),
79 1); 79 1);
80 client_session_->GetTabControlFeature()->CreateTab(kDummyTabId); 80 client_session_->GetTabControlFeature()->CreateTab(kDummyTabId);
81 client_session_->GetNavigationFeature()->NavigateToUrlText(kDummyTabId, 81 client_session_->GetNavigationFeature()->NavigateToUrlText(kDummyTabId,
82 url.spec()); 82 url.spec());
83 83
84 RunUntilQuit(); 84 RunUntilCompletion();
85 } 85 }
86 86
87 } // namespace 87 } // namespace
88 } // namespace blimp 88 } // namespace blimp
OLDNEW
« no previous file with comments | « blimp/engine/browser_tests/blimp_browser_test.cc ('k') | blimp/engine/mojo/blob_channel_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698