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

Side by Side Diff: content/test/gpu/gpu_test_config.h

Issue 10815027: Fix GPUTestConfigTest.LoadCurrentConfig on Android (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_TEST_GPU_GPU_TEST_CONFIG_H_ 5 #ifndef CONTENT_TEST_GPU_GPU_TEST_CONFIG_H_
6 #define CONTENT_TEST_GPU_GPU_TEST_CONFIG_H_ 6 #define CONTENT_TEST_GPU_GPU_TEST_CONFIG_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 11 matching lines...) Expand all
22 kOsWinXP = 1 << 0, 22 kOsWinXP = 1 << 0,
23 kOsWinVista = 1 << 1, 23 kOsWinVista = 1 << 1,
24 kOsWin7 = 1 << 2, 24 kOsWin7 = 1 << 2,
25 kOsWin = kOsWinXP | kOsWinVista | kOsWin7, 25 kOsWin = kOsWinXP | kOsWinVista | kOsWin7,
26 kOsMacLeopard = 1 << 3, 26 kOsMacLeopard = 1 << 3,
27 kOsMacSnowLeopard = 1 << 4, 27 kOsMacSnowLeopard = 1 << 4,
28 kOsMacLion = 1 << 5, 28 kOsMacLion = 1 << 5,
29 kOsMac = kOsMacLeopard | kOsMacSnowLeopard | kOsMacLion, 29 kOsMac = kOsMacLeopard | kOsMacSnowLeopard | kOsMacLion,
30 kOsLinux = 1 << 6, 30 kOsLinux = 1 << 6,
31 kOsChromeOS = 1 << 7, 31 kOsChromeOS = 1 << 7,
32 kOsAndroid = 1 << 8,
32 }; 33 };
33 34
34 enum BuildType { 35 enum BuildType {
35 kBuildTypeUnknown = 0, 36 kBuildTypeUnknown = 0,
36 kBuildTypeRelease = 1 << 0, 37 kBuildTypeRelease = 1 << 0,
37 kBuildTypeDebug = 1 << 1, 38 kBuildTypeDebug = 1 << 1,
38 }; 39 };
39 40
40 GPUTestConfig(); 41 GPUTestConfig();
41 virtual ~GPUTestConfig(); 42 virtual ~GPUTestConfig();
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 // If gpu_info is NULL, collect GPUInfo first. 102 // If gpu_info is NULL, collect GPUInfo first.
102 bool LoadCurrentConfig(const content::GPUInfo* gpu_info); 103 bool LoadCurrentConfig(const content::GPUInfo* gpu_info);
103 104
104 // Check if this bot's config matches |config_data| or any of the |configs|. 105 // Check if this bot's config matches |config_data| or any of the |configs|.
105 static bool CurrentConfigMatches(const std::string& config_data); 106 static bool CurrentConfigMatches(const std::string& config_data);
106 static bool CurrentConfigMatches(const std::vector<std::string>& configs); 107 static bool CurrentConfigMatches(const std::vector<std::string>& configs);
107 }; 108 };
108 109
109 #endif // CONTENT_TEST_GPU_GPU_TEST_CONFIG_H_ 110 #endif // CONTENT_TEST_GPU_GPU_TEST_CONFIG_H_
110 111
OLDNEW
« no previous file with comments | « build/android/gtest_filter/content_unittests_disabled ('k') | content/test/gpu/gpu_test_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698