base: Remove ALLOW_THIS_IN_INITIALIZER_LIST macro.

All the usages were fixed in past revisions and the remaining usages were fixed
within this patch.

BUG=234765
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/14657004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197671 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 8 insertions, 19 deletions

diff --git a/base/compiler_specific.h b/base/compiler_specific.h
index 5291ee5..0be7d89 100644
--- a/base/compiler_specific.h
+++ b/base/compiler_specific.h
@@ -40,16 +40,6 @@
 #define MSVC_DISABLE_OPTIMIZE() __pragma(optimize("", off))
 #define MSVC_ENABLE_OPTIMIZE() __pragma(optimize("", on))
 
-// DEPRECATED
-//
-// Prior to r83840 this was used to supress warning C4355 when using |this| as
-// an argument in constructor initializer lists:
-// http://msdn.microsoft.com/en-us/library/3c594ae3(VS.80).aspx
-//
-// C4355 is supressed globally during compilation and existing uses of this
-// macro should be removed. Refer to http://crbug.com/234765 for details.
-#define ALLOW_THIS_IN_INITIALIZER_LIST(code) code
-
 // Allows exporting a class that inherits from a non-exported base class.
 // This uses suppress instead of push/pop because the delimiter after the
 // declaration (either "," or "{") has to be placed before the pop macro.
@@ -73,7 +63,6 @@
 #define MSVC_POP_WARNING()
 #define MSVC_DISABLE_OPTIMIZE()
 #define MSVC_ENABLE_OPTIMIZE()
-#define ALLOW_THIS_IN_INITIALIZER_LIST(code) code
 #define NON_EXPORTED_BASE(code) code
 
 #endif  // COMPILER_MSVC
diff --git a/chrome/browser/history/top_sites_likely_impl_unittest.cc b/chrome/browser/history/top_sites_likely_impl_unittest.cc
index 3ec4a48..684c51b 100644
--- a/chrome/browser/history/top_sites_likely_impl_unittest.cc
+++ b/chrome/browser/history/top_sites_likely_impl_unittest.cc
@@ -74,7 +74,7 @@ class WaitForHistoryTask : public HistoryDBTask {
 class TopSitesQuerier {
  public:
   TopSitesQuerier()
-      : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
+      : weak_ptr_factory_(this),
         number_of_callbacks_(0),
         waiting_(false) {}
 
diff --git a/chromeos/audio/cras_audio_switch_handler.cc b/chromeos/audio/cras_audio_switch_handler.cc
index dea7016..4efb3a8 100644
--- a/chromeos/audio/cras_audio_switch_handler.cc
+++ b/chromeos/audio/cras_audio_switch_handler.cc
@@ -43,7 +43,7 @@ CrasAudioSwitchHandler* CrasAudioSwitchHandler::Get() {
 
 CrasAudioSwitchHandler::CrasAudioSwitchHandler()
     : muted_device_id_(0),
-      weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_ptr_factory_(this) {
   chromeos::DBusThreadManager::Get()->GetCrasAudioClient()->AddObserver(this);
   GetNodes();
 }
diff --git a/components/webdata/common/web_database_service.cc b/components/webdata/common/web_database_service.cc
index da5517b..baef346 100644
--- a/components/webdata/common/web_database_service.cc
+++ b/components/webdata/common/web_database_service.cc
@@ -40,7 +40,7 @@ class WebDatabaseService::BackendDelegate :
 WebDatabaseService::WebDatabaseService(
     const base::FilePath& path)
     : path_(path),
-      weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_ptr_factory_(this) {
   // WebDatabaseService should be instantiated on UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // WebDatabaseService requires DB thread if instantiated.
diff --git a/ipc/ipc_channel_win.cc b/ipc/ipc_channel_win.cc
index bde64124..8963707 100644
--- a/ipc/ipc_channel_win.cc
+++ b/ipc/ipc_channel_win.cc
@@ -42,7 +42,7 @@ Channel::ChannelImpl::ChannelImpl(const IPC::ChannelHandle &channel_handle,
       peer_pid_(base::kNullProcessId),
       waiting_connect_(mode & MODE_SERVER_FLAG),
       processing_incoming_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      weak_factory_(this),
       client_secret_(0),
       validate_client_(false) {
   CreatePipe(channel_handle, mode);
diff --git a/ppapi/native_client/src/trusted/plugin/service_runtime.cc b/ppapi/native_client/src/trusted/plugin/service_runtime.cc
index 6caee5d..ba21a49 100644
--- a/ppapi/native_client/src/trusted/plugin/service_runtime.cc
+++ b/ppapi/native_client/src/trusted/plugin/service_runtime.cc
@@ -107,7 +107,7 @@ void PluginReverseInterface::Log(nacl::string message) {
   plugin::WeakRefCallOnMainThread(
       anchor_,
       0,  /* delay in ms */
-      ALLOW_THIS_IN_INITIALIZER_LIST(this),
+      this,
       &plugin::PluginReverseInterface::Log_MainThreadContinuation,
       continuation);
 }
@@ -119,7 +119,7 @@ void PluginReverseInterface::DoPostMessage(nacl::string message) {
   plugin::WeakRefCallOnMainThread(
       anchor_,
       0,  /* delay in ms */
-      ALLOW_THIS_IN_INITIALIZER_LIST(this),
+      this,
       &plugin::PluginReverseInterface::PostMessage_MainThreadContinuation,
       continuation);
 }
@@ -573,7 +573,7 @@ int64_t PluginReverseInterface::RequestQuotaForWrite(
   plugin::WeakRefCallOnMainThread(
       anchor_,
       0,  /* delay in ms */
-      ALLOW_THIS_IN_INITIALIZER_LIST(this),
+      this,
       &plugin::PluginReverseInterface::QuotaRequest_MainThreadContinuation,
       continuation);
   // Wait for the main thread to request quota and signal completion.
diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc
index 992d7b4..ec25ae4 100644
--- a/ui/views/controls/textfield/native_textfield_views.cc
+++ b/ui/views/controls/textfield/native_textfield_views.cc
@@ -74,7 +74,7 @@ NativeTextfieldViews::NativeTextfieldViews(Textfield* parent)
       is_drop_cursor_visible_(false),
       skip_input_method_cancel_composition_(false),
       initiating_drag_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(cursor_timer_(this)),
+      cursor_timer_(this),
       aggregated_clicks_(0),
       touch_selection_controller_(NULL) {
   set_border(text_border_);