chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc - Issue 6854035: Move blocked content from TabContents to TabContentsWrapper.

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/content_settings/content_setting_image_model_unittest.cc

Issue 6854035: Move blocked content from TabContents to TabContentsWrapper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 8 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/content_settings/content_setting_image_model.cc ('k') | chrome/browser/ui/content_settings/content_settings_tab_helper.h » ('j') | chrome/browser/ui/content_settings/content_settings_tab_helper.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/content_setting_image_model.h"

6 #include "chrome/browser/content_settings/host_content_settings_map.h"	5 #include "chrome/browser/content_settings/host_content_settings_map.h"

7 #include "chrome/browser/prerender/prerender_manager.h"	6 #include "chrome/browser/prerender/prerender_manager.h"

8 #include "chrome/browser/profiles/profile.h"	7 #include "chrome/browser/profiles/profile.h"

	8 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"

9 #include "chrome/test/testing_profile.h"	9 #include "chrome/test/testing_profile.h"

10 #include "content/browser/browser_thread.h"	10 #include "content/browser/browser_thread.h"

11 #include "content/browser/renderer_host/test_render_view_host.h"	11 #include "content/browser/renderer_host/test_render_view_host.h"

12 #include "content/browser/tab_contents/test_tab_contents.h"	12 #include "content/browser/tab_contents/test_tab_contents.h"

13 #include "net/base/cookie_options.h"	13 #include "net/base/cookie_options.h"

14 #include "testing/gtest/include/gtest/gtest.h"	14 #include "testing/gtest/include/gtest/gtest.h"

15	15

16 class ContentSettingImageModelTest : public RenderViewHostTestHarness {	16 class ContentSettingImageModelTest : public RenderViewHostTestHarness {

17 public:	17 public:

18 ContentSettingImageModelTest()	18 ContentSettingImageModelTest()

(...skipping 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
79 EXPECT_FALSE(content_setting_image_model->get_tooltip().empty());	79 EXPECT_FALSE(content_setting_image_model->get_tooltip().empty());

80	80

81 // Make the tab_contents prerendered	81 // Make the tab_contents prerendered

82 tab_contents.profile()->GetPrerenderManager()->MarkTabContentsAsPrerendered(	82 tab_contents.profile()->GetPrerenderManager()->MarkTabContentsAsPrerendered(

83 &tab_contents);	83 &tab_contents);

84 content_setting_image_model->UpdateFromTabContents(&tab_contents);	84 content_setting_image_model->UpdateFromTabContents(&tab_contents);

85 EXPECT_TRUE(content_setting_image_model->is_visible());	85 EXPECT_TRUE(content_setting_image_model->is_visible());

86 EXPECT_NE(0, content_setting_image_model->get_icon());	86 EXPECT_NE(0, content_setting_image_model->get_icon());

87 EXPECT_FALSE(content_setting_image_model->get_tooltip().empty());	87 EXPECT_FALSE(content_setting_image_model->get_tooltip().empty());

88 }	88 }

OLD	NEW