Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Side by Side Diff: content/shell/common/webkit_test_helpers.cc

Issue 960853002: Mixed Content: Block blockable mixed content by default in tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "content/shell/common/webkit_test_helpers.h" 5 #include "content/shell/common/webkit_test_helpers.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/string_split.h" 10 #include "base/strings/string_split.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 #if defined(OS_MACOSX) 70 #if defined(OS_MACOSX)
71 prefs->editing_behavior = EDITING_BEHAVIOR_MAC; 71 prefs->editing_behavior = EDITING_BEHAVIOR_MAC;
72 #else 72 #else
73 prefs->editing_behavior = EDITING_BEHAVIOR_WIN; 73 prefs->editing_behavior = EDITING_BEHAVIOR_WIN;
74 #endif 74 #endif
75 prefs->java_enabled = false; 75 prefs->java_enabled = false;
76 prefs->application_cache_enabled = true; 76 prefs->application_cache_enabled = true;
77 prefs->tabs_to_links = false; 77 prefs->tabs_to_links = false;
78 prefs->hyperlink_auditing_enabled = false; 78 prefs->hyperlink_auditing_enabled = false;
79 prefs->allow_displaying_insecure_content = true; 79 prefs->allow_displaying_insecure_content = true;
80 prefs->allow_running_insecure_content = true; 80 prefs->allow_running_insecure_content = false;
81 prefs->disable_reading_from_canvas = false; 81 prefs->disable_reading_from_canvas = false;
82 prefs->strict_mixed_content_checking = false; 82 prefs->strict_mixed_content_checking = false;
83 prefs->strict_powerful_feature_restrictions = false; 83 prefs->strict_powerful_feature_restrictions = false;
84 prefs->webgl_errors_to_console_enabled = false; 84 prefs->webgl_errors_to_console_enabled = false;
85 base::string16 serif; 85 base::string16 serif;
86 #if defined(OS_MACOSX) 86 #if defined(OS_MACOSX)
87 prefs->cursive_font_family_map[kCommonScript] = 87 prefs->cursive_font_family_map[kCommonScript] =
88 base::ASCIIToUTF16("Apple Chancery"); 88 base::ASCIIToUTF16("Apple Chancery");
89 prefs->fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Papyrus"); 89 prefs->fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Papyrus");
90 serif = base::ASCIIToUTF16("Times"); 90 serif = base::ASCIIToUTF16("Times");
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 if (command_line.HasSwitch(switches::kRegisterFontFiles)) { 127 if (command_line.HasSwitch(switches::kRegisterFontFiles)) {
128 base::SplitString( 128 base::SplitString(
129 command_line.GetSwitchValueASCII(switches::kRegisterFontFiles), 129 command_line.GetSwitchValueASCII(switches::kRegisterFontFiles),
130 ';', 130 ';',
131 &files); 131 &files);
132 } 132 }
133 return files; 133 return files;
134 } 134 }
135 135
136 } // namespace content 136 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698