diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-11 19:47:26 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-11 19:47:26 +0000 |
| commit | 0d85ea6e9786806964ec2a05a12dd2e0a05bdb0c (patch) | |
| tree | 552a503dd6c198dcaaf88d7cf9fcecf545fd8b69 /o3d/tests | |
| parent | 7c9109b43243c43c427c337c7ac3c049fe77a5b9 (diff) | |
| download | chromium_src-0d85ea6e9786806964ec2a05a12dd2e0a05bdb0c.zip chromium_src-0d85ea6e9786806964ec2a05a12dd2e0a05bdb0c.tar.gz chromium_src-0d85ea6e9786806964ec2a05a12dd2e0a05bdb0c.tar.bz2 | |
Recomitting 31676 with fix.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31692 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests')
| -rw-r--r-- | o3d/tests/common/win/testing_common.cc | 4 | ||||
| -rw-r--r-- | o3d/tests/tests.gyp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/o3d/tests/common/win/testing_common.cc b/o3d/tests/common/win/testing_common.cc index 5479719..ba7c402 100644 --- a/o3d/tests/common/win/testing_common.cc +++ b/o3d/tests/common/win/testing_common.cc @@ -53,8 +53,8 @@ #if defined(RENDERER_CB) #include "core/cross/command_buffer/renderer_cb.h" #include "core/cross/command_buffer/display_window_cb.h" -#include "gpu_plugin/command_buffer.h" -#include "gpu_plugin/np_utils/np_browser_stub.h" +#include "gpu/gpu_plugin/command_buffer.h" +#include "gpu/np_utils/np_browser_stub.h" #endif using o3d::DisplayWindowWindows; diff --git a/o3d/tests/tests.gyp b/o3d/tests/tests.gyp index 27e48a6..1942b35 100644 --- a/o3d/tests/tests.gyp +++ b/o3d/tests/tests.gyp @@ -105,16 +105,16 @@ ['renderer == "cb"', { 'dependencies': [ - '../gpu_plugin/gpu_plugin.gyp:np_utils', + '../gpu/gpu.gyp:np_utils', ] }, ], ['renderer == "cb" and cb_service != "remote"', { 'dependencies': [ - '../command_buffer/command_buffer.gyp:command_buffer_client_test', - '../command_buffer/command_buffer.gyp:command_buffer_common_test', - '../command_buffer/command_buffer.gyp:command_buffer_service_test', + '../gpu/gpu.gyp:command_buffer_client_test', + '../gpu/gpu.gyp:command_buffer_common_test', + '../gpu/gpu.gyp:command_buffer_service_test', ] }, ], |