Rename WebIntentData for backend storage to WebIntentServiceData.

chrome/browser/webdata/web_data_service.cc

 // Copyright (c) 2011 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/message_loop.h"
 #include "base/stl_util.h"
 #include "base/task.h"
 #include "base/threading/thread.h"
@@ skipping 203 matching lines @@
                                  request));
   return request->GetHandle();
 }
 
 //////////////////////////////////////////////////////////////////////////////
 //
 // Web Intents.
 //
 //////////////////////////////////////////////////////////////////////////////
 
-void WebDataService::AddWebIntent(const WebIntentData& intent) {
-  GenericRequest<WebIntentData>* request = new GenericRequest<WebIntentData>(
-      this, GetNextRequestHandle(), NULL, intent);
+void WebDataService::AddWebIntent(const WebIntentServiceData& service) {
+  GenericRequest<WebIntentServiceData>* request =
+      new GenericRequest<WebIntentServiceData>(
+          this, GetNextRequestHandle(), NULL, service);
   RegisterRequest(request);
   ScheduleTask(NewRunnableMethod(this, &WebDataService::AddWebIntentImpl,
                                  request));
 }
 
-void WebDataService::RemoveWebIntent(const WebIntentData& intent) {
-  GenericRequest<WebIntentData>* request = new GenericRequest<WebIntentData>(
-      this, GetNextRequestHandle(), NULL, intent);
+void WebDataService::RemoveWebIntent(const WebIntentServiceData& service) {
+  GenericRequest<WebIntentServiceData>* request =
+      new GenericRequest<WebIntentServiceData>(
+          this, GetNextRequestHandle(), NULL, service);
   RegisterRequest(request);
   ScheduleTask(NewRunnableMethod(this, &WebDataService::RemoveWebIntentImpl,
                                  request));
 }
 
 WebDataService::Handle WebDataService::GetWebIntents(const string16& action,
                                        WebDataServiceConsumer* consumer) {
   DCHECK(consumer);
   GenericRequest<string16>* request = new GenericRequest<string16>(
       this, GetNextRequestHandle(), consumer, action);
@@ skipping 589 matching lines @@
   request->RequestComplete();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Web Intents implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 void WebDataService::RemoveWebIntentImpl(
-    GenericRequest<WebIntentData>* request) {
+    GenericRequest<WebIntentServiceData>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
-    const WebIntentData& intent = request->arg();
-    db_->GetWebIntentsTable()->RemoveWebIntent(intent);
+    const WebIntentServiceData& service = request->arg();
+    db_->GetWebIntentsTable()->RemoveWebIntent(service);
     ScheduleCommit();
   }
   request->RequestComplete();
 }
 
-void WebDataService::AddWebIntentImpl(GenericRequest<WebIntentData>* request) {
+void WebDataService::AddWebIntentImpl(
+    GenericRequest<WebIntentServiceData>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
-    const WebIntentData& intent = request->arg();
-    db_->GetWebIntentsTable()->SetWebIntent(intent);
+    const WebIntentServiceData& service = request->arg();
+    db_->GetWebIntentsTable()->SetWebIntent(service);
     ScheduleCommit();
   }
   request->RequestComplete();
 }
 
 
 void WebDataService::GetWebIntentsImpl(GenericRequest<string16>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
-    std::vector<WebIntentData> result;
+    std::vector<WebIntentServiceData> result;
     db_->GetWebIntentsTable()->GetWebIntents(request->arg(), &result);
     request->SetResult(
-        new WDResult<std::vector<WebIntentData> >(WEB_INTENTS_RESULT, result));
+        new WDResult<std::vector<WebIntentServiceData> >(
+            WEB_INTENTS_RESULT, result));
   }
   request->RequestComplete();
 }
 
 void WebDataService::GetAllWebIntentsImpl(
     GenericRequest<std::string>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
-    std::vector<WebIntentData> result;
+    std::vector<WebIntentServiceData> result;
     db_->GetWebIntentsTable()->GetAllWebIntents(&result);
     request->SetResult(
-        new WDResult<std::vector<WebIntentData> >(WEB_INTENTS_RESULT, result));
+        new WDResult<std::vector<WebIntentServiceData> >(
+            WEB_INTENTS_RESULT, result));
   }
   request->RequestComplete();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Token Service implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
@@ skipping 540 matching lines @@
   return result_;
 }
 
 void WebDataService::WebDataRequest::RequestComplete() {
   WebDataService* s = service_;
   Task* t = NewRunnableMethod(s,
                               &WebDataService::RequestCompleted,
                               handle_);
   message_loop_->PostTask(FROM_HERE, t);
 }