Index: content/browser/gpu/gpu_util_unittest.cc |
=================================================================== |
--- content/browser/gpu/gpu_util_unittest.cc (revision 154773) |
+++ content/browser/gpu/gpu_util_unittest.cc (working copy) |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/gpu_util.h" |
+#include "content/browser/gpu/gpu_util.h" |
#include "testing/gtest/include/gtest/gtest.h" |
using content::GpuFeatureType; |
@@ -17,6 +17,14 @@ |
content::GPU_FEATURE_TYPE_WEBGL); |
EXPECT_EQ(gpu_util::StringToGpuFeatureType("multisampling"), |
content::GPU_FEATURE_TYPE_MULTISAMPLING); |
+ EXPECT_EQ(gpu_util::StringToGpuFeatureType("flash_3d"), |
+ content::GPU_FEATURE_TYPE_FLASH3D); |
+ EXPECT_EQ(gpu_util::StringToGpuFeatureType("flash_stage3d"), |
+ content::GPU_FEATURE_TYPE_FLASH_STAGE3D); |
+ EXPECT_EQ(gpu_util::StringToGpuFeatureType("texture_sharing"), |
+ content::GPU_FEATURE_TYPE_TEXTURE_SHARING); |
+ EXPECT_EQ(gpu_util::StringToGpuFeatureType("accelerated_video_decode"), |
+ content::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE); |
EXPECT_EQ(gpu_util::StringToGpuFeatureType("all"), |
content::GPU_FEATURE_TYPE_ALL); |
EXPECT_EQ(gpu_util::StringToGpuFeatureType("xxx"), |
@@ -43,6 +51,22 @@ |
"multisampling"); |
EXPECT_STREQ( |
gpu_util::GpuFeatureTypeToString( |
+ content::GPU_FEATURE_TYPE_FLASH3D).c_str(), |
+ "flash_3d"); |
+ EXPECT_STREQ( |
+ gpu_util::GpuFeatureTypeToString( |
+ content::GPU_FEATURE_TYPE_FLASH_STAGE3D).c_str(), |
+ "flash_stage3d"); |
+ EXPECT_STREQ( |
+ gpu_util::GpuFeatureTypeToString( |
+ content::GPU_FEATURE_TYPE_TEXTURE_SHARING).c_str(), |
+ "texture_sharing"); |
+ EXPECT_STREQ( |
+ gpu_util::GpuFeatureTypeToString( |
+ content::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE).c_str(), |
+ "accelerated_video_decode"); |
+ EXPECT_STREQ( |
+ gpu_util::GpuFeatureTypeToString( |
content::GPU_FEATURE_TYPE_ALL).c_str(), |
"all"); |
EXPECT_STREQ(gpu_util::GpuFeatureTypeToString( |
@@ -54,11 +78,10 @@ |
content::GPU_FEATURE_TYPE_WEBGL | |
content::GPU_FEATURE_TYPE_MULTISAMPLING)).c_str(), |
"webgl,multisampling"); |
- |
- std::string tmp; |
- tmp = gpu_util::GpuFeatureTypeToString( |
- static_cast<content::GpuFeatureType>( |
- content::GPU_FEATURE_TYPE_WEBGL | |
- content::GPU_FEATURE_TYPE_ALL)); |
- EXPECT_STREQ(tmp.c_str(), "all"); |
+ EXPECT_STREQ( |
+ gpu_util::GpuFeatureTypeToString( |
+ static_cast<content::GpuFeatureType>( |
+ content::GPU_FEATURE_TYPE_WEBGL | |
+ content::GPU_FEATURE_TYPE_ALL)).c_str(), |
+ "all"); |
} |