Pass ID of the calling extension to the native messaging host.

chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/platform_file.h"
 #include "base/process_util.h"
 #include "base/run_loop.h"
 #include "base/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
@@ skipping 83 matching lines @@
     if (native_message_process_host_.get()) {
       BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE,
                                 native_message_process_host_.release());
     }
     message_loop_.RunUntilIdle();
   }
 
   virtual void PostMessageFromNativeProcess(
       int port_id,
       const std::string& message) OVERRIDE  {
-    last_posted_message_ = message;
+    last_message_ = message;
+
+    // Parse the message.
+    base::Value* parsed = base::JSONReader::Read(message);
+    base::DictionaryValue* dict_value;
+    if (parsed && parsed->GetAsDictionary(&dict_value)) {
+      last_message_parsed_.reset(dict_value);
+    } else {
+      LOG(ERROR) << "Failed to parse " << message;
+      last_message_parsed_.reset();
+      delete parsed;
+    }
+
     if (read_message_run_loop_)
       read_message_run_loop_->Quit();
   }
 
   virtual void CloseChannel(int port_id, bool error) OVERRIDE {
   }
 
  protected:
   std::string FormatMessage(const std::string& message) {
     Pickle pickle;
@@ skipping 13 matching lines @@
 
   // Force the channel to be dev.
   base::ScopedTempDir temp_dir_;
   Feature::ScopedCurrentChannel current_channel_;
   scoped_ptr<NativeMessageProcessHost> native_message_process_host_;
   base::FilePath user_data_dir_;
   MessageLoopForIO message_loop_;
   scoped_ptr<base::RunLoop> read_message_run_loop_;
   scoped_ptr<content::TestBrowserThread> ui_thread_;
   scoped_ptr<content::TestBrowserThread> io_thread_;
-  std::string last_posted_message_;
+  std::string last_message_;
+  scoped_ptr<base::DictionaryValue> last_message_parsed_;
 };
 
 // Read a single message from a local file.
 TEST_F(NativeMessagingTest, SingleSendMessageRead) {
   base::FilePath temp_output_file = temp_dir_.path().AppendASCII("output");
   base::FilePath temp_input_file = CreateTempFileWithMessage(kTestMessage);
 
   scoped_ptr<NativeProcessLauncher> launcher(
       new FakeLauncher(temp_input_file, temp_output_file));
   native_message_process_host_ = NativeMessageProcessHost::CreateWithLauncher(
       AsWeakPtr(), kTestNativeMessagingExtensionId, "empty_app.py",
       0, launcher.Pass());
   ASSERT_TRUE(native_message_process_host_.get());
   read_message_run_loop_.reset(new base::RunLoop());
   read_message_run_loop_->RunUntilIdle();
 
-  if (last_posted_message_.empty()) {
+  if (last_message_.empty()) {
     read_message_run_loop_.reset(new base::RunLoop());
     native_message_process_host_->ReadNowForTesting();
     read_message_run_loop_->Run();
   }
-  EXPECT_EQ(kTestMessage, last_posted_message_);
+  EXPECT_EQ(kTestMessage, last_message_);
 }
 
 // Tests sending a single message. The message should get written to
 // |temp_file| and should match the contents of single_message_request.msg.
 TEST_F(NativeMessagingTest, SingleSendMessageWrite) {
   base::FilePath temp_output_file = temp_dir_.path().AppendASCII("output");
   base::FilePath temp_input_file = CreateTempFileWithMessage(std::string());
 
   scoped_ptr<NativeProcessLauncher> launcher(
       new FakeLauncher(temp_input_file, temp_output_file));
@@ skipping 12 matching lines @@
     ASSERT_TRUE(file_util::ReadFileToString(temp_output_file, &output));
     if (!output.empty())
       break;
     base::PlatformThread::YieldCurrentThread();
   }
 
   EXPECT_EQ(FormatMessage(kTestMessage), output);
 }
 
 // Test send message with a real client. The client just echo's back the text
-// it recieved.
+// it received.
 TEST_F(NativeMessagingTest, EchoConnect) {
   base::ScopedTempDir temp_dir;
   base::FilePath manifest_path = temp_dir.path().AppendASCII(
       std::string(kTestNativeMessagingHostName) + ".json");
   ASSERT_NO_FATAL_FAILURE(CreateTestNativeHostManifest(manifest_path));
 
   std::string hosts_option = base::StringPrintf(
       "%s=%s", extensions::kTestNativeMessagingHostName,
       manifest_path.AsUTF8Unsafe().c_str());
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kNativeMessagingHosts, hosts_option);
 
   native_message_process_host_ = NativeMessageProcessHost::Create(
       AsWeakPtr(), kTestNativeMessagingExtensionId,
       kTestNativeMessagingHostName, 0);
   ASSERT_TRUE(native_message_process_host_.get());
 
   native_message_process_host_->Send("{\"text\": \"Hello.\"}");
   read_message_run_loop_.reset(new base::RunLoop());
   read_message_run_loop_->Run();
-  EXPECT_EQ("{\"id\": 1, \"echo\": {\"text\": \"Hello.\"}}",
-            last_posted_message_);
+  ASSERT_FALSE(last_message_.empty());
+  ASSERT_TRUE(last_message_parsed_);
+
+  std::string expected_url = std::string("chrome-extension://") +
+      kTestNativeMessagingExtensionId + "/";
+  int id;
+  EXPECT_TRUE(last_message_parsed_->GetInteger("id", &id));
+  EXPECT_EQ(1, id);
+  std::string text;
+  EXPECT_TRUE(last_message_parsed_->GetString("echo.text", &text));
+  EXPECT_EQ("Hello.", text);
+  std::string url;
+  EXPECT_TRUE(last_message_parsed_->GetString("caller_url", &url));
+  EXPECT_EQ(expected_url, url);
+
 
   native_message_process_host_->Send("{\"foo\": \"bar\"}");
   read_message_run_loop_.reset(new base::RunLoop());
   read_message_run_loop_->Run();
-  EXPECT_EQ("{\"id\": 2, \"echo\": {\"foo\": \"bar\"}}", last_posted_message_);
+  EXPECT_TRUE(last_message_parsed_->GetInteger("id", &id));
+  EXPECT_EQ(2, id);
+  EXPECT_TRUE(last_message_parsed_->GetString("echo.foo", &text));
+  EXPECT_EQ("bar", text);
+  EXPECT_TRUE(last_message_parsed_->GetString("caller_url", &url));
+  EXPECT_EQ(expected_url, url);
 }
 
 }  // namespace extensions