Update and enable NativeMessagingTest.EchoConnect.

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/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"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time.h"
 #include "chrome/browser/extensions/api/messaging/native_message_process_host.h"
+#include "chrome/browser/extensions/api/messaging/native_messaging_test_util.h"
 #include "chrome/browser/extensions/api/messaging/native_process_launcher.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/features/feature.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 namespace {
 
-const char kTestHostId[] = "knldjmfmopnpolahpmmgbagdohdnhkik";
 const char kTestMessage[] = "{\"text\": \"Hello.\"}";
 
 base::FilePath GetTestDir() {
   base::FilePath test_dir;
   PathService::Get(chrome::DIR_TEST_DATA, &test_dir);
   test_dir = test_dir.AppendASCII("native_messaging");
   return test_dir;
 }
 
 }  // namespace
@@ skipping 56 matching lines @@
       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;
-    read_message_run_loop_.Quit();
+    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;
     pickle.WriteString(message);
     return std::string(const_cast<const Pickle*>(&pickle)->payload(),
                        pickle.payload_size());
   }
 
   base::FilePath CreateTempFileWithMessage(const std::string& message) {
     base::FilePath filename = temp_dir_.path().AppendASCII("input");
     file_util::CreateTemporaryFile(&filename);
     std::string message_with_header = FormatMessage(message);
     EXPECT_TRUE(file_util::WriteFile(
         filename, message_with_header.data(), message_with_header.size()));
     return filename;
   }
 
   // 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_;
-  base::RunLoop read_message_run_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_;
 };
 
 // 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(), kTestHostId, "empty_app.py", 0, launcher.Pass());
+      AsWeakPtr(), kTestNativeMessagingExtensionId, "empty_app.py",
+      0, launcher.Pass());
   ASSERT_TRUE(native_message_process_host_.get());
-  message_loop_.RunUntilIdle();
+  read_message_run_loop_.reset(new base::RunLoop());
+  read_message_run_loop_->RunUntilIdle();
 
-  native_message_process_host_->ReadNowForTesting();
-  read_message_run_loop_.Run();
+  if (last_posted_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_);
 }
 
 // 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));
   native_message_process_host_ = NativeMessageProcessHost::CreateWithLauncher(
-      AsWeakPtr(), kTestHostId, "empty_app.py", 0, launcher.Pass());
+      AsWeakPtr(), kTestNativeMessagingExtensionId, "empty_app.py",
+      0, launcher.Pass());
   ASSERT_TRUE(native_message_process_host_.get());
   message_loop_.RunUntilIdle();
 
   native_message_process_host_->Send(kTestMessage);
   message_loop_.RunUntilIdle();
 
   std::string output;
   base::TimeTicks start_time = base::TimeTicks::Now();
   while (base::TimeTicks::Now() - start_time < TestTimeouts::action_timeout()) {
     ASSERT_TRUE(file_util::ReadFileToString(temp_output_file, &output));
     if (!output.empty())
       break;
     base::PlatformThread::YieldCurrentThread();
   }
 
   EXPECT_EQ(FormatMessage(kTestMessage), output);
 }
 
-// Disabled, see http://crbug.com/159754.
 // Test send message with a real client. The client just echo's back the text
 // it recieved.
-TEST_F(NativeMessagingTest, DISABLED_EchoConnect) {
+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(), kTestHostId, "empty_app.py", 0);
+      AsWeakPtr(), kTestNativeMessagingExtensionId,
+      kTestNativeMessagingHostName, 0);
   ASSERT_TRUE(native_message_process_host_.get());
-  message_loop_.RunUntilIdle();
 
   native_message_process_host_->Send("{\"text\": \"Hello.\"}");
-  read_message_run_loop_.Run();
+  read_message_run_loop_.reset(new base::RunLoop());
+  read_message_run_loop_->Run();
   EXPECT_EQ("{\"id\": 1, \"echo\": {\"text\": \"Hello.\"}}",
             last_posted_message_);
 
   native_message_process_host_->Send("{\"foo\": \"bar\"}");
-  read_message_run_loop_.Run();
+  read_message_run_loop_.reset(new base::RunLoop());
+  read_message_run_loop_->Run();
   EXPECT_EQ("{\"id\": 2, \"echo\": {\"foo\": \"bar\"}}", last_posted_message_);
 }
 
 }  // namespace extensions