4 files changed, 0 insertions, 24 deletions
diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc
index fefed51..d5293b2 100644
--- a/views/controls/native_control.cc
+++ b/views/controls/native_control.cc
@@ -79,10 +79,7 @@ class NativeControlContainer : public CWindowImpl<NativeControlContainer,
  private:
 
   LRESULT OnCreate(LPCREATESTRUCT create_struct) {
-    TRACK_HWND_CREATION(m_hWnd);
-
     control_ = parent_->CreateNativeControl(m_hWnd);
-    TRACK_HWND_CREATION(control_);
 
     FocusManager::InstallFocusSubclass(control_, parent_);
 
@@ -125,7 +122,6 @@ class NativeControlContainer : public CWindowImpl<NativeControlContainer,
   void OnDestroy() {
     if (parent_)
       parent_->OnDestroy();
-    TRACK_HWND_DESTRUCTION(m_hWnd);
   }
 
   void OnContextMenu(HWND window, const WTL::CPoint& location) {
@@ -376,7 +372,6 @@ LRESULT CALLBACK NativeControl::NativeControlWndProc(HWND window, UINT message,
                             reinterpret_cast<WNDPROC>(original_handler));
     RemoveProp(window, kHandlerKey);
     RemoveProp(window, kNativeControlKey);
-    TRACK_HWND_DESTRUCTION(window);
   }
 
   return CallWindowProc(reinterpret_cast<WNDPROC>(original_handler), window,
diff --git a/views/controls/native_control_win.cc b/views/controls/native_control_win.cc
index 0c1baf8..c1ddadf 100644
--- a/views/controls/native_control_win.cc
+++ b/views/controls/native_control_win.cc
@@ -112,8 +112,6 @@ void NativeControlWin::ShowContextMenu(const gfx::Point& location) {
 }
 
 void NativeControlWin::NativeControlCreated(HWND native_control) {
-  TRACK_HWND_CREATION(native_control);
-
   // Associate this object with the control's HWND so that WidgetWin can find
   // this object when it receives messages from it.
   SetProp(native_control, kNativeControlWinKey, this);
@@ -191,7 +189,6 @@ LRESULT NativeControlWin::NativeControlWndProc(HWND window,
   } else if (message == WM_DESTROY) {
     win_util::SetWindowProc(window, native_control->original_wndproc_);
     RemoveProp(window, kNativeControlWinKey);
-    TRACK_HWND_DESTRUCTION(window);
   }
 
   return CallWindowProc(native_control->original_wndproc_, window, message,
diff --git a/views/controls/text_field.cc b/views/controls/text_field.cc
index 76732a1..2a608bb 100644
--- a/views/controls/text_field.cc
+++ b/views/controls/text_field.cc
@@ -71,9 +71,7 @@ class TextField::Edit
     MSG_WM_CHAR(OnChar)
     MSG_WM_CONTEXTMENU(OnContextMenu)
     MSG_WM_COPY(OnCopy)
-    MSG_WM_CREATE(OnCreate)
     MSG_WM_CUT(OnCut)
-    MSG_WM_DESTROY(OnDestroy)
     MESSAGE_HANDLER_EX(WM_IME_CHAR, OnImeChar)
     MESSAGE_HANDLER_EX(WM_IME_STARTCOMPOSITION, OnImeStartComposition)
     MESSAGE_HANDLER_EX(WM_IME_COMPOSITION, OnImeComposition)
@@ -121,9 +119,7 @@ class TextField::Edit
   void OnChar(TCHAR key, UINT repeat_count, UINT flags);
   void OnContextMenu(HWND window, const CPoint& point);
   void OnCopy();
-  LRESULT OnCreate(CREATESTRUCT* create_struct);
   void OnCut();
-  void OnDestroy();
   LRESULT OnImeChar(UINT message, WPARAM wparam, LPARAM lparam);
   LRESULT OnImeStartComposition(UINT message, WPARAM wparam, LPARAM lparam);
   LRESULT OnImeComposition(UINT message, WPARAM wparam, LPARAM lparam);
@@ -427,12 +423,6 @@ void TextField::Edit::OnCopy() {
   }
 }
 
-LRESULT TextField::Edit::OnCreate(CREATESTRUCT* create_struct) {
-  SetMsgHandled(FALSE);
-  TRACK_HWND_CREATION(m_hWnd);
-  return 0;
-}
-
 void TextField::Edit::OnCut() {
   if (parent_->IsReadOnly() || parent_->IsPassword())
     return;
@@ -444,10 +434,6 @@ void TextField::Edit::OnCut() {
   ReplaceSel(L"", true);
 }
 
-void TextField::Edit::OnDestroy() {
-  TRACK_HWND_DESTRUCTION(m_hWnd);
-}
-
 LRESULT TextField::Edit::OnImeChar(UINT message, WPARAM wparam, LPARAM lparam) {
   // http://crbug.com/7707: a rich-edit control may crash when it receives a
   // WM_IME_CHAR message while it is processing a WM_IME_COMPOSITION message.
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index 4dfb0ca..fdb6252 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -179,7 +179,6 @@ void WidgetWin::Init(HWND parent, const gfx::Rect& bounds,
                          window_style_, bounds.x(), bounds.y(), bounds.width(),
                          bounds.height(), parent, NULL, NULL, this);
   DCHECK(hwnd_);
-  TRACK_HWND_CREATION(hwnd_);
   SetWindowSupportsRerouteMouseWheel(hwnd_);
 
   // The window procedure should have set the data for us.
@@ -1031,7 +1030,6 @@ LRESULT CALLBACK WidgetWin::WndProc(HWND window, UINT message,
   if (!widget->ProcessWindowMessage(window, message, w_param, l_param, result))
     result = DefWindowProc(window, message, w_param, l_param);
   if (message == WM_NCDESTROY) {
-    TRACK_HWND_DESTRUCTION(window);
     widget->hwnd_ = NULL;
     widget->OnFinalMessage(window);
   }