| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <memory> | 5 #include <memory> |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "services/navigation/public/interfaces/view.mojom.h" | 9 #include "services/navigation/public/interfaces/view.mojom.h" |
| 10 #include "services/shell/public/cpp/shell_client.h" | 10 #include "services/shell/public/cpp/shell_client.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 void NavigationListPruned(bool from_front, int count) override {} | 63 void NavigationListPruned(bool from_front, int count) override {} |
| 64 | 64 |
| 65 int load_count_ = 0; | 65 int load_count_ = 0; |
| 66 mojo::Binding<mojom::ViewClient> binding_; | 66 mojo::Binding<mojom::ViewClient> binding_; |
| 67 base::RunLoop* loop_ = nullptr; | 67 base::RunLoop* loop_ = nullptr; |
| 68 std::unique_ptr<shell::Connection> window_manager_connection_; | 68 std::unique_ptr<shell::Connection> window_manager_connection_; |
| 69 | 69 |
| 70 DISALLOW_COPY_AND_ASSIGN(NavigationTest); | 70 DISALLOW_COPY_AND_ASSIGN(NavigationTest); |
| 71 }; | 71 }; |
| 72 | 72 |
| 73 TEST_F(NavigationTest, Navigate) { | 73 // See crbug.com/619523 |
| 74 TEST_F(NavigationTest, DISABLED_Navigate) { |
| 74 mojom::ViewFactoryPtr view_factory; | 75 mojom::ViewFactoryPtr view_factory; |
| 75 connector()->ConnectToInterface("exe:navigation", &view_factory); | 76 connector()->ConnectToInterface("exe:navigation", &view_factory); |
| 76 | 77 |
| 77 mojom::ViewPtr view; | 78 mojom::ViewPtr view; |
| 78 view_factory->CreateView(GetViewClient(), GetProxy(&view)); | 79 view_factory->CreateView(GetViewClient(), GetProxy(&view)); |
| 79 view->NavigateTo(GURL("about:blank")); | 80 view->NavigateTo(GURL("about:blank")); |
| 80 | 81 |
| 81 base::RunLoop loop; | 82 base::RunLoop loop; |
| 82 QuitOnLoadingStateChange(&loop); | 83 QuitOnLoadingStateChange(&loop); |
| 83 loop.Run(); | 84 loop.Run(); |
| 84 } | 85 } |
| 85 | 86 |
| 86 } // namespace navigation | 87 } // namespace navigation |
| OLD | NEW |