| Index: chrome/test/ppapi/ppapi_test.cc
|
| diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc
|
| index 5e00f8b7a87e46cdca7d71fe5f3cc8119cfc1683..27167d32064b0056ee02d57c7e8d51b255da6a36 100644
|
| --- a/chrome/test/ppapi/ppapi_test.cc
|
| +++ b/chrome/test/ppapi/ppapi_test.cc
|
| @@ -25,13 +25,14 @@
|
| #include "chrome/test/base/test_launcher_utils.h"
|
| #include "chrome/test/base/ui_test_utils.h"
|
| #include "content/public/browser/dom_operation_notification_details.h"
|
| -#include "content/public/test/test_renderer_host.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/notification_types.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/common/content_paths.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "content/public/test/browser_test_utils.h"
|
| +#include "content/public/test/test_launcher_utils.h"
|
| +#include "content/public/test/test_renderer_host.h"
|
| #include "content/test/gpu/test_switches.h"
|
| #include "media/audio/audio_manager.h"
|
| #include "net/base/net_util.h"
|
| @@ -122,7 +123,7 @@ void PPAPITestBase::SetUpCommandLine(CommandLine* command_line) {
|
| // Do not use mesa if real GPU is required.
|
| if (!command_line->HasSwitch(switches::kUseGpuInTests)) {
|
| #if !defined(OS_MACOSX)
|
| - CHECK(test_launcher_utils::OverrideGLImplementation(
|
| + CHECK(content::OverrideGLImplementation(
|
| command_line, gfx::kGLImplementationOSMesaName)) <<
|
| "kUseGL must not be set by test framework code!";
|
| #endif
|
|
|