Revert 63478 - Adds CHECKs in hopes of figuring out why we're crashing on some test

bots.

BUG=44991
TEST=none

Review URL: http://codereview.chromium.org/3992005

TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/4028002

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

1 files changed, 3 insertions, 8 deletions

diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc
index 1fa2786..a0ff1b0 100644
--- a/views/controls/native_control.cc
+++ b/views/controls/native_control.cc
@@ -78,8 +78,8 @@ class NativeControlContainer : public CWindowImpl<NativeControlContainer,
       parent_->NativeControlDestroyed();
     delete this;
   }
-
  private:
+
   LRESULT OnCreate(LPCREATESTRUCT create_struct) {
     control_ = parent_->CreateNativeControl(m_hWnd);
 
@@ -87,13 +87,8 @@ class NativeControlContainer : public CWindowImpl<NativeControlContainer,
     WNDPROC original_handler =
         win_util::SetWindowProc(control_,
                                 &NativeControl::NativeControlWndProc);
-    BOOL set_prop_result = SetProp(control_, kHandlerKey, original_handler);
-    CHECK(set_prop_result) << "Failed to SetProp in NativeControlContainer "
-                           << win_util::FormatLastWin32Error();
-
-    set_prop_result = SetProp(control_, kNativeControlKey, parent_);
-    CHECK(set_prop_result) << "Failed to SetProp in NativeControlContainer "
-                           << win_util::FormatLastWin32Error();
+    SetProp(control_, kHandlerKey, original_handler);
+    SetProp(control_, kNativeControlKey , parent_);
 
     ::ShowWindow(control_, SW_SHOW);
     return 1;