Index: content/common/gpu/gpu_channel_unittest.cc |
diff --git a/content/common/gpu/gpu_channel_unittest.cc b/content/common/gpu/gpu_channel_unittest.cc |
index 719d5479f2d258f2e05e316b3ff1a7d023a0c8ab..b940678c1a2583de3fe4876d8b48d2a0a2f95633 100644 |
--- a/content/common/gpu/gpu_channel_unittest.cc |
+++ b/content/common/gpu/gpu_channel_unittest.cc |
@@ -73,7 +73,7 @@ TEST_F(GpuChannelTest, CreateViewCommandBufferAllowed) { |
init_params.stream_id = 0; |
init_params.stream_priority = GpuStreamPriority::NORMAL; |
init_params.attribs = std::vector<int>(); |
- init_params.active_url = GURL(); |
+ init_params.active_url = std::string(); |
init_params.gpu_preference = gfx::PreferIntegratedGpu; |
bool succeeded = false; |
HandleMessage(channel, new GpuChannelMsg_CreateViewCommandBuffer( |
@@ -100,7 +100,7 @@ TEST_F(GpuChannelTest, CreateViewCommandBufferDisallowed) { |
init_params.stream_id = 0; |
init_params.stream_priority = GpuStreamPriority::NORMAL; |
init_params.attribs = std::vector<int>(); |
- init_params.active_url = GURL(); |
+ init_params.active_url = std::string(); |
init_params.gpu_preference = gfx::PreferIntegratedGpu; |
bool succeeded = false; |
HandleMessage(channel, new GpuChannelMsg_CreateViewCommandBuffer( |
@@ -125,7 +125,7 @@ TEST_F(GpuChannelTest, CreateOffscreenCommandBuffer) { |
init_params.stream_id = 0; |
init_params.stream_priority = GpuStreamPriority::NORMAL; |
init_params.attribs = std::vector<int>(); |
- init_params.active_url = GURL(); |
+ init_params.active_url = std::string(); |
init_params.gpu_preference = gfx::PreferIntegratedGpu; |
bool succeeded = false; |
HandleMessage(channel, |
@@ -150,7 +150,7 @@ TEST_F(GpuChannelTest, IncompatibleStreamIds) { |
init_params.stream_id = kStreamId1; |
init_params.stream_priority = GpuStreamPriority::NORMAL; |
init_params.attribs = std::vector<int>(); |
- init_params.active_url = GURL(); |
+ init_params.active_url = std::string(); |
init_params.gpu_preference = gfx::PreferIntegratedGpu; |
bool succeeded = false; |
HandleMessage(channel, |
@@ -169,7 +169,7 @@ TEST_F(GpuChannelTest, IncompatibleStreamIds) { |
init_params.stream_id = kStreamId2; |
init_params.stream_priority = GpuStreamPriority::NORMAL; |
init_params.attribs = std::vector<int>(); |
- init_params.active_url = GURL(); |
+ init_params.active_url = std::string(); |
init_params.gpu_preference = gfx::PreferIntegratedGpu; |
succeeded = false; |
HandleMessage(channel, |
@@ -195,7 +195,7 @@ TEST_F(GpuChannelTest, IncompatibleStreamPriorities) { |
init_params.stream_id = kStreamId1; |
init_params.stream_priority = kStreamPriority1; |
init_params.attribs = std::vector<int>(); |
- init_params.active_url = GURL(); |
+ init_params.active_url = std::string(); |
init_params.gpu_preference = gfx::PreferIntegratedGpu; |
bool succeeded = false; |
HandleMessage(channel, |
@@ -215,7 +215,7 @@ TEST_F(GpuChannelTest, IncompatibleStreamPriorities) { |
init_params.stream_id = kStreamId2; |
init_params.stream_priority = kStreamPriority2; |
init_params.attribs = std::vector<int>(); |
- init_params.active_url = GURL(); |
+ init_params.active_url = std::string(); |
init_params.gpu_preference = gfx::PreferIntegratedGpu; |
succeeded = false; |
HandleMessage(channel, |
@@ -241,7 +241,7 @@ TEST_F(GpuChannelTest, StreamLifetime) { |
init_params.stream_id = kStreamId1; |
init_params.stream_priority = kStreamPriority1; |
init_params.attribs = std::vector<int>(); |
- init_params.active_url = GURL(); |
+ init_params.active_url = std::string(); |
init_params.gpu_preference = gfx::PreferIntegratedGpu; |
bool succeeded = false; |
HandleMessage(channel, |
@@ -265,7 +265,7 @@ TEST_F(GpuChannelTest, StreamLifetime) { |
init_params.stream_id = kStreamId2; |
init_params.stream_priority = kStreamPriority2; |
init_params.attribs = std::vector<int>(); |
- init_params.active_url = GURL(); |
+ init_params.active_url = std::string(); |
init_params.gpu_preference = gfx::PreferIntegratedGpu; |
succeeded = false; |
HandleMessage(channel, |
@@ -292,7 +292,7 @@ TEST_F(GpuChannelTest, RealTimeStreamsDisallowed) { |
init_params.stream_id = kStreamId; |
init_params.stream_priority = kStreamPriority; |
init_params.attribs = std::vector<int>(); |
- init_params.active_url = GURL(); |
+ init_params.active_url = std::string(); |
init_params.gpu_preference = gfx::PreferIntegratedGpu; |
bool succeeded = false; |
HandleMessage(channel, |
@@ -319,7 +319,7 @@ TEST_F(GpuChannelTest, RealTimeStreamsAllowed) { |
init_params.stream_id = kStreamId; |
init_params.stream_priority = kStreamPriority; |
init_params.attribs = std::vector<int>(); |
- init_params.active_url = GURL(); |
+ init_params.active_url = std::string(); |
init_params.gpu_preference = gfx::PreferIntegratedGpu; |
bool succeeded = false; |
HandleMessage(channel, |