trunk/src/chrome/browser/ui/search/instant_ntp_prerenderer_unittest.cc - Issue 135903002: Revert 244407 "InstantExtended: remove dead code related to the ..."

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: trunk/src/chrome/browser/ui/search/instant_ntp_prerenderer_unittest.cc

Issue 135903002: Revert 244407 "InstantExtended: remove dead code related to the ..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 11 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 | « trunk/src/chrome/browser/ui/search/instant_ntp_prerenderer.cc ('k') | trunk/src/chrome/browser/ui/search/instant_page.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/memory/scoped_ptr.h"	5 #include "base/memory/scoped_ptr.h"

6 #include "base/prefs/pref_service.h"	6 #include "base/prefs/pref_service.h"

7 #include "chrome/browser/content_settings/host_content_settings_map.h"	7 #include "chrome/browser/content_settings/host_content_settings_map.h"

8 #include "chrome/browser/search/instant_service_factory.h"	8 #include "chrome/browser/search/instant_service_factory.h"

9 #include "chrome/browser/search/search.h"	9 #include "chrome/browser/search/search.h"

10 #include "chrome/browser/ui/search/instant_ntp.h"	10 #include "chrome/browser/ui/search/instant_ntp.h"

(...skipping 224 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
235	235

236 TEST_F(InstantNTPPrerendererTest, IsJavascriptEnabledChecksPrefs) {	236 TEST_F(InstantNTPPrerendererTest, IsJavascriptEnabledChecksPrefs) {

237 instant_ntp_prerenderer()->set_override_javascript_enabled(false);	237 instant_ntp_prerenderer()->set_override_javascript_enabled(false);

238 instant_ntp_prerenderer()->profile()->GetPrefs()->SetBoolean(	238 instant_ntp_prerenderer()->profile()->GetPrefs()->SetBoolean(

239 prefs::kWebKitJavascriptEnabled, true);	239 prefs::kWebKitJavascriptEnabled, true);

240 EXPECT_TRUE(instant_ntp_prerenderer()->IsJavascriptEnabled());	240 EXPECT_TRUE(instant_ntp_prerenderer()->IsJavascriptEnabled());

241 instant_ntp_prerenderer()->profile()->GetPrefs()->SetBoolean(	241 instant_ntp_prerenderer()->profile()->GetPrefs()->SetBoolean(

242 prefs::kWebKitJavascriptEnabled, false);	242 prefs::kWebKitJavascriptEnabled, false);

243 EXPECT_FALSE(instant_ntp_prerenderer()->IsJavascriptEnabled());	243 EXPECT_FALSE(instant_ntp_prerenderer()->IsJavascriptEnabled());

244 }	244 }

OLD	NEW