Reverts a commit that caused ASAN failures, and 2 dependent commits.

chrome_frame/test/infobar_unittests.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlmisc.h>
 #include <atlwin.h>
 
@@ skipping 79 matching lines @@
   virtual ~MockWindowSubclass() { Die(); }
   MOCK_METHOD0(Die, void());
 };  // class MockWindowSubclass
 
 template<typename T> class MockDelegate
     : public SubclassingWindowWithDelegate<T>::Delegate {
  public:
   virtual ~MockDelegate() { Die(); }
   MOCK_METHOD0(Die, void());
   MOCK_METHOD1(AdjustDisplacedWindowDimensions, void(RECT* rect));
-};  // class MockDelegate
+};  // clas MockDelegate
 
 template<typename T> T* Initialize(T* t,
                                    HWND hwnd,
                                    typename T::Delegate* delegate) {
   if (t->Initialize(hwnd, delegate)) {
     return t;
   } else {
     delete t;
     return NULL;
   }
@@ skipping 483 matching lines @@
 
   message_loop.RunFor(10);  // seconds
 
   window.DestroyWindow();
 
   ASSERT_FALSE(message_loop.WasTimedOut());
 }
 
 // TODO(erikwright): Write test for variations on return from default
 // OnNcCalcValidRects