chrome_frame: Remove use of ALLOW_THIS_IN_INITIALIZER_LIST.

It's no longer providing value as the MSVC warning is disabled during compilation. Refer to bug for details.

BUG=234765

Review URL: https://chromiumcodereview.appspot.com/14364008

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

6 files changed, 8 insertions, 11 deletions

diff --git a/chrome_frame/infobars/internal/infobar_window.cc b/chrome_frame/infobars/internal/infobar_window.cc
index 34b2c3d..e0f0428 100644
--- a/chrome_frame/infobars/internal/infobar_window.cc
+++ b/chrome_frame/infobars/internal/infobar_window.cc
@@ -38,7 +38,7 @@ InfobarWindow::InfobarWindow(InfobarType type)
       current_width_(0),
       timer_id_(0),
       timer_stub_(NULL),
-      frame_impl_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      frame_impl_(this) {
   DCHECK(type_ >= FIRST_INFOBAR_TYPE);
   DCHECK(type_ < END_OF_INFOBAR_TYPE);
 }
diff --git a/chrome_frame/ready_mode/internal/ready_prompt_window.cc b/chrome_frame/ready_mode/internal/ready_prompt_window.cc
index b51a6bc..7cb13214 100644
--- a/chrome_frame/ready_mode/internal/ready_prompt_window.cc
+++ b/chrome_frame/ready_mode/internal/ready_prompt_window.cc
@@ -30,7 +30,7 @@ ReadyPromptWindow::ReadyPromptWindow(
       ready_mode_state_(ready_mode_state),
       url_launcher_(url_launcher),
       icon_(NULL),
-      weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_ptr_factory_(this) {
 }
 ReadyPromptWindow::~ReadyPromptWindow() {
   if (icon_)
diff --git a/chrome_frame/ready_mode/ready_mode.cc b/chrome_frame/ready_mode/ready_mode.cc
index b07f158..7e6a0df 100644
--- a/chrome_frame/ready_mode/ready_mode.cc
+++ b/chrome_frame/ready_mode/ready_mode.cc
@@ -155,7 +155,7 @@ BrowserObserver::BrowserObserver(ready_mode::Delegate* chrome_frame,
     : web_browser_(web_browser),
       chrome_frame_(chrome_frame),
       adapter_(adapter),
-      weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_ptr_factory_(this) {
 }
 
 void BrowserObserver::OnNavigateTo(const std::wstring& url) {
diff --git a/chrome_frame/test/chrome_frame_ui_test_utils.cc b/chrome_frame/test/chrome_frame_ui_test_utils.cc
index 96f6bdf..25dd60b 100644
--- a/chrome_frame/test/chrome_frame_ui_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_ui_test_utils.cc
@@ -638,7 +638,7 @@ std::wstring AccObjectMatcher::GetDescription() const {
 
 // AccEventObserver methods
 AccEventObserver::AccEventObserver()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(event_handler_(new EventHandler(this))),
+    : event_handler_(new EventHandler(this)),
       is_watching_(false) {
   event_receiver_.SetListenerForEvents(this, EVENT_SYSTEM_MENUPOPUPSTART,
                                        EVENT_OBJECT_VALUECHANGE);
diff --git a/chrome_frame/test/ie_event_sink.cc b/chrome_frame/test/ie_event_sink.cc
index f8baff0..98bfacc 100644
--- a/chrome_frame/test/ie_event_sink.cc
+++ b/chrome_frame/test/ie_event_sink.cc
@@ -201,12 +201,9 @@ _ATL_FUNC_INFO IEEventSink::kFileDownloadInfo = {
 bool IEEventSink::abnormal_shutdown_ = false;
 
 IEEventSink::IEEventSink()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(
-          onmessage_(this, &IEEventSink::OnMessage)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          onloaderror_(this, &IEEventSink::OnLoadError)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          onload_(this, &IEEventSink::OnLoad)),
+    : onmessage_(this, &IEEventSink::OnMessage),
+      onloaderror_(this, &IEEventSink::OnLoadError),
+      onload_(this, &IEEventSink::OnLoad),
       listener_(NULL),
       ie_process_id_(0),
       did_receive_on_quit_(false) {
diff --git a/chrome_frame/test/win_event_receiver.cc b/chrome_frame/test/win_event_receiver.cc
index 7277b49..c014b64 100644
--- a/chrome_frame/test/win_event_receiver.cc
+++ b/chrome_frame/test/win_event_receiver.cc
@@ -105,7 +105,7 @@ WindowWatchdog::ProcessExitObserver::ProcessExitObserver(
     : window_watchdog_(window_watchdog),
       process_handle_(NULL),
       hwnd_(hwnd),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   DWORD pid = 0;
   ::GetWindowThreadProcessId(hwnd, &pid);
   if (pid != 0) {