diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-26 00:04:48 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-26 00:04:48 +0000 |
| commit | 144259d6f653fe03ec889d24605e60a00e5a28a0 (patch) | |
| tree | 7f776c0dd209af6626f75d0f07be9251a19d2970 /chrome/test/gpu | |
| parent | 54ba4a8cd61e1e5ad659ea6b3ef59c909654ce0c (diff) | |
| download | chromium_src-144259d6f653fe03ec889d24605e60a00e5a28a0.zip chromium_src-144259d6f653fe03ec889d24605e60a00e5a28a0.tar.gz chromium_src-144259d6f653fe03ec889d24605e60a00e5a28a0.tar.bz2 | |
[Reason for revert: might be a factor in XP-only failures UITestCanLaunchWithOSMesa. Will unrevert if proven innocent.]
Revert 76075 - With this CL, GPU blacklist auto update from the web (before it ships together with chrome) is implemented. This allows us to blacklist bad GPU/drivers as soon as we discover them.
Note that this patch does not turn the auto update on. We will turn it on in a separate CL.
BUG=68802
TEST=build bots all green
Review URL: http://codereview.chromium.org/6469094
TBR=zmo@google.com
Review URL: http://codereview.chromium.org/6599020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/gpu')
| -rw-r--r-- | chrome/test/gpu/gpu_pixel_browsertest.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc index 26fc191..ede1c69 100644 --- a/chrome/test/gpu/gpu_pixel_browsertest.cc +++ b/chrome/test/gpu/gpu_pixel_browsertest.cc @@ -14,13 +14,12 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "chrome/browser/gpu_data_manager.h" +#include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_window.h" #include "chrome/browser/gpu_process_host.h" #include "chrome/browser/gpu_process_host_ui_shim.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/gpu_info.h" @@ -93,14 +92,14 @@ class GPUInfoCollectedObserver { gpu_info_collected_(false) { gpu_info_update_callback_ = NewCallback(this, &GPUInfoCollectedObserver::OnGpuInfoCollected); - GpuDataManager::GetInstance()-> - AddGpuInfoUpdateCallback(gpu_info_update_callback_); + GpuProcessHostUIShimManager::GetInstance()->gpu_info_update_callbacks().Add( + gpu_info_update_callback_); } void OnGpuInfoCollected() { gpu_info_collected_ = true; - GpuDataManager::GetInstance()-> - RemoveGpuInfoUpdateCallback(gpu_info_update_callback_); + GpuProcessHostUIShimManager::GetInstance()-> + gpu_info_update_callbacks().Remove(gpu_info_update_callback_); delete gpu_info_update_callback_; MessageLoopForUI::current()->Quit(); } |