Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/session/assignment_source.h" | 6 #include "blimp/client/core/session/assignment_source.h" |
| 7 #include "blimp/client/feature/ime_feature.h" | 7 #include "blimp/client/feature/ime_feature.h" |
| 8 #include "blimp/client/feature/mock_ime_feature_delegate.h" | 8 #include "blimp/client/feature/mock_ime_feature_delegate.h" |
| 9 #include "blimp/client/feature/mock_navigation_feature_delegate.h" | 9 #include "blimp/client/feature/mock_navigation_feature_delegate.h" |
| 10 #include "blimp/client/feature/mock_render_widget_feature_delegate.h" | 10 #include "blimp/client/feature/mock_render_widget_feature_delegate.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 51 | 51 |
| 52 client::MockNavigationFeatureDelegate client_nav_feature_delegate_; | 52 client::MockNavigationFeatureDelegate client_nav_feature_delegate_; |
| 53 client::MockRenderWidgetFeatureDelegate client_rw_feature_delegate_; | 53 client::MockRenderWidgetFeatureDelegate client_rw_feature_delegate_; |
| 54 client::MockImeFeatureDelegate client_ime_feature_delegate_; | 54 client::MockImeFeatureDelegate client_ime_feature_delegate_; |
| 55 std::unique_ptr<client::TestClientSession> client_session_; | 55 std::unique_ptr<client::TestClientSession> client_session_; |
| 56 | 56 |
| 57 private: | 57 private: |
| 58 DISALLOW_COPY_AND_ASSIGN(EngineBrowserTest); | 58 DISALLOW_COPY_AND_ASSIGN(EngineBrowserTest); |
| 59 }; | 59 }; |
| 60 | 60 |
| 61 IN_PROC_BROWSER_TEST_F(EngineBrowserTest, LoadUrl) { | 61 IN_PROC_BROWSER_TEST_F(EngineBrowserTest, LoadUrl) { |
|
Kevin M
2016/08/05 23:30:17
Consider adding a "testing::InSequence s" here to
Brian Goldman
2016/08/06 17:21:14
Done.
| |
| 62 EXPECT_TRUE(embedded_test_server()->Start()); | 62 EXPECT_TRUE(embedded_test_server()->Start()); |
| 63 GURL url = embedded_test_server()->GetURL("/hello.html"); | 63 GURL url = embedded_test_server()->GetURL("/hello.html"); |
| 64 | 64 |
| 65 EXPECT_CALL(client_rw_feature_delegate_, OnRenderWidgetCreated(1)); | 65 EXPECT_CALL(client_rw_feature_delegate_, OnRenderWidgetCreated(1)); |
| 66 EXPECT_CALL(client_nav_feature_delegate_, OnUrlChanged(kDummyTabId, url)) | 66 EXPECT_CALL(client_nav_feature_delegate_, |
| 67 OnTitleChanged(kDummyTabId, url.GetContent())); | |
| 68 EXPECT_CALL(client_nav_feature_delegate_, | |
| 69 OnTitleChanged(kDummyTabId, "hello")) | |
| 67 .WillOnce(InvokeWithoutArgs(this, &EngineBrowserTest::QuitRunLoop)); | 70 .WillOnce(InvokeWithoutArgs(this, &EngineBrowserTest::QuitRunLoop)); |
| 68 | 71 |
| 69 // Skip assigner. Engine info is already available. | 72 // Skip assigner. Engine info is already available. |
| 70 client_session_->ConnectWithAssignment( | 73 client_session_->ConnectWithAssignment( |
| 71 client::AssignmentSource::Result::RESULT_OK, GetAssignment()); | 74 client::AssignmentSource::Result::RESULT_OK, GetAssignment()); |
| 72 client_session_->GetTabControlFeature()->SetSizeAndScale(gfx::Size(100, 100), | 75 client_session_->GetTabControlFeature()->SetSizeAndScale(gfx::Size(100, 100), |
| 73 1); | 76 1); |
| 74 client_session_->GetTabControlFeature()->CreateTab(kDummyTabId); | 77 client_session_->GetTabControlFeature()->CreateTab(kDummyTabId); |
| 75 client_session_->GetNavigationFeature()->NavigateToUrlText(kDummyTabId, | 78 client_session_->GetNavigationFeature()->NavigateToUrlText(kDummyTabId, |
| 76 url.spec()); | 79 url.spec()); |
| 77 | 80 |
| 78 RunUntilQuit(); | 81 RunUntilQuit(); |
| 79 } | 82 } |
| 80 | 83 |
| 81 } // namespace | 84 } // namespace |
| 82 } // namespace blimp | 85 } // namespace blimp |
| OLD | NEW |