Index: ppapi/native_client/src/trusted/plugin/nacl_entry_points.h |
diff --git a/ppapi/native_client/src/trusted/plugin/nacl_entry_points.h b/ppapi/native_client/src/trusted/plugin/nacl_entry_points.h |
index ff00259f64295329fbd53f162a498862a2c1ffbe..6ba93feeaa0c31ed427433e711085514ac84ec3c 100644 |
--- a/ppapi/native_client/src/trusted/plugin/nacl_entry_points.h |
+++ b/ppapi/native_client/src/trusted/plugin/nacl_entry_points.h |
@@ -1,33 +1,8 @@ |
/* |
-* Copyright 2009, Google Inc. |
-* All rights reserved. |
-* |
-* Redistribution and use in source and binary forms, with or without |
-* modification, are permitted provided that the following conditions are |
-* met: |
-* |
-* * Redistributions of source code must retain the above copyright |
-* notice, this list of conditions and the following disclaimer. |
-* * Redistributions in binary form must reproduce the above |
-* copyright notice, this list of conditions and the following disclaimer |
-* in the documentation and/or other materials provided with the |
-* distribution. |
-* * Neither the name of Google Inc. nor the names of its |
-* contributors may be used to endorse or promote products derived from |
-* this software without specific prior written permission. |
-* |
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
-*/ |
+ * 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. |
+ */ |
#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NACL_ENTRY_POINTS_H_ |
#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NACL_ENTRY_POINTS_H_ |
@@ -52,12 +27,4 @@ typedef int (*GetURandomFDFunc)(void); |
extern LaunchNaClProcessFunc launch_nacl_process; |
extern GetURandomFDFunc get_urandom_fd; |
-// Registers the internal NaCl plugin with PluginList. |
-// Old version. TODO(mseaborn): Remove this eventually, when Chromium |
-// has stopped using it for a while. Note that this is still called |
-// by Chromium in the browser process. |
-void RegisterInternalNaClPlugin(); |
-// New version. |
-void RegisterInternalNaClPlugin(const std::map<std::string, uintptr_t>& funcs); |
- |
#endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NACL_ENTRY_POINTS_H_ |