OLD | NEW |
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 "chrome/test/ppapi/ppapi_test.h" | 5 #include "chrome/test/ppapi/ppapi_test.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "content/public/browser/notification_service.h" | 29 #include "content/public/browser/notification_service.h" |
30 #include "content/public/browser/notification_types.h" | 30 #include "content/public/browser/notification_types.h" |
31 #include "content/public/browser/web_contents.h" | 31 #include "content/public/browser/web_contents.h" |
32 #include "content/public/common/content_paths.h" | 32 #include "content/public/common/content_paths.h" |
33 #include "content/public/common/content_switches.h" | 33 #include "content/public/common/content_switches.h" |
34 #include "content/public/test/browser_test_utils.h" | 34 #include "content/public/test/browser_test_utils.h" |
35 #include "content/test/gpu/test_switches.h" | 35 #include "content/test/gpu/test_switches.h" |
36 #include "media/audio/audio_manager.h" | 36 #include "media/audio/audio_manager.h" |
37 #include "net/base/net_util.h" | 37 #include "net/base/net_util.h" |
38 #include "net/test/test_server.h" | 38 #include "net/test/test_server.h" |
| 39 #include "ppapi/shared_impl/ppapi_switches.h" |
39 #include "ui/gl/gl_switches.h" | 40 #include "ui/gl/gl_switches.h" |
40 #include "webkit/plugins/plugin_switches.h" | 41 #include "webkit/plugins/plugin_switches.h" |
41 | 42 |
42 using content::DomOperationNotificationDetails; | 43 using content::DomOperationNotificationDetails; |
43 using content::RenderViewHost; | 44 using content::RenderViewHost; |
44 | 45 |
45 namespace { | 46 namespace { |
46 | 47 |
47 // Platform-specific filename relative to the chrome executable. | 48 // Platform-specific filename relative to the chrome executable. |
48 #if defined(OS_WIN) | 49 #if defined(OS_WIN) |
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
347 const std::string& base, | 348 const std::string& base, |
348 const std::string& test_case) { | 349 const std::string& test_case) { |
349 return StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), | 350 return StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), |
350 test_case.c_str()); | 351 test_case.c_str()); |
351 } | 352 } |
352 | 353 |
353 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { | 354 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { |
354 // The default content setting for the PPAPI broker is ASK. We purposefully | 355 // The default content setting for the PPAPI broker is ASK. We purposefully |
355 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. | 356 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. |
356 } | 357 } |
OLD | NEW |