Move forms/ out of webkit/.

content/browser/renderer_host/test_render_view_host.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/test_backing_store.h"
 #include "content/browser/dom_storage/dom_storage_context_impl.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/browser/web_contents/test_web_contents.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_client.h"
+#include "content/public/common/password_form.h"
 #include "ui/gfx/rect.h"
 #include "webkit/dom_storage/dom_storage_types.h"
-#include "webkit/forms/password_form.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 
 using content::NativeWebKeyboardEvent;
-using webkit::forms::PasswordForm;
+using content::PasswordForm;

[jam, 2012/10/04 06:18:12]

nit: not needed (can also take the one above out)

[blundell, 2012/10/04 16:23:22]

Done.

 
 namespace content {
 
 namespace {
 // Normally this is done by the NavigationController, but we'll fake it out
 // here for testing.
 SessionStorageNamespaceImpl* CreateSessionStorageNamespace(
     SiteInstance* instance) {
   RenderProcessHost* process_host = instance->GetProcess();
   DOMStorageContext* dom_storage_context =
@@ skipping 348 matching lines @@
 
 TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() {
   return static_cast<TestRenderViewHost*>(active_rvh());
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content