| Index: chrome/test/automation/proxy_launcher.cc
|
| ===================================================================
|
| --- chrome/test/automation/proxy_launcher.cc (revision 112315)
|
| +++ chrome/test/automation/proxy_launcher.cc (working copy)
|
| @@ -23,8 +23,8 @@
|
| #include "chrome/test/base/test_launcher_utils.h"
|
| #include "chrome/test/base/test_switches.h"
|
| #include "chrome/test/ui/ui_test.h"
|
| -#include "content/common/child_process_info.h"
|
| #include "content/common/debug_flags.h"
|
| +#include "content/public/common/process_type.h"
|
| #include "ipc/ipc_channel.h"
|
| #include "ipc/ipc_descriptors.h"
|
| #include "sql/connection.h"
|
| @@ -443,7 +443,7 @@
|
| // Add command line arguments that should be applied to all UI tests.
|
| PrepareTestCommandline(&command_line, state.include_testing_id);
|
| DebugFlags::ProcessDebugFlags(
|
| - &command_line, ChildProcessInfo::UNKNOWN_PROCESS, false);
|
| + &command_line, content::PROCESS_TYPE_UNKNOWN, false);
|
|
|
| // Sometimes one needs to run the browser under a special environment
|
| // (e.g. valgrind) without also running the test harness (e.g. python)
|
|
|