release-request-97deec33-9c52-4210-b9f0-ef473887084a-for-git_oc-dr1-release-4075621 snap-temp-L51200000071372001android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21oreo-dr3-releaseoreo-dr2-releaseoreo-dr1-release

Change-Id: I098851ed76252216190c58948b89c8532c02eb89

2 files changed, 0 insertions, 36 deletions

diff --git a/dbus/authpolicy/active_directory_account_data.proto b/dbus/authpolicy/active_directory_account_data.proto
deleted file mode 100644
index 79325f6..0000000
--- a/dbus/authpolicy/active_directory_account_data.proto
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2017 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.
-
-syntax = "proto2";
-
-option optimize_for = LITE_RUNTIME;
-
-package authpolicy;
-
-// TODO(ljusten): Remove this file as soon as Chrome uses
-// active_directory_info.proto. crbug.com/712720.
-
-// Message sent to Chromium by authpolicy service as a response of successful
-// AuthenticateUser call. Contains information about authenticated user fetched
-// from Active Directory server.
-message ActiveDirectoryAccountData {
-  // Unique id of the user account. Taken from the objectGUID property of the
-  // Active Directory user account information.
-  optional string account_id = 1;
-  // Display name of the user. Taken from the displayName property of the Active
-  // account information.
-  optional string display_name = 2;
-  // Given name of the user. AKA first name. Taken from givenName property of
-  // the Active Directory user account information.
-  optional string given_name = 3;
-  // Logon name of the user (without @realm). Taken from the sAMAccountName
-  // property of the Active Directory user account information.
-  optional string sam_account_name = 4;
-}
diff --git a/system_api.gyp b/system_api.gyp
index fbe6773..9648010 100644
--- a/system_api.gyp
+++ b/system_api.gyp
@@ -95,9 +95,6 @@
         'proto_out_dir': 'include/authpolicy/proto_bindings',
       },
       'sources': [
-        # TODO(ljusten): Remove this file as soon as Chrome uses
-        # active_directory_info.proto. crbug.com/712720.
-        '<(proto_in_dir)/active_directory_account_data.proto',
         '<(proto_in_dir)/active_directory_info.proto',
       ],
       'includes': ['../../platform2/common-mk/protoc.gypi'],
@@ -110,9 +107,6 @@
         'system_api-authpolicy-protos-gen',
       ],
       'sources': [
-        # TODO(ljusten): Remove this file as soon as Chrome uses
-        # active_directory_info.proto. crbug.com/712720.
-        '<(SHARED_INTERMEDIATE_DIR)/include/authpolicy/proto_bindings/active_directory_account_data.pb.cc',
         '<(SHARED_INTERMEDIATE_DIR)/include/authpolicy/proto_bindings/active_directory_info.pb.cc',
       ]
     },