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_types.h" | 29 #include "content/public/browser/notification_types.h" |
30 #include "content/public/browser/web_contents.h" | 30 #include "content/public/browser/web_contents.h" |
31 #include "content/public/common/content_paths.h" | 31 #include "content/public/common/content_paths.h" |
32 #include "content/public/common/content_switches.h" | 32 #include "content/public/common/content_switches.h" |
33 #include "content/public/test/browser_test_utils.h" | 33 #include "content/public/test/browser_test_utils.h" |
34 #include "content/public/test/test_renderer_host.h" | 34 #include "content/public/test/test_renderer_host.h" |
35 #include "net/base/net_util.h" | 35 #include "net/base/net_util.h" |
36 #include "net/base/test_data_directory.h" | 36 #include "net/base/test_data_directory.h" |
37 #include "ppapi/shared_impl/ppapi_switches.h" | 37 #include "ppapi/shared_impl/ppapi_switches.h" |
38 #include "ui/gl/gl_switches.h" | 38 #include "ui/gl/gl_switches.h" |
39 #include "webkit/plugins/plugin_switches.h" | |
40 | 39 |
41 #if defined(OS_WIN) && defined(USE_ASH) | 40 #if defined(OS_WIN) && defined(USE_ASH) |
42 #include "base/win/windows_version.h" | 41 #include "base/win/windows_version.h" |
43 #endif | 42 #endif |
44 | 43 |
45 using content::DomOperationNotificationDetails; | 44 using content::DomOperationNotificationDetails; |
46 using content::RenderViewHost; | 45 using content::RenderViewHost; |
47 | 46 |
48 namespace { | 47 namespace { |
49 | 48 |
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
384 const std::string& base, | 383 const std::string& base, |
385 const std::string& test_case) { | 384 const std::string& test_case) { |
386 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), | 385 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), |
387 test_case.c_str()); | 386 test_case.c_str()); |
388 } | 387 } |
389 | 388 |
390 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { | 389 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { |
391 // The default content setting for the PPAPI broker is ASK. We purposefully | 390 // The default content setting for the PPAPI broker is ASK. We purposefully |
392 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. | 391 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. |
393 } | 392 } |
OLD | NEW |