Use NOTREACHED_IN_MIGRATION() in the rest of src/

This was generated by replacing " NOTREACHED()" with " NOTREACHED_IN_MIGRATION()" and running git cl format. This prepares for making NOTREACHED() [[noreturn]] alongside NotReachedIsFatal migration of existing inventory. third_party/crashpad is still excluded, needs to be changed upstream. Bug: 40580068 Change-Id: Ia5dbaddf53dba2fedefb67f1d428e8b24e9edffe Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5545021 Commit-Queue: Peter Boström <[email protected]> Auto-Submit: Peter Boström <[email protected]> Commit-Queue: Lei Zhang <[email protected]> Reviewed-by: Lei Zhang <[email protected]> Owners-Override: Lei Zhang <[email protected]> Cr-Commit-Position: refs/heads/main@{#1302314}
HLMelton · May 16, 2024 · 7843eba · 7843eba
1 parent 47dc17d
commit 7843eba
Show file tree

Hide file tree

Showing 284 changed files with 566 additions and 537 deletions.
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
@@ -158,7 +158,8 @@ void MigrateProfileData(base::FilePath cache_path,
 base::FilePath BuildCachePath(const base::FilePath& relative_path) {
   FilePath cache_path;
   if (!base::PathService::Get(base::DIR_CACHE, &cache_path)) {
-    NOTREACHED() << "Failed to get app cache directory for Android WebView";
+    NOTREACHED_IN_MIGRATION()
+        << "Failed to get app cache directory for Android WebView";
   }
   return cache_path.Append(relative_path);
 }
@@ -686,7 +687,8 @@ base::FilePath AwBrowserContext::BuildStoragePath(
     const base::FilePath& relative_path) {
   base::FilePath user_data_dir;
   if (!base::PathService::Get(base::DIR_ANDROID_APP_DATA, &user_data_dir)) {
-    NOTREACHED() << "Failed to get app data directory for Android WebView";
+    NOTREACHED_IN_MIGRATION()
+        << "Failed to get app data directory for Android WebView";
   }
   return user_data_dir.Append(relative_path);
 }

diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc
@@ -324,7 +324,7 @@ int AwBrowserMainParts::PreMainMessageLoopRun() {
 
 void AwBrowserMainParts::WillRunMainMessageLoop(
     std::unique_ptr<base::RunLoop>& run_loop) {
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
 }
 
 void AwBrowserMainParts::PostCreateThreads() {

diff --git a/android_webview/browser/aw_browser_terminator.cc b/android_webview/browser/aw_browser_terminator.cc
@@ -112,7 +112,7 @@ void OnRenderProcessGone(
                      << " killing application.";
           kill(getpid(), SIGKILL);
         }
-        NOTREACHED();
+        NOTREACHED_IN_MIGRATION();
         break;
       case AwRenderProcessGoneDelegate::RenderProcessGoneResult::kHandled:
         // Don't log UMA yet. This WebView may be handled, but we need to wait

diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
@@ -518,7 +518,8 @@ base::FilePath AwContentBrowserClient::GetDefaultDownloadDirectory() {
 }
 
 std::string AwContentBrowserClient::GetDefaultDownloadName() {
-  NOTREACHED() << "Android WebView does not use chromium downloads";
+  NOTREACHED_IN_MIGRATION()
+      << "Android WebView does not use chromium downloads";
   return std::string();
 }
 
@@ -535,22 +536,22 @@ AwContentBrowserClient::GetLocalTracesDirectory() {
 
 void AwContentBrowserClient::DidCreatePpapiPlugin(
     content::BrowserPpapiHost* browser_host) {
-  NOTREACHED() << "Android WebView does not support plugins";
+  NOTREACHED_IN_MIGRATION() << "Android WebView does not support plugins";
 }
 
 bool AwContentBrowserClient::AllowPepperSocketAPI(
     content::BrowserContext* browser_context,
     const GURL& url,
     bool private_api,
     const content::SocketPermissionRequest* params) {
-  NOTREACHED() << "Android WebView does not support plugins";
+  NOTREACHED_IN_MIGRATION() << "Android WebView does not support plugins";
   return false;
 }
 
 bool AwContentBrowserClient::IsPepperVpnProviderAPIAllowed(
     content::BrowserContext* browser_context,
     const GURL& url) {
-  NOTREACHED() << "Android WebView does not support plugins";
+  NOTREACHED_IN_MIGRATION() << "Android WebView does not support plugins";
   return false;
 }
 

diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw_contents.cc
@@ -1295,7 +1295,7 @@ jint AwContents::GetEffectivePriority(JNIEnv* env) {
     case content::ChildProcessImportance::IMPORTANT:
       return static_cast<jint>(RendererPriority::HIGH);
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return 0;
 }
 

diff --git a/android_webview/browser/aw_contents_client_bridge.cc b/android_webview/browser/aw_contents_client_bridge.cc
@@ -306,7 +306,7 @@ void AwContentsClientBridge::RunJavaScriptDialog(
       break;
     }
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
   }
 }
 

diff --git a/android_webview/browser/aw_field_trials.cc b/android_webview/browser/aw_field_trials.cc
@@ -66,7 +66,7 @@ void AwFieldTrials::OnVariationsSetupComplete() {
   if (base::PathService::Get(base::DIR_ANDROID_APP_DATA, &metrics_dir)) {
     InstantiatePersistentHistogramsWithFeaturesAndCleanup(metrics_dir);
   } else {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 }
 

diff --git a/android_webview/browser/aw_permission_manager.cc b/android_webview/browser/aw_permission_manager.cc
@@ -53,11 +53,11 @@ class LastRequestResultCache {
     }
 
     if (!requesting_origin.is_valid()) {
-      NOTREACHED() << requesting_origin.possibly_invalid_spec();
+      NOTREACHED_IN_MIGRATION() << requesting_origin.possibly_invalid_spec();
       return;
     }
     if (!embedding_origin.is_valid()) {
-      NOTREACHED() << embedding_origin.possibly_invalid_spec();
+      NOTREACHED_IN_MIGRATION() << embedding_origin.possibly_invalid_spec();
       return;
     }
 
@@ -68,7 +68,7 @@ class LastRequestResultCache {
 
     std::string key = GetCacheKey(requesting_origin, embedding_origin);
     if (key.empty()) {
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       // Never store an empty key because it could inadvertently be used for
       // another combination.
       return;
@@ -90,7 +90,8 @@ class LastRequestResultCache {
         << embedding_origin.possibly_invalid_spec();
 
     if (permission != PermissionType::PROTECTED_MEDIA_IDENTIFIER) {
-      NOTREACHED() << "Results are only cached for PROTECTED_MEDIA_IDENTIFIER";
+      NOTREACHED_IN_MIGRATION()
+          << "Results are only cached for PROTECTED_MEDIA_IDENTIFIER";
       return PermissionStatus::ASK;
     }
 
@@ -169,7 +170,7 @@ class AwPermissionManager::PendingRequest {
   void SetPermissionStatus(PermissionType type, PermissionStatus status) {
     auto result = permission_index_map_.find(type);
     if (result == permission_index_map_.end()) {
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return;
     }
     DCHECK(!IsCompleted());
@@ -191,7 +192,7 @@ class AwPermissionManager::PendingRequest {
   PermissionStatus GetPermissionStatus(PermissionType type) {
     auto result = permission_index_map_.find(type);
     if (result == permission_index_map_.end()) {
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return PermissionStatus::DENIED;
     }
     return results[result->second];
@@ -369,7 +370,8 @@ void AwPermissionManager::RequestPermissions(
                                                  PermissionStatus::DENIED);
         break;
       case PermissionType::NUM:
-        NOTREACHED() << "PermissionType::NUM was not expected here.";
+        NOTREACHED_IN_MIGRATION()
+            << "PermissionType::NUM was not expected here.";
         pending_request_raw->SetPermissionStatus(permissions[i],
                                                  PermissionStatus::DENIED);
         break;
@@ -612,7 +614,8 @@ void AwPermissionManager::CancelPermissionRequest(int request_id) {
         // There is nothing to cancel so this is simply ignored.
         break;
       case PermissionType::NUM:
-        NOTREACHED() << "PermissionType::NUM was not expected here.";
+        NOTREACHED_IN_MIGRATION()
+            << "PermissionType::NUM was not expected here.";
         break;
     }
     pending_request->SetPermissionStatus(permission, PermissionStatus::DENIED);

diff --git a/android_webview/browser/aw_permission_manager_unittest.cc b/android_webview/browser/aw_permission_manager_unittest.cc
@@ -96,7 +96,7 @@ class AwBrowserPermissionRequestDelegateForTesting final
       request_.erase(it);
       return;
     }
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 
  private:

diff --git a/android_webview/browser/aw_print_manager.cc b/android_webview/browser/aw_print_manager.cc
@@ -136,7 +136,7 @@ void AwPrintManager::DidPrintDocument(
 
   const printing::mojom::DidPrintContentParams& content = *params->content;
   if (!content.metafile_data_region.IsValid()) {
-    NOTREACHED() << "invalid memory handle";
+    NOTREACHED_IN_MIGRATION() << "invalid memory handle";
     web_contents()->Stop();
     PdfWritingDone(0);
     std::move(callback).Run(false);
@@ -146,7 +146,7 @@ void AwPrintManager::DidPrintDocument(
   auto data = base::RefCountedSharedMemoryMapping::CreateFromWholeRegion(
       content.metafile_data_region);
   if (!data) {
-    NOTREACHED() << "couldn't map";
+    NOTREACHED_IN_MIGRATION() << "couldn't map";
     web_contents()->Stop();
     PdfWritingDone(0);
     std::move(callback).Run(false);

diff --git a/android_webview/browser/aw_quota_manager_bridge.cc b/android_webview/browser/aw_quota_manager_bridge.cc
@@ -138,7 +138,7 @@ void GetStorageKeysTask::CheckDone() {
     content::GetUIThreadTaskRunner({})->PostTask(
         FROM_HERE, base::BindOnce(&GetStorageKeysTask::DoneOnUIThread, this));
   } else if (num_callbacks_received_ > num_callbacks_to_wait_) {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 }
 

diff --git a/android_webview/browser/aw_web_contents_view_delegate.cc b/android_webview/browser/aw_web_contents_view_delegate.cc
@@ -22,7 +22,7 @@ AwWebContentsViewDelegate::~AwWebContentsViewDelegate() {}
 content::WebDragDestDelegate* AwWebContentsViewDelegate::GetDragDestDelegate() {
   // GetDragDestDelegate is a pure virtual method from WebContentsViewDelegate
   // and must have an implementation although android doesn't use it.
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return NULL;
 }
 

diff --git a/android_webview/browser/cookie_manager.cc b/android_webview/browser/cookie_manager.cc
@@ -190,7 +190,8 @@ namespace {
 base::FilePath GetPathInAppDirectory(std::string path) {
   base::FilePath result;
   if (!base::PathService::Get(base::DIR_ANDROID_APP_DATA, &result)) {
-    NOTREACHED() << "Failed to get app data directory for Android WebView";
+    NOTREACHED_IN_MIGRATION()
+        << "Failed to get app data directory for Android WebView";
   }
   result = result.Append(FILE_PATH_LITERAL(path));
   return result;

diff --git a/android_webview/browser/find_helper.cc b/android_webview/browser/find_helper.cc
@@ -117,12 +117,12 @@ void FindHelper::NotifyResults(int active_ordinal,
 
   // Safeguard in case of errors to prevent reporting -1 to the API listeners.
   if (match_count == -1) {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
     match_count = 0;
   }
 
   if (active_ordinal == -1) {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
     active_ordinal = 0;
   }
 

diff --git a/android_webview/browser/gfx/aw_draw_fn_impl.cc b/android_webview/browser/gfx/aw_draw_fn_impl.cc
@@ -127,7 +127,7 @@ OverlaysParams::Mode GetOverlaysMode(AwDrawFnOverlaysMode mode) {
     case AW_DRAW_FN_OVERLAYS_MODE_ENABLED:
       return OverlaysParams::Mode::Enabled;
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return OverlaysParams::Mode::Disabled;
   }
 }

diff --git a/android_webview/browser/gfx/display_scheduler_webview.cc b/android_webview/browser/gfx/display_scheduler_webview.cc
@@ -31,10 +31,10 @@ DisplaySchedulerWebView::~DisplaySchedulerWebView() {
 
 void DisplaySchedulerWebView::ForceImmediateSwapIfPossible() {
   // We can't swap immediately
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
 }
 void DisplaySchedulerWebView::SetNeedsOneBeginFrame(bool needs_draw) {
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
 }
 void DisplaySchedulerWebView::DidSwapBuffers() {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);

diff --git a/android_webview/browser/gfx/skia_output_surface_dependency_webview.cc b/android_webview/browser/gfx/skia_output_surface_dependency_webview.cc
@@ -117,13 +117,13 @@ SkiaOutputSurfaceDependencyWebView::CreateGLSurface(
 
 base::ScopedClosureRunner SkiaOutputSurfaceDependencyWebView::CachePresenter(
     gl::Presenter* presenter) {
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return base::ScopedClosureRunner();
 }
 
 base::ScopedClosureRunner SkiaOutputSurfaceDependencyWebView::CacheGLSurface(
     gl::GLSurface* surface) {
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return base::ScopedClosureRunner();
 }
 

diff --git a/android_webview/browser/gfx/task_forwarding_sequence.cc b/android_webview/browser/gfx/task_forwarding_sequence.cc
@@ -68,7 +68,7 @@ void TaskForwardingSequence::ScheduleOrRetainTask(
 // Should not be called because tasks aren't reposted to wait for sync tokens,
 // or for yielding execution since ShouldYield() returns false.
 void TaskForwardingSequence::ContinueTask(base::OnceClosure task) {
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
 }
 
 // Method to wrap scheduled task with the order number processing required for

diff --git a/android_webview/browser/icon_helper.cc b/android_webview/browser/icon_helper.cc
@@ -109,7 +109,7 @@ void IconHelper::DidUpdateFaviconURL(
         // Silently ignore it. Only trigger a callback on valid icons.
         break;
       default:
-        NOTREACHED();
+        NOTREACHED_IN_MIGRATION();
         break;
     }
   }

diff --git a/android_webview/browser/metrics/visibility_metrics_logger.cc b/android_webview/browser/metrics/visibility_metrics_logger.cc
@@ -48,7 +48,7 @@ const char* SchemeEnumToString(VisibilityMetricsLogger::Scheme scheme) {
     case VisibilityMetricsLogger::Scheme::kIntent:
       return "intent";
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
   }
   return "";
 }

diff --git a/android_webview/browser/network_service/aw_proxy_config_monitor.cc b/android_webview/browser/network_service/aw_proxy_config_monitor.cc
@@ -119,7 +119,7 @@ void AwProxyConfigMonitor::OnProxyConfigChanged(
             net::ProxyConfigWithAnnotation::CreateDirect());
         break;
       case net::ProxyConfigService::CONFIG_PENDING:
-        NOTREACHED();
+        NOTREACHED_IN_MIGRATION();
         break;
     }
   }

diff --git a/android_webview/browser/network_service/aw_proxying_url_loader_factory.cc b/android_webview/browser/network_service/aw_proxying_url_loader_factory.cc
@@ -552,7 +552,7 @@ void InterceptedRequest::InterceptResponseReceived(
         committed_mode = CommittedRequestedWithHeaderMode::kConstantWebview;
         break;
       default:
-        NOTREACHED()
+        NOTREACHED_IN_MIGRATION()
             << "Invalid enum value for AwSettings:RequestedWithHeaderMode: "
             << requested_with_header_mode;
     }

diff --git a/android_webview/browser/renderer_host/auto_login_parser.cc b/android_webview/browser/renderer_host/auto_login_parser.cc
@@ -22,7 +22,7 @@ bool MatchRealm(const std::string& realm, RealmRestriction restriction) {
     case ALLOW_ANY_REALM:
       return true;
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return false;
   }
 }

diff --git a/android_webview/browser/safe_browsing/aw_url_checker_delegate_impl.cc b/android_webview/browser/safe_browsing/aw_url_checker_delegate_impl.cc
@@ -96,7 +96,7 @@ void AwUrlCheckerDelegateImpl::
     StartObservingInteractionsForDelayedBlockingPageHelper(
         const security_interstitials::UnsafeResource& resource,
         bool is_main_frame) {
-  NOTREACHED() << "Delayed warnings not implemented for WebView";
+  NOTREACHED_IN_MIGRATION() << "Delayed warnings not implemented for WebView";
 }
 
 bool AwUrlCheckerDelegateImpl::IsUrlAllowlisted(const GURL& url) {
@@ -274,7 +274,7 @@ void AwUrlCheckerDelegateImpl::DoApplicationResponse(
       proceed = false;
       break;
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
   }
 
   if (!proceed) {

diff --git a/android_webview/common/crash_reporter/aw_crash_reporter_client.cc b/android_webview/common/crash_reporter/aw_crash_reporter_client.cc
@@ -115,7 +115,7 @@ bool g_enabled;
 
 void EnableCrashReporter(const std::string& process_type) {
   if (g_enabled) {
-    NOTREACHED() << "EnableCrashReporter called more than once";
+    NOTREACHED_IN_MIGRATION() << "EnableCrashReporter called more than once";
     return;
   }
 

diff --git a/android_webview/lib/webview_entry_point.cc b/android_webview/lib/webview_entry_point.cc
@@ -25,7 +25,7 @@ bool NativeInit(base::android::LibraryProcessType library_process_type) {
       LOG(FATAL) << "WebView cannot be started with a browser process type.";
 
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return false;
   }
 }

diff --git a/android_webview/nonembedded/component_updater/aw_component_installer_policy.cc b/android_webview/nonembedded/component_updater/aw_component_installer_policy.cc
@@ -41,7 +41,7 @@ AwComponentInstallerPolicy::AwComponentInstallerPolicy() = default;
 
 void AwComponentInstallerPolicy::OnCustomUninstall() {
   // Uninstallation isn't supported in WebView.
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
 }
 
 // Copy the components file from `install_dir` to the serving directory of the

diff --git a/android_webview/test/shell/src/draw_fn/allocator.cc b/android_webview/test/shell/src/draw_fn/allocator.cc
@@ -21,7 +21,7 @@ AwDrawFnRenderMode QueryRenderMode() {
 }
 
 int CreateFunctor(void* data, AwDrawFnFunctorCallbacks* functor_callbacks) {
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return 0;
 }
 

diff --git a/apps/launcher.cc b/apps/launcher.cc
@@ -398,7 +398,7 @@ void LaunchPlatformAppWithCommandLineAndLaunchId(
     if (!in_kiosk_mode) {
       LOG(ERROR) << "App with 'kiosk_only' attribute must be run in "
                  << " ChromeOS kiosk mode.";
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return;
     }
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -306,7 +306,7 @@ void AwContentsClientBridge::RunJavaScriptDialog( @@
           break;
         }
         default:
-          NOTREACHED();
+          NOTREACHED_IN_MIGRATION();
       }
     }
@@ Expand Down @@