Source release 19.3.0

core/test/config_test_env.h

@@ -1,13 +1,13 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
 // source code may only be used and distributed under the Widevine License
 // Agreement.
-
 #ifndef CDM_TEST_CONFIG_TEST_ENV_H_
 #define CDM_TEST_CONFIG_TEST_ENV_H_
 
 #include <string>
-#include "disallow_copy_and_assign.h"
+
 #include "wv_cdm_types.h"
+#include "wv_class_utils.h"
 
 // Declare class ConfigTestEnv - holds the configuration settings needed
 // to talk to the various provisioning and license servers.
@@ -45,7 +45,6 @@ enum ContentId {
 // Configures default test environment.
 class ConfigTestEnv {
  public:
-
   typedef struct {
     ServerConfigurationId id;
     std::string license_server_url;
@@ -63,12 +62,9 @@ class ConfigTestEnv {
                 bool release);
   // Allow copy, assign, and move.  Performance is not an issue in test
   // initialization.
-  ConfigTestEnv(const ConfigTestEnv&) = default;
-  ConfigTestEnv(ConfigTestEnv&&) = default;
-  ConfigTestEnv& operator=(const ConfigTestEnv&) = default;
-  ConfigTestEnv& operator=(ConfigTestEnv&&) = default;
+  WVCDM_DEFAULT_COPY_AND_MOVE(ConfigTestEnv);
 
-  ~ConfigTestEnv() {};
+  ~ConfigTestEnv() {}
 
   ServerConfigurationId server_id() { return server_id_; }
   const std::string& client_auth() const { return client_auth_; }
@@ -157,11 +153,8 @@ class ConfigTestEnv {
   // It dump_golden_data_ is true, message data is dumped to a file for help
   // in generating golden test data.
   bool dump_golden_data_ = false;
-};
-
+};  // class ConfigTestEnv
 // The default provisioning server URL for a default provisioning request.
 extern const std::string kDefaultProvisioningServerUrl;
-
 }  // namespace wvcdm
-
 #endif  // CDM_TEST_CONFIG_TEST_ENV_H_