summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--o3d/gpu/command_buffer/client/id_allocator_test.cc2
-rw-r--r--o3d/gpu/command_buffer/service/cmd_parser_test.cc4
-rw-r--r--o3d/gpu/command_buffer/service/effect_utils_test.cc2
-rw-r--r--o3d/gpu/command_buffer/service/resource_test.cc2
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 {