Move forms/ out of webkit/.

chrome/browser/webdata/web_data_service.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 "chrome/browser/webdata/web_data_service.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/webdata/web_database.h"
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #ifdef DEBUG
 #include "content/public/browser/browser_thread.h"
 #endif
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
+#include "content/public/common/form_field.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "webkit/forms/form_field.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDataService implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 using base::Bind;
 using base::Time;
 using content::BrowserThread;
-using webkit::forms::FormField;
+using content::FormField;
 using webkit_glue::WebIntentServiceData;
 
 namespace {
 
 // A task used by WebDataService (for Sync mainly) to inform the
 // PersonalDataManager living on the UI thread that it needs to refresh.
 void NotifyOfMultipleAutofillChangesTask(
     const scoped_refptr<WebDataService>& web_data_service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 1453 matching lines @@
 }
 
 const WDTypedResult* WebDataService::WebDataRequest::GetResult() const {
   return result_;
 }
 
 void WebDataService::WebDataRequest::RequestComplete() {
   message_loop_->PostTask(FROM_HERE, Bind(&WebDataService::RequestCompleted,
                                           service_.get(), handle_));
 }