Add support for user-level Native Messaging hosts installation.

With this change Native Messaging hosts can be installed into user's
directory without requiring admin permissions

BUG=237873
R=asvitkine@chromium.org, dconnelly@chromium.org, jschuh@chromium.org, kalman@chromium.org

Review URL: https://codereview.chromium.org/140583002

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

1 files changed, 8 insertions, 20 deletions

diff --git a/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc b/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc
index eb0919a..eac88e8 100644
--- a/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc
+++ b/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc
@@ -2,29 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/command_line.h"
-#include "base/files/file_path.h"
-#include "base/files/scoped_temp_dir.h"
-#include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/api/messaging/native_messaging_test_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
-#include "extensions/common/features/feature.h"
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NativeMessageBasic) {
-  base::ScopedTempDir temp_dir;
-  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-  base::FilePath manifest_path = temp_dir.path().AppendASCII(
-      std::string(extensions::kTestNativeMessagingHostName) + ".json");
-  ASSERT_NO_FATAL_FAILURE(
-      extensions::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);
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NativeMessagingBasic) {
+  extensions::ScopedTestNativeMessagingHost test_host;
+  ASSERT_NO_FATAL_FAILURE(test_host.RegisterTestHost(false));
+  ASSERT_TRUE(RunExtensionTest("native_messaging")) << message_;
+}
 
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, UserLevelNativeMessaging) {
+  extensions::ScopedTestNativeMessagingHost test_host;
+  ASSERT_NO_FATAL_FAILURE(test_host.RegisterTestHost(true));
   ASSERT_TRUE(RunExtensionTest("native_messaging")) << message_;
 }