chrome/browser/ui/zoom/zoom_controller_unittest.cc - Issue 156703006: Cleanup: Remove unneeded browser_thread.h includes.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 156703006: Cleanup: Remove unneeded browser_thread.h includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 10 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

« no previous file with comments | « chrome/browser/ui/window_sizer/window_sizer_common_unittest.h ('k') | chrome/browser/usb/usb_context.h » ('j') | no next file with comments »

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 "base/prefs/pref_service.h"	6 #include "base/prefs/pref_service.h"

7 #include "chrome/browser/ui/browser.h"	7 #include "chrome/browser/ui/browser.h"

8 #include "chrome/browser/ui/browser_finder.h"	8 #include "chrome/browser/ui/browser_finder.h"

9 #include "chrome/browser/ui/zoom/zoom_controller.h"	9 #include "chrome/browser/ui/zoom/zoom_controller.h"

10 #include "chrome/browser/ui/zoom/zoom_observer.h"	10 #include "chrome/browser/ui/zoom/zoom_observer.h"

11 #include "chrome/common/pref_names.h"	11 #include "chrome/common/pref_names.h"

12 #include "chrome/test/base/chrome_render_view_host_test_harness.h"	12 #include "chrome/test/base/chrome_render_view_host_test_harness.h"

13 #include "chrome/test/base/testing_profile.h"	13 #include "chrome/test/base/testing_profile.h"

14 #include "content/public/browser/browser_thread.h"

15 #include "content/public/browser/host_zoom_map.h"	14 #include "content/public/browser/host_zoom_map.h"

16 #include "content/public/browser/navigation_details.h"	15 #include "content/public/browser/navigation_details.h"

17 #include "content/public/common/frame_navigate_params.h"	16 #include "content/public/common/frame_navigate_params.h"

18 #include "content/public/test/test_utils.h"	17 #include "content/public/test/test_utils.h"

19 #include "testing/gmock/include/gmock/gmock.h"	18 #include "testing/gmock/include/gmock/gmock.h"

20 #include "testing/gtest/include/gtest/gtest.h"	19 #include "testing/gtest/include/gtest/gtest.h"

21	20

22 class TestZoomObserver : public ZoomObserver {	21 class TestZoomObserver : public ZoomObserver {

23 public:	22 public:

24 MOCK_METHOD2(OnZoomChanged, void(content::WebContents*, bool));	23 MOCK_METHOD2(OnZoomChanged, void(content::WebContents*, bool));

(...skipping 30 matching lines...) Expand all Loading...
55	54

56 TEST_F(ZoomControllerTest, Observe) {	55 TEST_F(ZoomControllerTest, Observe) {

57 EXPECT_CALL(zoom_observer_, OnZoomChanged(web_contents(), false)).Times(1);	56 EXPECT_CALL(zoom_observer_, OnZoomChanged(web_contents(), false)).Times(1);

58	57

59 content::HostZoomMap* host_zoom_map =	58 content::HostZoomMap* host_zoom_map =

60 content::HostZoomMap::GetForBrowserContext(	59 content::HostZoomMap::GetForBrowserContext(

61 web_contents()->GetBrowserContext());	60 web_contents()->GetBrowserContext());

62	61

63 host_zoom_map->SetZoomLevelForHost(std::string(), 110.0f);	62 host_zoom_map->SetZoomLevelForHost(std::string(), 110.0f);

64 }	63 }

OLD	NEW