Remove policy watching from It2MeHost.

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

 // Copyright 2014 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 "extensions/browser/api/messaging/native_message_host.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/arc/extensions/arc_support_message_host.h"
-#include "components/policy/core/common/policy_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/url_pattern.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/it2me/it2me_native_messaging_host.h"
+#include "remoting/host/policy_watcher.h"
 #include "ui/gfx/native_widget_types.h"
 #include "url/gurl.h"
 
 namespace extensions {
 
 namespace {
 
 // A simple NativeMessageHost that mimics the implementation of
 // chrome/test/data/native_messaging/native_hosts/echo.py. It is currently
 // used for testing by ExtensionApiTest::NativeMessagingBasic.
@@ skipping 59 matching lines @@
       new remoting::It2MeHostFactory());
   std::unique_ptr<remoting::ChromotingHostContext> context =
       remoting::ChromotingHostContext::CreateForChromeOS(
           make_scoped_refptr(g_browser_process->system_request_context()),
           content::BrowserThread::GetTaskRunnerForThread(
               content::BrowserThread::IO),
           content::BrowserThread::GetTaskRunnerForThread(
               content::BrowserThread::UI),
           content::BrowserThread::GetTaskRunnerForThread(
               content::BrowserThread::FILE));
+  std::unique_ptr<remoting::PolicyWatcher> policy_watcher =
+      remoting::PolicyWatcher::Create(g_browser_process->policy_service(),
+                                      context->file_task_runner());
   std::unique_ptr<NativeMessageHost> host(
       new remoting::It2MeNativeMessagingHost(
-          /*needs_elevation=*/false, g_browser_process->policy_service(),
+          /*needs_elevation=*/false, std::move(policy_watcher),
           std::move(context), std::move(host_factory)));
   return host;
 }
 
 // If you modify the list of allowed_origins, don't forget to update
 // remoting/host/it2me/com.google.chrome.remote_assistance.json.jinja2
 // to keep the two lists in sync.
 // TODO(kelvinp): Load the native messaging manifest as a resource file into
 // chrome and fetch the list of allowed_origins from the manifest (see
 // crbug/424743).
@@ skipping 47 matching lines @@
       }
       *error = kForbiddenError;
       return nullptr;
     }
   }
   *error = kNotFoundError;
   return nullptr;
 }
 
 }  // namespace extensions