Rename WebIntentData for backend storage to WebIntentServiceData.

chrome/browser/ui/intents/web_intent_picker_controller_unittest.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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/favicon/favicon_service.h"
-#include "chrome/browser/intents/web_intent_data.h"
+#include "chrome/browser/intents/web_intent_service_data.h"
 #include "chrome/browser/intents/web_intents_registry.h"
 #include "chrome/browser/intents/web_intents_registry_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/intents/web_intent_picker.h"
 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
 #include "chrome/browser/ui/intents/web_intent_picker_factory.h"
 #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
@@ skipping 116 matching lines @@
 
   virtual void TearDown() {
     controller_.reset();
 
     TabContentsWrapperTestHarness::TearDown();
   }
 
  protected:
   void AddWebIntentService(const string16& action,
                            const GURL& service_url) {
-    WebIntentData web_intent_data;
-    web_intent_data.action = action;
-    web_intent_data.type = kType;
-    web_intent_data.service_url = service_url;
-    web_data_service_->AddWebIntent(web_intent_data);
+    WebIntentServiceData web_intent_service_data;
+    web_intent_service_data.action = action;
+    web_intent_service_data.type = kType;
+    web_intent_service_data.service_url = service_url;
+    web_data_service_->AddWebIntent(web_intent_service_data);
   }
 
   void AddFaviconForURL(const GURL& url) {
     std::vector<unsigned char> image_data;
     FillBitmap(16, 16, &image_data);
 
     favicon_service_->SetFavicon(url,
                                  MakeFaviconURL(url),
                                  image_data,
                                  history::FAVICON);
@@ skipping 100 matching lines @@
       .Times(0);
   EXPECT_CALL(*controller_, OnCancelled())
       .WillOnce(Invoke(controller_.get(),
                        &TestWebIntentPickerController::BaseOnCancelled));
   EXPECT_CALL(*picker_factory_, ClosePicker(_));
 
   controller_->ShowDialog(NULL, kAction1, kType);
   WaitForDialogToShow();
   delegate_->OnCancelled();
 }