summaryrefslogtreecommitdiffstats
path: root/ppapi/native_client
diff options
context:
space:
mode:
authorsteveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-31 18:03:42 +0000
committersteveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-31 18:03:42 +0000
commitcec181a1b4e54924801d1f3d4c8bb1fa114ae971 (patch)
tree1bec613f34d1f09f961b2c2874d0e05107fb1642 /ppapi/native_client
parentb8e43508d422e562b6242661a8a070094c252c85 (diff)
downloadchromium_src-cec181a1b4e54924801d1f3d4c8bb1fa114ae971.zip
chromium_src-cec181a1b4e54924801d1f3d4c8bb1fa114ae971.tar.gz
chromium_src-cec181a1b4e54924801d1f3d4c8bb1fa114ae971.tar.bz2
Fix license headers in a number of files
These headers now match the regex used in the presubmit check. This will simplify adding a tool to check license compatibility for the Android WebView build. BUG=138921 Review URL: https://chromiumcodereview.appspot.com/10835019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
-rw-r--r--ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_instance.h6
-rw-r--r--ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_instance.h6
-rw-r--r--ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_loader.h6
-rw-r--r--ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_request_info.h6
-rw-r--r--ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_response_info.h6
-rw-r--r--ppapi/native_client/src/trusted/plugin/arch_arm/sandbox_isa.cc6
-rw-r--r--ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc6
-rw-r--r--ppapi/native_client/src/trusted/plugin/dylib_unittest.cc6
-rw-r--r--ppapi/native_client/src/trusted/plugin/dylib_unittest.h6
-rw-r--r--ppapi/native_client/src/trusted/plugin/nexe_arch.cc6
-rw-r--r--ppapi/native_client/src/trusted/plugin/nexe_arch.h6
-rw-r--r--ppapi/native_client/src/trusted/plugin/plugin_unittest.cc6
-rw-r--r--ppapi/native_client/tests/ppapi_example_audio/ppapi_example_audio.html2
-rw-r--r--ppapi/native_client/tests/ppapi_example_gles2/ppapi_example_gles2.html2
-rw-r--r--ppapi/native_client/tests/ppapi_example_post_message/ppapi_example_post_message.html2
-rw-r--r--ppapi/native_client/tests/ppapi_geturl/ppapi_geturl.cc6
-rw-r--r--ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book.html2
17 files changed, 43 insertions, 43 deletions
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_instance.h b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_instance.h
index 137b137..ccfd25f 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_instance.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_instance.h
@@ -1,6 +1,6 @@
-// Copyright 2011 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.
+// 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_SHARED_PPAPI_PROXY_BROWSER_INSTANCE_H_
#define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_INSTANCE_H_
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_instance.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_instance.h
index 153761b..740a2b7 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_instance.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_instance.h
@@ -1,6 +1,6 @@
-// Copyright 2011 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.
+// 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_SHARED_PPAPI_PROXY_PLUGIN_PPB_INSTANCE_H_
#define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_PPB_INSTANCE_H_
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_loader.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_loader.h
index b1417d73..a62cb9b 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_loader.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_loader.h
@@ -1,6 +1,6 @@
-// Copyright 2011 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.
+// 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_SHARED_PPAPI_PROXY_PLUGIN_URL_LOADER_H_
#define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_URL_LOADER_H_
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_request_info.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_request_info.h
index e53fd3b..c80078c 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_request_info.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_request_info.h
@@ -1,6 +1,6 @@
-// Copyright 2011 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.
+// 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_SHARED_PPAPI_PROXY_PLUGIN_PPB_URL_REQUEST_INFO_H_
#define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_PPB_URL_REQUEST_INFO_H_
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_response_info.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_response_info.h
index 5b938bd..66b08e8 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_response_info.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_response_info.h
@@ -1,6 +1,6 @@
-// Copyright 2011 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.
+// 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_SHARED_PPAPI_PROXY_PLUGIN_URL_RESPONSE_INFO_H_
#define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_URL_RESPONSE_INFO_H_
diff --git a/ppapi/native_client/src/trusted/plugin/arch_arm/sandbox_isa.cc b/ppapi/native_client/src/trusted/plugin/arch_arm/sandbox_isa.cc
index f72d0b3..01b8769 100644
--- a/ppapi/native_client/src/trusted/plugin/arch_arm/sandbox_isa.cc
+++ b/ppapi/native_client/src/trusted/plugin/arch_arm/sandbox_isa.cc
@@ -1,6 +1,6 @@
-// Copyright 2011 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.
+// 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 "native_client/src/trusted/plugin/nexe_arch.h"
diff --git a/ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc b/ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc
index 093cdb2..d9f9c0c 100644
--- a/ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc
+++ b/ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc
@@ -1,6 +1,6 @@
-// Copyright 2011 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.
+// 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 "native_client/src/trusted/plugin/nexe_arch.h"
#include "native_client/src/trusted/platform_qualify/nacl_os_qualify.h"
diff --git a/ppapi/native_client/src/trusted/plugin/dylib_unittest.cc b/ppapi/native_client/src/trusted/plugin/dylib_unittest.cc
index 7790ac5..eff9816 100644
--- a/ppapi/native_client/src/trusted/plugin/dylib_unittest.cc
+++ b/ppapi/native_client/src/trusted/plugin/dylib_unittest.cc
@@ -1,6 +1,6 @@
-// Copyright 2011 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.
+// 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 "native_client/src/trusted/plugin/dylib_unittest.h"
diff --git a/ppapi/native_client/src/trusted/plugin/dylib_unittest.h b/ppapi/native_client/src/trusted/plugin/dylib_unittest.h
index df60b70..2c4f8a2c 100644
--- a/ppapi/native_client/src/trusted/plugin/dylib_unittest.h
+++ b/ppapi/native_client/src/trusted/plugin/dylib_unittest.h
@@ -1,6 +1,6 @@
-// Copyright 2010 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.
+// 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.
// Functions for dynamically loading the trusted plugin when running unit
// tests.
diff --git a/ppapi/native_client/src/trusted/plugin/nexe_arch.cc b/ppapi/native_client/src/trusted/plugin/nexe_arch.cc
index 8c542e6..a33df0b 100644
--- a/ppapi/native_client/src/trusted/plugin/nexe_arch.cc
+++ b/ppapi/native_client/src/trusted/plugin/nexe_arch.cc
@@ -1,6 +1,6 @@
-// Copyright 2011 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.
+// 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 "native_client/src/trusted/plugin/nexe_arch.h"
diff --git a/ppapi/native_client/src/trusted/plugin/nexe_arch.h b/ppapi/native_client/src/trusted/plugin/nexe_arch.h
index f327e80..1a9bb2f 100644
--- a/ppapi/native_client/src/trusted/plugin/nexe_arch.h
+++ b/ppapi/native_client/src/trusted/plugin/nexe_arch.h
@@ -1,7 +1,7 @@
/*
- * Copyright 2011 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.
+ * 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.
*/
// Routines for determining the most appropriate NaCl executable for
diff --git a/ppapi/native_client/src/trusted/plugin/plugin_unittest.cc b/ppapi/native_client/src/trusted/plugin/plugin_unittest.cc
index 4558a07..27e2c02 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin_unittest.cc
+++ b/ppapi/native_client/src/trusted/plugin/plugin_unittest.cc
@@ -1,6 +1,6 @@
-// Copyright 2011 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.
+// 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.
// Unit tests for ppGoogleNaClPlugin
diff --git a/ppapi/native_client/tests/ppapi_example_audio/ppapi_example_audio.html b/ppapi/native_client/tests/ppapi_example_audio/ppapi_example_audio.html
index 71d3c49..1cf654c 100644
--- a/ppapi/native_client/tests/ppapi_example_audio/ppapi_example_audio.html
+++ b/ppapi/native_client/tests/ppapi_example_audio/ppapi_example_audio.html
@@ -1,5 +1,5 @@
<!--
- Copyright 2011 The Chromium Authors. All rights reserved.
+ 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.
-->
diff --git a/ppapi/native_client/tests/ppapi_example_gles2/ppapi_example_gles2.html b/ppapi/native_client/tests/ppapi_example_gles2/ppapi_example_gles2.html
index c54a164..a256414 100644
--- a/ppapi/native_client/tests/ppapi_example_gles2/ppapi_example_gles2.html
+++ b/ppapi/native_client/tests/ppapi_example_gles2/ppapi_example_gles2.html
@@ -1,5 +1,5 @@
<!--
- Copyright 2011 The Chromium Authors. All rights reserved.
+ 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.
-->
diff --git a/ppapi/native_client/tests/ppapi_example_post_message/ppapi_example_post_message.html b/ppapi/native_client/tests/ppapi_example_post_message/ppapi_example_post_message.html
index 05cee03..7a7b8d5 100644
--- a/ppapi/native_client/tests/ppapi_example_post_message/ppapi_example_post_message.html
+++ b/ppapi/native_client/tests/ppapi_example_post_message/ppapi_example_post_message.html
@@ -1,5 +1,5 @@
<!--
- Copyright 2011 The Chromium Authors. All rights reserved.
+ 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.
-->
diff --git a/ppapi/native_client/tests/ppapi_geturl/ppapi_geturl.cc b/ppapi/native_client/tests/ppapi_geturl/ppapi_geturl.cc
index 5119629..e2209e4 100644
--- a/ppapi/native_client/tests/ppapi_geturl/ppapi_geturl.cc
+++ b/ppapi/native_client/tests/ppapi_geturl/ppapi_geturl.cc
@@ -1,6 +1,6 @@
-// Copyright 2011 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.
+// 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 <cstdio>
#include <cstdlib>
diff --git a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book.html b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book.html
index 352b6d4..71dc99c 100644
--- a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book.html
+++ b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book.html
@@ -1,5 +1,5 @@
<!--
- Copyright 2011 The Chromium Authors. All rights reserved.
+ 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.
-->