Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(274)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/ipc/service/gpu_channel_unittest.cc

Issue 1845563005: Refactor content/common/gpu into gpu/ipc/service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Drop ref to deleted content_tests_gypi_values.content_unittests_ozone_sources Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/ipc/service/gpu_channel_test_common.cc ('k') | gpu/ipc/service/gpu_command_buffer_stub.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/ipc/service/gpu_channel_unittest.cc
diff --git a/content/common/gpu/gpu_channel_unittest.cc b/gpu/ipc/service/gpu_channel_unittest.cc
similarity index 84%
rename from content/common/gpu/gpu_channel_unittest.cc
rename to gpu/ipc/service/gpu_channel_unittest.cc
index 7e15a7709e9da2e7a7a4d20943b6197893e43935..71c9d3a7dd7178613f8a14f0c033e6e6568f8fd6 100644
--- a/content/common/gpu/gpu_channel_unittest.cc
+++ b/gpu/ipc/service/gpu_channel_unittest.cc
@@ -5,13 +5,13 @@
#include <stdint.h>
#include "base/test/test_simple_task_runner.h"
-#include "content/common/gpu/gpu_channel.h"
-#include "content/common/gpu/gpu_channel_manager.h"
-#include "content/common/gpu/gpu_channel_test_common.h"
#include "gpu/ipc/common/gpu_messages.h"
+#include "gpu/ipc/service/gpu_channel.h"
+#include "gpu/ipc/service/gpu_channel_manager.h"
+#include "gpu/ipc/service/gpu_channel_test_common.h"
#include "ipc/ipc_test_sink.h"
-namespace content {
+namespace gpu {
class GpuChannelTest : public GpuChannelTestCommon {
public:
@@ -55,10 +55,10 @@ class GpuChannelTest : public GpuChannelTestCommon {
};
#if defined(OS_WIN)
-const gpu::SurfaceHandle kFakeSurfaceHandle =
- reinterpret_cast<gpu::SurfaceHandle>(1);
+const SurfaceHandle kFakeSurfaceHandle =
+ reinterpret_cast<SurfaceHandle>(1);
#else
-const gpu::SurfaceHandle kFakeSurfaceHandle = 1;
+const SurfaceHandle kFakeSurfaceHandle = 1;
#endif
TEST_F(GpuChannelTest, CreateViewCommandBufferAllowed) {
@@ -68,14 +68,14 @@ TEST_F(GpuChannelTest, CreateViewCommandBufferAllowed) {
CreateChannel(kClientId, allow_view_command_buffers, false);
ASSERT_TRUE(channel);
- gpu::SurfaceHandle surface_handle = kFakeSurfaceHandle;
- DCHECK_NE(surface_handle, gpu::kNullSurfaceHandle);
+ SurfaceHandle surface_handle = kFakeSurfaceHandle;
+ DCHECK_NE(surface_handle, kNullSurfaceHandle);
int32_t kRouteId = 1;
GPUCreateCommandBufferConfig init_params;
init_params.share_group_id = MSG_ROUTING_NONE;
init_params.stream_id = 0;
- init_params.stream_priority = gpu::GpuStreamPriority::NORMAL;
+ init_params.stream_priority = GpuStreamPriority::NORMAL;
init_params.attribs = std::vector<int>();
init_params.active_url = GURL();
init_params.gpu_preference = gfx::PreferIntegratedGpu;
@@ -96,14 +96,14 @@ TEST_F(GpuChannelTest, CreateViewCommandBufferDisallowed) {
CreateChannel(kClientId, allow_view_command_buffers, false);
ASSERT_TRUE(channel);
- gpu::SurfaceHandle surface_handle = kFakeSurfaceHandle;
- DCHECK_NE(surface_handle, gpu::kNullSurfaceHandle);
+ SurfaceHandle surface_handle = kFakeSurfaceHandle;
+ DCHECK_NE(surface_handle, kNullSurfaceHandle);
int32_t kRouteId = 1;
GPUCreateCommandBufferConfig init_params;
init_params.share_group_id = MSG_ROUTING_NONE;
init_params.stream_id = 0;
- init_params.stream_priority = gpu::GpuStreamPriority::NORMAL;
+ init_params.stream_priority = GpuStreamPriority::NORMAL;
init_params.attribs = std::vector<int>();
init_params.active_url = GURL();
init_params.gpu_preference = gfx::PreferIntegratedGpu;
@@ -126,13 +126,13 @@ TEST_F(GpuChannelTest, CreateOffscreenCommandBuffer) {
GPUCreateCommandBufferConfig init_params;
init_params.share_group_id = MSG_ROUTING_NONE;
init_params.stream_id = 0;
- init_params.stream_priority = gpu::GpuStreamPriority::NORMAL;
+ init_params.stream_priority = GpuStreamPriority::NORMAL;
init_params.attribs = std::vector<int>();
init_params.active_url = GURL();
init_params.gpu_preference = gfx::PreferIntegratedGpu;
bool succeeded = false;
HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
- gpu::kNullSurfaceHandle, gfx::Size(1, 1),
+ kNullSurfaceHandle, gfx::Size(1, 1),
init_params, kRouteId, &succeeded));
EXPECT_TRUE(succeeded);
@@ -151,13 +151,13 @@ TEST_F(GpuChannelTest, IncompatibleStreamIds) {
GPUCreateCommandBufferConfig init_params;
init_params.share_group_id = MSG_ROUTING_NONE;
init_params.stream_id = kStreamId1;
- init_params.stream_priority = gpu::GpuStreamPriority::NORMAL;
+ init_params.stream_priority = GpuStreamPriority::NORMAL;
init_params.attribs = std::vector<int>();
init_params.active_url = GURL();
init_params.gpu_preference = gfx::PreferIntegratedGpu;
bool succeeded = false;
HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
- gpu::kNullSurfaceHandle, gfx::Size(1, 1),
+ kNullSurfaceHandle, gfx::Size(1, 1),
init_params, kRouteId1, &succeeded));
EXPECT_TRUE(succeeded);
@@ -170,13 +170,13 @@ TEST_F(GpuChannelTest, IncompatibleStreamIds) {
init_params.share_group_id = kRouteId1;
init_params.stream_id = kStreamId2;
- init_params.stream_priority = gpu::GpuStreamPriority::NORMAL;
+ init_params.stream_priority = GpuStreamPriority::NORMAL;
init_params.attribs = std::vector<int>();
init_params.active_url = GURL();
init_params.gpu_preference = gfx::PreferIntegratedGpu;
succeeded = false;
HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
- gpu::kNullSurfaceHandle, gfx::Size(1, 1),
+ kNullSurfaceHandle, gfx::Size(1, 1),
init_params, kRouteId2, &succeeded));
EXPECT_FALSE(succeeded);
@@ -192,7 +192,7 @@ TEST_F(GpuChannelTest, StreamLifetime) {
// Create first context.
int32_t kRouteId1 = 1;
int32_t kStreamId1 = 1;
- gpu::GpuStreamPriority kStreamPriority1 = gpu::GpuStreamPriority::NORMAL;
+ GpuStreamPriority kStreamPriority1 = GpuStreamPriority::NORMAL;
GPUCreateCommandBufferConfig init_params;
init_params.share_group_id = MSG_ROUTING_NONE;
init_params.stream_id = kStreamId1;
@@ -202,7 +202,7 @@ TEST_F(GpuChannelTest, StreamLifetime) {
init_params.gpu_preference = gfx::PreferIntegratedGpu;
bool succeeded = false;
HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
- gpu::kNullSurfaceHandle, gfx::Size(1, 1),
+ kNullSurfaceHandle, gfx::Size(1, 1),
init_params, kRouteId1, &succeeded));
EXPECT_TRUE(succeeded);
@@ -216,7 +216,7 @@ TEST_F(GpuChannelTest, StreamLifetime) {
// Create second context in same share group but different stream.
int32_t kRouteId2 = 2;
int32_t kStreamId2 = 2;
- gpu::GpuStreamPriority kStreamPriority2 = gpu::GpuStreamPriority::LOW;
+ GpuStreamPriority kStreamPriority2 = GpuStreamPriority::LOW;
init_params.share_group_id = MSG_ROUTING_NONE;
init_params.stream_id = kStreamId2;
@@ -226,7 +226,7 @@ TEST_F(GpuChannelTest, StreamLifetime) {
init_params.gpu_preference = gfx::PreferIntegratedGpu;
succeeded = false;
HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
- gpu::kNullSurfaceHandle, gfx::Size(1, 1),
+ kNullSurfaceHandle, gfx::Size(1, 1),
init_params, kRouteId2, &succeeded));
EXPECT_TRUE(succeeded);
@@ -243,7 +243,7 @@ TEST_F(GpuChannelTest, RealTimeStreamsDisallowed) {
// Create first context.
int32_t kRouteId = 1;
int32_t kStreamId = 1;
- gpu::GpuStreamPriority kStreamPriority = gpu::GpuStreamPriority::REAL_TIME;
+ GpuStreamPriority kStreamPriority = GpuStreamPriority::REAL_TIME;
GPUCreateCommandBufferConfig init_params;
init_params.share_group_id = MSG_ROUTING_NONE;
init_params.stream_id = kStreamId;
@@ -253,7 +253,7 @@ TEST_F(GpuChannelTest, RealTimeStreamsDisallowed) {
init_params.gpu_preference = gfx::PreferIntegratedGpu;
bool succeeded = false;
HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
- gpu::kNullSurfaceHandle, gfx::Size(1, 1),
+ kNullSurfaceHandle, gfx::Size(1, 1),
init_params, kRouteId, &succeeded));
EXPECT_FALSE(succeeded);
@@ -270,7 +270,7 @@ TEST_F(GpuChannelTest, RealTimeStreamsAllowed) {
// Create first context.
int32_t kRouteId = 1;
int32_t kStreamId = 1;
- gpu::GpuStreamPriority kStreamPriority = gpu::GpuStreamPriority::REAL_TIME;
+ GpuStreamPriority kStreamPriority = GpuStreamPriority::REAL_TIME;
GPUCreateCommandBufferConfig init_params;
init_params.share_group_id = MSG_ROUTING_NONE;
init_params.stream_id = kStreamId;
@@ -280,7 +280,7 @@ TEST_F(GpuChannelTest, RealTimeStreamsAllowed) {
init_params.gpu_preference = gfx::PreferIntegratedGpu;
bool succeeded = false;
HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
- gpu::kNullSurfaceHandle, gfx::Size(1, 1),
+ kNullSurfaceHandle, gfx::Size(1, 1),
init_params, kRouteId, &succeeded));
EXPECT_TRUE(succeeded);
@@ -288,4 +288,4 @@ TEST_F(GpuChannelTest, RealTimeStreamsAllowed) {
EXPECT_TRUE(stub);
}
-} // namespace content
+} // namespace gpu
« no previous file with comments | « gpu/ipc/service/gpu_channel_test_common.cc ('k') | gpu/ipc/service/gpu_command_buffer_stub.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698