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/message_loop/message_loop.h" | 5 #include "base/message_loop/message_loop.h" |
| 6 #include "base/run_loop.h" |
6 #include "blimp/client/core/contents/blimp_navigation_controller_delegate.h" | 7 #include "blimp/client/core/contents/blimp_navigation_controller_delegate.h" |
7 #include "blimp/client/core/contents/blimp_navigation_controller_impl.h" | 8 #include "blimp/client/core/contents/blimp_navigation_controller_impl.h" |
8 #include "blimp/client/core/contents/fake_navigation_feature.h" | 9 #include "blimp/client/core/contents/fake_navigation_feature.h" |
9 #include "testing/gmock/include/gmock/gmock.h" | 10 #include "testing/gmock/include/gmock/gmock.h" |
10 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
11 | 12 |
12 using testing::_; | 13 using testing::_; |
13 | 14 |
14 namespace blimp { | 15 namespace blimp { |
15 namespace client { | 16 namespace client { |
(...skipping 28 matching lines...) Expand all Loading... |
44 EXPECT_EQ(kExampleURL, navigation_controller.GetURL()); | 45 EXPECT_EQ(kExampleURL, navigation_controller.GetURL()); |
45 | 46 |
46 EXPECT_CALL(feature, GoBack(_)); | 47 EXPECT_CALL(feature, GoBack(_)); |
47 EXPECT_CALL(feature, GoForward(_)); | 48 EXPECT_CALL(feature, GoForward(_)); |
48 EXPECT_CALL(feature, Reload(_)); | 49 EXPECT_CALL(feature, Reload(_)); |
49 | 50 |
50 navigation_controller.GoBack(); | 51 navigation_controller.GoBack(); |
51 navigation_controller.GoForward(); | 52 navigation_controller.GoForward(); |
52 navigation_controller.Reload(); | 53 navigation_controller.Reload(); |
53 | 54 |
54 loop.RunUntilIdle(); | 55 base::RunLoop().RunUntilIdle(); |
55 } | 56 } |
56 | 57 |
57 } // namespace | 58 } // namespace |
58 } // namespace client | 59 } // namespace client |
59 } // namespace blimp | 60 } // namespace blimp |
OLD | NEW |