Move SerializedScriptValue to content/public/common and put it into the content namespace.

BUG=98716
Review URL: http://codereview.chromium.org/8372009

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

5 files changed, 23 insertions, 19 deletions

diff --git a/content/renderer/indexed_db_dispatcher.cc b/content/renderer/indexed_db_dispatcher.cc
index aba628b..c3eea0e 100644
--- a/content/renderer/indexed_db_dispatcher.cc
+++ b/content/renderer/indexed_db_dispatcher.cc
@@ -64,7 +64,7 @@ bool IndexedDBDispatcher::OnMessageReceived(const IPC::Message& msg) {
 }
 
 void IndexedDBDispatcher::RequestIDBCursorUpdate(
-    const SerializedScriptValue& value,
+    const content::SerializedScriptValue& value,
     WebIDBCallbacks* callbacks_ptr,
     int32 idb_cursor_id,
     WebExceptionCode* ec) {
@@ -296,7 +296,7 @@ void IndexedDBDispatcher::RequestIDBObjectStoreGet(
 }
 
 void IndexedDBDispatcher::RequestIDBObjectStorePut(
-    const SerializedScriptValue& value,
+    const content::SerializedScriptValue& value,
     const IndexedDBKey& key,
     WebKit::WebIDBObjectStore::PutMode put_mode,
     WebIDBCallbacks* callbacks_ptr,
@@ -419,7 +419,7 @@ void IndexedDBDispatcher::OnSuccessStringList(
 }
 
 void IndexedDBDispatcher::OnSuccessSerializedScriptValue(
-    int32 response_id, const SerializedScriptValue& value) {
+    int32 response_id, const content::SerializedScriptValue& value) {
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);
   callbacks->onSuccess(value);
   pending_callbacks_.Remove(response_id);
@@ -427,7 +427,7 @@ void IndexedDBDispatcher::OnSuccessSerializedScriptValue(
 
 void IndexedDBDispatcher::OnSuccessOpenCursor(int32 repsonse_id,
     int32 object_id, const IndexedDBKey& key, const IndexedDBKey& primaryKey,
-    const SerializedScriptValue& value) {
+    const content::SerializedScriptValue& value) {
   WebIDBCallbacks* callbacks =
       pending_callbacks_.Lookup(repsonse_id);
   callbacks->onSuccess(new RendererWebIDBCursorImpl(object_id, key,
diff --git a/content/renderer/indexed_db_dispatcher.h b/content/renderer/indexed_db_dispatcher.h
index 059abc4..e30fa95 100644
--- a/content/renderer/indexed_db_dispatcher.h
+++ b/content/renderer/indexed_db_dispatcher.h
@@ -16,7 +16,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransactionCallbacks.h"
 
 class IndexedDBKey;
-class SerializedScriptValue;
 
 namespace WebKit {
 class WebDOMStringList;
@@ -25,6 +24,10 @@ class WebIDBKeyRange;
 class WebIDBTransaction;
 }
 
+namespace content {
+class SerializedScriptValue;
+}
+
 // Handle the indexed db related communication for this entire renderer.
 class IndexedDBDispatcher : public IPC::Channel::Listener {
  public:
@@ -52,7 +55,7 @@ class IndexedDBDispatcher : public IPC::Channel::Listener {
       WebKit::WebFrame* web_frame);
 
   void RequestIDBCursorUpdate(
-      const SerializedScriptValue& value,
+      const content::SerializedScriptValue& value,
       WebKit::WebIDBCallbacks* callbacks_ptr,
       int32 idb_cursor_id,
       WebKit::WebExceptionCode* ec);
@@ -115,7 +118,7 @@ class IndexedDBDispatcher : public IPC::Channel::Listener {
                                 const WebKit::WebIDBTransaction& transaction,
                                 WebKit::WebExceptionCode* ec);
 
-  void RequestIDBObjectStorePut(const SerializedScriptValue& value,
+  void RequestIDBObjectStorePut(const content::SerializedScriptValue& value,
                                 const IndexedDBKey& key,
                                 WebKit::WebIDBObjectStore::PutMode putMode,
                                 WebKit::WebIDBCallbacks* callbacks,
@@ -159,11 +162,12 @@ class IndexedDBDispatcher : public IPC::Channel::Listener {
   void OnSuccessOpenCursor(int32 response_id, int32 object_id,
                            const IndexedDBKey& key,
                            const IndexedDBKey& primary_key,
-                           const SerializedScriptValue& value);
+                           const content::SerializedScriptValue& value);
   void OnSuccessStringList(int32 response_id,
                            const std::vector<string16>& value);
-  void OnSuccessSerializedScriptValue(int32 response_id,
-                                      const SerializedScriptValue& value);
+  void OnSuccessSerializedScriptValue(
+      int32 response_id,
+      const content::SerializedScriptValue& value);
   void OnError(int32 response_id, int code, const string16& message);
   void OnBlocked(int32 response_id);
   void OnAbort(int32 transaction_id);
diff --git a/content/renderer/renderer_webidbcursor_impl.cc b/content/renderer/renderer_webidbcursor_impl.cc
index 1837e2f..82996f4 100644
--- a/content/renderer/renderer_webidbcursor_impl.cc
+++ b/content/renderer/renderer_webidbcursor_impl.cc
@@ -15,7 +15,7 @@ using WebKit::WebSerializedScriptValue;
 
 RendererWebIDBCursorImpl::RendererWebIDBCursorImpl(int32 idb_cursor_id,
     const IndexedDBKey& key, const IndexedDBKey& primary_key,
-    const SerializedScriptValue& value)
+    const content::SerializedScriptValue& value)
     : idb_cursor_id_(idb_cursor_id),
       key_(key),
       primary_key_(primary_key),
@@ -55,8 +55,8 @@ void RendererWebIDBCursorImpl::update(const WebSerializedScriptValue& value,
                                       WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       RenderThreadImpl::current()->indexed_db_dispatcher();
-  dispatcher->RequestIDBCursorUpdate(SerializedScriptValue(value), callbacks,
-                                     idb_cursor_id_, &ec);
+  dispatcher->RequestIDBCursorUpdate(
+      content::SerializedScriptValue(value), callbacks, idb_cursor_id_, &ec);
 }
 
 void RendererWebIDBCursorImpl::continueFunction(const WebIDBKey& key,
diff --git a/content/renderer/renderer_webidbcursor_impl.h b/content/renderer/renderer_webidbcursor_impl.h
index 95e2fad..bb1c165 100644
--- a/content/renderer/renderer_webidbcursor_impl.h
+++ b/content/renderer/renderer_webidbcursor_impl.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "content/common/indexed_db_key.h"
-#include "content/common/serialized_script_value.h"
+#include "content/public/common/serialized_script_value.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCursor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h"
@@ -17,7 +17,7 @@ class RendererWebIDBCursorImpl : public WebKit::WebIDBCursor {
  public:
   RendererWebIDBCursorImpl(int32 idb_cursor_id, const IndexedDBKey& key,
                            const IndexedDBKey& primary_key,
-                           const SerializedScriptValue& value);
+                           const content::SerializedScriptValue& value);
   virtual ~RendererWebIDBCursorImpl();
 
   virtual unsigned short direction() const;
@@ -37,7 +37,7 @@ class RendererWebIDBCursorImpl : public WebKit::WebIDBCursor {
   int32 idb_cursor_id_;
   const IndexedDBKey key_;
   const IndexedDBKey primary_key_;
-  const SerializedScriptValue value_;
+  const content::SerializedScriptValue value_;
 };
 
 #endif  // CONTENT_RENDERER_RENDERER_WEBIDBCURSOR_IMPL_H_
diff --git a/content/renderer/renderer_webidbobjectstore_impl.cc b/content/renderer/renderer_webidbobjectstore_impl.cc
index 8f65bf4..70ebc0a 100644
--- a/content/renderer/renderer_webidbobjectstore_impl.cc
+++ b/content/renderer/renderer_webidbobjectstore_impl.cc
@@ -5,7 +5,7 @@
 #include "content/renderer/renderer_webidbobjectstore_impl.h"
 
 #include "content/common/indexed_db_messages.h"
-#include "content/common/serialized_script_value.h"
+#include "content/public/common/serialized_script_value.h"
 #include "content/renderer/indexed_db_dispatcher.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/renderer_webidbindex_impl.h"
@@ -90,8 +90,8 @@ void RendererWebIDBObjectStoreImpl::put(
   IndexedDBDispatcher* dispatcher =
       RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBObjectStorePut(
-      SerializedScriptValue(value), IndexedDBKey(key), put_mode, callbacks,
-      idb_object_store_id_, transaction, &ec);
+      content::SerializedScriptValue(value), IndexedDBKey(key), put_mode,
+      callbacks, idb_object_store_id_, transaction, &ec);
 }
 
 void RendererWebIDBObjectStoreImpl::deleteFunction(