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

6 files changed, 8 insertions, 7 deletions

diff --git a/AUTHORS b/AUTHORS
index 54553c4..f1fe250 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -94,3 +94,4 @@ Ben Karel <eschew@gmail.com>
 Sam McDonald <sam@sammcd.com>
 Magnus Danielsson <fuzzac@gmail.com>
 Kushal Pisavadia <kushi.p@gmail.com>
+Maarten Lankhorst <m.b.lankhorst@gmail.com>
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index e8b10ea4..c5d35e6 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -2089,7 +2089,7 @@ TEST_F(ExtensionServiceTest, UpdatePendingExtension) {
   ASSERT_TRUE(extension);
 
   bool enabled = service_->GetExtensionById(kGoodId, false);
-  EXPECT_EQ(kGoodInitialState == Extension::ENABLED, enabled);
+  EXPECT_EQ(enabled, kGoodInitialState == Extension::ENABLED);
   EXPECT_EQ(kGoodInitialState,
             service_->extension_prefs()->GetExtensionState(extension->id()));
   EXPECT_EQ(kGoodInitialIncognitoEnabled,
diff --git a/chrome/browser/prefs/session_startup_pref_unittest.cc b/chrome/browser/prefs/session_startup_pref_unittest.cc
index 3732f58..0ad5390 100644
--- a/chrome/browser/prefs/session_startup_pref_unittest.cc
+++ b/chrome/browser/prefs/session_startup_pref_unittest.cc
@@ -49,7 +49,7 @@ TEST_F(SessionStartupPrefTest, URLListManagedOverridesUser) {
   EXPECT_EQ(3u, result.urls.size());
 
   SessionStartupPref override_test =
-      SessionStartupPref::SessionStartupPref(SessionStartupPref::URLS);
+      SessionStartupPref(SessionStartupPref::URLS);
   override_test.urls.push_back(GURL("dev.chromium.org"));
   SessionStartupPref::SetStartupPref(pref_service_.get(), override_test);
 
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc
index 594a45a..d8031ce 100644
--- a/chrome/browser/translate/translate_manager_browsertest.cc
+++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -483,7 +483,7 @@ TEST_F(TranslateManagerTest, TestAllLanguages) {
     ASSERT_LT(i, static_cast<size_t>(NUM_LANGUAGES));
 
     std::string lang = LanguageCodeWithDialects(static_cast<Language>(i));
-    SCOPED_TRACE(::testing::Message::Message() << "Iteration " << i <<
+    SCOPED_TRACE(::testing::Message() << "Iteration " << i <<
         " language=" << lang);
 
     // We should not have a translate infobar.
@@ -1118,7 +1118,7 @@ TEST_F(TranslateManagerTest, BeforeTranslateExtraButtons) {
       static_cast<TestingProfile*>(contents()->profile());
   test_profile->set_off_the_record(true);
   for (int i = 0; i < 8; ++i) {
-    SCOPED_TRACE(::testing::Message::Message() << "Iteration " << i <<
+    SCOPED_TRACE(::testing::Message() << "Iteration " << i <<
         " incognito mode=" << test_profile->IsOffTheRecord());
     SimulateNavigation(GURL("http://www.google.fr"), "Le Google", "fr", true);
     infobar = GetTranslateInfoBar();
@@ -1150,7 +1150,7 @@ TEST_F(TranslateManagerTest, BeforeTranslateExtraButtons) {
   // to be shown (in non incognito mode only).
   test_profile->set_off_the_record(true);
   for (int i = 0; i < 8; ++i) {
-    SCOPED_TRACE(::testing::Message::Message() << "Iteration " << i <<
+    SCOPED_TRACE(::testing::Message() << "Iteration " << i <<
         " incognito mode=" << test_profile->IsOffTheRecord());
     SimulateNavigation(GURL("http://www.google.de"), "Das Google", "de", true);
     infobar = GetTranslateInfoBar();
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);
diff --git a/ppapi/proxy/ppb_context_3d_proxy.cc b/ppapi/proxy/ppb_context_3d_proxy.cc
index 55df27b..11c8ebb 100644
--- a/ppapi/proxy/ppb_context_3d_proxy.cc
+++ b/ppapi/proxy/ppb_context_3d_proxy.cc
@@ -395,7 +395,7 @@ Context3D::Context3D(const HostResource& resource)
     : PluginResource(resource),
       draw_(NULL),
       read_(NULL),
-      transfer_buffer_id_(NULL) {
+      transfer_buffer_id_(0) {
 }
 
 Context3D::~Context3D() {