Include scoped_gdi_object.h where necessary.

Add base::win:: prefix to the calls to ScopedGDIObject and remove the using
'using' declaration.

BUG=None
TEST=trybots

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

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

3 files changed, 6 insertions, 5 deletions

diff --git a/base/scoped_handle_win.h b/base/scoped_handle_win.h
index a98114b..09bb2cb 100644
--- a/base/scoped_handle_win.h
+++ b/base/scoped_handle_win.h
@@ -4,14 +4,13 @@
 
 // TODO(brettw) remove this file when all callers are converted to using the
 // new location/namespace
-#include "base/win/scoped_handle.h"
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/scoped_handle.h"
+#include "base/win/scoped_handle.h"
 #include "base/win/scoped_hdc.h"
 #include "base/win/scoped_hglobal.h"
 
 using base::win::ScopedBitmap;
-using base::win::ScopedGDIObject;
 using base::win::ScopedHandle;
 using base::win::ScopedHDC;
 using base::win::ScopedHFONT;
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc
index 6a86bc0..72804de 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc
@@ -17,6 +17,7 @@
 #include "base/scoped_comptr_win.h"
 #include "base/thread.h"
 #include "base/win_util.h"
+#include "base/win/scoped_gdi_object.h"
 #include "chrome/browser/accessibility/browser_accessibility_win.h"
 #include "chrome/browser/accessibility/browser_accessibility_manager.h"
 #include "chrome/browser/accessibility/browser_accessibility_state.h"
@@ -674,7 +675,7 @@ void RenderWidgetHostViewWin::Redraw() {
   RECT damage_bounds;
   GetUpdateRect(&damage_bounds, FALSE);
 
-  ScopedGDIObject<HRGN> damage_region(CreateRectRgn(0, 0, 0, 0));
+  base::win::ScopedGDIObject<HRGN> damage_region(CreateRectRgn(0, 0, 0, 0));
   GetUpdateRgn(damage_region, FALSE);
 
   // Paint the invalid region synchronously.  Our caller will not paint again
@@ -901,7 +902,7 @@ void RenderWidgetHostViewWin::OnPaint(HDC unused_dc) {
 
   // Grab the region to paint before creation of paint_dc since it clears the
   // damage region.
-  ScopedGDIObject<HRGN> damage_region(CreateRectRgn(0, 0, 0, 0));
+  base::win::ScopedGDIObject<HRGN> damage_region(CreateRectRgn(0, 0, 0, 0));
   GetUpdateRgn(damage_region, FALSE);
 
   CPaintDC paint_dc(m_hWnd);
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
index 20a4b00..199e631 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -43,6 +43,7 @@
 #include <dwmapi.h>
 
 #include "app/win_util.h"
+#include "base/win/scoped_gdi_object.h"
 #endif
 
 #if defined(OS_LINUX)
@@ -1123,7 +1124,7 @@ void AutocompletePopupContentsView::UpdateBlurRegion() {
 
   gfx::Path contents_path;
   MakeContentsPath(&contents_path, contents_rect);
-  ScopedGDIObject<HRGN> popup_region;
+  base::win::ScopedGDIObject<HRGN> popup_region;
   popup_region.Set(contents_path.CreateNativeRegion());
   bb.hRgnBlur = popup_region.Get();
   DwmEnableBlurBehindWindow(GetWidget()->GetNativeView(), &bb);