Fix else-if after returns/breaks in components/.

In various components/[a-c]* directories.

Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Ic42b2176db06d2adbf35d815932c54aed6d3c255
Reviewed-on: https://chromium-review.googlesource.com/776020Reviewed-by: Colin Blundell <blundell@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#519515}

components/app_modal/views/javascript_app_modal_dialog_views.cc

@@ -118,7 +118,8 @@ base::string16 JavaScriptAppModalDialogViews::GetDialogButtonLabel(
           parent_->is_reload() ?
           IDS_BEFORERELOAD_MESSAGEBOX_OK_BUTTON_LABEL :
           IDS_BEFOREUNLOAD_MESSAGEBOX_OK_BUTTON_LABEL);
-    } else if (button == ui::DIALOG_BUTTON_CANCEL) {
+    }
+    if (button == ui::DIALOG_BUTTON_CANCEL) {
       return l10n_util::GetStringUTF16(
           parent_->is_reload() ?
           IDS_BEFORERELOAD_MESSAGEBOX_CANCEL_BUTTON_LABEL :

components/browser_sync/profile_sync_service.cc

@@ -1287,18 +1287,18 @@ void ProfileSyncService::OnConfigureStart() {
 ProfileSyncService::SyncStatusSummary
 ProfileSyncService::QuerySyncStatusSummary() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  if (HasUnrecoverableError()) {
+  if (HasUnrecoverableError())
     return UNRECOVERABLE_ERROR;
-  } else if (!engine_) {
+  if (!engine_)
     return NOT_ENABLED;
-  } else if (engine_ && !IsFirstSetupComplete()) {
+  if (engine_ && !IsFirstSetupComplete())
     return SETUP_INCOMPLETE;
-  } else if (engine_ && IsFirstSetupComplete() && data_type_manager_ &&
-             data_type_manager_->state() == DataTypeManager::STOPPED) {
+  if (engine_ && IsFirstSetupComplete() && data_type_manager_ &&
+      data_type_manager_->state() == DataTypeManager::STOPPED) {
     return DATATYPES_NOT_INITIALIZED;
-  } else if (IsSyncActive()) {
-    return INITIALIZED;
   }
+  if (IsSyncActive())
+    return INITIALIZED;
   return UNKNOWN_ERROR;
 }
 
@@ -1342,12 +1342,11 @@ bool ProfileSyncService::QueryDetailedSyncStatus(SyncEngine::Status* result) {
   if (engine_ && engine_initialized_) {
     *result = engine_->GetDetailedStatus();
     return true;
-  } else {
-    SyncEngine::Status status;
-    status.sync_protocol_error = last_actionable_error_;
-    *result = status;
-    return false;
   }
+  SyncEngine::Status status;
+  status.sync_protocol_error = last_actionable_error_;
+  *result = status;
+  return false;
 }
 
 const AuthError& ProfileSyncService::GetAuthError() const {
@@ -1835,11 +1834,10 @@ bool ProfileSyncService::SetDecryptionPassphrase(
     bool result = crypto_->SetDecryptionPassphrase(passphrase);
     UMA_HISTOGRAM_BOOLEAN("Sync.PassphraseDecryptionSucceeded", result);
     return result;
-  } else {
-    NOTREACHED() << "SetDecryptionPassphrase must not be called when "
-                    "IsPassphraseRequired() is false.";
-    return false;
   }
+  NOTREACHED() << "SetDecryptionPassphrase must not be called when "
+                  "IsPassphraseRequired() is false.";
+  return false;
 }
 
 bool ProfileSyncService::IsEncryptEverythingAllowed() const {
@@ -2271,11 +2269,7 @@ base::FilePath ProfileSyncService::GetDirectoryPathForTest() const {
 
 base::MessageLoop* ProfileSyncService::GetSyncLoopForTest() const {
   DCHECK(thread_checker_.CalledOnValidThread());
-  if (sync_thread_) {
-    return sync_thread_->message_loop();
-  } else {
-    return nullptr;
-  }
+  return sync_thread_ ? sync_thread_->message_loop() : nullptr;
 }
 
 syncer::SyncEncryptionHandler::Observer*

components/captive_portal/captive_portal_detector.cc

@@ -142,8 +142,7 @@ void CaptivePortalDetector::GetCaptivePortalResultFromResponse(
 base::Time CaptivePortalDetector::GetCurrentTime() const {
   if (time_for_testing_.is_null())
     return base::Time::Now();
-  else
-    return time_for_testing_;
+  return time_for_testing_;
 }
 
 bool CaptivePortalDetector::FetchingURL() const {

components/cast_channel/logger.cc

@@ -103,11 +103,7 @@ void Logger::LogSocketChallengeReplyEvent(int channel_id,
 
 LastError Logger::GetLastError(int channel_id) const {
   const auto it = last_errors_.find(channel_id);
-  if (it != last_errors_.end()) {
-    return it->second;
-  } else {
-    return LastError();
-  }
+  return it != last_errors_.end() ? it->second : LastError();
 }
 
 void Logger::ClearLastError(int channel_id) {

components/contextual_search/renderer/contextual_search_wrapper.cc

@@ -75,9 +75,8 @@ bool ContextualSearchWrapper::EnsureServiceConnected() {
     render_frame()->GetRemoteInterfaces()->GetInterface(
         &contextual_search_js_api_service_);
     return true;
-  } else {
-    return false;
   }
+  return false;
 }
 
 void ContextualSearchWrapper::OnDestruct() {}

components/crash/content/app/breakpad_linux.cc

@@ -1390,7 +1390,8 @@ size_t WaitForCrashReportUploadProcess(int fd, size_t bytes_to_read,
     if (ret < 0) {
       // Error
       break;
-    } else if (ret > 0) {
+    }
+    if (ret > 0) {
       // There is data to read.
       ssize_t len = HANDLE_EINTR(
           sys_read(fd, buf + bytes_read, bytes_to_read - bytes_read));

components/crash/content/app/hard_error_handler_win.cc

@@ -100,10 +100,12 @@ bool HardErrorHandler(EXCEPTION_POINTERS* ex_info) {
   if (exception == kExceptionModuleNotFound) {
     ModuleNotFoundHardError(ex_info->ExceptionRecord);
     return true;
-  } else if (exception == kExceptionEntryPtNotFound) {
+  }
+  if (exception == kExceptionEntryPtNotFound) {
     EntryPointNotFoundHardError(ex_info->ExceptionRecord);
     return true;
-  } else if (FacilityFromException(exception) == FACILITY_GRAPHICS_KERNEL) {
+  }
+  if (FacilityFromException(exception) == FACILITY_GRAPHICS_KERNEL) {
     RaiseHardErrorMsg(exception, std::string(), std::string());
     return true;
   }

components/cronet/ios/test/cronet_test_base.mm

@@ -116,9 +116,8 @@
           _semaphore, dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC));
     }
     return request_completed;
-  } else {
-    return dispatch_semaphore_wait(_semaphore, DISPATCH_TIME_FOREVER) == 0;
   }
+  return dispatch_semaphore_wait(_semaphore, DISPATCH_TIME_FOREVER) == 0;
 }
 
 - (void)URLSession:(NSURLSession*)session
@@ -207,22 +206,21 @@ bool CronetTestBase::StartDataTaskAndWaitForCompletion(
 }
 
 ::testing::AssertionResult CronetTestBase::IsResponseSuccessful() {
-  if ([delegate_ error])
+  if ([delegate_ error]) {
     return ::testing::AssertionFailure() << "error in response: " <<
            [[[delegate_ error] description]
                cStringUsingEncoding:NSUTF8StringEncoding];
-  else
-    return ::testing::AssertionSuccess() << "no errors in response";
+  }
+  return ::testing::AssertionSuccess() << "no errors in response";
 }
 
 ::testing::AssertionResult CronetTestBase::IsResponseCanceled() {
   if ([delegate_ error] && [[delegate_ error] code] == NSURLErrorCancelled)
     return ::testing::AssertionSuccess() << "the response is canceled";
-  else
-    return ::testing::AssertionFailure() << "the response is not canceled."
-                                         << " The response error is " <<
-           [[[delegate_ error] description]
-               cStringUsingEncoding:NSUTF8StringEncoding];
+  return ::testing::AssertionFailure() << "the response is not canceled."
+                                       << " The response error is " <<
+         [[[delegate_ error] description]
+             cStringUsingEncoding:NSUTF8StringEncoding];
 }
 
 std::unique_ptr<net::MockCertVerifier> CronetTestBase::CreateMockCertVerifier(

components/cryptauth/sync_scheduler_impl.cc

@@ -177,9 +177,9 @@ base::TimeDelta SyncSchedulerImpl::GetJitteredPeriod() {
 }
 
 base::TimeDelta SyncSchedulerImpl::GetPeriod() {
-  if (strategy_ == Strategy::PERIODIC_REFRESH) {
+  if (strategy_ == Strategy::PERIODIC_REFRESH)
     return refresh_period_;
-  } else if (strategy_ == Strategy::AGGRESSIVE_RECOVERY && failure_count_ > 0) {
+  if (strategy_ == Strategy::AGGRESSIVE_RECOVERY && failure_count_ > 0) {
     // The backoff for each consecutive failure is exponentially doubled until
     // it is equal to the normal refresh period.
     // Note: |backoff_factor| may evaulate to INF if |failure_count_| is large,
@@ -187,11 +187,10 @@ base::TimeDelta SyncSchedulerImpl::GetPeriod() {
     double backoff_factor = pow(2, failure_count_ - 1);
     base::TimeDelta backoff_period = base_recovery_period_ * backoff_factor;
     return backoff_period < refresh_period_ ? backoff_period : refresh_period_;
-  } else {
-    PA_LOG(ERROR) << "Error getting period for strategy: "
-                  << static_cast<int>(strategy_);
-    return base::TimeDelta();
   }
+  PA_LOG(ERROR) << "Error getting period for strategy: "
+                << static_cast<int>(strategy_);
+  return base::TimeDelta();
 }
 
 }  // namespace cryptauth