From 1c51cf7bcdb3882388c69e3f686f291f7997d853 Mon Sep 17 00:00:00 2001 From: "hbono@chromium.org" Date: Fri, 25 Feb 2011 13:39:41 +0000 Subject: Fix compiling on gcc-4.6. This change removes invalid direct calls to constructors and replaces NULL to 0 as workarounds for a compiler bug of gcc 4.6. Patch from Maarten Lankhorst . BUG=none TEST=fix builds on gcc 4.6 Review URL: http://codereview.chromium.org/6596005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76046 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/browser/ui/search_engines') diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc index 72b5bc1..053276e 100644 --- a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc +++ b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc @@ -114,7 +114,7 @@ void KeywordEditorControllerTest::Init(bool simulate_load_failure) { model_ = profile_->GetTemplateURLModel(); if (simulate_load_failure) - model_->OnWebDataServiceRequestDone(NULL, NULL); + model_->OnWebDataServiceRequestDone(0, NULL); controller_.reset(new KeywordEditorController(profile_.get())); controller_->table_model()->SetObserver(this); -- cgit v1.1