Revert 121840 - Make scoped dc objects smarter

remoting/host/disconnect_window_win.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 "remoting/host/disconnect_window.h"
 
 #include <windows.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 196 matching lines @@
   host_->Shutdown(base::Closure());
 }
 
 static int GetControlTextWidth(HWND control) {
   RECT rect = {0, 0, 0, 0};
   WCHAR text[256];
   int result = GetWindowText(control, text, arraysize(text));
   if (result) {
     base::win::ScopedGetDC dc(control);
     base::win::ScopedSelectObject font(
-        dc.get(), (HFONT)SendMessage(control, WM_GETFONT, 0, 0));
-    DrawText(dc.get(), text, -1, &rect, DT_CALCRECT|DT_SINGLELINE);
+        dc, (HFONT)SendMessage(control, WM_GETFONT, 0, 0));
+    DrawText(dc, text, -1, &rect, DT_CALCRECT|DT_SINGLELINE);
   }
   return rect.right;
 }
 
 void DisconnectWindowWin::SetStrings(const UiStrings& strings,
                                      const std::string& username) {
   SetWindowText(hwnd_, strings.product_name.c_str());
 
   HWND hwndButton = GetDlgItem(hwnd_, IDC_DISCONNECT);
   CHECK(hwndButton);
@@ skipping 59 matching lines @@
     ::EndDialog(hwnd_, result);
     hwnd_ = NULL;
   }
 }
 
 DisconnectWindow* DisconnectWindow::Create() {
   return new DisconnectWindowWin;
 }
 
 }  // namespace remoting