Revert 15965. I wasn't supposed to check that in since it still doesn't compile on linux and mac!

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

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

63 files changed, 179 insertions, 225 deletions

diff --git a/app/os_exchange_data.cc b/app/os_exchange_data.cc
index e27c6fd..c9e2311 100644
--- a/app/os_exchange_data.cc
+++ b/app/os_exchange_data.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <shlobj.h>
+
 #include "app/os_exchange_data.h"
 
 #include "app/l10n_util.h"
diff --git a/app/os_exchange_data.h b/app/os_exchange_data.h
index 4a8fbc4..5668008 100644
--- a/app/os_exchange_data.h
+++ b/app/os_exchange_data.h
@@ -5,10 +5,11 @@
 #ifndef APP_OS_EXCHANGE_DATA_H_
 #define APP_OS_EXCHANGE_DATA_H_
 
+#include <atlbase.h>
 #include <objidl.h>
 #include <vector>
 
-#include "base/scoped_comptr_win.h"
+#include "base/basictypes.h"
 
 class GURL;
 class Pickle;
@@ -133,7 +134,7 @@ class OSExchangeData : public IDataObject {
   typedef std::vector<StoredDataInfo*> StoredData;
   StoredData contents_;
 
-  ScopedComPtr<IDataObject> source_object_;
+  CComPtr<IDataObject> source_object_;
 
   LONG ref_count_;
 
diff --git a/app/os_exchange_data_unittest.cc b/app/os_exchange_data_unittest.cc
index 981a8d1..13a28a9 100644
--- a/app/os_exchange_data_unittest.cc
+++ b/app/os_exchange_data_unittest.cc
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <atlbase.h>
+#include <shlobj.h>
+
 #include "app/os_exchange_data.h"
 #include "base/clipboard_util.h"
 #include "base/pickle.h"
@@ -39,7 +42,7 @@ TEST(OSExchangeDataTest, StringDataAccessViaCOM) {
   OSExchangeData* data = new OSExchangeData;
   std::wstring input = L"O hai googlz.";
   data->SetString(input);
-  ScopedComPtr<IDataObject> com_data(data);
+  CComPtr<IDataObject> com_data(data);
 
   FORMATETC format_etc =
       { CF_UNICODETEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
@@ -51,6 +54,8 @@ TEST(OSExchangeDataTest, StringDataAccessViaCOM) {
       ScopedHGlobal<wchar_t>(medium.hGlobal).get();
   EXPECT_EQ(input, output);
   ReleaseStgMedium(&medium);
+
+  // data is freed automatically by CComPtr.
 }
 
 // Test setting using the IDataObject COM API
@@ -58,7 +63,7 @@ TEST(OSExchangeDataTest, StringDataWritingViaCOM) {
   OSExchangeData* data = new OSExchangeData;
   std::wstring input = L"http://www.google.com/";
 
-  ScopedComPtr<IDataObject> com_data(data);
+  CComPtr<IDataObject> com_data(data);
 
   // Store data in the object using the COM SetData API.
   CLIPFORMAT cfstr_ineturl = RegisterClipboardFormat(CFSTR_INETURL);
@@ -93,7 +98,7 @@ TEST(OSExchangeDataTest, URLDataAccessViaCOM) {
   OSExchangeData* data = new OSExchangeData;
   GURL url("http://www.google.com/");
   data->SetURL(url, L"");
-  ScopedComPtr<IDataObject> com_data(data);
+  CComPtr<IDataObject> com_data(data);
 
   CLIPFORMAT cfstr_ineturl = RegisterClipboardFormat(CFSTR_INETURL);
   FORMATETC format_etc =
@@ -116,7 +121,7 @@ TEST(OSExchangeDataTest, MultipleFormatsViaCOM) {
   data->SetURL(url, L"Google");
   data->SetString(text);
 
-  ScopedComPtr<IDataObject> com_data(data);
+  CComPtr<IDataObject> com_data(data);
 
   CLIPFORMAT cfstr_ineturl = RegisterClipboardFormat(CFSTR_INETURL);
   FORMATETC url_format_etc =
@@ -151,10 +156,9 @@ TEST(OSExchangeDataTest, EnumerationViaCOM) {
       RegisterClipboardFormat(CFSTR_FILEDESCRIPTOR);
   CLIPFORMAT text_x_moz_url = RegisterClipboardFormat(L"text/x-moz-url");
 
-  ScopedComPtr<IDataObject> com_data(data);
-  ScopedComPtr<IEnumFORMATETC> enumerator;
-  EXPECT_EQ(S_OK, com_data.get()->EnumFormatEtc(DATADIR_GET,
-                                                enumerator.Receive()));
+  CComPtr<IDataObject> com_data(data);
+  CComPtr<IEnumFORMATETC> enumerator;
+  EXPECT_EQ(S_OK, com_data->EnumFormatEtc(DATADIR_GET, &enumerator));
 
   // Test that we can get one item.
   {
@@ -206,9 +210,9 @@ TEST(OSExchangeDataTest, EnumerationViaCOM) {
   {
     EXPECT_EQ(S_OK, enumerator->Reset());
     EXPECT_EQ(S_OK, enumerator->Skip(1));
-    ScopedComPtr<IEnumFORMATETC> cloned_enumerator;
-    EXPECT_EQ(S_OK, enumerator.get()->Clone(cloned_enumerator.Receive()));
-    EXPECT_EQ(S_OK, enumerator.get()->Reset());
+    CComPtr<IEnumFORMATETC> cloned_enumerator;
+    EXPECT_EQ(S_OK, enumerator->Clone(&cloned_enumerator));
+    EXPECT_EQ(S_OK, enumerator->Reset());
 
     {
       ULONG retrieved = 0;
@@ -253,7 +257,7 @@ TEST(OSExchangeDataTest, TestURLExchangeFormats) {
   EXPECT_EQ(url_spec, WideToUTF8(output_string));
 
   // File contents access via COM
-  ScopedComPtr<IDataObject> com_data(data);
+  CComPtr<IDataObject> com_data(data);
   {
     CLIPFORMAT cfstr_file_contents =
         RegisterClipboardFormat(CFSTR_FILECONTENTS);
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index e83f54f..1bde447 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -4,11 +4,6 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_WIN)
-#include <windows.h>
-#include <commctrl.h>
-#endif
-
 #include <algorithm>
 
 #include "app/l10n_util.h"
diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc
index d00ee47..6304609 100644
--- a/chrome/browser/first_run.cc
+++ b/chrome/browser/first_run.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/first_run.h"
-
 #include <atlbase.h>
 #include <atlcom.h>
 #include <windows.h>
@@ -11,6 +9,8 @@
 
 #include <sstream>
 
+#include "chrome/browser/first_run.h"
+
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
diff --git a/chrome/browser/history/history_publisher.cc b/chrome/browser/history/history_publisher.cc
index 364bb821..52327c5 100644
--- a/chrome/browser/history/history_publisher.cc
+++ b/chrome/browser/history/history_publisher.cc
@@ -6,7 +6,7 @@
 
 namespace history {
 
-const char* const HistoryPublisher::kThumbnailImageFormat = "image/jpeg";
+const char* HistoryPublisher::kThumbnailImageFormat = "image/jpeg";
 
 void HistoryPublisher::PublishPageThumbnail(
     const std::vector<unsigned char>& thumbnail, const GURL& url,
diff --git a/chrome/browser/history/history_publisher.h b/chrome/browser/history/history_publisher.h
index 00090659..71005e5 100644
--- a/chrome/browser/history/history_publisher.h
+++ b/chrome/browser/history/history_publisher.h
@@ -8,12 +8,14 @@
 #include <vector>
 #include <string>
 
-#include "base/scoped_comptr_win.h"
+#include "base/basictypes.h"
 #include "base/time.h"
 #include "chrome/browser/history/history_types.h"
 #include "googleurl/src/gurl.h"
 
 #if defined(OS_WIN)
+#include <atlbase.h>
+#include <atlcomcli.h>
 #include "history_indexer.h"
 #endif
 
@@ -58,18 +60,18 @@ class HistoryPublisher {
   // Returns '0' if the time object is NULL.
   static double TimeToUTCVariantTime(const base::Time& time);
 
-  typedef std::vector< ScopedComPtr<IChromeHistoryIndexer> > IndexerList;
+  typedef std::vector<CComPtr<IChromeHistoryIndexer> > IndexerList;
 
   // The list of indexers registered to receive history data from us.
   IndexerList indexers_;
 
   // The Registry key under HKCU where the indexers need to register their
   // CLSID.
-  static const wchar_t* const kRegKeyRegisteredIndexersInfo;
+  static const wchar_t* kRegKeyRegisteredIndexersInfo;
 #endif
 
   // The format of the thumbnail we pass to indexers.
-  static const char* const kThumbnailImageFormat;
+  static const char* kThumbnailImageFormat;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryPublisher);
 };
diff --git a/chrome/browser/history/history_publisher_win.cc b/chrome/browser/history/history_publisher_win.cc
index ef4fb7f..72c0f1d 100644
--- a/chrome/browser/history/history_publisher_win.cc
+++ b/chrome/browser/history/history_publisher_win.cc
@@ -10,11 +10,10 @@
 #include <wtypes.h>
 
 #include "base/registry.h"
-#include "base/scoped_comptr_win.h"
 
 namespace history {
 
-const wchar_t* const HistoryPublisher::kRegKeyRegisteredIndexersInfo =
+const wchar_t* HistoryPublisher::kRegKeyRegisteredIndexersInfo =
     L"Software\\Google\\Google Chrome\\IndexerPlugins";
 
 // static
@@ -61,7 +60,7 @@ bool HistoryPublisher::ReadRegisteredIndexersFromRegistry() {
     CLSID clsid;
     CLSIDFromString(static_cast<LPOLESTR>(
         const_cast<TCHAR*>(iter.Name())), &clsid);
-    ScopedComPtr<IChromeHistoryIndexer> indexer;
+    CComPtr<IChromeHistoryIndexer> indexer;
     HRESULT hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC,
                                   __uuidof(IChromeHistoryIndexer),
                                   reinterpret_cast<void**>(&indexer));
diff --git a/chrome/browser/input_window_dialog_win.cc b/chrome/browser/input_window_dialog_win.cc
index 2da360a..d236cc9 100644
--- a/chrome/browser/input_window_dialog_win.cc
+++ b/chrome/browser/input_window_dialog_win.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/input_window_dialog.h"
 
 #include "app/l10n_util.h"
-#include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "views/grid_layout.h"
@@ -61,7 +60,7 @@ class ContentView : public views::View,
  public:
   explicit ContentView(WinInputWindowDialog* delegate)
       : delegate_(delegate),
-        ALLOW_THIS_IN_INITIALIZER_LIST(focus_grabber_factory_(this)) {
+        focus_grabber_factory_(this) {
     DCHECK(delegate_);
   }
 
diff --git a/chrome/browser/tab_contents/tab_contents_view_win.h b/chrome/browser/tab_contents/tab_contents_view_win.h
index 4166891..6e36549 100644
--- a/chrome/browser/tab_contents/tab_contents_view_win.h
+++ b/chrome/browser/tab_contents/tab_contents_view_win.h
@@ -64,7 +64,7 @@ class TabContentsViewWin : public TabContentsView,
   virtual void OnSetFocus(HWND window);
   virtual void OnVScroll(int scroll_type, short position, HWND scrollbar);
   virtual void OnWindowPosChanged(WINDOWPOS* window_pos);
-  virtual void OnSize(UINT param, const WTL::CSize& size);
+  virtual void OnSize(UINT param, const CSize& size);
   virtual LRESULT OnNCCalcSize(BOOL w_param, LPARAM l_param);
   virtual void OnNCPaint(HRGN rgn);
 
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
index f4d9e9e..d62465f 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -4,8 +4,6 @@
 
 #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h"
 
-#include <objidl.h>
-#include <commctrl.h>
 #include <dwmapi.h>
 
 #include "app/gfx/chrome_canvas.h"
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 71b4051..88264f2 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -1093,7 +1093,7 @@ int BookmarkBarView::GetDragOperations(View* sender, int x, int y) {
 }
 
 void BookmarkBarView::RunMenu(views::View* view,
-                              const gfx::Point& pt,
+                              const CPoint& pt,
                               HWND hwnd) {
   BookmarkNode* node;
   MenuItemView::AnchorPosition anchor_point = MenuItemView::TOPLEFT;
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
index ccf787e..a56f51a 100644
--- a/chrome/browser/views/bookmark_bar_view.h
+++ b/chrome/browser/views/bookmark_bar_view.h
@@ -300,7 +300,7 @@ class BookmarkBarView : public views::View,
   // . menu for star groups.
   // The latter two are handled by a MenuRunner, which builds the appropriate
   // menu.
-  virtual void RunMenu(views::View* view, const gfx::Point& pt, HWND hwnd);
+  virtual void RunMenu(views::View* view, const CPoint& pt, HWND hwnd);
 
   // Invoked when a star entry corresponding to a URL on the bookmark bar is
   // pressed. Forwards to the PageNavigator to open the URL.
diff --git a/chrome/browser/views/bookmark_folder_tree_view.cc b/chrome/browser/views/bookmark_folder_tree_view.cc
index 801973f..e092670 100644
--- a/chrome/browser/views/bookmark_folder_tree_view.cc
+++ b/chrome/browser/views/bookmark_folder_tree_view.cc
@@ -4,8 +4,6 @@
 
 #include "chrome/browser/views/bookmark_folder_tree_view.h"
 
-#include <commctrl.h>
-
 #include "app/drag_drop_types.h"
 #include "app/os_exchange_data.h"
 #include "base/base_drag_source.h"
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 6831f11..d635932 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -137,7 +137,7 @@ BookmarkManagerView::BookmarkManagerView(Profile* profile)
     : profile_(profile->GetOriginalProfile()),
       table_view_(NULL),
       tree_view_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(search_factory_(this)) {
+      search_factory_(this) {
   search_tf_ = new views::TextField();
   search_tf_->set_default_width_in_chars(30);
 
@@ -479,7 +479,7 @@ void BookmarkManagerView::ShowContextMenu(views::View* source,
 }
 
 void BookmarkManagerView::RunMenu(views::View* source,
-                                  const gfx::Point& pt,
+                                  const CPoint& pt,
                                   HWND hwnd) {
   // TODO(glen): when you change the buttons around and what not, futz with
   // this to make it look good. If you end up keeping padding numbers make them
@@ -487,14 +487,14 @@ void BookmarkManagerView::RunMenu(views::View* source,
   if (!GetBookmarkModel()->IsLoaded())
     return;
 
-  int menu_x = pt.x();
+  int menu_x = pt.x;
   menu_x += UILayoutIsRightToLeft() ? (source->width() - 5) :
                                       (-source->width() + 5);
   if (source->GetID() == kOrganizeMenuButtonID) {
-    ShowMenu(hwnd, menu_x, pt.y() + 2,
+    ShowMenu(hwnd, menu_x, pt.y + 2,
              BookmarkContextMenu::BOOKMARK_MANAGER_ORGANIZE_MENU);
   } else if (source->GetID() == kToolsMenuButtonID) {
-    ShowToolsMenu(hwnd, menu_x, pt.y() + 2);
+    ShowToolsMenu(hwnd, menu_x, pt.y + 2);
   } else {
     NOTREACHED();
   }
diff --git a/chrome/browser/views/bookmark_manager_view.h b/chrome/browser/views/bookmark_manager_view.h
index 33566a4..a624281 100644
--- a/chrome/browser/views/bookmark_manager_view.h
+++ b/chrome/browser/views/bookmark_manager_view.h
@@ -147,7 +147,7 @@ class BookmarkManagerView : public views::View,
                                bool is_mouse_gesture);
 
   // ViewMenuDelegate.
-  virtual void RunMenu(views::View* source, const gfx::Point& pt, HWND hwnd);
+  virtual void RunMenu(views::View* source, const CPoint& pt, HWND hwnd);
 
   // MenuDelegate.
   virtual void ExecuteCommand(int id);
diff --git a/chrome/browser/views/bookmark_menu_button.cc b/chrome/browser/views/bookmark_menu_button.cc
index 3f6c43a..0074e61 100644
--- a/chrome/browser/views/bookmark_menu_button.cc
+++ b/chrome/browser/views/bookmark_menu_button.cc
@@ -93,13 +93,13 @@ void BookmarkMenuButton::BookmarkMenuDeleted(
 }
 
 void BookmarkMenuButton::RunMenu(views::View* source,
-                                 const gfx::Point& pt,
+                                 const CPoint& pt,
                                  gfx::NativeView hwnd) {
   RunMenu(source, pt, hwnd, false);
 }
 
 void BookmarkMenuButton::RunMenu(views::View* source,
-                                 const gfx::Point& pt,
+                                 const CPoint& pt,
                                  gfx::NativeView hwnd,
                                  bool for_drop) {
   Profile* profile = browser_->profile();
@@ -141,5 +141,5 @@ void BookmarkMenuButton::StopShowFolderDropMenuTimer() {
 }
 
 void BookmarkMenuButton::ShowDropMenu() {
-  RunMenu(NULL, gfx::Point(), GetWidget()->GetNativeView(), true);
+  RunMenu(NULL, CPoint(), GetWidget()->GetNativeView(), true);
 }
diff --git a/chrome/browser/views/bookmark_menu_button.h b/chrome/browser/views/bookmark_menu_button.h
index 3f2a98e..0ebb59f 100644
--- a/chrome/browser/views/bookmark_menu_button.h
+++ b/chrome/browser/views/bookmark_menu_button.h
@@ -36,13 +36,13 @@ class BookmarkMenuButton : public views::MenuButton,
 
   // ViewMenuDelegate.
   virtual void RunMenu(views::View* source,
-                       const gfx::Point& pt,
+                       const CPoint& pt,
                        gfx::NativeView hwnd);
 
  private:
   // Shows the menu.
   void RunMenu(views::View* source,
-               const gfx::Point& pt,
+               const CPoint& pt,
                gfx::NativeView hwnd,
                bool for_drop);
 
diff --git a/chrome/browser/views/bookmark_table_view.cc b/chrome/browser/views/bookmark_table_view.cc
index edbedf0..c1b4023 100644
--- a/chrome/browser/views/bookmark_table_view.cc
+++ b/chrome/browser/views/bookmark_table_view.cc
@@ -4,8 +4,6 @@
 
 #include "chrome/browser/views/bookmark_table_view.h"
 
-#include <commctrl.h>
-
 #include "app/drag_drop_types.h"
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/chrome_font.h"
@@ -432,12 +430,11 @@ void BookmarkTableView::PaintAltText() {
 gfx::Rect BookmarkTableView::GetAltTextBounds() {
   static const int kXOffset = 16;
   DCHECK(GetNativeControlHWND());
-  RECT client_rect_rect;
-  GetClientRect(GetNativeControlHWND(), &client_rect_rect);
-  gfx::Rect client_rect(client_rect_rect);
+  CRect client_rect;
+  GetClientRect(GetNativeControlHWND(), client_rect);
   ChromeFont font = GetAltTextFont();
   // Pad height by 2 for halo.
-  return gfx::Rect(kXOffset, content_offset(), client_rect.width() - kXOffset,
+  return gfx::Rect(kXOffset, content_offset(), client_rect.Width() - kXOffset,
                    std::max(kImageSize, font.height() + 2));
 }
 
diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc
index 7aa2a37..915e78f 100644
--- a/chrome/browser/views/download_item_view.cc
+++ b/chrome/browser/views/download_item_view.cc
@@ -143,7 +143,7 @@ DownloadItemView::DownloadItemView(DownloadItem* download,
     dangerous_download_label_(NULL),
     dangerous_download_label_sized_(false),
     creation_time_(base::Time::Now()),
-    ALLOW_THIS_IN_INITIALIZER_LIST(reenable_method_factory_(this)),
+    reenable_method_factory_(this),
     disabled_while_opening_(false) {
   // TODO(idana) Bug# 1163334
   //
diff --git a/chrome/browser/views/frame/browser_frame.h b/chrome/browser/views/frame/browser_frame.h
index fdb5e49..792e90e 100644
--- a/chrome/browser/views/frame/browser_frame.h
+++ b/chrome/browser/views/frame/browser_frame.h
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_
 
 #include "views/window/window_win.h"
-#include "views/window/non_client_view.h"
 
 class AeroGlassNonClientView;
 class BrowserView;
diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc
index 4c1397a..20c7e06 100644
--- a/chrome/browser/views/hung_renderer_view.cc
+++ b/chrome/browser/views/hung_renderer_view.cc
@@ -405,14 +405,14 @@ void HungRendererDialogView::CreateKillButtonView() {
 gfx::Rect HungRendererDialogView::GetDisplayBounds(
     TabContents* contents) {
   HWND contents_hwnd = contents->GetNativeView();
-  RECT contents_bounds_rect;
-  GetWindowRect(contents_hwnd, &contents_bounds_rect);
-  gfx::Rect contents_bounds(contents_bounds_rect);
+  CRect contents_bounds;
+  GetWindowRect(contents_hwnd, &contents_bounds);
+
   gfx::Rect window_bounds = window()->GetBounds();
 
-  int window_x = contents_bounds.x() +
-      (contents_bounds.width() - window_bounds.width()) / 2;
-  int window_y = contents_bounds.y() + kOverlayContentsOffsetY;
+  int window_x = contents_bounds.left +
+      (contents_bounds.Width() - window_bounds.width()) / 2;
+  int window_y = contents_bounds.top + kOverlayContentsOffsetY;
   return gfx::Rect(window_x, window_y, window_bounds.width(),
                    window_bounds.height());
 }
diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc
index f14aded..6749dec 100644
--- a/chrome/browser/views/infobars/infobars.cc
+++ b/chrome/browser/views/infobars/infobars.cc
@@ -84,9 +84,8 @@ class InfoBarBackground : public views::Background {
 
 InfoBar::InfoBar(InfoBarDelegate* delegate)
     : delegate_(delegate),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          close_button_(new views::ImageButton(this))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(delete_factory_(this)) {
+      close_button_(new views::ImageButton(this)),
+      delete_factory_(this) {
   // We delete ourselves when we're removed from the view hierarchy.
   SetParentOwned(false);
 
diff --git a/chrome/browser/views/login_view.cc b/chrome/browser/views/login_view.cc
index df7f1b4..cab7ba2 100644
--- a/chrome/browser/views/login_view.cc
+++ b/chrome/browser/views/login_view.cc
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/views/login_view.h"
-
 #include <string>
 
+#include "chrome/browser/views/login_view.h"
+
 #include "app/l10n_util.h"
-#include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
@@ -32,7 +31,7 @@ LoginView::LoginView(const std::wstring& explanation)
       password_label_(new Label(
           l10n_util::GetString(IDS_LOGIN_DIALOG_PASSWORD_FIELD))),
       message_label_(new Label(explanation)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(focus_grabber_factory_(this)),
+      focus_grabber_factory_(this),
       login_model_(NULL) {
   message_label_->SetMultiLine(true);
   message_label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index ef822ee12..abd1d9b 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/views/options/content_page_view.h"
-
 #include <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
+#include "chrome/browser/views/options/content_page_view.h"
+
 #include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ -176,8 +176,7 @@ ContentPageView::ContentPageView(Profile* profile)
       download_default_download_location_display_(NULL),
       download_browse_button_(NULL),
       download_ask_for_save_location_checkbox_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          select_file_dialog_(SelectFileDialog::Create(this))),
+      select_file_dialog_(SelectFileDialog::Create(this)),
       passwords_exceptions_button_(NULL),
       passwords_group_(NULL),
       passwords_asktosave_radio_(NULL),
diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc
index a294fff..cc8d65c 100644
--- a/chrome/browser/views/options/cookies_view.cc
+++ b/chrome/browser/views/options/cookies_view.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/views/options/cookies_view.h"
-
 #include <algorithm>
 
+#include "chrome/browser/views/options/cookies_view.h"
+
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
@@ -697,7 +697,7 @@ CookiesView::CookiesView(Profile* profile)
       remove_button_(NULL),
       remove_all_button_(NULL),
       profile_(profile),
-      ALLOW_THIS_IN_INITIALIZER_LIST(search_update_factory_(this)) {
+      search_update_factory_(this) {
 }
 
 void CookiesView::Init() {
diff --git a/chrome/browser/views/options/exceptions_page_view.cc b/chrome/browser/views/options/exceptions_page_view.cc
index ecc9884..daff30e 100644
--- a/chrome/browser/views/options/exceptions_page_view.cc
+++ b/chrome/browser/views/options/exceptions_page_view.cc
@@ -77,12 +77,10 @@ void ExceptionsTableModel::OnWebDataServiceRequestDone(
 // ExceptionsPageView, public
 ExceptionsPageView::ExceptionsPageView(Profile* profile)
     : OptionsPageView(profile),
-      ALLOW_THIS_IN_INITIALIZER_LIST(remove_button_(
-          this,
-          l10n_util::GetString(IDS_EXCEPTIONS_PAGE_VIEW_REMOVE_BUTTON))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(remove_all_button_(
-          this,
-          l10n_util::GetString(IDS_EXCEPTIONS_PAGE_VIEW_REMOVE_ALL_BUTTON))),
+      remove_button_(this, l10n_util::GetString(
+          IDS_EXCEPTIONS_PAGE_VIEW_REMOVE_BUTTON)),
+      remove_all_button_(this, l10n_util::GetString(
+          IDS_EXCEPTIONS_PAGE_VIEW_REMOVE_ALL_BUTTON)),
       table_model_(profile),
       table_view_(NULL) {
 }
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index 27d710a..09db2ff 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -209,8 +209,7 @@ void EmbellishTitle(views::Label* title_label) {
 }
 
 FontsPageView::FontsPageView(Profile* profile)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(
-          select_font_dialog_(SelectFontDialog::Create(this))),
+    : select_font_dialog_(SelectFontDialog::Create(this)),
       fonts_group_title_(NULL),
       encoding_group_title_(NULL),
       fixed_width_font_change_page_button_(NULL),
diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc
index 7c54d5c..eb4675c 100644
--- a/chrome/browser/views/options/general_page_view.cc
+++ b/chrome/browser/views/options/general_page_view.cc
@@ -521,8 +521,7 @@ GeneralPageView::GeneralPageView(Profile* profile)
       default_browser_group_(NULL),
       default_browser_status_label_(NULL),
       default_browser_use_as_default_button_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          default_browser_worker_(new DefaultBrowserWorker(this))),
+      default_browser_worker_(new DefaultBrowserWorker(this)),
       OptionsPageView(profile) {
 }
 
diff --git a/chrome/browser/views/options/passwords_page_view.cc b/chrome/browser/views/options/passwords_page_view.cc
index 29ed27a..77c02ad 100644
--- a/chrome/browser/views/options/passwords_page_view.cc
+++ b/chrome/browser/views/options/passwords_page_view.cc
@@ -183,16 +183,14 @@ void PasswordsTableModel::CancelLoginsQuery() {
 // PasswordsPageView, public
 PasswordsPageView::PasswordsPageView(Profile* profile)
     : OptionsPageView(profile),
-      ALLOW_THIS_IN_INITIALIZER_LIST(show_button_(
+      show_button_(
           this,
           l10n_util::GetString(IDS_PASSWORDS_PAGE_VIEW_SHOW_BUTTON),
-          l10n_util::GetString(IDS_PASSWORDS_PAGE_VIEW_HIDE_BUTTON))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(remove_button_(
-          this,
-          l10n_util::GetString(IDS_PASSWORDS_PAGE_VIEW_REMOVE_BUTTON))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(remove_all_button_(
-          this,
-          l10n_util::GetString(IDS_PASSWORDS_PAGE_VIEW_REMOVE_ALL_BUTTON))),
+          l10n_util::GetString(IDS_PASSWORDS_PAGE_VIEW_HIDE_BUTTON)),
+      remove_button_(this, l10n_util::GetString(
+          IDS_PASSWORDS_PAGE_VIEW_REMOVE_BUTTON)),
+      remove_all_button_(this, l10n_util::GetString(
+          IDS_PASSWORDS_PAGE_VIEW_REMOVE_ALL_BUTTON)),
       table_model_(profile),
       table_view_(NULL) {
 }
diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc
index 8c9e6ad..3c045b7 100644
--- a/chrome/browser/views/page_info_window.cc
+++ b/chrome/browser/views/page_info_window.cc
@@ -7,10 +7,6 @@
 #include <cryptuiapi.h>
 #pragma comment(lib, "cryptui.lib")
 
-#include <atlbase.h>
-#include <atlapp.h>
-#include <atlmisc.h>
-
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/win_util.h"
diff --git a/chrome/browser/views/select_profile_dialog.cc b/chrome/browser/views/select_profile_dialog.cc
index faa4a04..ff9c0a3 100644
--- a/chrome/browser/views/select_profile_dialog.cc
+++ b/chrome/browser/views/select_profile_dialog.cc
@@ -33,7 +33,7 @@ void SelectProfileDialog::RunDialog() {
 }
 
 SelectProfileDialog::SelectProfileDialog()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(helper_(new GetProfilesHelper(this))) {
+    : helper_(new GetProfilesHelper(this)) {
   // We first create an instance of the helper and then setup controls. This
   // doesn't lead to race condition because once the helper is done with
   // enumerating profiles by examining the file system, it posts a task on the
diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc
index cb7504c..3975604 100644
--- a/chrome/browser/views/tabs/tab.cc
+++ b/chrome/browser/views/tabs/tab.cc
@@ -208,10 +208,10 @@ bool Tab::GetTooltipText(int x, int y, std::wstring* tooltip) {
   return false;
 }
 
-bool Tab::GetTooltipTextOrigin(int x, int y, gfx::Point* origin) {
+bool Tab::GetTooltipTextOrigin(int x, int y, CPoint* origin) {
   ChromeFont font;
-  origin->set_x(title_bounds().x() + 10);
-  origin->set_y(-views::TooltipManager::GetTooltipHeight() - 4);
+  origin->x = title_bounds().x() + 10;
+  origin->y = -views::TooltipManager::GetTooltipHeight() - 4;
   return true;
 }
 
diff --git a/chrome/browser/views/tabs/tab.h b/chrome/browser/views/tabs/tab.h
index 920a849..ec295ed 100644
--- a/chrome/browser/views/tabs/tab.h
+++ b/chrome/browser/views/tabs/tab.h
@@ -101,7 +101,7 @@ class Tab : public TabRenderer,
   virtual void OnMouseReleased(const views::MouseEvent& event,
                                bool canceled);
   virtual bool GetTooltipText(int x, int y, std::wstring* tooltip);
-  virtual bool GetTooltipTextOrigin(int x, int y, gfx::Point* origin);
+  virtual bool GetTooltipTextOrigin(int x, int y, CPoint* origin);
   virtual std::string GetClassName() const { return kTabClassName; }
   virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
   virtual bool GetAccessibleName(std::wstring* name);
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index 96bdd918..e7b664b 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/views/tabs/tab_renderer.h"
-
 #include <limits>
 
+#include "chrome/browser/views/tabs/tab_renderer.h"
+
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/chrome_font.h"
 #include "app/l10n_util.h"
@@ -174,7 +174,7 @@ class TabRenderer::FavIconCrashAnimation : public Animation,
                                            public AnimationDelegate {
  public:
   explicit FavIconCrashAnimation(TabRenderer* target)
-      : ALLOW_THIS_IN_INITIALIZER_LIST(Animation(1000, 25, this)),
+      : Animation(1000, 25, this),
         target_(target) {
   }
   virtual ~FavIconCrashAnimation() {}
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 104cb34..333dcf4 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -582,7 +582,7 @@ gfx::Size BrowserToolbarView::GetPreferredSize() {
       vertical_spacing);
 }
 
-void BrowserToolbarView::RunPageMenu(const gfx::Point& pt, HWND hwnd) {
+void BrowserToolbarView::RunPageMenu(const CPoint& pt, HWND hwnd) {
   Menu::AnchorPoint anchor = Menu::TOPRIGHT;
   if (UILayoutIsRightToLeft())
     anchor = Menu::TOPLEFT;
@@ -646,10 +646,10 @@ void BrowserToolbarView::RunPageMenu(const gfx::Point& pt, HWND hwnd) {
 
   menu.AppendMenuItemWithLabel(IDC_REPORT_BUG,
                                l10n_util::GetString(IDS_REPORT_BUG));
-  menu.RunMenuAt(pt.x(), pt.y());
+  menu.RunMenuAt(pt.x, pt.y);
 }
 
-void BrowserToolbarView::RunAppMenu(const gfx::Point& pt, HWND hwnd) {
+void BrowserToolbarView::RunAppMenu(const CPoint& pt, HWND hwnd) {
   Menu::AnchorPoint anchor = Menu::TOPRIGHT;
   if (UILayoutIsRightToLeft())
     anchor = Menu::TOPLEFT;
@@ -704,7 +704,7 @@ void BrowserToolbarView::RunAppMenu(const gfx::Point& pt, HWND hwnd) {
   menu.AppendSeparator();
   menu.AppendMenuItemWithLabel(IDC_EXIT, l10n_util::GetString(IDS_EXIT));
 
-  menu.RunMenuAt(pt.x(), pt.y());
+  menu.RunMenuAt(pt.x, pt.y);
 
   // Menu is going away, so set the profiles menu pointer to NULL.
   profiles_menu_ = NULL;
@@ -718,7 +718,7 @@ bool BrowserToolbarView::IsItemChecked(int id) const {
   return EncodingMenuControllerDelegate::IsItemChecked(id);
 }
 
-void BrowserToolbarView::RunMenu(views::View* source, const gfx::Point& pt,
+void BrowserToolbarView::RunMenu(views::View* source, const CPoint& pt,
                                  HWND hwnd) {
   switch (source->GetID()) {
     case VIEW_ID_PAGE_MENU:
diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h
index ad373d4..b5f3861 100644
--- a/chrome/browser/views/toolbar_view.h
+++ b/chrome/browser/views/toolbar_view.h
@@ -72,7 +72,7 @@ class BrowserToolbarView : public views::View,
   virtual bool GetAcceleratorInfo(int id, views::Accelerator* accel);
 
   // views::MenuDelegate
-  virtual void RunMenu(views::View* source, const gfx::Point& pt, HWND hwnd);
+  virtual void RunMenu(views::View* source, const CPoint& pt, HWND hwnd);
 
   // GetProfilesHelper::Delegate method.
   virtual void OnGetProfilesDone(const std::vector<std::wstring>& profiles);
@@ -157,10 +157,10 @@ class BrowserToolbarView : public views::View,
   void SetSecurityLevel(ToolbarModel::SecurityLevel security_level);
 
   // Show the page menu.
-  void RunPageMenu(const gfx::Point& pt, HWND hwnd);
+  void RunPageMenu(const CPoint& pt, HWND hwnd);
 
   // Show the app menu.
-  void RunAppMenu(const gfx::Point& pt, HWND hwnd);
+  void RunAppMenu(const CPoint& pt, HWND hwnd);
 
   // Overridden from View, to pass keyboard triggering of the right-click
   // context menu on to the toolbar child view that currently has the
diff --git a/chrome/browser/views/user_data_dir_dialog.cc b/chrome/browser/views/user_data_dir_dialog.cc
index 70f9924..c6b17f3 100644
--- a/chrome/browser/views/user_data_dir_dialog.cc
+++ b/chrome/browser/views/user_data_dir_dialog.cc
@@ -22,8 +22,7 @@ std::wstring UserDataDirDialog::RunUserDataDirDialog(
 }
 
 UserDataDirDialog::UserDataDirDialog(const std::wstring& user_data_dir)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(
-          select_file_dialog_(SelectFileDialog::Create(this))),
+    : select_file_dialog_(SelectFileDialog::Create(this)),
       is_blocking_(true) {
   std::wstring message_text = l10n_util::GetStringF(
       IDS_CANT_WRITE_USER_DIRECTORY_SUMMARY, user_data_dir);
diff --git a/chrome/test/interactive_ui/view_event_test_base.cc b/chrome/test/interactive_ui/view_event_test_base.cc
index a1203d5..19de3e8 100644
--- a/chrome/test/interactive_ui/view_event_test_base.cc
+++ b/chrome/test/interactive_ui/view_event_test_base.cc
@@ -4,8 +4,6 @@
 
 #include "chrome/test/interactive_ui/view_event_test_base.h"
 
-#include <ole2.h>
-
 #include "base/message_loop.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "views/view.h"
diff --git a/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc
index 157caf0..270894b 100644
--- a/views/controls/button/button_dropdown.cc
+++ b/views/controls/button/button_dropdown.cc
@@ -5,7 +5,6 @@
 #include "views/controls/button/button_dropdown.h"
 
 #include "app/l10n_util.h"
-#include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "grit/generated_resources.h"
 #include "views/controls/menu/view_menu_delegate.h"
@@ -27,7 +26,7 @@ ButtonDropDown::ButtonDropDown(ButtonListener* listener,
     : ImageButton(listener),
       menu_delegate_(menu_delegate),
       y_position_on_lbuttondown_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(show_menu_factory_(this)) {
+      show_menu_factory_(this) {
 }
 
 ButtonDropDown::~ButtonDropDown() {
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index 6dbf4ae..993cd9b 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -110,7 +110,7 @@ int MenuButton::GetMaximumScreenXCoordinate() {
   }
 
   HWND hwnd = widget->GetNativeView();
-  RECT t;
+  CRect t;
   ::GetWindowRect(hwnd, &t);
 
   gfx::Rect r(t);
@@ -154,7 +154,8 @@ bool MenuButton::Activate() {
     GetRootView()->SetMouseHandler(NULL);
 
     menu_visible_ = true;
-    menu_delegate_->RunMenu(this, menu_position, GetWidget()->GetNativeView());
+    menu_delegate_->RunMenu(this, menu_position.ToPOINT(),
+                            GetWidget()->GetNativeView());
     menu_visible_ = false;
     menu_closed_time_ = Time::Now();
 
diff --git a/views/controls/button/native_button_win.cc b/views/controls/button/native_button_win.cc
index 5dd70d3..6748241 100644
--- a/views/controls/button/native_button_win.cc
+++ b/views/controls/button/native_button_win.cc
@@ -4,8 +4,6 @@
 
 #include "views/controls/button/native_button_win.h"
 
-#include <commctrl.h>
-
 #include "base/logging.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/native_button.h"
diff --git a/views/controls/hwnd_view.cc b/views/controls/hwnd_view.cc
index fdf4042..677e60a 100644
--- a/views/controls/hwnd_view.cc
+++ b/views/controls/hwnd_view.cc
@@ -110,10 +110,9 @@ void HWNDView::ShowWidget(int x, int y, int w, int h) {
 
   if (fast_resize()) {
     // In a fast resize, we move the window and clip it with SetWindowRgn.
-    RECT win_rect;
-    GetWindowRect(native_view(), &win_rect);
-    gfx::Rect rect(win_rect);
-    ::SetWindowPos(native_view(), 0, x, y, rect.width(), rect.height(),
+    CRect rect;
+    GetWindowRect(native_view(), &rect);
+    ::SetWindowPos(native_view(), 0, x, y, rect.Width(), rect.Height(),
                    swp_flags);
 
     HRGN clip_region = CreateRectRgn(0, 0, w, h);
diff --git a/views/controls/menu/view_menu_delegate.h b/views/controls/menu/view_menu_delegate.h
index 3d6887b..bb72ed3 100644
--- a/views/controls/menu/view_menu_delegate.h
+++ b/views/controls/menu/view_menu_delegate.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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.
 
@@ -7,10 +7,6 @@
 
 #include "base/gfx/native_widget_types.h"
 
-namespace gfx {
-class Point;
-}
-
 namespace views {
 
 class View;
@@ -29,7 +25,7 @@ class ViewMenuDelegate {
   // Create and show a menu at the specified position. Source is the view the
   // ViewMenuDelegate was set on.
   virtual void RunMenu(View* source,
-                       const gfx::Point& pt,
+                       const CPoint& pt,
                        gfx::NativeView hwnd) = 0;
 };
 
diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc
index 2ac20af..e0cf055 100644
--- a/views/controls/message_box_view.cc
+++ b/views/controls/message_box_view.cc
@@ -30,7 +30,7 @@ MessageBoxView::MessageBoxView(int dialog_flags,
       icon_(NULL),
       checkbox_(NULL),
       message_width_(message_width),
-      ALLOW_THIS_IN_INITIALIZER_LIST(focus_grabber_factory_(this)) {
+      focus_grabber_factory_(this) {
   Init(dialog_flags, default_prompt);
 }
 
@@ -42,7 +42,7 @@ MessageBoxView::MessageBoxView(int dialog_flags,
       icon_(NULL),
       checkbox_(NULL),
       message_width_(kDefaultMessageWidth),
-      ALLOW_THIS_IN_INITIALIZER_LIST(focus_grabber_factory_(this)) {
+      focus_grabber_factory_(this) {
   Init(dialog_flags, default_prompt);
 }
 
diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc
index 6b0b7df..ce37193 100644
--- a/views/controls/native_control.cc
+++ b/views/controls/native_control.cc
@@ -8,7 +8,6 @@
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlframe.h>
-#include <atlmisc.h>
 
 #include "app/l10n_util_win.h"
 #include "base/logging.h"
@@ -128,7 +127,7 @@ class NativeControlContainer : public CWindowImpl<NativeControlContainer,
     TRACK_HWND_DESTRUCTION(m_hWnd);
   }
 
-  void OnContextMenu(HWND window, const WTL::CPoint& location) {
+  void OnContextMenu(HWND window, const CPoint& location) {
     if (parent_)
       parent_->OnContextMenu(location);
   }
diff --git a/views/controls/native_control.h b/views/controls/native_control.h
index 39022a2..0573168 100644
--- a/views/controls/native_control.h
+++ b/views/controls/native_control.h
@@ -9,10 +9,6 @@
 
 #include "views/view.h"
 
-namespace WTL {
-class CPoint;
-}
-
 namespace views {
 
 class HWNDView;
@@ -57,7 +53,7 @@ class NativeControl : public View {
   virtual LRESULT OnCommand(UINT code, int id, HWND source) { return 0; }
 
   // Invoked when the appropriate gesture for a context menu is issued.
-  virtual void OnContextMenu(const WTL::CPoint& location);
+  virtual void OnContextMenu(const CPoint& location);
 
   // Overridden so to set the native focus to the native control.
   virtual void Focus();
diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc
index 18096fb..e484517 100644
--- a/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -6,7 +6,6 @@
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
-#include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -38,9 +37,8 @@ class AutorepeatButton : public ImageButton {
  public:
   AutorepeatButton(ButtonListener* listener)
       : ImageButton(listener),
-        ALLOW_THIS_IN_INITIALIZER_LIST(repeater_(
-            NewCallback<AutorepeatButton>(this,
-                                          &AutorepeatButton::NotifyClick))) {
+        repeater_(NewCallback<AutorepeatButton>(this,
+            &AutorepeatButton::NotifyClick)) {
   }
   virtual ~AutorepeatButton() {}
 
@@ -257,14 +255,13 @@ class BitmapScrollBarThumb : public View {
 BitmapScrollBar::BitmapScrollBar(bool horizontal, bool show_scroll_buttons)
     : contents_size_(0),
       contents_scroll_offset_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(prev_button_(new AutorepeatButton(this))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(next_button_(new AutorepeatButton(this))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(thumb_(new BitmapScrollBarThumb(this))),
+      prev_button_(new AutorepeatButton(this)),
+      next_button_(new AutorepeatButton(this)),
+      thumb_(new BitmapScrollBarThumb(this)),
       thumb_track_state_(CustomButton::BS_NORMAL),
       last_scroll_amount_(SCROLL_NONE),
-      ALLOW_THIS_IN_INITIALIZER_LIST(repeater_(
-          NewCallback<BitmapScrollBar>(this,
-                                       &BitmapScrollBar::TrackClicked))),
+      repeater_(NewCallback<BitmapScrollBar>(this,
+          &BitmapScrollBar::TrackClicked)),
       context_menu_mouse_position_(0),
       show_scroll_buttons_(show_scroll_buttons),
       ScrollBar(horizontal) {
diff --git a/views/controls/table/group_table_view.cc b/views/controls/table/group_table_view.cc
index b5d5698..5e6a155 100644
--- a/views/controls/table/group_table_view.cc
+++ b/views/controls/table/group_table_view.cc
@@ -5,7 +5,6 @@
 #include "views/controls/table/group_table_view.h"
 
 #include "app/gfx/chrome_canvas.h"
-#include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 
@@ -25,7 +24,7 @@ GroupTableView::GroupTableView(GroupTableModel* model,
     : TableView(model, columns, table_type, false, resizable_columns,
                 autosize_columns),
     model_(model),
-    ALLOW_THIS_IN_INITIALIZER_LIST(sync_selection_factory_(this)) {
+    sync_selection_factory_(this) {
 }
 
 GroupTableView::~GroupTableView() {
@@ -166,22 +165,22 @@ void GroupTableView::OnSelectedStateChanged() {
 
 // Draws the line separator betweens the groups.
 void GroupTableView::PostPaint(int model_row, int column, bool selected,
-                               const gfx::Rect& bounds, HDC hdc) {
+                               const CRect& bounds, HDC hdc) {
   GroupRange group_range;
   model_->GetGroupRangeForItem(model_row, &group_range);
 
   // We always paint a vertical line at the end of the last cell.
   HPEN hPen = CreatePen(PS_SOLID, kSeparatorLineThickness, kSeparatorLineColor);
   HPEN hPenOld = (HPEN) SelectObject(hdc, hPen);
-  int x = static_cast<int>(bounds.right() - kSeparatorLineThickness);
-  MoveToEx(hdc, x, bounds.y(), NULL);
-  LineTo(hdc, x, bounds.bottom());
+  int x = static_cast<int>(bounds.right - kSeparatorLineThickness);
+  MoveToEx(hdc, x, bounds.top, NULL);
+  LineTo(hdc, x, bounds.bottom);
 
   // We paint a separator line after the last item of a group.
   if (model_row == (group_range.start + group_range.length - 1)) {
-    int y = static_cast<int>(bounds.bottom() - kSeparatorLineThickness);
+    int y = static_cast<int>(bounds.bottom - kSeparatorLineThickness);
     MoveToEx(hdc, 0, y, NULL);
-    LineTo(hdc, bounds.width(), y);
+    LineTo(hdc, bounds.Width(), y);
   }
   SelectObject(hdc, hPenOld);
   DeleteObject(hPen);
diff --git a/views/controls/table/group_table_view.h b/views/controls/table/group_table_view.h
index e581d5d..d128759 100644
--- a/views/controls/table/group_table_view.h
+++ b/views/controls/table/group_table_view.h
@@ -48,7 +48,7 @@ class GroupTableView : public TableView {
   // Extra-painting required to draw the separator line between groups.
   virtual bool ImplementPostPaint() { return true; }
   virtual void PostPaint(int model_row, int column, bool selected,
-                         const gfx::Rect& bounds, HDC device_context);
+                         const CRect& bounds, HDC device_context);
 
   // In order to make keyboard navigation possible (using the Up and Down
   // keys), we must take action when an arrow key is pressed. The reason we
diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc
index 0f7d6b9..5ab86d3 100644
--- a/views/controls/table/table_view.cc
+++ b/views/controls/table/table_view.cc
@@ -4,12 +4,8 @@
 
 #include "views/controls/table/table_view.h"
 
-#include <windowsx.h>
-#include <atlbase.h>
-#include <atlapp.h>
-#include <atlmisc.h>
-
 #include <algorithm>
+#include <windowsx.h>
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/favicon_size.h"
@@ -99,7 +95,7 @@ TableView::TableView(TableModel* model,
       list_view_(NULL),
       header_original_handler_(NULL),
       original_handler_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(table_view_wrapper_(this)),
+      table_view_wrapper_(this),
       custom_cell_font_(NULL),
       content_offset_(0) {
   for (std::vector<TableColumn>::const_iterator i = columns.begin();
@@ -578,10 +574,10 @@ LRESULT CALLBACK TableView::TableWndProc(HWND window,
       // the position supplied in the l_param.
       if (table_view->UILayoutIsRightToLeft() &&
           (GET_X_LPARAM(l_param) != -1 || GET_Y_LPARAM(l_param) != -1)) {
-        WTL::CPoint screen_point;
+        CPoint screen_point;
         GetCursorPos(&screen_point);
-        WTL::CPoint table_point = screen_point;
-        WTL::CRect client_rect;
+        CPoint table_point = screen_point;
+        CRect client_rect;
         if (ScreenToClient(window, &table_point) &&
             GetClientRect(window, &client_rect) &&
             client_rect.PtInRect(table_point)) {
@@ -1235,11 +1231,11 @@ LRESULT TableView::OnCustomDraw(NMLVCUSTOMDRAW* draw_info) {
         SkBitmap image = model_->GetIcon(model_index);
         if (!image.isNull()) {
           // Get the rect that holds the icon.
-          WTL::CRect icon_rect, client_rect;
+          CRect icon_rect, client_rect;
           if (ListView_GetItemRect(list_view_, view_index, &icon_rect,
                                    LVIR_ICON) &&
               GetClientRect(list_view_, &client_rect)) {
-            WTL::CRect intersection;
+            CRect intersection;
             // Client rect includes the header but we need to make sure we don't
             // paint into it.
             client_rect.top += content_offset_;
@@ -1291,11 +1287,10 @@ LRESULT TableView::OnCustomDraw(NMLVCUSTOMDRAW* draw_info) {
         }
       }
       if (ImplementPostPaint()) {
-        WTL::CRect cell_rect;
+        CRect cell_rect;
         if (ListView_GetItemRect(list_view_, view_index, &cell_rect,
                                  LVIR_BOUNDS)) {
-          PostPaint(model_index, 0, false, gfx::Rect(cell_rect),
-                    draw_info->nmcd.hdc);
+          PostPaint(model_index, 0, false, cell_rect, draw_info->nmcd.hdc);
           r = CDRF_SKIPDEFAULT;
         }
       }
@@ -1318,7 +1313,7 @@ void TableView::ResetColumnSizes() {
 
   // See comment in TableColumn for what this does.
   int width = this->width();
-  WTL::CRect native_bounds;
+  CRect native_bounds;
   if (GetClientRect(GetNativeControlHWND(), &native_bounds) &&
       native_bounds.Width() > 0) {
     // Prefer the bounds of the window over our bounds, which may be different.
@@ -1529,7 +1524,7 @@ void TableView::UpdateContentOffset() {
   POINT origin = {0, 0};
   MapWindowPoints(header, list_view_, &origin, 1);
 
-  WTL::CRect header_bounds;
+  CRect header_bounds;
   GetWindowRect(header, &header_bounds);
 
   content_offset_ = origin.y + header_bounds.Height();
diff --git a/views/controls/table/table_view.h b/views/controls/table/table_view.h
index da228fc..2db5234 100644
--- a/views/controls/table/table_view.h
+++ b/views/controls/table/table_view.h
@@ -9,7 +9,6 @@
 
 #if defined(OS_WIN)
 #include <windows.h>
-typedef struct tagNMLVCUSTOMDRAW NMLVCUSTOMDRAW;
 #endif  // defined(OS_WIN)
 
 #include <map>
@@ -471,7 +470,7 @@ class TableView : public NativeControl,
   virtual bool ImplementPostPaint() { return false; }
   // Subclasses can implement in this method extra-painting for cells.
   virtual void PostPaint(int model_row, int column, bool selected,
-                         const gfx::Rect& bounds, HDC device_context) { }
+                         const CRect& bounds, HDC device_context) { }
   virtual void PostPaint() {}
 
   virtual HWND CreateNativeControl(HWND parent_container);
diff --git a/views/controls/text_field.cc b/views/controls/text_field.cc
index 6fd9c3e..0395af3 100644
--- a/views/controls/text_field.cc
+++ b/views/controls/text_field.cc
@@ -8,7 +8,6 @@
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlctrls.h>
-#include <atlmisc.h>
 #include <tom.h>  // For ITextDocument, a COM interface to CRichEditCtrl
 #include <vsstyle.h>
 
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index d6f6627..894aa6e 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -4,9 +4,7 @@
 
 #include "views/controls/tree/tree_view.h"
 
-#include <atlbase.h>
-#include <atlapp.h>
-#include <atlmisc.h>
+#include <shellapi.h>
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/icon_util.h"
@@ -32,7 +30,7 @@ TreeView::TreeView()
       process_enter_(false),
       show_context_menu_only_when_node_selected_(true),
       select_on_right_mouse_down_(true),
-      ALLOW_THIS_IN_INITIALIZER_LIST(wrapper_(this)),
+      wrapper_(this),
       original_handler_(NULL),
       drag_enabled_(false),
       has_custom_icons_(false),
@@ -483,7 +481,7 @@ bool TreeView::OnKeyDown(int virtual_key_code) {
   return false;
 }
 
-void TreeView::OnContextMenu(const WTL::CPoint& location) {
+void TreeView::OnContextMenu(const CPoint& location) {
   if (!GetContextMenuController())
     return;
 
diff --git a/views/controls/tree/tree_view.h b/views/controls/tree/tree_view.h
index fe470c0..1ded058 100644
--- a/views/controls/tree/tree_view.h
+++ b/views/controls/tree/tree_view.h
@@ -5,9 +5,6 @@
 #ifndef VIEWS_CONTROLS_TREE_TREE_VIEW_H_
 #define VIEWS_CONTROLS_TREE_TREE_VIEW_H_
 
-#include <windows.h>
-#include <commctrl.h>
-
 #include <map>
 
 #include "base/basictypes.h"
@@ -162,7 +159,7 @@ class TreeView : public NativeControl, TreeModelObserver {
   virtual bool NotifyOnKeyDown() const { return true; }
   virtual bool OnKeyDown(int virtual_key_code);
 
-  virtual void OnContextMenu(const WTL::CPoint& location);
+  virtual void OnContextMenu(const CPoint& location);
 
   // Returns the TreeModelNode for |tree_item|.
   TreeModelNode* GetNodeForTreeItem(HTREEITEM tree_item);
diff --git a/views/grid_layout_unittest.cc b/views/grid_layout_unittest.cc
index cd38fc8..57bfa83 100644
--- a/views/grid_layout_unittest.cc
+++ b/views/grid_layout_unittest.cc
@@ -53,7 +53,7 @@ class GridLayoutTest : public testing::Test {
   }
 
   gfx::Size pref;
-  gfx::Rect bounds;
+  CRect bounds;
   View host;
   GridLayout* layout;
 };
@@ -78,7 +78,7 @@ class GridLayoutAlignmentTest : public testing::Test {
     }
   }
 
-  void TestAlignment(GridLayout::Alignment alignment, gfx::Rect* bounds) {
+  void TestAlignment(GridLayout::Alignment alignment, CRect* bounds) {
     ColumnSet* c1 = layout->AddColumnSet(0);
     c1->AddColumn(alignment, alignment, 1, GridLayout::USE_PREF, 0, 0);
     layout->StartRow(1, 0);
@@ -87,7 +87,7 @@ class GridLayoutAlignmentTest : public testing::Test {
     EXPECT_TRUE(gfx::Size(10, 20) == pref);
     host.SetBounds(0, 0, 100, 100);
     layout->Layout(&host);
-    *bounds = v1.bounds();
+    *bounds = v1.bounds().ToRECT();
     RemoveAll();
   }
 
@@ -97,27 +97,27 @@ class GridLayoutAlignmentTest : public testing::Test {
 };
 
 TEST_F(GridLayoutAlignmentTest, Fill) {
-  gfx::Rect bounds;
+  CRect bounds;
   TestAlignment(GridLayout::FILL, &bounds);
-  EXPECT_TRUE(gfx::Rect(0, 0, 100, 100) == bounds);
+  EXPECT_TRUE(CRect(0, 0, 100, 100) == bounds);
 }
 
 TEST_F(GridLayoutAlignmentTest, Leading) {
-  gfx::Rect bounds;
+  CRect bounds;
   TestAlignment(GridLayout::LEADING, &bounds);
-  EXPECT_TRUE(gfx::Rect(0, 0, 10, 20) == bounds);
+  EXPECT_TRUE(CRect(0, 0, 10, 20) == bounds);
 }
 
 TEST_F(GridLayoutAlignmentTest, Center) {
-  gfx::Rect bounds;
+  CRect bounds;
   TestAlignment(GridLayout::CENTER, &bounds);
-  EXPECT_TRUE(gfx::Rect(45, 40, 55, 60) == bounds);
+  EXPECT_TRUE(CRect(45, 40, 55, 60) == bounds);
 }
 
 TEST_F(GridLayoutAlignmentTest, Trailing) {
-  gfx::Rect bounds;
+  CRect bounds;
   TestAlignment(GridLayout::TRAILING, &bounds);
-  EXPECT_TRUE(gfx::Rect(90, 80, 100, 100) == bounds);
+  EXPECT_TRUE(CRect(90, 80, 100, 100) == bounds);
 }
 
 TEST_F(GridLayoutTest, TwoColumns) {
diff --git a/views/view.h b/views/view.h
index e5360213..ed4d4a0 100644
--- a/views/view.h
+++ b/views/view.h
@@ -7,6 +7,12 @@
 
 #include "build/build_config.h"
 
+#if defined(OS_WIN)
+#include <atlbase.h>
+#include <atlapp.h>
+#include <atlmisc.h>
+#endif  // defined(OS_WIN)
+
 #include <algorithm>
 #include <map>
 #include <string>
@@ -19,10 +25,6 @@
 #include "views/background.h"
 #include "views/border.h"
 
-#if defined(OS_WIN)
-struct IDataObject;
-#endif  // defined(OS_WIN)
-
 namespace gfx {
 class Insets;
 class Path;
diff --git a/views/widget/root_view_drop_target.h b/views/widget/root_view_drop_target.h
index 32cb14b..a3c3afd 100644
--- a/views/widget/root_view_drop_target.h
+++ b/views/widget/root_view_drop_target.h
@@ -5,6 +5,10 @@
 #ifndef VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_
 #define VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_
 
+#include <atlbase.h>
+#include <atlapp.h>
+#include <atlmisc.h>
+
 #include "app/os_exchange_data.h"
 #include "base/base_drop_target.h"
 
diff --git a/views/widget/tooltip_manager.cc b/views/widget/tooltip_manager.cc
index c082040..59612e4 100644
--- a/views/widget/tooltip_manager.cc
+++ b/views/widget/tooltip_manager.cc
@@ -4,7 +4,6 @@
 
 #include "views/widget/tooltip_manager.h"
 
-#include <windowsx.h>
 #include <limits>
 
 #include "app/gfx/text_elider.h"
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h
index b39362f..d948e66 100644
--- a/views/widget/widget_win.h
+++ b/views/widget/widget_win.h
@@ -6,9 +6,7 @@
 #define VIEWS_WIDGET_WIDGET_WIN_H_
 
 #include <atlbase.h>
-#include <atlapp.h>
 #include <atlcrack.h>
-#include <atlmisc.h>
 
 #include "base/message_loop.h"
 #include "base/system_monitor.h"
@@ -38,7 +36,7 @@ RootView* GetRootViewForHWND(HWND hwnd);
 // uMsg - kReflectedMessage
 // wParam - Should be 0
 // lParam - Pointer to MSG struct containing the original message.
-const int kReflectedMessage = WM_APP + 3;
+static const int kReflectedMessage = WM_APP + 3;
 
 // These two messages aren't defined in winuser.h, but they are sent to windows
 // with captions. They appear to paint the window caption and frame.
@@ -48,8 +46,8 @@ const int kReflectedMessage = WM_APP + 3;
 // window and paint the standard caption/title over the top of the custom one.
 // So we need to handle these messages in CustomFrameWindow to prevent this
 // from happening.
-const int WM_NCUAHDRAWCAPTION = 0xAE;
-const int WM_NCUAHDRAWFRAME = 0xAF;
+static const int WM_NCUAHDRAWCAPTION = 0xAE;
+static const int WM_NCUAHDRAWFRAME = 0xAF;
 
 ///////////////////////////////////////////////////////////////////////////////
 //
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index 19ce2fb..66e2ccd 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -74,12 +74,11 @@ const int kCaptionTopSpacing = 1;
 
 CustomFrameView::CustomFrameView(Window* frame)
     : NonClientFrameView(),
-      ALLOW_THIS_IN_INITIALIZER_LIST(close_button_(new ImageButton(this))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(restore_button_(new ImageButton(this))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(maximize_button_(new ImageButton(this))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(minimize_button_(new ImageButton(this))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          system_menu_button_(new ImageButton(this))),
+      close_button_(new ImageButton(this)),
+      restore_button_(new ImageButton(this)),
+      maximize_button_(new ImageButton(this)),
+      minimize_button_(new ImageButton(this)),
+      system_menu_button_(new ImageButton(this)),
       should_show_minmax_buttons_(false),
       frame_(frame) {
   InitClass();
diff --git a/views/window/window_win.h b/views/window/window_win.h
index 5a90835..76d5196 100644
--- a/views/window/window_win.h
+++ b/views/window/window_win.h
@@ -6,6 +6,8 @@
 #define VIEWS_WINDOW_WINDOW_WIN_H_
 
 #include "views/widget/widget_win.h"
+#include "views/window/client_view.h"
+#include "views/window/non_client_view.h"
 #include "views/window/window.h"
 
 namespace gfx {
diff --git a/webkit/tools/test_shell/foreground_helper.h b/webkit/tools/test_shell/foreground_helper.h
index 3718e02..3d62b46 100644
--- a/webkit/tools/test_shell/foreground_helper.h
+++ b/webkit/tools/test_shell/foreground_helper.h
@@ -16,9 +16,9 @@
 // This is probably leveraging a windows bug.
 class ForegroundHelper : public CWindowImpl<ForegroundHelper> {
  public:
-  BEGIN_MSG_MAP(ForegroundHelper)
-    MESSAGE_HANDLER(WM_HOTKEY, OnHotKey)
-  END_MSG_MAP()
+BEGIN_MSG_MAP(ForegroundHelper)
+  MESSAGE_HANDLER(WM_HOTKEY, OnHotKey)
+END_MSG_MAP()
 
   // Brings a window into the foreground.
   // Can be called from any window, even if the caller is not the
@@ -37,7 +37,7 @@ class ForegroundHelper : public CWindowImpl<ForegroundHelper> {
     // be in the foreground and allowed to move the target window
     // into the foreground too.
 
-    if (NULL == Create(NULL, NULL, NULL, WS_POPUP))
+    if(NULL == Create(NULL, NULL, NULL, WS_POPUP))
       return AtlHresultFromLastError();
 
     static const int hotkey_id = 0x0000baba;
@@ -62,11 +62,11 @@ class ForegroundHelper : public CWindowImpl<ForegroundHelper> {
     // Loop until we get the key.
     // TODO: It may be possible to get stuck here if the
     // message gets lost?
-    while (GetMessage(&msg, NULL, 0, 0)) {
+    while(GetMessage(&msg, NULL, 0, 0)) {
       TranslateMessage(&msg);
       DispatchMessage(&msg);
 
-      if (WM_HOTKEY == msg.message)
+      if(WM_HOTKEY == msg.message)
         break;
     }
 
@@ -78,7 +78,7 @@ class ForegroundHelper : public CWindowImpl<ForegroundHelper> {
 
   // Handle the registered Hotkey being pressed.
   LRESULT OnHotKey(UINT /*uMsg*/, WPARAM /*wParam*/,
-		           LPARAM /*lParam*/, BOOL& bHandled) {
+		   LPARAM /*lParam*/, BOOL& bHandled) {
     HWND window = reinterpret_cast<HWND>(GetWindowLongPtr(GWLP_USERDATA));
     SetForegroundWindow(window);
     return 1;