Move extension messages to their own file and add a RenderViewObserver to start moving the extens...

chrome/browser/extensions/extension_messages_browsertest.cc

 // Copyright (c) 2009 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/values.h"
 #include "chrome/browser/extensions/extension_message_service.h"
+#include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/test/render_view_test.h"
 #include "content/common/view_messages.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 static void DispatchOnConnect(int source_port_id, const std::string& name,
                               const std::string& tab_json) {
   ListValue args;
@@ skipping 33 matching lines @@
     "var port = chrome.extension.connect({name:'testName'});"
     "port.onMessage.addListener(doOnMessage);"
     "port.postMessage({message: 'content ready'});"
     "function doOnMessage(msg, port) {"
     "  alert('content got: ' + msg.val);"
     "}");
 
   // Verify that we opened a channel and sent a message through it.
   const IPC::Message* open_channel_msg =
       render_thread_.sink().GetUniqueMessageMatching(
-          ViewHostMsg_OpenChannelToExtension::ID);
+          ExtensionHostMsg_OpenChannelToExtension::ID);
   ASSERT_TRUE(open_channel_msg);
   void* iter = IPC::SyncMessage::GetDataIterator(open_channel_msg);
-  ViewHostMsg_OpenChannelToExtension::SendParam open_params;
+  ExtensionHostMsg_OpenChannelToExtension::SendParam open_params;
   ASSERT_TRUE(IPC::ReadParam(open_channel_msg, &iter, &open_params));
   EXPECT_EQ("testName", open_params.d);
 
   const IPC::Message* post_msg =
       render_thread_.sink().GetUniqueMessageMatching(
-          ViewHostMsg_ExtensionPostMessage::ID);
+          ExtensionHostMsg_PostMessage::ID);
   ASSERT_TRUE(post_msg);
-  ViewHostMsg_ExtensionPostMessage::Param post_params;
-  ViewHostMsg_ExtensionPostMessage::Read(post_msg, &post_params);
+  ExtensionHostMsg_PostMessage::Param post_params;
+  ExtensionHostMsg_PostMessage::Read(post_msg, &post_params);
   EXPECT_EQ("{\"message\":\"content ready\"}", post_params.b);
 
   // Now simulate getting a message back from the other side.
   render_thread_.sink().ClearMessages();
   const int kPortId = 0;
   DispatchOnMessage("{\"val\": 42}", kPortId);
 
   // Verify that we got it.
   const IPC::Message* alert_msg =
       render_thread_.sink().GetUniqueMessageMatching(
@@ skipping 27 matching lines @@
   render_thread_.sink().ClearMessages();
 
   // Simulate a new connection being opened.
   const int kPortId = 0;
   const std::string kPortName = "testName";
   DispatchOnConnect(kPortId, kPortName, "{\"url\":\"foo://bar\"}");
 
   // Verify that we handled the new connection by posting a message.
   const IPC::Message* post_msg =
       render_thread_.sink().GetUniqueMessageMatching(
-          ViewHostMsg_ExtensionPostMessage::ID);
+          ExtensionHostMsg_PostMessage::ID);
   ASSERT_TRUE(post_msg);
-  ViewHostMsg_ExtensionPostMessage::Param post_params;
-  ViewHostMsg_ExtensionPostMessage::Read(post_msg, &post_params);
+  ExtensionHostMsg_PostMessage::Param post_params;
+  ExtensionHostMsg_PostMessage::Read(post_msg, &post_params);
   std::string expected_msg =
       "{\"message\":\"onconnect from foo://bar name " + kPortName + "\"}";
   EXPECT_EQ(expected_msg, post_params.b);
 
   // Now simulate getting a message back from the channel opener.
   render_thread_.sink().ClearMessages();
   DispatchOnMessage("{\"val\": 42}", kPortId);
 
   // Verify that we got it.
   const IPC::Message* alert_msg =
@@ skipping 11 matching lines @@
 
   // Verify that we got it.
   alert_msg =
       render_thread_.sink().GetUniqueMessageMatching(
           ViewHostMsg_RunJavaScriptMessage::ID);
   ASSERT_TRUE(alert_msg);
   iter = IPC::SyncMessage::GetDataIterator(alert_msg);
   ASSERT_TRUE(IPC::ReadParam(alert_msg, &iter, &alert_param));
   EXPECT_EQ(L"disconnected: 24", alert_param.a);
 }