Revert of Remote assistance on Chrome OS Part IV - It2MeHost

remoting/host/policy_hack/policy_watcher_mac.mm

 // 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 "remoting/host/policy_hack/policy_watcher.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 
 #include "base/compiler_specific.h"
 #include "base/mac/foundation_util.h"
@@ skipping 64 matching lines @@
 
     // Set policy. Policy must be set (even if it is empty) so that the
     // default policy is picked up the first time reload is called.
     UpdatePolicies(&policy);
 
     // Reschedule task.
     ScheduleFallbackReloadTask();
   }
 };
 
-scoped_ptr<PolicyWatcher> PolicyWatcher::Create(
-    policy::PolicyService* policy_service,
-    scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
-  return make_scoped_ptr(new PolicyWatcherMac(task_runner));
+PolicyWatcher* PolicyWatcher::Create(
+        scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
+  return new PolicyWatcherMac(task_runner);
 }
 
 }  // namespace policy_hack
 }  // namespace remoting