Refactor and cleanup codes. No functional changes.

provisioning_sdk/public/BUILD

@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright 2016 Google Inc.
+# Copyright 2016 Google LLC.
 #
 # This software is licensed under the terms defined in the Widevine Master
 # License Agreement. For a copy of this agreement, please contact
@@ -33,7 +33,11 @@ cc_library(
     name = "libprovisioning_sdk",
     srcs = [":libprovisioning_sdk.so"],
     hdrs = glob(["*.h"]),
-    deps = ["//base"],
+    deps = [
+        "//base",
+        "//common:certificate_type",
+        "//protos/public:certificate_provisioning_proto",
+    ],
 )
 
 cc_library(
@@ -42,13 +46,17 @@ cc_library(
     hdrs = ["provisioning_engine.h"],
     copts = PUBLIC_COPTS,
     deps = [
-        ":certificate_type",
         ":provisioning_session",
         ":provisioning_status",
         "//base",
+        "@abseil_repo//absl/memory",
+        "//common:certificate_type",
+        "//common:drm_service_certificate",
         "//common:rsa_key",
+        "//provisioning_sdk/internal:provisioning30_session_impl",
         "//provisioning_sdk/internal:provisioning_engine_impl",
         "//provisioning_sdk/internal:provisioning_session_impl",
+        "//protos/public:certificate_provisioning_proto",
     ],
 )
 
@@ -58,7 +66,7 @@ cc_test(
     srcs = ["provisioning_engine_test.cc"],
     deps = [
         ":provisioning_engine",
-        "//external:gtest_main",
+        "//testing:gunit_main",
     ],
 )
 
@@ -71,7 +79,7 @@ cc_library(
         ":provisioning_status",
         "//base",
         "//provisioning_sdk/internal:provisioning_session_impl",
-        "//protos/public:device_certificate_proto",
+        "//protos/public:drm_certificate_proto",
     ],
 )
 
@@ -82,9 +90,3 @@ cc_library(
     copts = PUBLIC_COPTS,
     deps = ["//base"],
 )
-
-cc_library(
-    name = "certificate_type",
-    hdrs = ["certificate_type.h"],
-    copts = PUBLIC_COPTS,
-)