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

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

Issue 10911315: Move gpu blacklist data file to content side. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 3 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
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | chrome/unit_tests.isolate » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/test/trace_event_analyzer.h" 10 #include "base/test/trace_event_analyzer.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 } else { 63 } else {
64 gpu_enabled_ = true; 64 gpu_enabled_ = true;
65 } 65 }
66 command_line->AppendSwitch(switches::kDisablePopupBlocking); 66 command_line->AppendSwitch(switches::kDisablePopupBlocking);
67 ui::DisableTestCompositor(); 67 ui::DisableTestCompositor();
68 command_line->AppendSwitchASCII(switches::kWindowSize, "400,300"); 68 command_line->AppendSwitchASCII(switches::kWindowSize, "400,300");
69 } 69 }
70 70
71 void SetupBlacklist(const std::string& json_blacklist) { 71 void SetupBlacklist(const std::string& json_blacklist) {
72 content::GPUInfo gpu_info; 72 content::GPUInfo gpu_info;
73 GpuDataManager::GetInstance()->Initialize( 73 GpuDataManager::GetInstance()->InitializeForTesting(
74 "0", json_blacklist, gpu_info); 74 json_blacklist, gpu_info);
75 } 75 }
76 76
77 // If expected_reply is NULL, we don't check the reply content. 77 // If expected_reply is NULL, we don't check the reply content.
78 void RunTest(const FilePath& url, 78 void RunTest(const FilePath& url,
79 const char* expected_reply, 79 const char* expected_reply,
80 bool new_tab) { 80 bool new_tab) {
81 #if defined(OS_LINUX) && !defined(NDEBUG) 81 #if defined(OS_LINUX) && !defined(NDEBUG)
82 // Bypass tests on GPU Linux Debug bots. 82 // Bypass tests on GPU Linux Debug bots.
83 if (gpu_enabled_) 83 if (gpu_enabled_)
84 return; 84 return;
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 base::StringPrintf( 505 base::StringPrintf(
506 "%d (resize offset %d): IOSurface width %d -> %d; Creates %d " 506 "%d (resize offset %d): IOSurface width %d -> %d; Creates %d "
507 "Expected %d", offset_i, offsets[offset_i], 507 "Expected %d", offset_i, offsets[offset_i],
508 old_width, new_width, num_creates, expected_creates); 508 old_width, new_width, num_creates, expected_creates);
509 } 509 }
510 } 510 }
511 } 511 }
512 #endif 512 #endif
513 513
514 } // namespace anonymous 514 } // namespace anonymous
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | chrome/unit_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698