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

Side by Side Diff: chrome/test/gpu/gpu_feature_browsertest.cc

Issue 8758003: Remove dead code for gpu blacklist auto-update. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "base/file_util.h" 5 #include "base/file_util.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/test/trace_event_analyzer.h" 8 #include "base/test/trace_event_analyzer.h"
9 #include "base/version.h" 9 #include "base/version.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 15 matching lines...) Expand all
26 // This enables DOM automation for tab contents. 26 // This enables DOM automation for tab contents.
27 EnableDOMAutomation(); 27 EnableDOMAutomation();
28 } 28 }
29 29
30 void SetupBlacklist(const std::string& json_blacklist) { 30 void SetupBlacklist(const std::string& json_blacklist) {
31 scoped_ptr<Version> os_version(Version::GetVersionFromString("1.0")); 31 scoped_ptr<Version> os_version(Version::GetVersionFromString("1.0"));
32 GpuBlacklist* blacklist = new GpuBlacklist("1.0"); 32 GpuBlacklist* blacklist = new GpuBlacklist("1.0");
33 33
34 ASSERT_TRUE(blacklist->LoadGpuBlacklist( 34 ASSERT_TRUE(blacklist->LoadGpuBlacklist(
35 json_blacklist, GpuBlacklist::kAllOs)); 35 json_blacklist, GpuBlacklist::kAllOs));
36 GpuDataManager::GetInstance()->SetBuiltInGpuBlacklist(blacklist); 36 GpuDataManager::GetInstance()->SetGpuBlacklist(blacklist);
37 } 37 }
38 38
39 void RunTest(const FilePath& url, bool expect_gpu_process) { 39 void RunTest(const FilePath& url, bool expect_gpu_process) {
40 using namespace trace_analyzer; 40 using namespace trace_analyzer;
41 41
42 FilePath test_path; 42 FilePath test_path;
43 PathService::Get(chrome::DIR_TEST_DATA, &test_path); 43 PathService::Get(chrome::DIR_TEST_DATA, &test_path);
44 test_path = test_path.Append(FILE_PATH_LITERAL("gpu")); 44 test_path = test_path.Append(FILE_PATH_LITERAL("gpu"));
45 test_path = test_path.Append(url); 45 test_path = test_path.Append(url);
46 46
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 flags.flags(), 178 flags.flags(),
179 static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas)); 179 static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas));
180 180
181 const bool expect_gpu_process = false; 181 const bool expect_gpu_process = false;
182 const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html")); 182 const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
183 RunTest(url, expect_gpu_process); 183 RunTest(url, expect_gpu_process);
184 } 184 }
185 185
186 } // namespace anonymous 186 } // namespace anonymous
187 187
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698