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

Side by Side Diff: chrome/test/plugin/plugin_test.cpp

Issue 194051: Remove unused ATL headers. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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 | « chrome/renderer/webplugin_delegate_proxy.cc ('k') | chrome/test/ui/npapi_uitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2008-2009, Google Inc. 1 // Copyright 2008-2009, Google Inc.
2 // All rights reserved. 2 // All rights reserved.
3 // 3 //
4 // Redistribution and use in source and binary forms, with or without 4 // Redistribution and use in source and binary forms, with or without
5 // modification, are permitted provided that the following conditions are 5 // modification, are permitted provided that the following conditions are
6 // met: 6 // met:
7 // 7 //
8 // * Redistributions of source code must retain the above copyright 8 // * Redistributions of source code must retain the above copyright
9 // notice, this list of conditions and the following disclaimer. 9 // notice, this list of conditions and the following disclaimer.
10 // * Redistributions in binary form must reproduce the above 10 // * Redistributions in binary form must reproduce the above
(...skipping 22 matching lines...) Expand all
33 // Real 33 // Real
34 // QuickTime 34 // QuickTime
35 // Windows Media Player 35 // Windows Media Player
36 // -this includes both WMP plugins. npdsplay.dll is the older one that 36 // -this includes both WMP plugins. npdsplay.dll is the older one that
37 // comes with XP. np-mswmp.dll can be downloaded from Microsoft and 37 // comes with XP. np-mswmp.dll can be downloaded from Microsoft and
38 // needs SP2 or Vista. 38 // needs SP2 or Vista.
39 39
40 #include <windows.h> 40 #include <windows.h>
41 #include <shellapi.h> 41 #include <shellapi.h>
42 #include <shlobj.h> 42 #include <shlobj.h>
43 #include <atlbase.h>
44 #include <comutil.h> 43 #include <comutil.h>
45 44
46 #include <stdlib.h> 45 #include <stdlib.h>
47 #include <string.h> 46 #include <string.h>
48 #include <memory.h> 47 #include <memory.h>
49 48
49 #include <string>
50
50 #include "base/file_path.h" 51 #include "base/file_path.h"
51 #include "base/file_util.h" 52 #include "base/file_util.h"
52 #include "base/registry.h" 53 #include "base/registry.h"
53 #include "chrome/browser/net/url_request_mock_http_job.h" 54 #include "chrome/browser/net/url_request_mock_http_job.h"
54 #include "chrome/common/chrome_switches.h" 55 #include "chrome/common/chrome_switches.h"
55 #include "chrome/common/chrome_paths.h" 56 #include "chrome/common/chrome_paths.h"
56 #include "chrome/test/automation/tab_proxy.h" 57 #include "chrome/test/automation/tab_proxy.h"
57 #include "chrome/test/ui/ui_test.h" 58 #include "chrome/test/ui/ui_test.h"
58 #include "net/base/net_util.h" 59 #include "net/base/net_util.h"
59 #include "third_party/npapi/bindings/npapi.h" 60 #include "third_party/npapi/bindings/npapi.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 } 174 }
174 175
175 // http://crbug.com/8690 176 // http://crbug.com/8690
176 TEST_F(PluginTest, DISABLED_Java) { 177 TEST_F(PluginTest, DISABLED_Java) {
177 TestPlugin(L"Java.html", kShortWaitTimeout, false); 178 TestPlugin(L"Java.html", kShortWaitTimeout, false);
178 } 179 }
179 180
180 TEST_F(PluginTest, Silverlight) { 181 TEST_F(PluginTest, Silverlight) {
181 TestPlugin(L"silverlight.html", kShortWaitTimeout, false); 182 TestPlugin(L"silverlight.html", kShortWaitTimeout, false);
182 } 183 }
OLDNEW
« no previous file with comments | « chrome/renderer/webplugin_delegate_proxy.cc ('k') | chrome/test/ui/npapi_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698