content/public/test/ppapi_test_utils.cc - Issue 1821103002: Migrate a bunch of LayoutTests from NPAPI to PPAPI

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: content/public/test/ppapi_test_utils.cc

Issue 1821103002: Migrate a bunch of LayoutTests from NPAPI to PPAPI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_open-and-close-window-with-plugin

Patch Set: rebase; fix expectations for plugin-initiate-popup-window-expected Created 4 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

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/public/test/ppapi_test_utils.h"	5 #include "content/public/test/ppapi_test_utils.h"

6	6

7 #include <vector>	7 #include <vector>

8	8

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/files/file_util.h"	10 #include "base/files/file_util.h"

(...skipping 97 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
108 static const CharType kPluginLibrary[] = "libblink_test_plugin.so";	108 static const CharType kPluginLibrary[] = "libblink_test_plugin.so";

109 static const CharType kDeprecatedPluginLibrary[] =	109 static const CharType kDeprecatedPluginLibrary[] =

110 "libblink_deprecated_test_plugin.so";	110 "libblink_deprecated_test_plugin.so";

111 #endif	111 #endif

112 static const CharType kExtraParameters[] =	112 static const CharType kExtraParameters[] =

113 FILE_PATH_LITERAL("#Blink Test Plugin#Interesting description.#0.8");	113 FILE_PATH_LITERAL("#Blink Test Plugin#Interesting description.#0.8");

114 static const CharType kDeprecatedExtraParameters[] =	114 static const CharType kDeprecatedExtraParameters[] =

115 FILE_PATH_LITERAL("#Blink Deprecated Test Plugin#Description#0.1");	115 FILE_PATH_LITERAL("#Blink Deprecated Test Plugin#Description#0.1");

116	116

117 std::vector<PluginInfo> plugins;	117 std::vector<PluginInfo> plugins;

	118 plugins.push_back(PluginInfo(

	119 kPluginLibrary, kExtraParameters,

	120 FILE_PATH_LITERAL("application/x-blink-test-plugin#blinktestplugin")));

118 plugins.push_back(	121 plugins.push_back(

119 PluginInfo(kPluginLibrary, kExtraParameters,	122 PluginInfo(kDeprecatedPluginLibrary, kDeprecatedExtraParameters,

120 FILE_PATH_LITERAL("application/x-blink-test-plugin")));	123 FILE_PATH_LITERAL("application/"

121 plugins.push_back(PluginInfo(	124 "x-blink-deprecated-test-plugin#"

122 kDeprecatedPluginLibrary, kDeprecatedExtraParameters,	125 "blinkdeprecatedtestplugin")));

123 FILE_PATH_LITERAL("application/x-blink-deprecated-test-plugin")));

124 return RegisterPlugins(command_line, plugins);	126 return RegisterPlugins(command_line, plugins);

125 }	127 }

126	128

127 } // namespace ppapi	129 } // namespace ppapi

OLD	NEW

« no previous file with comments | « content/common/pepper_plugin_list.cc ('k') | content/renderer/pepper/plugin_object.cc » ('j') | no next file with comments »