diff options
| author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-25 13:39:41 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-25 13:39:41 +0000 |
| commit | 1c51cf7bcdb3882388c69e3f686f291f7997d853 (patch) | |
| tree | 86c9978a89bd0a9c255ec10f6d319d0e514283e5 /chrome/browser/ui/search_engines | |
| parent | f51a7d903bf74513618ab8bf5b392af540227dbe (diff) | |
| download | chromium_src-1c51cf7bcdb3882388c69e3f686f291f7997d853.zip chromium_src-1c51cf7bcdb3882388c69e3f686f291f7997d853.tar.gz chromium_src-1c51cf7bcdb3882388c69e3f686f291f7997d853.tar.bz2 | |
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 <m.b.lankhorst@gmail.com>.
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
Diffstat (limited to 'chrome/browser/ui/search_engines')
| -rw-r--r-- | chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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); |