Move native_widget_types and gtk_native_view_id_manager from base/gfx to...

chrome/test/automation/automation_proxy_uitest.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
-#ifndef CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_UITEST_H__
-#define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_UITEST_H__
+#ifndef CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_UITEST_H_
+#define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_UITEST_H_
 
 #include <string>
 
-#include "base/gfx/native_widget_types.h"
+#include "app/gfx/native_widget_types.h"
 #include "base/message_loop.h"
 #include "base/platform_thread.h"
 #include "base/time.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "googleurl/src/gurl.h"
 
 class TabProxy;
 
 // Base class for automation proxy testing.
@@ skipping 107 matching lines @@
   std::string message_, origin_, target_;
   QuitAfter quit_after_;
   const wchar_t* host_window_class_;
   gfx::NativeWindow host_window_;
 };
 
 // A test harness for testing external tabs.
 typedef CustomAutomationProxyTest<AutomationProxyForExternalTab>
     ExternalTabTestType;
 
-#endif  // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_UITEST_H__
+#endif  // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_UITEST_H_