chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc - Issue 9706012: Add abstractions that let embedders drive tests of WebContents.

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

Unified Diff: chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

Issue 9706012: Add abstractions that let embedders drive tests of WebContents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove CONTENT_EXPORT on statically linked functions. Merge to head for commit. Created 8 years, 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/web_intent_sheet_controller_unittest.mm ('k') | chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

index 5fa44ed5a7dfbdb892b7ca09107f8aa7eb6d5812..671ea3a3453c6ea44a847a376db46179b6be9057 100644

--- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

@@ -12,11 +12,13 @@

#include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"

#include "chrome/common/chrome_switches.h"

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

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

+#include "content/public/browser/web_contents.h"

#include "content/test/test_browser_thread.h"

+#include "content/test/web_contents_tester.h"

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

using content::BrowserThread;

+using content::WebContentsTester;

class ContentSettingBubbleModelTest : public TabContentsWrapperTestHarness {

protected:

@@ -114,7 +116,8 @@ TEST_F(ContentSettingBubbleModelTest, MultiplePlugins) {

// Navigating to some sample url prevents the GetURL method from returning an

// invalid empty URL.

- contents()->NavigateAndCommit(GURL("http://www.example.com"));

+ WebContentsTester::For(

+ contents())->NavigateAndCommit(GURL("http://www.example.com"));

GURL url = contents()->GetURL();

map->AddExceptionForURL(url,

url,