Chromad: Change ERROR_BAD_MACHINE_NAME to ERROR_INVALID_MACHINE_NAME

BUG=715459 TEST=existing tests TBR=achuith@chromium.org Change-Id: Ib52ef795f5b7cfab49a0d156679653b00c4c8db9 Reviewed-on: https://chromium-review.googlesource.com/512722 Reviewed-by: Roman Sorokin <rsorokin@chromium.org> Commit-Queue: Roman Sorokin <rsorokin@chromium.org> Cr-Commit-Position: refs/heads/master@{#473888}
Denger-Network · May 23, 2017 · 795c4f1 · 795c4f1
1 parent dfc8047
commit 795c4f1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
@@ -585,7 +585,7 @@ void EnrollmentScreenHandler::HandleAdDomainJoin(
           "invalidateAd", machine_name, user_name,
           static_cast<int>(ActiveDirectoryErrorState::MACHINE_NAME_TOO_LONG));
       return;
-    case authpolicy::ERROR_BAD_MACHINE_NAME:
+    case authpolicy::ERROR_INVALID_MACHINE_NAME:
       CallJS("invalidateAd", machine_name, user_name,
              static_cast<int>(ActiveDirectoryErrorState::MACHINE_NAME_INVALID));
       return;

diff --git a/chromeos/dbus/fake_auth_policy_client.cc b/chromeos/dbus/fake_auth_policy_client.cc
@@ -92,7 +92,7 @@ void FakeAuthPolicyClient::JoinAdDomain(const std::string& machine_name,
   } else if (machine_name.empty() ||
              machine_name.find_first_of(kInvalidMachineNameCharacters) !=
                  std::string::npos) {
-    error = authpolicy::ERROR_BAD_MACHINE_NAME;
+    error = authpolicy::ERROR_INVALID_MACHINE_NAME;
   } else {
     std::vector<std::string> parts = base::SplitString(
         user_principal_name, "@", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);

diff --git a/chromeos/dbus/fake_auth_policy_client_unittest.cc b/chromeos/dbus/fake_auth_policy_client_unittest.cc
@@ -44,7 +44,7 @@ TEST_F(FakeAuthPolicyClientTest, JoinAdDomain_ParseMachineName) {
   authpolicy_client()->JoinAdDomain(
       "", kCorrectUserName, /* password_fd */ -1,
       base::Bind([](authpolicy::ErrorType error) {
-        EXPECT_EQ(authpolicy::ERROR_BAD_MACHINE_NAME, error);
+        EXPECT_EQ(authpolicy::ERROR_INVALID_MACHINE_NAME, error);
       }));
   authpolicy_client()->JoinAdDomain(
       "too_long_machine_name", kCorrectUserName, /* password_fd */ -1,
@@ -54,12 +54,12 @@ TEST_F(FakeAuthPolicyClientTest, JoinAdDomain_ParseMachineName) {
   authpolicy_client()->JoinAdDomain(
       "invalid:name", kCorrectUserName, /* password_fd */ -1,
       base::Bind([](authpolicy::ErrorType error) {
-        EXPECT_EQ(authpolicy::ERROR_BAD_MACHINE_NAME, error);
+        EXPECT_EQ(authpolicy::ERROR_INVALID_MACHINE_NAME, error);
       }));
   authpolicy_client()->JoinAdDomain(
       ">nvalidname", kCorrectUserName, /* password_fd */ -1,
       base::Bind([](authpolicy::ErrorType error) {
-        EXPECT_EQ(authpolicy::ERROR_BAD_MACHINE_NAME, error);
+        EXPECT_EQ(authpolicy::ERROR_INVALID_MACHINE_NAME, error);
       }));
 
   base::RunLoop().RunUntilIdle();