The Windows portion of Native Messagaing

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

Index: chrome/browser/extensions/api/messaging/native_messaging_apitest.cc
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_apitest_posix.cc b/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc
similarity index 84%
rename from chrome/browser/extensions/api/messaging/native_messaging_apitest_posix.cc
rename to chrome/browser/extensions/api/messaging/native_messaging_apitest.cc
index dd1723903759994af9a48209cacc92ebd247ff7c..aa2a4af880d4bdafe64f8bbf5a3a5b795501e4a4 100644
--- a/chrome/browser/extensions/api/messaging/native_messaging_apitest_posix.cc
+++ b/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc
@@ -14,6 +14,8 @@
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NativeMessageBasic) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableNativeMessaging);
+  FilePath user_data_dir;
+  ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
   // Override the user data dir to point to our native app.
   extensions::Feature::ScopedCurrentChannel
       current_channel(chrome::VersionInfo::CHANNEL_DEV);
@@ -22,4 +24,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NativeMessageBasic) {
   test_user_data_dir = test_user_data_dir.AppendASCII("native_messaging");
   ASSERT_TRUE(PathService::Override(chrome::DIR_USER_DATA, test_user_data_dir));
   ASSERT_TRUE(RunExtensionTest("native_messaging")) << message_;
+  // Move the user data dir back.
+  ASSERT_TRUE(PathService::Override(chrome::DIR_USER_DATA, user_data_dir));
 }