chrome/browser/content_settings/content_settings_pref_provider_unittest.cc - Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite:

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

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: more fixing Created 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/content_settings/content_settings_policy_provider_unittest.cc ('k') | chrome/browser/content_settings/host_content_settings_map_unittest.cc » ('j') | chrome/test/base/chrome_test_suite.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

index c63632f013d6b680c96e5a8760e009feb75ea3ec..01177c1c5c03169c38adc533c10ac87e9b7b5dd7 100644

--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

@@ -17,7 +17,6 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

-#include "chrome/test/base/testing_browser_process_test.h"

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

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

#include "content/browser/browser_thread.h"

@@ -47,7 +46,7 @@ void ExpectObsoleteGeolocationSetting(

namespace content_settings {

-class PrefDefaultProviderTest : public TestingBrowserProcessTest {

+class PrefDefaultProviderTest : public testing::Test {

public:

PrefDefaultProviderTest()

: ui_thread_(BrowserThread::UI, &message_loop_),

@@ -216,7 +215,7 @@ bool SettingsEqual(const ContentSettings& settings1,

return true;

}

-class PrefProviderTest : public TestingBrowserProcessTest {

+class PrefProviderTest : public testing::Test {

public:

PrefProviderTest() : ui_thread_(

BrowserThread::UI, &message_loop_) {