Reverted !client_id check because it caused unit test failure.

Reverted code back to what it was and removed DCHECK that is no
longer necessary

BUG= 383745
TBR=rohitrao

Review URL: https://codereview.chromium.org/318013003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276670 0039d316-1c4b-4281-b951-d872f2087c98

base/ios/device_util.mm

@@ -46,7 +46,7 @@ NSString* GenerateClientId() {
   if (!client_id || [client_id isEqualToString:kZeroUUID]) {
     if (base::ios::IsRunningOnIOS6OrLater()) {
       client_id = [[[UIDevice currentDevice] identifierForVendor] UUIDString];
-      if (!client_id || [client_id isEqualToString:kZeroUUID])
+      if ([client_id isEqualToString:kZeroUUID])
         client_id = base::SysUTF8ToNSString(ios::device_util::GetRandomId());
     } else {
       client_id = base::SysUTF8ToNSString(ios::device_util::GetRandomId());
@@ -163,7 +163,6 @@ std::string GetDeviceIdentifier(const char* salt) {
 
 std::string GetSaltedString(const std::string& in_string,
                             const std::string& salt) {
-  DCHECK(in_string.length());
   DCHECK(salt.length());
   NSData* hash_data = [base::SysUTF8ToNSString(in_string + salt)
       dataUsingEncoding:NSUTF8StringEncoding];