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

Side by Side Diff: chrome/browser/ui/zoom/zoom_controller_browsertest.cc

Issue 393133002: Migrate HostZoomMap to live in StoragePartition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to 291677. Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/ui/zoom/zoom_controller.h" 5 #include "chrome/browser/ui/zoom/zoom_controller.h"
6 6
7 #include "base/prefs/pref_service.h"
7 #include "base/process/kill.h" 8 #include "base/process/kill.h"
9 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/tabs/tab_strip_model.h" 11 #include "chrome/browser/ui/tabs/tab_strip_model.h"
12 #include "chrome/common/pref_names.h"
10 #include "chrome/test/base/in_process_browser_test.h" 13 #include "chrome/test/base/in_process_browser_test.h"
11 #include "chrome/test/base/ui_test_utils.h" 14 #include "chrome/test/base/ui_test_utils.h"
12 #include "content/public/browser/render_process_host.h" 15 #include "content/public/browser/render_process_host.h"
13 #include "content/public/browser/web_contents.h" 16 #include "content/public/browser/web_contents.h"
14 #include "content/public/test/browser_test_utils.h" 17 #include "content/public/test/browser_test_utils.h"
18 #include "testing/gmock/include/gmock/gmock.h"
15 19
16 typedef InProcessBrowserTest ZoomControllerBrowserTest; 20 bool operator==(const ZoomController::ZoomChangedEventData& lhs,
21 const ZoomController::ZoomChangedEventData& rhs) {
22 return lhs.web_contents == rhs.web_contents &&
23 lhs.old_zoom_level == rhs.old_zoom_level &&
24 lhs.new_zoom_level == rhs.new_zoom_level &&
25 lhs.zoom_mode == rhs.zoom_mode &&
26 lhs.can_show_bubble == rhs.can_show_bubble;
27 }
28
29 class ZoomChangedWatcher : public ZoomObserver {
30 public:
31 ZoomChangedWatcher(
32 content::WebContents* web_contents,
33 const ZoomController::ZoomChangedEventData& expected_event_data)
34 : web_contents_(web_contents),
35 expected_event_data_(expected_event_data),
36 message_loop_runner_(new content::MessageLoopRunner) {
37 ZoomController::FromWebContents(web_contents)->AddObserver(this);
38 }
39 virtual ~ZoomChangedWatcher() {}
40
41 void Wait() {
42 message_loop_runner_->Run();
43 }
44 virtual void OnZoomChanged(
45 const ZoomController::ZoomChangedEventData& event_data) OVERRIDE {
46 if (event_data == expected_event_data_)
47 message_loop_runner_->Quit();
48 }
49
50 private:
51 content::WebContents* web_contents_;
52 ZoomController::ZoomChangedEventData expected_event_data_;
53 scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
54
55 DISALLOW_COPY_AND_ASSIGN(ZoomChangedWatcher);
56 };
57
58 class TestZoomObserver : public ZoomObserver {
59 public:
60 MOCK_METHOD1(OnZoomChanged,
61 void(const ZoomController::ZoomChangedEventData&));
62 };
63
64 class ZoomControllerBrowserTest: public InProcessBrowserTest {
65 protected:
66 TestZoomObserver zoom_observer_;
67 };
17 68
18 // TODO(wjmaclean): Enable this on Android when we can kill the process there. 69 // TODO(wjmaclean): Enable this on Android when we can kill the process there.
19 #if defined(OS_ANDROID) 70 #if defined(OS_ANDROID)
20 #define MAYBE_CrashedTabsDoNotChangeZoom DISABLED_CrashedTabsDoNotChangeZoom 71 #define MAYBE_CrashedTabsDoNotChangeZoom DISABLED_CrashedTabsDoNotChangeZoom
21 #else 72 #else
22 #define MAYBE_CrashedTabsDoNotChangeZoom CrashedTabsDoNotChangeZoom 73 #define MAYBE_CrashedTabsDoNotChangeZoom CrashedTabsDoNotChangeZoom
23 #endif 74 #endif
24 IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest, 75 IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest,
25 MAYBE_CrashedTabsDoNotChangeZoom) { 76 MAYBE_CrashedTabsDoNotChangeZoom) {
26 // At the start of the test we are at a tab displaying about:blank. 77 // At the start of the test we are at a tab displaying about:blank.
(...skipping 13 matching lines...) Expand all
40 base::KillProcess(host->GetHandle(), 0, false); 91 base::KillProcess(host->GetHandle(), 0, false);
41 crash_observer.Wait(); 92 crash_observer.Wait();
42 } 93 }
43 EXPECT_FALSE(web_contents->GetRenderProcessHost()->HasConnection()); 94 EXPECT_FALSE(web_contents->GetRenderProcessHost()->HasConnection());
44 95
45 // The following attempt to change the zoom level for a crashed tab should 96 // The following attempt to change the zoom level for a crashed tab should
46 // fail. 97 // fail.
47 zoom_controller->SetZoomLevel(new_zoom_level); 98 zoom_controller->SetZoomLevel(new_zoom_level);
48 EXPECT_FLOAT_EQ(old_zoom_level, zoom_controller->GetZoomLevel()); 99 EXPECT_FLOAT_EQ(old_zoom_level, zoom_controller->GetZoomLevel());
49 } 100 }
101
102 IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest, OnPreferenceChanged) {
103 content::WebContents* web_contents =
104 browser()->tab_strip_model()->GetActiveWebContents();
105 double new_default_zoom_level = 1.0;
106 // Since this page uses the default zoom level, the changes to the default
107 // zoom level will change the zoom level for this web_contents.
108 ZoomController::ZoomChangedEventData zoom_change_data(
109 web_contents,
110 new_default_zoom_level,
111 new_default_zoom_level,
112 ZoomController::ZOOM_MODE_DEFAULT,
113 true);
114 ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data);
115 browser()->profile()->GetZoomLevelPrefs()->SetDouble(prefs::kDefaultZoomLevel,
116 new_default_zoom_level);
117 // Because this test relies on a round-trip IPC to/from the renderer process,
118 // we need to wait for it to propagate.
119 zoom_change_watcher.Wait();
120 }
121
122 IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest, Observe) {
123 content::WebContents* web_contents =
124 browser()->tab_strip_model()->GetActiveWebContents();
125 ZoomController* zoom_controller =
126 ZoomController::FromWebContents(web_contents);
127 zoom_controller->AddObserver(&zoom_observer_);
128
129 double new_zoom_level = 1.0;
130 // When the event is initiated from HostZoomMap, the old zoom level is not
131 // available.
132 ZoomController::ZoomChangedEventData zoom_change_data(
133 web_contents,
134 new_zoom_level,
135 new_zoom_level,
136 ZoomController::ZOOM_MODE_DEFAULT,
137 true); // We have a non-empty host, so this will be 'true'.
138 EXPECT_CALL(zoom_observer_, OnZoomChanged(zoom_change_data)).Times(1);
139
140 content::HostZoomMap* host_zoom_map =
141 content::HostZoomMap::GetDefaultForBrowserContext(
142 web_contents->GetBrowserContext());
143
144 host_zoom_map->SetZoomLevelForHost("about:blank", new_zoom_level);
145 }
146
147
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698