Move forms/ out of webkit/.

chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 3397 matching lines @@
   import_settings_data_.browser = browser;
   import_settings_data_.reply_message = reply_message;
 
   importer_list_ = new ImporterList(NULL);
   importer_list_->DetectSourceProfiles(this);
 }
 
 namespace {
 
 // Translates a dictionary password to a PasswordForm struct.
-webkit::forms::PasswordForm GetPasswordFormFromDict(
+content::PasswordForm GetPasswordFormFromDict(
     const DictionaryValue& password_dict) {
 
   // If the time is specified, change time to the specified time.
   base::Time time = base::Time::Now();
   int it;
   double dt;
   if (password_dict.GetInteger("time", &it))
     time = base::Time::FromTimeT(it);
   else if (password_dict.GetDouble("time", &dt))
     time = base::Time::FromDoubleT(dt);
@@ skipping 19 matching lines @@
   password_dict.GetString("username_element", &username_element);
   password_dict.GetString("password_element", &password_element);
   password_dict.GetString("submit_element", &submit_element);
   password_dict.GetString("action_target", &action_target_text);
   if (!password_dict.GetBoolean("blacklist", &blacklist))
     blacklist = false;
 
   GURL origin_gurl(origin_url_text);
   GURL action_target(action_target_text);
 
-  webkit::forms::PasswordForm password_form;
+  content::PasswordForm password_form;
   password_form.signon_realm = signon_realm;
   password_form.username_value = username_value;
   password_form.password_value = password_value;
   password_form.origin = origin_gurl;
   password_form.username_element = username_element;
   password_form.password_element = password_element;
   password_form.submit_element = submit_element;
   password_form.action = action_target;
   password_form.blacklisted_by_user = blacklist;
   password_form.date_created = time;
@@ skipping 18 matching lines @@
   }
 
   // The "signon realm" is effectively the primary key and must be included.
   // Check here before calling GetPasswordFormFromDict.
   if (!password_dict->HasKey("signon_realm")) {
     AutomationJSONReply(this, reply_message).SendError(
         "Password must include a value for 'signon_realm.'");
     return;
   }
 
-  webkit::forms::PasswordForm new_password =
+  content::PasswordForm new_password =
       GetPasswordFormFromDict(*password_dict);
 
   // Use IMPLICIT_ACCESS since new passwords aren't added in incognito mode.
   PasswordStore* password_store = PasswordStoreFactory::GetForProfile(
       browser->profile(), Profile::IMPLICIT_ACCESS);
 
   // The password store does not exist for an incognito window.
   if (password_store == NULL) {
     scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
     return_value->SetBoolean("password_added", false);
@@ skipping 25 matching lines @@
     return;
   }
 
   // The "signon realm" is effectively the primary key and must be included.
   // Check here before calling GetPasswordFormFromDict.
   if (!password_dict->HasKey("signon_realm")) {
     AutomationJSONReply(this, reply_message).SendError(
         "Password must include a value for 'signon_realm.'");
     return;
   }
-  webkit::forms::PasswordForm to_remove =
+  content::PasswordForm to_remove =
       GetPasswordFormFromDict(*password_dict);
 
   // Use EXPLICIT_ACCESS since passwords can be removed in incognito mode.
   PasswordStore* password_store = PasswordStoreFactory::GetForProfile(
       browser->profile(), Profile::EXPLICIT_ACCESS);
   if (password_store == NULL) {
     AutomationJSONReply(this, reply_message).SendError(
         "Unable to get password store.");
     return;
   }
@@ skipping 2791 matching lines @@
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }
 
 void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
                                                   WebContents* tab) {
   if (chrome::GetActiveWebContents(browser) != tab)
     chrome::ActivateTabAt(browser, chrome::GetIndexOfTab(browser, tab), true);
 }