OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/ui/browser.h" | 6 #include "chrome/browser/ui/browser.h" |
7 #include "chrome/browser/ui/browser_finder.h" | 7 #include "chrome/browser/ui/browser_finder.h" |
8 #include "chrome/test/base/chrome_render_view_host_test_harness.h" | 8 #include "chrome/test/base/chrome_render_view_host_test_harness.h" |
9 #include "chrome/test/base/testing_profile.h" | 9 #include "chrome/test/base/testing_profile.h" |
10 #include "components/prefs/pref_service.h" | 10 #include "components/prefs/pref_service.h" |
(...skipping 23 matching lines...) Expand all Loading... |
34 content::RenderViewHostTester::For(rvh())->CreateTestRenderView( | 34 content::RenderViewHostTester::For(rvh())->CreateTestRenderView( |
35 base::string16(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, -1, false); | 35 base::string16(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, -1, false); |
36 } | 36 } |
37 | 37 |
38 void TearDown() override { | 38 void TearDown() override { |
39 zoom_controller_.reset(); | 39 zoom_controller_.reset(); |
40 ChromeRenderViewHostTestHarness::TearDown(); | 40 ChromeRenderViewHostTestHarness::TearDown(); |
41 } | 41 } |
42 | 42 |
43 protected: | 43 protected: |
44 scoped_ptr<ZoomController> zoom_controller_; | 44 std::unique_ptr<ZoomController> zoom_controller_; |
45 }; | 45 }; |
46 | 46 |
47 TEST_F(ZoomControllerTest, DidNavigateMainFrame) { | 47 TEST_F(ZoomControllerTest, DidNavigateMainFrame) { |
48 double zoom_level = zoom_controller_->GetZoomLevel(); | 48 double zoom_level = zoom_controller_->GetZoomLevel(); |
49 ZoomController::ZoomChangedEventData zoom_change_data( | 49 ZoomController::ZoomChangedEventData zoom_change_data( |
50 web_contents(), | 50 web_contents(), |
51 zoom_level, | 51 zoom_level, |
52 zoom_level, | 52 zoom_level, |
53 ZoomController::ZOOM_MODE_DEFAULT, | 53 ZoomController::ZOOM_MODE_DEFAULT, |
54 false); | 54 false); |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 ZoomController::ZOOM_MODE_MANUAL, | 124 ZoomController::ZOOM_MODE_MANUAL, |
125 false /* can_show_bubble */); | 125 false /* can_show_bubble */); |
126 { | 126 { |
127 ZoomChangedWatcher zoom_change_watcher2(zoom_controller_.get(), | 127 ZoomChangedWatcher zoom_change_watcher2(zoom_controller_.get(), |
128 zoom_change_data2); | 128 zoom_change_data2); |
129 zoom_controller_->SetZoomLevel(new_zoom_level2); | 129 zoom_controller_->SetZoomLevel(new_zoom_level2); |
130 zoom_change_watcher2.Wait(); | 130 zoom_change_watcher2.Wait(); |
131 } | 131 } |
132 | 132 |
133 } | 133 } |
OLD | NEW |