diff options
Diffstat (limited to 'chromium/net/android')
31 files changed, 32 insertions, 34 deletions
diff --git a/chromium/net/android/BUILD.gn b/chromium/net/android/BUILD.gn index 771d681e868..556c205c0d8 100644 --- a/chromium/net/android/BUILD.gn +++ b/chromium/net/android/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. +# Copyright 2014 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/android/android_http_util.cc b/chromium/net/android/android_http_util.cc index 83f8831548f..c38163b328e 100644 --- a/chromium/net/android/android_http_util.cc +++ b/chromium/net/android/android_http_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/cert_verify_result_android.cc b/chromium/net/android/cert_verify_result_android.cc index b1c2336b7f1..62339cfccfd 100644 --- a/chromium/net/android/cert_verify_result_android.cc +++ b/chromium/net/android/cert_verify_result_android.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/cert_verify_result_android.h b/chromium/net/android/cert_verify_result_android.h index bed863a0c16..c753957a565 100644 --- a/chromium/net/android/cert_verify_result_android.h +++ b/chromium/net/android/cert_verify_result_android.h @@ -1,4 +1,4 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/dummy_spnego_authenticator.cc b/chromium/net/android/dummy_spnego_authenticator.cc index 8a13e7d1e40..3ddea3f9bfc 100644 --- a/chromium/net/android/dummy_spnego_authenticator.cc +++ b/chromium/net/android/dummy_spnego_authenticator.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "net/android/dummy_spnego_authenticator.h" diff --git a/chromium/net/android/dummy_spnego_authenticator.h b/chromium/net/android/dummy_spnego_authenticator.h index 5a221a48469..9b1740e75db 100644 --- a/chromium/net/android/dummy_spnego_authenticator.h +++ b/chromium/net/android/dummy_spnego_authenticator.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/gurl_utils.cc b/chromium/net/android/gurl_utils.cc index 71976665a2f..e3df9a42723 100644 --- a/chromium/net/android/gurl_utils.cc +++ b/chromium/net/android/gurl_utils.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/http_auth_negotiate_android.cc b/chromium/net/android/http_auth_negotiate_android.cc index 0f63e5bfe7c..30f524ee546 100644 --- a/chromium/net/android/http_auth_negotiate_android.cc +++ b/chromium/net/android/http_auth_negotiate_android.cc @@ -1,4 +1,4 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/http_auth_negotiate_android.h b/chromium/net/android/http_auth_negotiate_android.h index de70664b525..e9f449d6b54 100644 --- a/chromium/net/android/http_auth_negotiate_android.h +++ b/chromium/net/android/http_auth_negotiate_android.h @@ -1,4 +1,4 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/http_auth_negotiate_android_unittest.cc b/chromium/net/android/http_auth_negotiate_android_unittest.cc index 9dfaf88d120..aba7e0aaf26 100644 --- a/chromium/net/android/http_auth_negotiate_android_unittest.cc +++ b/chromium/net/android/http_auth_negotiate_android_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java b/chromium/net/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java index 06688a091e1..27a73ac674d 100644 --- a/chromium/net/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java +++ b/chromium/net/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java @@ -1,4 +1,4 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -49,7 +49,6 @@ import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.shadows.ShadowAccountManager; import org.robolectric.shadows.ShadowApplication; -import org.robolectric.shadows.multidex.ShadowMultiDex; import org.chromium.base.ApplicationStatus; import org.chromium.base.test.BaseRobolectricTestRunner; @@ -65,8 +64,7 @@ import java.util.List; */ @RunWith(BaseRobolectricTestRunner.class) @Config(manifest = Config.NONE, - shadows = {HttpNegotiateAuthenticatorTest.ExtendedShadowAccountManager.class, - ShadowMultiDex.class}) + shadows = {HttpNegotiateAuthenticatorTest.ExtendedShadowAccountManager.class}) public class HttpNegotiateAuthenticatorTest { /** * User the AccountManager to inject a mock instance. diff --git a/chromium/net/android/junit/src/org/chromium/net/NetworkTrafficAnnotationTagTest.java b/chromium/net/android/junit/src/org/chromium/net/NetworkTrafficAnnotationTagTest.java index fb157b0018a..246539028fd 100644 --- a/chromium/net/android/junit/src/org/chromium/net/NetworkTrafficAnnotationTagTest.java +++ b/chromium/net/android/junit/src/org/chromium/net/NetworkTrafficAnnotationTagTest.java @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/keystore.cc b/chromium/net/android/keystore.cc index 4ec8c2a5728..f8405556470 100644 --- a/chromium/net/android/keystore.cc +++ b/chromium/net/android/keystore.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/keystore.h b/chromium/net/android/keystore.h index 471cc2feaee..0fd3f013875 100644 --- a/chromium/net/android/keystore.h +++ b/chromium/net/android/keystore.h @@ -1,4 +1,4 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/network_change_notifier_android.cc b/chromium/net/android/network_change_notifier_android.cc index b21eab661a8..167614634ea 100644 --- a/chromium/net/android/network_change_notifier_android.cc +++ b/chromium/net/android/network_change_notifier_android.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/network_change_notifier_android.h b/chromium/net/android/network_change_notifier_android.h index f899cea7916..20526fbe4d3 100644 --- a/chromium/net/android/network_change_notifier_android.h +++ b/chromium/net/android/network_change_notifier_android.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/network_change_notifier_android_unittest.cc b/chromium/net/android/network_change_notifier_android_unittest.cc index 06a3bd23e7c..af62fec5df7 100644 --- a/chromium/net/android/network_change_notifier_android_unittest.cc +++ b/chromium/net/android/network_change_notifier_android_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/network_change_notifier_delegate_android.cc b/chromium/net/android/network_change_notifier_delegate_android.cc index 7c2f8c41968..b72b65d2dc4 100644 --- a/chromium/net/android/network_change_notifier_delegate_android.cc +++ b/chromium/net/android/network_change_notifier_delegate_android.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/network_change_notifier_delegate_android.h b/chromium/net/android/network_change_notifier_delegate_android.h index 66d8c929e4b..6c6b934b4df 100644 --- a/chromium/net/android/network_change_notifier_delegate_android.h +++ b/chromium/net/android/network_change_notifier_delegate_android.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/network_change_notifier_factory_android.cc b/chromium/net/android/network_change_notifier_factory_android.cc index 35e9ce72b60..06fccc900c8 100644 --- a/chromium/net/android/network_change_notifier_factory_android.cc +++ b/chromium/net/android/network_change_notifier_factory_android.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/network_change_notifier_factory_android.h b/chromium/net/android/network_change_notifier_factory_android.h index 7e15474a9c6..7581a1728df 100644 --- a/chromium/net/android/network_change_notifier_factory_android.h +++ b/chromium/net/android/network_change_notifier_factory_android.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/network_library.cc b/chromium/net/android/network_library.cc index aee7aff8f5d..61d322e6e20 100644 --- a/chromium/net/android/network_library.cc +++ b/chromium/net/android/network_library.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/network_library.h b/chromium/net/android/network_library.h index 9597e9f1e1a..c48da3af537 100644 --- a/chromium/net/android/network_library.h +++ b/chromium/net/android/network_library.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/network_library_unittest.cc b/chromium/net/android/network_library_unittest.cc index d1ce81449e4..3abc5f85bc0 100644 --- a/chromium/net/android/network_library_unittest.cc +++ b/chromium/net/android/network_library_unittest.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/radio_activity_tracker.cc b/chromium/net/android/radio_activity_tracker.cc index 10c2e71a53c..195977d78a6 100644 --- a/chromium/net/android/radio_activity_tracker.cc +++ b/chromium/net/android/radio_activity_tracker.cc @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/radio_activity_tracker.h b/chromium/net/android/radio_activity_tracker.h index 268e61ad8b4..284e9bae886 100644 --- a/chromium/net/android/radio_activity_tracker.h +++ b/chromium/net/android/radio_activity_tracker.h @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/tools/proxy_test_cases.py b/chromium/net/android/tools/proxy_test_cases.py index ab93f678314..42c7a70c9f7 100755 --- a/chromium/net/android/tools/proxy_test_cases.py +++ b/chromium/net/android/tools/proxy_test_cases.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Copyright 2012 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/android/traffic_stats.cc b/chromium/net/android/traffic_stats.cc index 0aa647f749a..53a6e6b5894 100644 --- a/chromium/net/android/traffic_stats.cc +++ b/chromium/net/android/traffic_stats.cc @@ -1,4 +1,4 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/traffic_stats.h b/chromium/net/android/traffic_stats.h index baa062de45e..8f583740ca0 100644 --- a/chromium/net/android/traffic_stats.h +++ b/chromium/net/android/traffic_stats.h @@ -1,4 +1,4 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/traffic_stats_unittest.cc b/chromium/net/android/traffic_stats_unittest.cc index f901590b09f..1e707c31b2e 100644 --- a/chromium/net/android/traffic_stats_unittest.cc +++ b/chromium/net/android/traffic_stats_unittest.cc @@ -1,4 +1,4 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/android/unittest_support/AndroidManifest.xml b/chromium/net/android/unittest_support/AndroidManifest.xml index 29c12f9e767..43cc4ea95d5 100644 --- a/chromium/net/android/unittest_support/AndroidManifest.xml +++ b/chromium/net/android/unittest_support/AndroidManifest.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -Copyright 2014 The Chromium Authors. All rights reserved. +Copyright 2014 The Chromium Authors Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. --> |