diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 23:53:29 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 23:53:29 +0000 |
| commit | 79655a0a333df1b1f8d02e884885fcfa1810c204 (patch) | |
| tree | 2199609ac97a453e3addea866326eedf98c6b20a /o3d | |
| parent | 6ca444ba487be0f8bebeb91352728a8193c4b445 (diff) | |
| download | chromium_src-79655a0a333df1b1f8d02e884885fcfa1810c204.zip chromium_src-79655a0a333df1b1f8d02e884885fcfa1810c204.tar.gz chromium_src-79655a0a333df1b1f8d02e884885fcfa1810c204.tar.bz2 | |
Missed some files from 31854.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31859 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
4 files changed, 5 insertions, 5 deletions
diff --git a/o3d/gpu/command_buffer/client/id_allocator_test.cc b/o3d/gpu/command_buffer/client/id_allocator_test.cc index 10c7809..bb8d5f9b 100644 --- a/o3d/gpu/command_buffer/client/id_allocator_test.cc +++ b/o3d/gpu/command_buffer/client/id_allocator_test.cc @@ -32,8 +32,8 @@ // This file has the unit tests for the IdAllocator class. -#include "tests/common/win/testing_common.h" #include "gpu/command_buffer/client/id_allocator.h" +#include "testing/gtest/include/gtest/gtest.h" namespace command_buffer { diff --git a/o3d/gpu/command_buffer/service/cmd_parser_test.cc b/o3d/gpu/command_buffer/service/cmd_parser_test.cc index 3c9871e..347eef2 100644 --- a/o3d/gpu/command_buffer/service/cmd_parser_test.cc +++ b/o3d/gpu/command_buffer/service/cmd_parser_test.cc @@ -34,10 +34,10 @@ #include "gpu/command_buffer/service/precompile.h" -#include "tests/common/win/testing_common.h" +#include "base/scoped_ptr.h" #include "gpu/command_buffer/service/cmd_parser.h" #include "gpu/command_buffer/service/mocks.h" -#include "base/scoped_ptr.h" +#include "testing/gtest/include/gtest/gtest.h" namespace command_buffer { diff --git a/o3d/gpu/command_buffer/service/effect_utils_test.cc b/o3d/gpu/command_buffer/service/effect_utils_test.cc index 695291e..4e42762 100644 --- a/o3d/gpu/command_buffer/service/effect_utils_test.cc +++ b/o3d/gpu/command_buffer/service/effect_utils_test.cc @@ -33,8 +33,8 @@ // This file contains the unit tests for the effect utilities. #include "gpu/command_buffer/service/precompile.h" -#include "tests/common/win/testing_common.h" #include "gpu/command_buffer/service/cross/effect_utils.h" +#include "testing/gtest/include/gtest/gtest.h" namespace o3d { namespace command_buffer { diff --git a/o3d/gpu/command_buffer/service/resource_test.cc b/o3d/gpu/command_buffer/service/resource_test.cc index 3e95dfb..7a9438b 100644 --- a/o3d/gpu/command_buffer/service/resource_test.cc +++ b/o3d/gpu/command_buffer/service/resource_test.cc @@ -33,8 +33,8 @@ // Tests for the ResourceMap. #include "gpu/command_buffer/service/precompile.h" -#include "tests/common/win/testing_common.h" #include "gpu/command_buffer/service/resource.h" +#include "testing/gtest/include/gtest/gtest.h" namespace command_buffer { |