Moved web_intent_service_data into webkit/glue

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/7980063

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102273 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 7 insertions, 77 deletions

diff --git a/chrome/browser/intents/register_intent_handler_infobar_delegate.h b/chrome/browser/intents/register_intent_handler_infobar_delegate.h
index bd4521c..cd887e1 100644
--- a/chrome/browser/intents/register_intent_handler_infobar_delegate.h
+++ b/chrome/browser/intents/register_intent_handler_infobar_delegate.h
@@ -8,8 +8,8 @@
 
 #include "base/basictypes.h"
 #include "base/string16.h"
-#include "chrome/browser/intents/web_intent_service_data.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
+#include "webkit/glue/web_intent_service_data.h"
 
 class Profile;
 class TabContents;
diff --git a/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc b/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc
index 6d729b3..56b08d5 100644
--- a/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc
+++ b/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc
@@ -7,7 +7,6 @@
 #include "chrome/browser/intents/register_intent_handler_infobar_delegate.h"
 #include "chrome/browser/intents/web_intents_registry.h"
 #include "chrome/browser/intents/web_intents_registry_factory.h"
-#include "chrome/browser/intents/web_intent_service_data.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
@@ -15,6 +14,7 @@
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/glue/web_intent_service_data.h"
 
 namespace {
 
diff --git a/chrome/browser/intents/web_intent_service_data.cc b/chrome/browser/intents/web_intent_service_data.cc
deleted file mode 100644
index d34173d..0000000
--- a/chrome/browser/intents/web_intent_service_data.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-// 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 "base/utf_string_conversions.h"
-#include "chrome/browser/intents/web_intent_service_data.h"
-#include <ostream>
-
-WebIntentServiceData::WebIntentServiceData()
-    : disposition(WebIntentServiceData::DISPOSITION_WINDOW) {
-}
-
-WebIntentServiceData::~WebIntentServiceData() {}
-
-bool WebIntentServiceData::operator==(const WebIntentServiceData& other) const {
-  return (service_url == other.service_url &&
-          action == other.action &&
-          type == other.type &&
-          title == other.title &&
-          disposition == other.disposition);
-}
-
-std::ostream& operator<<(::std::ostream& os,
-                         const WebIntentServiceData& intent) {
-  return os <<
-         "{" << intent.service_url <<
-         ", " << UTF16ToUTF8(intent.action) <<
-         ", " << UTF16ToUTF8(intent.type) <<
-         ", " << UTF16ToUTF8(intent.title) <<
-         ", " << intent.disposition <<
-         "}";
-}
diff --git a/chrome/browser/intents/web_intent_service_data.h b/chrome/browser/intents/web_intent_service_data.h
deleted file mode 100644
index 642e190..0000000
--- a/chrome/browser/intents/web_intent_service_data.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_INTENTS_WEB_INTENT_SERVICE_DATA_H_
-#define CHROME_BROWSER_INTENTS_WEB_INTENT_SERVICE_DATA_H_
-#pragma once
-
-#include "base/string16.h"
-#include "googleurl/src/gurl.h"
-#include <iosfwd>
-
-// Describes the relevant elements of a WebIntent service.
-// TODO(gbillock): if we want to use this in an IPC message, it should
-// go in webkit/glue in web_intent_data.
-struct WebIntentServiceData {
-  // An intents disposition determines which context the service is opened in.
-  enum Disposition {
-    DISPOSITION_WINDOW,  // Open service inside a new window. (Default)
-    DISPOSITION_INLINE,  // Open service inside the picker UI window.
-  };
-
-  WebIntentServiceData();
-  ~WebIntentServiceData();
-
-  bool operator==(const WebIntentServiceData& other) const;
-
-  GURL service_url;  // URL for service invocation.
-  string16 action;  // Name of action provided by service.
-  string16 type;  // MIME type of data accepted by service.
-  string16 title;  // The title of the service.
-  Disposition disposition;  // The context the service is opened in.
-};
-
-// Printing operator - helps gtest produce readable error messages.
-std::ostream& operator<<(std::ostream& os, const WebIntentServiceData& intent);
-
-#endif  // CHROME_BROWSER_INTENTS_WEB_INTENT_SERVICE_DATA_H_
diff --git a/chrome/browser/intents/web_intents_registry.h b/chrome/browser/intents/web_intents_registry.h
index 3b1af44..a3ae3fd 100644
--- a/chrome/browser/intents/web_intents_registry.h
+++ b/chrome/browser/intents/web_intents_registry.h
@@ -8,9 +8,9 @@
 
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
-#include "chrome/browser/intents/web_intent_service_data.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/webdata/web_data_service.h"
+#include "webkit/glue/web_intent_service_data.h"
 
 // Handles storing and retrieving of web intents in the web database.
 // The registry provides filtering logic to retrieve specific types of intents.
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.cc b/chrome/browser/ui/intents/web_intent_picker_controller.cc
index 1dd7d98..f076dc9 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.cc
@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "chrome/browser/favicon/favicon_service.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"
@@ -18,6 +17,7 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_source.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "webkit/glue/web_intent_service_data.h"
 
 namespace {
 
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc
index 4dcf8d5..be8ca85 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc
@@ -10,7 +10,6 @@
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/favicon/favicon_service.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"
@@ -26,6 +25,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/native_widget_types.h"
+#include "webkit/glue/web_intent_service_data.h"
 
 using testing::_;
 using testing::AtMost;
diff --git a/chrome/browser/webdata/web_intents_table.h b/chrome/browser/webdata/web_intents_table.h
index 1a01f37..a542930 100644
--- a/chrome/browser/webdata/web_intents_table.h
+++ b/chrome/browser/webdata/web_intents_table.h
@@ -10,8 +10,8 @@
 
 #include "base/basictypes.h"
 #include "base/string16.h"
-#include "chrome/browser/intents/web_intent_service_data.h"
 #include "chrome/browser/webdata/web_database_table.h"
+#include "webkit/glue/web_intent_service_data.h"
 
 class GURL;
 
diff --git a/chrome/browser/webdata/web_intents_table_unittest.cc b/chrome/browser/webdata/web_intents_table_unittest.cc
index bd68fff..3e10b19 100644
--- a/chrome/browser/webdata/web_intents_table_unittest.cc
+++ b/chrome/browser/webdata/web_intents_table_unittest.cc
@@ -8,12 +8,12 @@
 #include "base/scoped_temp_dir.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.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"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/glue/web_intent_service_data.h"
 
 namespace {