Remove using namespace from components/signin code

The using namespace construct is disallowed in the code style guide.
It also causes issues (compilation warnings turned into errors)
in jumbo builds since they will be in a "header context" there
which is explicitly blocked by our compiler settings.

This patch also has a bit of a feature creep to remove a number
of unnecessary static_casts that made the code hard to read,
especially with the namespaces.

Change-Id: Icaa4968695a6f033868aac681a9ebe08eee75c3e
Reviewed-on: https://chromium-review.googlesource.com/c/1320131
Commit-Queue: Daniel Bratell <bratell@opera.com>
Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606113}

components/signin/core/browser/signin_internals_util.h

@@ -25,10 +25,11 @@ const size_t kTruncateTokenStringLength = 6;
 // Helper enums to access fields from SigninStatus (declared below).
 enum {
   SIGNIN_FIELDS_BEGIN = 0,
-  UNTIMED_FIELDS_BEGIN = SIGNIN_FIELDS_BEGIN
+  UNTIMED_FIELDS_BEGIN_UNTYPED = SIGNIN_FIELDS_BEGIN
 };
 
 enum UntimedSigninStatusField {
+  UNTIMED_FIELDS_BEGIN = UNTIMED_FIELDS_BEGIN_UNTYPED,
   ACCOUNT_ID = UNTIMED_FIELDS_BEGIN,
   GAIA_ID,
   USERNAME,
@@ -37,10 +38,11 @@ enum UntimedSigninStatusField {
 
 enum {
   UNTIMED_FIELDS_COUNT = UNTIMED_FIELDS_END - UNTIMED_FIELDS_BEGIN,
-  TIMED_FIELDS_BEGIN = UNTIMED_FIELDS_END
+  TIMED_FIELDS_BEGIN_UNTYPED = UNTIMED_FIELDS_END
 };
 
 enum TimedSigninStatusField {
+  TIMED_FIELDS_BEGIN = TIMED_FIELDS_BEGIN_UNTYPED,
   AUTHENTICATION_RESULT_RECEIVED = TIMED_FIELDS_BEGIN,
   REFRESH_TOKEN_RECEIVED,
   SIGNIN_STARTED,

components/signin/core/browser/signin_manager.cc

@@ -24,8 +24,6 @@
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "third_party/icu/source/i18n/unicode/regex.h"
 
-using namespace signin_internals_util;
-
 SigninManager::SigninManager(
     SigninClient* client,
     ProfileOAuth2TokenService* token_service,
@@ -91,7 +89,8 @@ bool SigninManager::PrepareForSignin(SigninType type,
   password_.assign(password);
   signin_manager_signed_in_ = false;
   user_info_fetched_by_account_tracker_ = false;
-  NotifyDiagnosticsObservers(SIGNIN_STARTED, SigninTypeToString(type));
+  NotifyDiagnosticsObservers(signin_internals_util::SIGNIN_STARTED,
+                             SigninTypeToString(type));
   return true;
 }
 
@@ -404,7 +403,8 @@ void SigninManager::MergeSigninCredentialIntoCookieJar() {
 }
 
 void SigninManager::CompletePendingSignin() {
-  NotifyDiagnosticsObservers(SIGNIN_COMPLETED, "Successful");
+  NotifyDiagnosticsObservers(signin_internals_util::SIGNIN_COMPLETED,
+                             "Successful");
   DCHECK(!possibly_invalid_account_id_.empty());
   OnSignedIn();
 

components/signin/core/browser/signin_manager_base.cc

@@ -24,8 +24,6 @@
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 
-using namespace signin_internals_util;
-
 SigninManagerBase::SigninManagerBase(
     SigninClient* client,
     AccountTrackerService* account_tracker_service,
@@ -249,17 +247,17 @@ void SigninManagerBase::RemoveObserver(Observer* observer) {
 }
 
 void SigninManagerBase::AddSigninDiagnosticsObserver(
-    SigninDiagnosticsObserver* observer) {
+    signin_internals_util::SigninDiagnosticsObserver* observer) {
   signin_diagnostics_observers_.AddObserver(observer);
 }
 
 void SigninManagerBase::RemoveSigninDiagnosticsObserver(
-    SigninDiagnosticsObserver* observer) {
+    signin_internals_util::SigninDiagnosticsObserver* observer) {
   signin_diagnostics_observers_.RemoveObserver(observer);
 }
 
 void SigninManagerBase::NotifyDiagnosticsObservers(
-    const TimedSigninStatusField& field,
+    const signin_internals_util::TimedSigninStatusField& field,
     const std::string& value) {
   for (auto& observer : signin_diagnostics_observers_)
     observer.NotifySigninValueChanged(field, value);