Rename WebIntentData for backend storage to WebIntentServiceData.

chrome/browser/webdata/web_intents_table_unittest.cc

Index: chrome/browser/webdata/web_intents_table_unittest.cc
diff --git a/chrome/browser/webdata/web_intents_table_unittest.cc b/chrome/browser/webdata/web_intents_table_unittest.cc
index ab3e1c4f0af500beb181afbdbe3685280021702e..2b0e0a35897ed47c154867a696624b30a46ec4f6 100644
--- a/chrome/browser/webdata/web_intents_table_unittest.cc
+++ b/chrome/browser/webdata/web_intents_table_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/scoped_temp_dir.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/intents/web_intent_data.h"
+#include "chrome/browser/intents/web_intent_service_data.h"
 #include "chrome/browser/webdata/web_database.h"
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "chrome/common/chrome_paths.h"
@@ -25,9 +25,9 @@ string16 test_title_2 = ASCIIToUTF16("Test WebIntent #2");
 string16 mime_image = ASCIIToUTF16("image/*");
 string16 mime_video = ASCIIToUTF16("video/*");
 
-WebIntentData MakeIntent(const GURL& url, const string16& action,
-                         const string16& type, const string16& title) {
-  WebIntentData intent;
+WebIntentServiceData MakeIntent(const GURL& url, const string16& action,
+                                const string16& type, const string16& title) {
+  WebIntentServiceData intent;
   intent.service_url = url;
   intent.action = action;
   intent.type = type;
@@ -54,15 +54,15 @@ class WebIntentsTableTest : public testing::Test {
 
 // Test we can add, retrieve, and remove intents from the database.
 TEST_F(WebIntentsTableTest, SetGetDeleteIntent) {
-  std::vector<WebIntentData> intents;
+  std::vector<WebIntentServiceData> intents;
 
   // By default, no intents exist.
   EXPECT_TRUE(IntentsTable()->GetWebIntents(test_action, &intents));
   EXPECT_EQ(0U, intents.size());
 
   // Now adding one.
-  WebIntentData intent = MakeIntent(test_url, test_action, mime_image,
-                                    test_title);
+  WebIntentServiceData intent = MakeIntent(test_url, test_action, mime_image,
+                                           test_title);
   EXPECT_TRUE(IntentsTable()->SetWebIntent(intent));
 
   // Make sure that intent can now be fetched
@@ -81,10 +81,10 @@ TEST_F(WebIntentsTableTest, SetGetDeleteIntent) {
 
 // Test we support multiple intents for the same MIME type
 TEST_F(WebIntentsTableTest, SetMultipleIntents) {
-  std::vector<WebIntentData> intents;
+  std::vector<WebIntentServiceData> intents;
 
-  WebIntentData intent = MakeIntent(test_url, test_action, mime_image,
-                                    test_title);
+  WebIntentServiceData intent = MakeIntent(test_url, test_action, mime_image,
+                                           test_title);
   EXPECT_TRUE(IntentsTable()->SetWebIntent(intent));
 
   intent.type = mime_video;
@@ -108,10 +108,10 @@ TEST_F(WebIntentsTableTest, SetMultipleIntents) {
 
 // Test we support getting all intents independent of action.
 TEST_F(WebIntentsTableTest, GetAllIntents) {
-  std::vector<WebIntentData> intents;
+  std::vector<WebIntentServiceData> intents;
 
-  WebIntentData intent = MakeIntent(test_url, test_action, mime_image,
-                                    test_title);
+  WebIntentServiceData intent = MakeIntent(test_url, test_action, mime_image,
+                                           test_title);
   EXPECT_TRUE(IntentsTable()->SetWebIntent(intent));
 
   intent.action = test_action_2;