Make helper macros behave consistently for //content/public UserData types
X_USER_DATA_KEY_DECL() requires a semicolon while X_USER_DATA_KEY_IMPL()
does not. This CL changes it so they both consistently require a
semicolon.
The comments have also been updated to:
- reflect the updated macro usage to consistently require semicolons
- simply the friend declaration, which does not need to qualify the
base class template with the `content::` namespace nor explicitly
specify the base class template's type parameter.
Macro cleanups outside //content/public/browser were generated using the
following commands:
sed -z -i 's|\nNAVIGATION_HANDLE_USER_DATA_KEY_IMPL([ \n]*\([^)]\+\))|\nNAVIGATION_HANDLE_USER_DATA_KEY_IMPL(\1);|g' $(git gs NAVIGATION_HANDLE_USER_DATA_KEY_IMPL --name-only | grep -v navigation_handle_user_data.h)
sed -z -i 's|\nPAGE_USER_DATA_KEY_IMPL([ \n]*\([^)]\+\))|\nPAGE_USER_DATA_KEY_IMPL(\1);|g' $(git gs PAGE_USER_DATA_KEY_IMPL --name-only | grep -v page_user_data.h)
sed -z -i 's|\nRENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL([ \n]*\([^)]\+\))|\nRENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(\1);|g' $(git gs RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL --name-only | grep -v render_document_host_user_data.h)
sed -z -i 's|\nWEB_CONTENTS_USER_DATA_KEY_IMPL([ \n]*\([^)]\+\))|\nWEB_CONTENTS_USER_DATA_KEY_IMPL(\1);|g' $(git gs WEB_CONTENTS_USER_DATA_KEY_IMPL --name-only | grep -v web_contents_user_data.h)
Bug: 1254987
Change-Id: Ifbbc22108a17f4d3bcf5b6ae3e056d567c7cc4be
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3198788
Reviewed-by: Nasko Oskov <nasko@chromium.org>
Reviewed-by: Alexander Timin <altimin@chromium.org>
Owners-Override: Nasko Oskov <nasko@chromium.org>
Owners-Override: Alexander Timin <altimin@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/main@{#927517}
diff --git a/android_webview/browser/aw_autofill_client.cc b/android_webview/browser/aw_autofill_client.cc
index 40e05f4..d913422 100644
--- a/android_webview/browser/aw_autofill_client.cc
+++ b/android_webview/browser/aw_autofill_client.cc
@@ -360,6 +360,6 @@
Java_AwAutofillClient_showAutofillPopup(env, obj, view, is_rtl, data_array);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AwAutofillClient)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AwAutofillClient);
} // namespace android_webview
diff --git a/android_webview/browser/aw_print_manager.cc b/android_webview/browser/aw_print_manager.cc
index af8577fa..ce71215 100644
--- a/android_webview/browser/aw_print_manager.cc
+++ b/android_webview/browser/aw_print_manager.cc
@@ -157,6 +157,6 @@
std::move(did_print_document_cb).Run(true);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AwPrintManager)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AwPrintManager);
} // namespace android_webview
diff --git a/android_webview/browser/safe_browsing/aw_safe_browsing_subresource_helper.cc b/android_webview/browser/safe_browsing/aw_safe_browsing_subresource_helper.cc
index bb5b7a2..8f956cc 100644
--- a/android_webview/browser/safe_browsing/aw_safe_browsing_subresource_helper.cc
+++ b/android_webview/browser/safe_browsing/aw_safe_browsing_subresource_helper.cc
@@ -54,6 +54,6 @@
content::WebContents* web_contents)
: WebContentsObserver(web_contents) {}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AwSafeBrowsingSubresourceHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AwSafeBrowsingSubresourceHelper);
} // namespace android_webview
diff --git a/chrome/browser/android/autofill_assistant/client_android.cc b/chrome/browser/android/autofill_assistant/client_android.cc
index 3eb6959..a379b45e 100644
--- a/chrome/browser/android/autofill_assistant/client_android.cc
+++ b/chrome/browser/android/autofill_assistant/client_android.cc
@@ -655,6 +655,6 @@
return !ui_controller_android_ && controller_ && controller_->NeedsUI();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ClientAndroid)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ClientAndroid);
} // namespace autofill_assistant
diff --git a/chrome/browser/android/autofill_assistant/starter_android.cc b/chrome/browser/android/autofill_assistant/starter_android.cc
index 9da2813..0d6d039 100644
--- a/chrome/browser/android/autofill_assistant/starter_android.cc
+++ b/chrome/browser/android/autofill_assistant/starter_android.cc
@@ -293,6 +293,6 @@
return client_android->IsVisible();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(StarterAndroid)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(StarterAndroid);
} // namespace autofill_assistant
diff --git a/chrome/browser/android/contextualsearch/contextual_search_observer.cc b/chrome/browser/android/contextualsearch/contextual_search_observer.cc
index 7c40932..4c465275 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_observer.cc
+++ b/chrome/browser/android/contextualsearch/contextual_search_observer.cc
@@ -29,6 +29,6 @@
contextual_search_observer->set_api_handler(handler);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ContextualSearchObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ContextualSearchObserver);
} // namespace contextual_search
diff --git a/chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.cc b/chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.cc
index c6a7a6c4..0948f04 100644
--- a/chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.cc
+++ b/chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.cc
@@ -11,6 +11,6 @@
UnhandledTapWebContentsObserver::~UnhandledTapWebContentsObserver() {}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(UnhandledTapWebContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(UnhandledTapWebContentsObserver);
} // namespace contextual_search
diff --git a/chrome/browser/android/customtabs/client_data_header_web_contents_observer.cc b/chrome/browser/android/customtabs/client_data_header_web_contents_observer.cc
index ec019f83..414d033 100644
--- a/chrome/browser/android/customtabs/client_data_header_web_contents_observer.cc
+++ b/chrome/browser/android/customtabs/client_data_header_web_contents_observer.cc
@@ -38,6 +38,6 @@
client->SetCCTClientHeader(header_);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ClientDataHeaderWebContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ClientDataHeaderWebContentsObserver);
} // namespace customtabs
diff --git a/chrome/browser/android/oom_intervention/oom_intervention_tab_helper.cc b/chrome/browser/android/oom_intervention/oom_intervention_tab_helper.cc
index 3867b3b..f35fe79 100644
--- a/chrome/browser/android/oom_intervention/oom_intervention_tab_helper.cc
+++ b/chrome/browser/android/oom_intervention/oom_intervention_tab_helper.cc
@@ -330,4 +330,4 @@
receiver_.reset();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(OomInterventionTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(OomInterventionTabHelper);
diff --git a/chrome/browser/android/search_permissions/search_geolocation_disclosure_tab_helper.cc b/chrome/browser/android/search_permissions/search_geolocation_disclosure_tab_helper.cc
index 463a417a..22a9895f 100644
--- a/chrome/browser/android/search_permissions/search_geolocation_disclosure_tab_helper.cc
+++ b/chrome/browser/android/search_permissions/search_geolocation_disclosure_tab_helper.cc
@@ -274,4 +274,4 @@
gDayOffsetForTesting = days;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SearchGeolocationDisclosureTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SearchGeolocationDisclosureTabHelper);
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index 7f0cd45..a87ee3a 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -102,7 +102,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(TabAndroidHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(TabAndroidHelper);
} // namespace
diff --git a/chrome/browser/apps/app_service/app_web_contents_data.cc b/chrome/browser/apps/app_service/app_web_contents_data.cc
index dde7b44..5f3dc0de 100644
--- a/chrome/browser/apps/app_service/app_web_contents_data.cc
+++ b/chrome/browser/apps/app_service/app_web_contents_data.cc
@@ -20,6 +20,6 @@
client_ = nullptr;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AppWebContentsData)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AppWebContentsData);
} // namespace apps
diff --git a/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc b/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc
index 68a83c7..6fc88a6 100644
--- a/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc
+++ b/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc
@@ -83,6 +83,6 @@
receiver_.Bind(std::move(receiver));
}
-RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(DigitalGoodsFactoryImpl)
+RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(DigitalGoodsFactoryImpl);
} // namespace apps
diff --git a/chrome/browser/apps/digital_goods/digital_goods_impl.cc b/chrome/browser/apps/digital_goods/digital_goods_impl.cc
index 069791c..a83691c 100644
--- a/chrome/browser/apps/digital_goods/digital_goods_impl.cc
+++ b/chrome/browser/apps/digital_goods/digital_goods_impl.cc
@@ -120,6 +120,6 @@
render_frame_host().GetBrowserContext());
}
-RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(DigitalGoodsImpl)
+RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(DigitalGoodsImpl);
} // namespace apps
diff --git a/chrome/browser/apps/platform_apps/audio_focus_web_contents_observer.cc b/chrome/browser/apps/platform_apps/audio_focus_web_contents_observer.cc
index 84009ae..958c274d 100644
--- a/chrome/browser/apps/platform_apps/audio_focus_web_contents_observer.cc
+++ b/chrome/browser/apps/platform_apps/audio_focus_web_contents_observer.cc
@@ -70,6 +70,6 @@
->SetAudioFocusGroupId(audio_focus_group_id_);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AudioFocusWebContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AudioFocusWebContentsObserver);
} // namespace apps
diff --git a/chrome/browser/ash/arc/arc_web_contents_data.cc b/chrome/browser/ash/arc/arc_web_contents_data.cc
index 5737802..219394e 100644
--- a/chrome/browser/ash/arc/arc_web_contents_data.cc
+++ b/chrome/browser/ash/arc/arc_web_contents_data.cc
@@ -9,6 +9,6 @@
// static
const char ArcWebContentsData::kArcTransitionFlag[] = "ArcTransition";
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ArcWebContentsData)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ArcWebContentsData);
} // namespace arc
diff --git a/chrome/browser/ash/arc/print_spooler/print_session_impl.cc b/chrome/browser/ash/arc/print_spooler/print_session_impl.cc
index ec3bb79b..da0f1581 100644
--- a/chrome/browser/ash/arc/print_spooler/print_session_impl.cc
+++ b/chrome/browser/ash/arc/print_spooler/print_session_impl.cc
@@ -386,6 +386,6 @@
false, false);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PrintSessionImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PrintSessionImpl);
} // namespace arc
diff --git a/chrome/browser/ash/child_accounts/time_limits/web_time_navigation_observer.cc b/chrome/browser/ash/child_accounts/time_limits/web_time_navigation_observer.cc
index d5951e04..bd5fadb 100644
--- a/chrome/browser/ash/child_accounts/time_limits/web_time_navigation_observer.cc
+++ b/chrome/browser/ash/child_accounts/time_limits/web_time_navigation_observer.cc
@@ -85,7 +85,7 @@
content::WebContents* web_contents)
: content::WebContentsObserver(web_contents) {}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebTimeNavigationObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebTimeNavigationObserver);
} // namespace app_time
} // namespace ash
diff --git a/chrome/browser/ash/login/ui/web_contents_forced_title.cc b/chrome/browser/ash/login/ui/web_contents_forced_title.cc
index da66f5e..423347cf 100644
--- a/chrome/browser/ash/login/ui/web_contents_forced_title.cc
+++ b/chrome/browser/ash/login/ui/web_contents_forced_title.cc
@@ -35,6 +35,6 @@
web_contents()->UpdateTitleForEntry(entry, title_);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsForcedTitle)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsForcedTitle);
} // namespace ash
diff --git a/chrome/browser/ash/policy/dlp/dlp_content_tab_helper.cc b/chrome/browser/ash/policy/dlp/dlp_content_tab_helper.cc
index 7b6be3d..cebc82a 100644
--- a/chrome/browser/ash/policy/dlp/dlp_content_tab_helper.cc
+++ b/chrome/browser/ash/policy/dlp/dlp_content_tab_helper.cc
@@ -134,6 +134,6 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(DlpContentTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(DlpContentTabHelper);
} // namespace policy
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
index 27931a4..36627d8c 100644
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
@@ -191,7 +191,7 @@
AutocompleteClientWebContentsUserData::AutocompleteClientWebContentsUserData(
content::WebContents*) {}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AutocompleteClientWebContentsUserData)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AutocompleteClientWebContentsUserData);
} // namespace
diff --git a/chrome/browser/autofill/address_accessory_controller_impl.cc b/chrome/browser/autofill/address_accessory_controller_impl.cc
index 0ee8306..5071f62e 100644
--- a/chrome/browser/autofill/address_accessory_controller_impl.cc
+++ b/chrome/browser/autofill/address_accessory_controller_impl.cc
@@ -212,6 +212,6 @@
return mf_controller_;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AddressAccessoryControllerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AddressAccessoryControllerImpl);
} // namespace autofill
diff --git a/chrome/browser/autofill/credit_card_accessory_controller_impl.cc b/chrome/browser/autofill/credit_card_accessory_controller_impl.cc
index 6ed0793..16ca86f 100644
--- a/chrome/browser/autofill/credit_card_accessory_controller_impl.cc
+++ b/chrome/browser/autofill/credit_card_accessory_controller_impl.cc
@@ -425,6 +425,6 @@
return driver ? driver->browser_autofill_manager() : nullptr;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(CreditCardAccessoryControllerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(CreditCardAccessoryControllerImpl);
} // namespace autofill
diff --git a/chrome/browser/autofill/manual_filling_controller_impl.cc b/chrome/browser/autofill/manual_filling_controller_impl.cc
index 1c0aed2..5f4d25b 100644
--- a/chrome/browser/autofill/manual_filling_controller_impl.cc
+++ b/chrome/browser/autofill/manual_filling_controller_impl.cc
@@ -457,4 +457,4 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ManualFillingControllerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ManualFillingControllerImpl);
diff --git a/chrome/browser/banners/android/chrome_app_banner_manager_android.cc b/chrome/browser/banners/android/chrome_app_banner_manager_android.cc
index 3ff8c651..518b184 100644
--- a/chrome/browser/banners/android/chrome_app_banner_manager_android.cc
+++ b/chrome/browser/banners/android/chrome_app_banner_manager_android.cc
@@ -182,6 +182,6 @@
return true;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ChromeAppBannerManagerAndroid)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ChromeAppBannerManagerAndroid);
} // namespace webapps
diff --git a/chrome/browser/banners/app_banner_manager_desktop.cc b/chrome/browser/banners/app_banner_manager_desktop.cc
index 89f4f45f..bb5023f 100644
--- a/chrome/browser/banners/app_banner_manager_desktop.cc
+++ b/chrome/browser/banners/app_banner_manager_desktop.cc
@@ -264,6 +264,6 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AppBannerManagerDesktop)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AppBannerManagerDesktop);
} // namespace webapps
diff --git a/chrome/browser/cart/commerce_hint_service.cc b/chrome/browser/cart/commerce_hint_service.cc
index 95b8d5ce..e42217ea 100644
--- a/chrome/browser/cart/commerce_hint_service.cc
+++ b/chrome/browser/cart/commerce_hint_service.cc
@@ -261,6 +261,6 @@
base::UmaHistogramBoolean("Commerce.Carts.XHRIsAddToCart", reported);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(CommerceHintService)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(CommerceHintService);
} // namespace cart
diff --git a/chrome/browser/commerce/shopping_list/shopping_data_provider.cc b/chrome/browser/commerce/shopping_list/shopping_data_provider.cc
index 648dab6..0cc69cf 100644
--- a/chrome/browser/commerce/shopping_list/shopping_data_provider.cc
+++ b/chrome/browser/commerce/shopping_list/shopping_data_provider.cc
@@ -148,7 +148,7 @@
return meta;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ShoppingDataProvider)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ShoppingDataProvider);
void MergeData(power_bookmarks::PowerBookmarkMeta* meta,
base::Value& on_page_data_map) {
diff --git a/chrome/browser/complex_tasks/task_tab_helper.cc b/chrome/browser/complex_tasks/task_tab_helper.cc
index 22e5353..c3e3957 100644
--- a/chrome/browser/complex_tasks/task_tab_helper.cc
+++ b/chrome/browser/complex_tasks/task_tab_helper.cc
@@ -218,6 +218,6 @@
}
#endif // defined(OS_ANDROID)
-WEB_CONTENTS_USER_DATA_KEY_IMPL(TaskTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(TaskTabHelper);
} // namespace tasks
diff --git a/chrome/browser/content_settings/mixed_content_settings_tab_helper.cc b/chrome/browser/content_settings/mixed_content_settings_tab_helper.cc
index 39aae6c3..13a707a 100644
--- a/chrome/browser/content_settings/mixed_content_settings_tab_helper.cc
+++ b/chrome/browser/content_settings/mixed_content_settings_tab_helper.cc
@@ -79,4 +79,4 @@
is_running_insecure_content_allowed_ = true;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(MixedContentSettingsTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(MixedContentSettingsTabHelper);
diff --git a/chrome/browser/content_settings/sound_content_setting_observer.cc b/chrome/browser/content_settings/sound_content_setting_observer.cc
index c13116c..4dda8329 100644
--- a/chrome/browser/content_settings/sound_content_setting_observer.cc
+++ b/chrome/browser/content_settings/sound_content_setting_observer.cc
@@ -206,4 +206,4 @@
}
#endif
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SoundContentSettingObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SoundContentSettingObserver);
diff --git a/chrome/browser/data_reduction_proxy/data_reduction_proxy_tab_helper.cc b/chrome/browser/data_reduction_proxy/data_reduction_proxy_tab_helper.cc
index 683c8f2..d0f42e5 100644
--- a/chrome/browser/data_reduction_proxy/data_reduction_proxy_tab_helper.cc
+++ b/chrome/browser/data_reduction_proxy/data_reduction_proxy_tab_helper.cc
@@ -43,4 +43,4 @@
web_contents_->OnWebPreferencesChanged();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(DataReductionProxyTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(DataReductionProxyTabHelper);
diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
index b661084..ba68823 100644
--- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
+++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
@@ -568,6 +568,6 @@
return NoArguments();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(BookmarkManagerPrivateDragEventRouter)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(BookmarkManagerPrivateDragEventRouter);
} // namespace extensions
diff --git a/chrome/browser/extensions/api/terminal/terminal_private_api.cc b/chrome/browser/extensions/api/terminal/terminal_private_api.cc
index 15558bb..50e6a9f9 100644
--- a/chrome/browser/extensions/api/terminal/terminal_private_api.cc
+++ b/chrome/browser/extensions/api/terminal/terminal_private_api.cc
@@ -137,7 +137,7 @@
base::flat_set<std::string> terminal_ids_;
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(TerminalTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(TerminalTabHelper);
// Copies the value of |switch_name| if present from |src| to |dst|. If not
// present, uses |default_value| if nonempty. Returns the value set into |dst|.
diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
index ee986c3..01db3e0 100644
--- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
+++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
@@ -32,7 +32,7 @@
// static
bool FrameNavigationState::allow_extension_scheme_ = false;
-RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(FrameNavigationState)
+RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(FrameNavigationState);
FrameNavigationState::FrameNavigationState(content::RenderFrameHost* rfh)
: content::RenderDocumentHostUserData<FrameNavigationState>(rfh) {}
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
index b283857f..d18d496e 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
@@ -577,6 +577,6 @@
EventRouter::Get(browser_context_)->UnregisterObserver(this);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebNavigationTabObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebNavigationTabObserver);
} // namespace extensions
diff --git a/chrome/browser/extensions/chrome_extension_web_contents_observer.cc b/chrome/browser/extensions/chrome_extension_web_contents_observer.cc
index 82e253d..33324ab 100644
--- a/chrome/browser/extensions/chrome_extension_web_contents_observer.cc
+++ b/chrome/browser/extensions/chrome_extension_web_contents_observer.cc
@@ -167,6 +167,6 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ChromeExtensionWebContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ChromeExtensionWebContentsObserver);
} // namespace extensions
diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc
index 0ce80d7..c39f1d3 100644
--- a/chrome/browser/extensions/tab_helper.cc
+++ b/chrome/browser/extensions/tab_helper.cc
@@ -441,6 +441,6 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(TabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(TabHelper);
} // namespace extensions
diff --git a/chrome/browser/external_protocol/external_protocol_observer.cc b/chrome/browser/external_protocol/external_protocol_observer.cc
index 31365941..1642b10 100644
--- a/chrome/browser/external_protocol/external_protocol_observer.cc
+++ b/chrome/browser/external_protocol/external_protocol_observer.cc
@@ -22,4 +22,4 @@
ExternalProtocolHandler::PermitLaunchUrl();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ExternalProtocolObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ExternalProtocolObserver);
diff --git a/chrome/browser/federated_learning/floc_eligibility_observer.cc b/chrome/browser/federated_learning/floc_eligibility_observer.cc
index 6d3bfce..8fec455 100644
--- a/chrome/browser/federated_learning/floc_eligibility_observer.cc
+++ b/chrome/browser/federated_learning/floc_eligibility_observer.cc
@@ -98,6 +98,6 @@
observed_opt_in_signal_ = true;
}
-RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(FlocEligibilityObserver)
+RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(FlocEligibilityObserver);
} // namespace federated_learning
diff --git a/chrome/browser/file_system_access/file_system_access_permission_request_manager.cc b/chrome/browser/file_system_access/file_system_access_permission_request_manager.cc
index 1629c3c..47aaabe 100644
--- a/chrome/browser/file_system_access/file_system_access_permission_request_manager.cc
+++ b/chrome/browser/file_system_access/file_system_access_permission_request_manager.cc
@@ -151,4 +151,4 @@
ScheduleShowRequest();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(FileSystemAccessPermissionRequestManager)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(FileSystemAccessPermissionRequestManager);
diff --git a/chrome/browser/file_system_access/file_system_access_tab_helper.cc b/chrome/browser/file_system_access/file_system_access_tab_helper.cc
index cdaaab1..9f6533e8 100644
--- a/chrome/browser/file_system_access/file_system_access_tab_helper.cc
+++ b/chrome/browser/file_system_access/file_system_access_tab_helper.cc
@@ -47,4 +47,4 @@
content::WebContents* web_contents)
: content::WebContentsObserver(web_contents) {}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(FileSystemAccessTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(FileSystemAccessTabHelper);
diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc
index a995d61..0015bff 100644
--- a/chrome/browser/history/history_tab_helper.cc
+++ b/chrome/browser/history/history_tab_helper.cc
@@ -399,4 +399,4 @@
#endif
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(HistoryTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(HistoryTabHelper);
diff --git a/chrome/browser/history_clusters/history_clusters_metrics_logger.cc b/chrome/browser/history_clusters/history_clusters_metrics_logger.cc
index 76590c3..e531aa3 100644
--- a/chrome/browser/history_clusters/history_clusters_metrics_logger.cc
+++ b/chrome/browser/history_clusters/history_clusters_metrics_logger.cc
@@ -59,6 +59,6 @@
}
}
-PAGE_USER_DATA_KEY_IMPL(HistoryClustersMetricsLogger)
+PAGE_USER_DATA_KEY_IMPL(HistoryClustersMetricsLogger);
} // namespace history_clusters
diff --git a/chrome/browser/history_clusters/history_clusters_tab_helper.cc b/chrome/browser/history_clusters/history_clusters_tab_helper.cc
index ad10521..1d1d5bc 100644
--- a/chrome/browser/history_clusters/history_clusters_tab_helper.cc
+++ b/chrome/browser/history_clusters/history_clusters_tab_helper.cc
@@ -464,4 +464,4 @@
profile, ServiceAccessType::IMPLICIT_ACCESS);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(HistoryClustersTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(HistoryClustersTabHelper);
diff --git a/chrome/browser/lacros/web_contents_can_go_back_observer.cc b/chrome/browser/lacros/web_contents_can_go_back_observer.cc
index 58a40ae..60854a4 100644
--- a/chrome/browser/lacros/web_contents_can_go_back_observer.cc
+++ b/chrome/browser/lacros/web_contents_can_go_back_observer.cc
@@ -64,4 +64,4 @@
wayland_extension->SetCanGoBack(can_go_back);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsCanGoBackObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsCanGoBackObserver);
diff --git a/chrome/browser/lite_video/lite_video_observer.cc b/chrome/browser/lite_video/lite_video_observer.cc
index f7922ef..684c49e93 100644
--- a/chrome/browser/lite_video/lite_video_observer.cc
+++ b/chrome/browser/lite_video/lite_video_observer.cc
@@ -342,4 +342,4 @@
current_throttled_video_bytes_ += response_bytes;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(LiteVideoObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(LiteVideoObserver);
diff --git a/chrome/browser/login_detection/login_detection_tab_helper.cc b/chrome/browser/login_detection/login_detection_tab_helper.cc
index 34224b18..9687239 100644
--- a/chrome/browser/login_detection/login_detection_tab_helper.cc
+++ b/chrome/browser/login_detection/login_detection_tab_helper.cc
@@ -145,6 +145,6 @@
web_contents()->GetBrowserContext(), signedin_site);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(LoginDetectionTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(LoginDetectionTabHelper);
} // namespace login_detection
diff --git a/chrome/browser/mac/auth_session_request.mm b/chrome/browser/mac/auth_session_request.mm
index 0f538413a..47655e3 100644
--- a/chrome/browser/mac/auth_session_request.mm
+++ b/chrome/browser/mac/auth_session_request.mm
@@ -306,7 +306,7 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AuthSessionRequest)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AuthSessionRequest);
std::unique_ptr<content::NavigationThrottle> MaybeCreateAuthSessionThrottleFor(
content::NavigationHandle* handle) API_AVAILABLE(macos(10.15)) {
diff --git a/chrome/browser/media/history/media_history_contents_observer.cc b/chrome/browser/media/history/media_history_contents_observer.cc
index 2f3c59d..1955c53 100644
--- a/chrome/browser/media/history/media_history_contents_observer.cc
+++ b/chrome/browser/media/history/media_history_contents_observer.cc
@@ -120,4 +120,4 @@
cached_position_, cached_artwork_);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(MediaHistoryContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(MediaHistoryContentsObserver);
diff --git a/chrome/browser/metrics/desktop_session_duration/desktop_session_duration_observer.cc b/chrome/browser/metrics/desktop_session_duration/desktop_session_duration_observer.cc
index b8371f34..17388167 100644
--- a/chrome/browser/metrics/desktop_session_duration/desktop_session_duration_observer.cc
+++ b/chrome/browser/metrics/desktop_session_duration/desktop_session_duration_observer.cc
@@ -61,6 +61,6 @@
RegisterInputEventObserver(new_host);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(DesktopSessionDurationObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(DesktopSessionDurationObserver);
} // namespace metrics
diff --git a/chrome/browser/metrics/metrics_services_web_contents_observer.cc b/chrome/browser/metrics/metrics_services_web_contents_observer.cc
index e76b293..44d7d7e 100644
--- a/chrome/browser/metrics/metrics_services_web_contents_observer.cc
+++ b/chrome/browser/metrics/metrics_services_web_contents_observer.cc
@@ -28,6 +28,6 @@
manager->LoadingStateChanged(/*is_loading=*/false);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(MetricsServicesWebContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(MetricsServicesWebContentsObserver);
} // namespace metrics
diff --git a/chrome/browser/metrics/oom/out_of_memory_reporter.cc b/chrome/browser/metrics/oom/out_of_memory_reporter.cc
index 22dd7b7..19a0311 100644
--- a/chrome/browser/metrics/oom/out_of_memory_reporter.cc
+++ b/chrome/browser/metrics/oom/out_of_memory_reporter.cc
@@ -130,4 +130,4 @@
}
#endif // defined(OS_ANDROID)
-WEB_CONTENTS_USER_DATA_KEY_IMPL(OutOfMemoryReporter)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(OutOfMemoryReporter);
diff --git a/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.cc b/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.cc
index 7c9989d..8f24cfe 100644
--- a/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.cc
+++ b/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.cc
@@ -257,4 +257,4 @@
bool NavigationPredictorPreconnectClient::
enable_preconnects_for_local_ips_for_testing_ = false;
-WEB_CONTENTS_USER_DATA_KEY_IMPL(NavigationPredictorPreconnectClient)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(NavigationPredictorPreconnectClient);
diff --git a/chrome/browser/net/net_error_tab_helper.cc b/chrome/browser/net/net_error_tab_helper.cc
index ecff52f0..126fc29 100644
--- a/chrome/browser/net/net_error_tab_helper.cc
+++ b/chrome/browser/net/net_error_tab_helper.cc
@@ -310,6 +310,6 @@
easter_egg_high_score_.SetValue(0);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(NetErrorTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(NetErrorTabHelper);
} // namespace chrome_browser_net
diff --git a/chrome/browser/offline_pages/android/auto_fetch_page_load_watcher.cc b/chrome/browser/offline_pages/android/auto_fetch_page_load_watcher.cc
index b4a4a784..82eaf27 100644
--- a/chrome/browser/offline_pages/android/auto_fetch_page_load_watcher.cc
+++ b/chrome/browser/offline_pages/android/auto_fetch_page_load_watcher.cc
@@ -107,7 +107,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AutoFetchPageLoadWatcher::NavigationObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AutoFetchPageLoadWatcher::NavigationObserver);
// static
void AutoFetchPageLoadWatcher::CreateForWebContents(
diff --git a/chrome/browser/offline_pages/offline_page_tab_helper.cc b/chrome/browser/offline_pages/offline_page_tab_helper.cc
index ea3d26b..0bf7632 100644
--- a/chrome/browser/offline_pages/offline_page_tab_helper.cc
+++ b/chrome/browser/offline_pages/offline_page_tab_helper.cc
@@ -492,6 +492,6 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(OfflinePageTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(OfflinePageTabHelper);
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/offliner_user_data.cc b/chrome/browser/offline_pages/offliner_user_data.cc
index fda4fc8..1b61fd3 100644
--- a/chrome/browser/offline_pages/offliner_user_data.cc
+++ b/chrome/browser/offline_pages/offliner_user_data.cc
@@ -36,6 +36,6 @@
return nullptr;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(OfflinerUserData)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(OfflinerUserData);
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/recent_tab_helper.cc b/chrome/browser/offline_pages/recent_tab_helper.cc
index bc1aa2c..fcb31eb7 100644
--- a/chrome/browser/offline_pages/recent_tab_helper.cc
+++ b/chrome/browser/offline_pages/recent_tab_helper.cc
@@ -570,6 +570,6 @@
last_n_ongoing_snapshot_info_.reset();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(RecentTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(RecentTabHelper);
} // namespace offline_pages
diff --git a/chrome/browser/optimization_guide/optimization_guide_web_contents_observer.cc b/chrome/browser/optimization_guide/optimization_guide_web_contents_observer.cc
index cf60907..cca5a16 100644
--- a/chrome/browser/optimization_guide/optimization_guide_web_contents_observer.cc
+++ b/chrome/browser/optimization_guide/optimization_guide_web_contents_observer.cc
@@ -222,7 +222,7 @@
OptimizationGuideWebContentsObserver::NavigationHandleData::
~NavigationHandleData() = default;
-PAGE_USER_DATA_KEY_IMPL(OptimizationGuideWebContentsObserver::PageData)
+PAGE_USER_DATA_KEY_IMPL(OptimizationGuideWebContentsObserver::PageData);
NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(
- OptimizationGuideWebContentsObserver::NavigationHandleData)
-WEB_CONTENTS_USER_DATA_KEY_IMPL(OptimizationGuideWebContentsObserver)
+ OptimizationGuideWebContentsObserver::NavigationHandleData);
+WEB_CONTENTS_USER_DATA_KEY_IMPL(OptimizationGuideWebContentsObserver);
diff --git a/chrome/browser/page_load_metrics/observers/page_anchors_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/page_anchors_metrics_observer.cc
index fcdd3ae..3d1fa9f 100644
--- a/chrome/browser/page_load_metrics/observers/page_anchors_metrics_observer.cc
+++ b/chrome/browser/page_load_metrics/observers/page_anchors_metrics_observer.cc
@@ -34,7 +34,7 @@
link_locations_.clear();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PageAnchorsMetricsObserver::AnchorsData)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PageAnchorsMetricsObserver::AnchorsData);
void PageAnchorsMetricsObserver::RecordUkm() {
PageAnchorsMetricsObserver::AnchorsData* data =
diff --git a/chrome/browser/password_manager/android/password_accessory_controller_impl.cc b/chrome/browser/password_manager/android/password_accessory_controller_impl.cc
index 47f8c74..f70dc42 100644
--- a/chrome/browser/password_manager/android/password_accessory_controller_impl.cc
+++ b/chrome/browser/password_manager/android/password_accessory_controller_impl.cc
@@ -568,4 +568,4 @@
return helper && helper->GetSecurityLevel() == security_state::SECURE;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PasswordAccessoryControllerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PasswordAccessoryControllerImpl);
diff --git a/chrome/browser/password_manager/android/password_generation_controller_impl.cc b/chrome/browser/password_manager/android/password_generation_controller_impl.cc
index 3e63dc5..7209453 100644
--- a/chrome/browser/password_manager/android/password_generation_controller_impl.cc
+++ b/chrome/browser/password_manager/android/password_generation_controller_impl.cc
@@ -249,4 +249,4 @@
manual_generation_requested_ = false;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PasswordGenerationControllerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PasswordGenerationControllerImpl);
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
index 922bc90b..b6bf9b7 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -1543,4 +1543,4 @@
password_manager_.ResetPendingCredentials();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ChromePasswordManagerClient)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ChromePasswordManagerClient);
diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc
index 7c2268f..2955e74 100644
--- a/chrome/browser/password_manager/password_manager_browsertest.cc
+++ b/chrome/browser/password_manager/password_manager_browsertest.cc
@@ -235,7 +235,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ObservingAutofillClient)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ObservingAutofillClient);
void TestPromptNotShown(const char* failure_message,
content::WebContents* web_contents) {
diff --git a/chrome/browser/performance_hints/performance_hints_observer.cc b/chrome/browser/performance_hints/performance_hints_observer.cc
index fd51e84..295a218f 100644
--- a/chrome/browser/performance_hints/performance_hints_observer.cc
+++ b/chrome/browser/performance_hints/performance_hints_observer.cc
@@ -458,6 +458,6 @@
page_url_ = navigation_handle->GetURL();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PerformanceHintsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PerformanceHintsObserver);
} // namespace performance_hints
diff --git a/chrome/browser/performance_manager/observers/page_load_metrics_observer.cc b/chrome/browser/performance_manager/observers/page_load_metrics_observer.cc
index 2801eca..fb5c5575 100644
--- a/chrome/browser/performance_manager/observers/page_load_metrics_observer.cc
+++ b/chrome/browser/performance_manager/observers/page_load_metrics_observer.cc
@@ -304,7 +304,7 @@
navigation_type_ = navigation_type;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PageLoadMetricsWebContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PageLoadMetricsWebContentsObserver);
} // namespace
diff --git a/chrome/browser/permissions/last_tab_standing_tracker_tab_helper.cc b/chrome/browser/permissions/last_tab_standing_tracker_tab_helper.cc
index bd517a1..88b3938 100644
--- a/chrome/browser/permissions/last_tab_standing_tracker_tab_helper.cc
+++ b/chrome/browser/permissions/last_tab_standing_tracker_tab_helper.cc
@@ -48,4 +48,4 @@
content::WebContents* web_contents)
: content::WebContentsObserver(web_contents) {}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(LastTabStandingTrackerTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(LastTabStandingTrackerTabHelper);
diff --git a/chrome/browser/plugins/pdf_iframe_navigation_throttle.cc b/chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
index d0a5a12..6b260a40 100644
--- a/chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
+++ b/chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
@@ -52,7 +52,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PdfWebContentsLifetimeHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PdfWebContentsLifetimeHelper);
#if BUILDFLAG(ENABLE_PLUGINS)
// Returns true if the PDF plugin for |navigation_handle| is enabled. Optionally
diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc
index 7cc3e9ccc..c86829b 100644
--- a/chrome/browser/plugins/plugin_observer.cc
+++ b/chrome/browser/plugins/plugin_observer.cc
@@ -259,4 +259,4 @@
#endif // BUILDFLAG(ENABLE_PLUGINS)
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PluginObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PluginObserver);
diff --git a/chrome/browser/predictors/loading_predictor_tab_helper.cc b/chrome/browser/predictors/loading_predictor_tab_helper.cc
index e2e69d59..0dc69c9c 100644
--- a/chrome/browser/predictors/loading_predictor_tab_helper.cc
+++ b/chrome/browser/predictors/loading_predictor_tab_helper.cc
@@ -541,9 +541,9 @@
}
NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(
- LoadingPredictorTabHelper::NavigationPageDataHolder)
+ LoadingPredictorTabHelper::NavigationPageDataHolder);
RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(
- LoadingPredictorTabHelper::DocumentPageDataHolder)
-WEB_CONTENTS_USER_DATA_KEY_IMPL(LoadingPredictorTabHelper)
+ LoadingPredictorTabHelper::DocumentPageDataHolder);
+WEB_CONTENTS_USER_DATA_KEY_IMPL(LoadingPredictorTabHelper);
} // namespace predictors
diff --git a/chrome/browser/prefetch/no_state_prefetch/no_state_prefetch_tab_helper.cc b/chrome/browser/prefetch/no_state_prefetch/no_state_prefetch_tab_helper.cc
index 50f27f2..10b105f 100644
--- a/chrome/browser/prefetch/no_state_prefetch/no_state_prefetch_tab_helper.cc
+++ b/chrome/browser/prefetch/no_state_prefetch/no_state_prefetch_tab_helper.cc
@@ -39,6 +39,6 @@
no_state_prefetch_manager->RecordNavigation(navigation_handle->GetURL());
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(NoStatePrefetchTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(NoStatePrefetchTabHelper);
} // namespace prerender
diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_tab_helper.cc b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_tab_helper.cc
index e7d7832..9407bc0 100644
--- a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_tab_helper.cc
+++ b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_tab_helper.cc
@@ -1668,4 +1668,4 @@
std::move(isolated_factory_remote)));
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PrefetchProxyTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PrefetchProxyTabHelper);
diff --git a/chrome/browser/printing/pdf_nup_converter_client.cc b/chrome/browser/printing/pdf_nup_converter_client.cc
index 06d90ac4..0d0ed6a2 100644
--- a/chrome/browser/printing/pdf_nup_converter_client.cc
+++ b/chrome/browser/printing/pdf_nup_converter_client.cc
@@ -83,6 +83,6 @@
return pdf_nup_converter;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PdfNupConverterClient)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PdfNupConverterClient);
} // namespace printing
diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc
index 1cb18d6..b34e3b2 100644
--- a/chrome/browser/printing/print_view_manager.cc
+++ b/chrome/browser/printing/print_view_manager.cc
@@ -483,6 +483,6 @@
// Note: This is only used for testing.
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PrintViewManager)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PrintViewManager);
} // namespace printing
diff --git a/chrome/browser/printing/print_view_manager_basic.cc b/chrome/browser/printing/print_view_manager_basic.cc
index 907fe1df..f586232 100644
--- a/chrome/browser/printing/print_view_manager_basic.cc
+++ b/chrome/browser/printing/print_view_manager_basic.cc
@@ -49,6 +49,6 @@
}
#endif
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PrintViewManagerBasic)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PrintViewManagerBasic);
} // namespace printing
diff --git a/chrome/browser/reputation/reputation_web_contents_observer.cc b/chrome/browser/reputation/reputation_web_contents_observer.cc
index 7cb36fe4..5e5df4b2 100644
--- a/chrome/browser/reputation/reputation_web_contents_observer.cc
+++ b/chrome/browser/reputation/reputation_web_contents_observer.cc
@@ -515,4 +515,4 @@
MaybeCallReputationCheckCallback(true);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ReputationWebContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ReputationWebContentsObserver);
diff --git a/chrome/browser/resource_coordinator/tab_activity_watcher.cc b/chrome/browser/resource_coordinator/tab_activity_watcher.cc
index 10e17b7..be53918 100644
--- a/chrome/browser/resource_coordinator/tab_activity_watcher.cc
+++ b/chrome/browser/resource_coordinator/tab_activity_watcher.cc
@@ -487,7 +487,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(TabActivityWatcher::WebContentsData)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(TabActivityWatcher::WebContentsData);
TabActivityWatcher::TabActivityWatcher()
: tab_metrics_logger_(std::make_unique<TabMetricsLogger>()),
diff --git a/chrome/browser/resource_coordinator/tab_helper.cc b/chrome/browser/resource_coordinator/tab_helper.cc
index 3286153..0b942783 100644
--- a/chrome/browser/resource_coordinator/tab_helper.cc
+++ b/chrome/browser/resource_coordinator/tab_helper.cc
@@ -73,6 +73,6 @@
TabLoadTracker::Get()->StopTracking(web_contents());
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ResourceCoordinatorTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ResourceCoordinatorTabHelper);
} // namespace resource_coordinator
diff --git a/chrome/browser/resource_coordinator/tab_lifecycle_unit_source.cc b/chrome/browser/resource_coordinator/tab_lifecycle_unit_source.cc
index 94ef9f7..9be180da3 100644
--- a/chrome/browser/resource_coordinator/tab_lifecycle_unit_source.cc
+++ b/chrome/browser/resource_coordinator/tab_lifecycle_unit_source.cc
@@ -59,7 +59,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(TabLifecycleUnitSource::TabLifecycleUnitHolder)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(TabLifecycleUnitSource::TabLifecycleUnitHolder);
// A very simple graph observer that forwards events over to the
// TabLifecycleUnitSource on the UI thread. This is created on the UI thread
diff --git a/chrome/browser/resource_coordinator/tab_manager_web_contents_data.cc b/chrome/browser/resource_coordinator/tab_manager_web_contents_data.cc
index c782c25..cc2c8e9 100644
--- a/chrome/browser/resource_coordinator/tab_manager_web_contents_data.cc
+++ b/chrome/browser/resource_coordinator/tab_manager_web_contents_data.cc
@@ -78,6 +78,6 @@
return !(*this == right);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(TabManager::WebContentsData)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(TabManager::WebContentsData);
} // namespace resource_coordinator
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.cc b/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.cc
index 2691ae4e..cadc96bac8 100644
--- a/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.cc
+++ b/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.cc
@@ -191,4 +191,4 @@
return data;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ClickToCallUiController)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ClickToCallUiController);
diff --git a/chrome/browser/sharing/shared_clipboard/shared_clipboard_ui_controller.cc b/chrome/browser/sharing/shared_clipboard/shared_clipboard_ui_controller.cc
index b80a75f..8efd0bf 100644
--- a/chrome/browser/sharing/shared_clipboard/shared_clipboard_ui_controller.cc
+++ b/chrome/browser/sharing/shared_clipboard/shared_clipboard_ui_controller.cc
@@ -113,4 +113,4 @@
return SharingFeatureName::kSharedClipboard;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SharedClipboardUiController)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SharedClipboardUiController);
diff --git a/chrome/browser/sharing/sms/sms_remote_fetcher_ui_controller.cc b/chrome/browser/sharing/sms/sms_remote_fetcher_ui_controller.cc
index 32491f0e..80f1ce7b 100644
--- a/chrome/browser/sharing/sms/sms_remote_fetcher_ui_controller.cc
+++ b/chrome/browser/sharing/sms/sms_remote_fetcher_ui_controller.cc
@@ -144,4 +144,4 @@
weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SmsRemoteFetcherUiController)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SmsRemoteFetcherUiController);
diff --git a/chrome/browser/signin/dice_tab_helper.cc b/chrome/browser/signin/dice_tab_helper.cc
index 8612f76..827c751 100644
--- a/chrome/browser/signin/dice_tab_helper.cc
+++ b/chrome/browser/signin/dice_tab_helper.cc
@@ -113,4 +113,4 @@
GaiaUrls::GetInstance()->gaia_url();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(DiceTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(DiceTabHelper);
diff --git a/chrome/browser/signin/logout_tab_helper.cc b/chrome/browser/signin/logout_tab_helper.cc
index 8172346..564cbbb 100644
--- a/chrome/browser/signin/logout_tab_helper.cc
+++ b/chrome/browser/signin/logout_tab_helper.cc
@@ -11,7 +11,7 @@
#include "components/signin/public/identity_manager/identity_manager.h"
#include "content/public/browser/navigation_handle.h"
-WEB_CONTENTS_USER_DATA_KEY_IMPL(LogoutTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(LogoutTabHelper);
LogoutTabHelper::LogoutTabHelper(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents) {}
diff --git a/chrome/browser/signin/reauth_tab_helper.cc b/chrome/browser/signin/reauth_tab_helper.cc
index 10f39be..6404e8f 100644
--- a/chrome/browser/signin/reauth_tab_helper.cc
+++ b/chrome/browser/signin/reauth_tab_helper.cc
@@ -111,6 +111,6 @@
restrict_to_reauth_origin_(restrict_to_reauth_origin),
callback_(std::move(callback)) {}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ReauthTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ReauthTabHelper);
} // namespace signin
diff --git a/chrome/browser/ssl/connection_help_tab_helper.cc b/chrome/browser/ssl/connection_help_tab_helper.cc
index c98bdb1..8d3e2c3 100644
--- a/chrome/browser/ssl/connection_help_tab_helper.cc
+++ b/chrome/browser/ssl/connection_help_tab_helper.cc
@@ -57,4 +57,4 @@
return GURL(kHelpCenterConnectionHelpUrl);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ConnectionHelpTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ConnectionHelpTabHelper);
diff --git a/chrome/browser/ssl/https_only_mode_tab_helper.cc b/chrome/browser/ssl/https_only_mode_tab_helper.cc
index feefd68..f8ec94c1 100644
--- a/chrome/browser/ssl/https_only_mode_tab_helper.cc
+++ b/chrome/browser/ssl/https_only_mode_tab_helper.cc
@@ -28,4 +28,4 @@
factory_ = std::make_unique<ChromeSecurityBlockingPageFactory>();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(HttpsOnlyModeTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(HttpsOnlyModeTabHelper);
diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc
index f194e59f..b727585 100644
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -303,4 +303,4 @@
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SecurityStateTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SecurityStateTabHelper);
diff --git a/chrome/browser/ssl/typed_navigation_upgrade_throttle.cc b/chrome/browser/ssl/typed_navigation_upgrade_throttle.cc
index d365430..5f62015 100644
--- a/chrome/browser/ssl/typed_navigation_upgrade_throttle.cc
+++ b/chrome/browser/ssl/typed_navigation_upgrade_throttle.cc
@@ -78,7 +78,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(TypedNavigationUpgradeLifetimeHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(TypedNavigationUpgradeLifetimeHelper);
GURL GetHttpUrl(const GURL& url, int http_fallback_port_for_testing) {
DCHECK_EQ(url::kHttpsScheme, url.scheme());
diff --git a/chrome/browser/subresource_redirect/subresource_redirect_observer.cc b/chrome/browser/subresource_redirect/subresource_redirect_observer.cc
index ee5c59a..3209f20 100644
--- a/chrome/browser/subresource_redirect/subresource_redirect_observer.cc
+++ b/chrome/browser/subresource_redirect/subresource_redirect_observer.cc
@@ -98,7 +98,7 @@
bool is_allowed_by_login_state_ = false;
};
-NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(NavigationData)
+NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(NavigationData);
} // namespace
@@ -109,7 +109,7 @@
ImageCompressionAppliedDocument::~ImageCompressionAppliedDocument() = default;
-RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(ImageCompressionAppliedDocument)
+RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(ImageCompressionAppliedDocument);
// static
ImageCompressionAppliedDocument::State
@@ -391,6 +391,6 @@
return true;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SubresourceRedirectObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SubresourceRedirectObserver);
} // namespace subresource_redirect
diff --git a/chrome/browser/supervised_user/supervised_user_interstitial.cc b/chrome/browser/supervised_user/supervised_user_interstitial.cc
index 5db43a8..9b8bc2a 100644
--- a/chrome/browser/supervised_user/supervised_user_interstitial.cc
+++ b/chrome/browser/supervised_user/supervised_user_interstitial.cc
@@ -113,7 +113,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(TabCloser)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(TabCloser);
// Removes all the infobars which are attached to |web_contents| and for
// which ShouldExpire() returns true.
diff --git a/chrome/browser/supervised_user/supervised_user_navigation_observer.cc b/chrome/browser/supervised_user/supervised_user_navigation_observer.cc
index 500347b3..5e73c909 100644
--- a/chrome/browser/supervised_user/supervised_user_navigation_observer.cc
+++ b/chrome/browser/supervised_user/supervised_user_navigation_observer.cc
@@ -371,4 +371,4 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SupervisedUserNavigationObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SupervisedUserNavigationObserver);
diff --git a/chrome/browser/sync/sessions/sync_sessions_router_tab_helper.cc b/chrome/browser/sync/sessions/sync_sessions_router_tab_helper.cc
index e0742a3c..54ca764c 100644
--- a/chrome/browser/sync/sessions/sync_sessions_router_tab_helper.cc
+++ b/chrome/browser/sync/sessions/sync_sessions_router_tab_helper.cc
@@ -102,6 +102,6 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SyncSessionsRouterTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SyncSessionsRouterTabHelper);
} // namespace sync_sessions
diff --git a/chrome/browser/sync/sync_encryption_keys_tab_helper.cc b/chrome/browser/sync/sync_encryption_keys_tab_helper.cc
index d5122d4c..1fde639 100644
--- a/chrome/browser/sync/sync_encryption_keys_tab_helper.cc
+++ b/chrome/browser/sync/sync_encryption_keys_tab_helper.cc
@@ -178,4 +178,4 @@
return encryption_key_api_ != nullptr;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SyncEncryptionKeysTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SyncEncryptionKeysTabHelper);
diff --git a/chrome/browser/tab_contents/form_interaction_tab_helper.cc b/chrome/browser/tab_contents/form_interaction_tab_helper.cc
index 9161993..6e400d9 100644
--- a/chrome/browser/tab_contents/form_interaction_tab_helper.cc
+++ b/chrome/browser/tab_contents/form_interaction_tab_helper.cc
@@ -112,4 +112,4 @@
return had_form_interaction_;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(FormInteractionTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(FormInteractionTabHelper);
diff --git a/chrome/browser/tab_contents/navigation_metrics_recorder.cc b/chrome/browser/tab_contents/navigation_metrics_recorder.cc
index a12a0e0..0da643a 100644
--- a/chrome/browser/tab_contents/navigation_metrics_recorder.cc
+++ b/chrome/browser/tab_contents/navigation_metrics_recorder.cc
@@ -103,4 +103,4 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(NavigationMetricsRecorder)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(NavigationMetricsRecorder);
diff --git a/chrome/browser/translate/chrome_translate_client.cc b/chrome/browser/translate/chrome_translate_client.cc
index 78ca770..9dd9050 100644
--- a/chrome/browser/translate/chrome_translate_client.cc
+++ b/chrome/browser/translate/chrome_translate_client.cc
@@ -420,4 +420,4 @@
}
#endif
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ChromeTranslateClient)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ChromeTranslateClient);
diff --git a/chrome/browser/ui/android/context_menu_helper.cc b/chrome/browser/ui/android/context_menu_helper.cc
index db0425f9..19c667d 100644
--- a/chrome/browser/ui/android/context_menu_helper.cc
+++ b/chrome/browser/ui/android/context_menu_helper.cc
@@ -82,4 +82,4 @@
jpopulator_factory);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ContextMenuHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ContextMenuHelper);
diff --git a/chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder_tab_tracker.cc b/chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder_tab_tracker.cc
index a9048ad..7b4213b 100644
--- a/chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder_tab_tracker.cc
+++ b/chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder_tab_tracker.cc
@@ -80,6 +80,6 @@
{url.spec(), -2}});
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(CrOSActionRecorderTabTracker)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(CrOSActionRecorderTabTracker);
} // namespace app_list
diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/browser/ui/autofill/chrome_autofill_client.cc
index 1706a43bf..9ddcdef 100644
--- a/chrome/browser/ui/autofill/chrome_autofill_client.cc
+++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc
@@ -942,6 +942,6 @@
return base::UTF8ToUTF16(primary_account_info.full_name);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ChromeAutofillClient)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ChromeAutofillClient);
} // namespace autofill
diff --git a/chrome/browser/ui/autofill/edit_address_profile_dialog_controller_impl.cc b/chrome/browser/ui/autofill/edit_address_profile_dialog_controller_impl.cc
index 674820a..e290e40 100644
--- a/chrome/browser/ui/autofill/edit_address_profile_dialog_controller_impl.cc
+++ b/chrome/browser/ui/autofill/edit_address_profile_dialog_controller_impl.cc
@@ -104,6 +104,6 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(EditAddressProfileDialogControllerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(EditAddressProfileDialogControllerImpl);
} // namespace autofill
diff --git a/chrome/browser/ui/autofill/payments/card_unmask_authentication_selection_dialog_controller_impl.cc b/chrome/browser/ui/autofill/payments/card_unmask_authentication_selection_dialog_controller_impl.cc
index 8d80c07..4b8b077 100644
--- a/chrome/browser/ui/autofill/payments/card_unmask_authentication_selection_dialog_controller_impl.cc
+++ b/chrome/browser/ui/autofill/payments/card_unmask_authentication_selection_dialog_controller_impl.cc
@@ -118,6 +118,6 @@
: content::WebContentsObserver(web_contents) {}
WEB_CONTENTS_USER_DATA_KEY_IMPL(
- CardUnmaskAuthenticationSelectionDialogControllerImpl)
+ CardUnmaskAuthenticationSelectionDialogControllerImpl);
} // namespace autofill
diff --git a/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl.cc b/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl.cc
index 2d624bc..a8b0e8f 100644
--- a/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl.cc
+++ b/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl.cc
@@ -144,6 +144,6 @@
LocalCardMigrationStrikeDatabase::kStrikesToAddWhenBubbleClosed);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(LocalCardMigrationBubbleControllerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(LocalCardMigrationBubbleControllerImpl);
} // namespace autofill
diff --git a/chrome/browser/ui/autofill/payments/local_card_migration_dialog_controller_impl.cc b/chrome/browser/ui/autofill/payments/local_card_migration_dialog_controller_impl.cc
index 13540c5..bebf0fa 100644
--- a/chrome/browser/ui/autofill/payments/local_card_migration_dialog_controller_impl.cc
+++ b/chrome/browser/ui/autofill/payments/local_card_migration_dialog_controller_impl.cc
@@ -300,6 +300,6 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(LocalCardMigrationDialogControllerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(LocalCardMigrationDialogControllerImpl);
} // namespace autofill
diff --git a/chrome/browser/ui/autofill/payments/manage_migration_ui_controller.cc b/chrome/browser/ui/autofill/payments/manage_migration_ui_controller.cc
index 7658dd2..a8d7dc3 100644
--- a/chrome/browser/ui/autofill/payments/manage_migration_ui_controller.cc
+++ b/chrome/browser/ui/autofill/payments/manage_migration_ui_controller.cc
@@ -152,6 +152,6 @@
dialog_controller_->ShowFeedbackDialog();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ManageMigrationUiController)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ManageMigrationUiController);
} // namespace autofill
diff --git a/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl.cc b/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl.cc
index f2354d7b..657e13a 100644
--- a/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl.cc
+++ b/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl.cc
@@ -193,6 +193,6 @@
web_contents();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(OfferNotificationBubbleControllerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(OfferNotificationBubbleControllerImpl);
} // namespace autofill
diff --git a/chrome/browser/ui/autofill/payments/offer_notification_helper.cc b/chrome/browser/ui/autofill/payments/offer_notification_helper.cc
index e68842b..fc94890 100644
--- a/chrome/browser/ui/autofill/payments/offer_notification_helper.cc
+++ b/chrome/browser/ui/autofill/payments/offer_notification_helper.cc
@@ -44,6 +44,6 @@
origins_to_display_notification_.clear();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(OfferNotificationHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(OfferNotificationHelper);
} // namespace autofill
diff --git a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
index a8af1fc..933a050 100644
--- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
+++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
@@ -589,6 +589,6 @@
return security_level_;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SaveCardBubbleControllerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SaveCardBubbleControllerImpl);
} // namespace autofill
diff --git a/chrome/browser/ui/autofill/payments/save_upi_bubble_controller_impl.cc b/chrome/browser/ui/autofill/payments/save_upi_bubble_controller_impl.cc
index e211ba41..0b22ff8 100644
--- a/chrome/browser/ui/autofill/payments/save_upi_bubble_controller_impl.cc
+++ b/chrome/browser/ui/autofill/payments/save_upi_bubble_controller_impl.cc
@@ -58,6 +58,6 @@
DCHECK(save_upi_bubble_);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SaveUPIBubbleControllerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SaveUPIBubbleControllerImpl);
} // namespace autofill
diff --git a/chrome/browser/ui/autofill/payments/virtual_card_manual_fallback_bubble_controller_impl.cc b/chrome/browser/ui/autofill/payments/virtual_card_manual_fallback_bubble_controller_impl.cc
index 924dab2..5c40aef1 100644
--- a/chrome/browser/ui/autofill/payments/virtual_card_manual_fallback_bubble_controller_impl.cc
+++ b/chrome/browser/ui/autofill/payments/virtual_card_manual_fallback_bubble_controller_impl.cc
@@ -314,6 +314,6 @@
observer_for_test_ = observer_for_test;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(VirtualCardManualFallbackBubbleControllerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(VirtualCardManualFallbackBubbleControllerImpl);
} // namespace autofill
diff --git a/chrome/browser/ui/autofill/payments/virtual_card_selection_dialog_controller_impl.cc b/chrome/browser/ui/autofill/payments/virtual_card_selection_dialog_controller_impl.cc
index ac3c6e0..44513eb 100644
--- a/chrome/browser/ui/autofill/payments/virtual_card_selection_dialog_controller_impl.cc
+++ b/chrome/browser/ui/autofill/payments/virtual_card_selection_dialog_controller_impl.cc
@@ -101,6 +101,6 @@
callback_.Reset();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(VirtualCardSelectionDialogControllerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(VirtualCardSelectionDialogControllerImpl);
} // namespace autofill
diff --git a/chrome/browser/ui/autofill/payments/webauthn_dialog_controller_impl.cc b/chrome/browser/ui/autofill/payments/webauthn_dialog_controller_impl.cc
index 1c54362..622caca 100644
--- a/chrome/browser/ui/autofill/payments/webauthn_dialog_controller_impl.cc
+++ b/chrome/browser/ui/autofill/payments/webauthn_dialog_controller_impl.cc
@@ -100,6 +100,6 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebauthnDialogControllerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebauthnDialogControllerImpl);
} // namespace autofill
diff --git a/chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl.cc b/chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl.cc
index 702ac30..f9a4409 100644
--- a/chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl.cc
+++ b/chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl.cc
@@ -164,6 +164,6 @@
DCHECK(bubble_view());
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SaveUpdateAddressProfileBubbleControllerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SaveUpdateAddressProfileBubbleControllerImpl);
} // namespace autofill
diff --git a/chrome/browser/ui/blocked_content/framebust_block_tab_helper.cc b/chrome/browser/ui/blocked_content/framebust_block_tab_helper.cc
index 2afa41c..9788d26 100644
--- a/chrome/browser/ui/blocked_content/framebust_block_tab_helper.cc
+++ b/chrome/browser/ui/blocked_content/framebust_block_tab_helper.cc
@@ -55,4 +55,4 @@
content_settings::UpdateLocationBarUiForWebContents(web_contents());
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(FramebustBlockTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(FramebustBlockTabHelper);
diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
index 963d8519..0298dab 100644
--- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
@@ -162,4 +162,4 @@
UpdateStarredStateForCurrentURL();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(BookmarkTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(BookmarkTabHelper);
diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc
index 06a67ce..8585cc2f 100644
--- a/chrome/browser/ui/browser_instant_controller.cc
+++ b/chrome/browser/ui/browser_instant_controller.cc
@@ -68,7 +68,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(TabReloader)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(TabReloader);
} // namespace
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_states.cc b/chrome/browser/ui/content_settings/content_setting_image_model_states.cc
index a1a8866f..da7fceb 100644
--- a/chrome/browser/ui/content_settings/content_setting_image_model_states.cc
+++ b/chrome/browser/ui/content_settings/content_setting_image_model_states.cc
@@ -79,4 +79,4 @@
CHECK_LT(type, ImageType::NUM_IMAGE_TYPES);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ContentSettingImageModelStates)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ContentSettingImageModelStates);
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.cc b/chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.cc
index 3b44421..2906872 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.cc
+++ b/chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.cc
@@ -17,4 +17,4 @@
web_contents->RemoveUserData(UserDataKey());
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(FullscreenWithinTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(FullscreenWithinTabHelper);
diff --git a/chrome/browser/ui/focus_tab_after_navigation_helper.cc b/chrome/browser/ui/focus_tab_after_navigation_helper.cc
index 56ea5e8..03d2026 100644
--- a/chrome/browser/ui/focus_tab_after_navigation_helper.cc
+++ b/chrome/browser/ui/focus_tab_after_navigation_helper.cc
@@ -93,4 +93,4 @@
return search::IsNTPOrRelatedURL(url, profile);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(FocusTabAfterNavigationHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(FocusTabAfterNavigationHelper);
diff --git a/chrome/browser/ui/hats/hats_helper.cc b/chrome/browser/ui/hats/hats_helper.cc
index e4b616f0..ce3fa3f5 100644
--- a/chrome/browser/ui/hats/hats_helper.cc
+++ b/chrome/browser/ui/hats/hats_helper.cc
@@ -77,4 +77,4 @@
return Profile::FromBrowserContext(web_contents()->GetBrowserContext());
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(HatsHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(HatsHelper);
diff --git a/chrome/browser/ui/hung_plugin_tab_helper.cc b/chrome/browser/ui/hung_plugin_tab_helper.cc
index c97cb50..03ded2e 100644
--- a/chrome/browser/ui/hung_plugin_tab_helper.cc
+++ b/chrome/browser/ui/hung_plugin_tab_helper.cc
@@ -179,4 +179,4 @@
child_id, state->name);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(HungPluginTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(HungPluginTabHelper);
diff --git a/chrome/browser/ui/intent_picker_tab_helper.cc b/chrome/browser/ui/intent_picker_tab_helper.cc
index d952df0d..64bfb6a 100644
--- a/chrome/browser/ui/intent_picker_tab_helper.cc
+++ b/chrome/browser/ui/intent_picker_tab_helper.cc
@@ -161,4 +161,4 @@
registrar_observation_.Reset();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(IntentPickerTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(IntentPickerTabHelper);
diff --git a/chrome/browser/ui/login/login_tab_helper.cc b/chrome/browser/ui/login/login_tab_helper.cc
index 791eb9a..3b2f58d 100644
--- a/chrome/browser/ui/login/login_tab_helper.cc
+++ b/chrome/browser/ui/login/login_tab_helper.cc
@@ -267,4 +267,4 @@
false /* check_for_repost */);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(LoginTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(LoginTabHelper);
diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
index f9e110e..bb052c1 100644
--- a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
@@ -102,7 +102,7 @@
NAVIGATION_HANDLE_USER_DATA_KEY_DECL();
};
-NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(NavigationUserData)
+NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(NavigationUserData);
} // namespace
diff --git a/chrome/browser/ui/omnibox/omnibox_tab_helper.cc b/chrome/browser/ui/omnibox/omnibox_tab_helper.cc
index 2bce04c3..e3193a0 100644
--- a/chrome/browser/ui/omnibox/omnibox_tab_helper.cc
+++ b/chrome/browser/ui/omnibox/omnibox_tab_helper.cc
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/location_bar/location_bar.h"
#include "components/omnibox/browser/omnibox_view.h"
-WEB_CONTENTS_USER_DATA_KEY_IMPL(OmniboxTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(OmniboxTabHelper);
OmniboxTabHelper::~OmniboxTabHelper() = default;
OmniboxTabHelper::OmniboxTabHelper(content::WebContents* contents) {}
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
index 9707a056..5204502 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
@@ -963,4 +963,4 @@
move_to_account_store_helpers_.erase(done_helper_it);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ManagePasswordsUIController)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ManagePasswordsUIController);
diff --git a/chrome/browser/ui/passwords/well_known_change_password_navigation_throttle.cc b/chrome/browser/ui/passwords/well_known_change_password_navigation_throttle.cc
index c5210fe..2d093e97 100644
--- a/chrome/browser/ui/passwords/well_known_change_password_navigation_throttle.cc
+++ b/chrome/browser/ui/passwords/well_known_change_password_navigation_throttle.cc
@@ -81,7 +81,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsLifetimeHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsLifetimeHelper);
} // namespace
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc
index 775bdd4..7f14437 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
@@ -495,4 +495,4 @@
web_contents_->OnWebPreferencesChanged();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PrefsTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PrefsTabHelper);
diff --git a/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc b/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc
index 006c34d..7db9c0c 100644
--- a/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc
+++ b/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc
@@ -98,6 +98,6 @@
content::WebContents* web_contents)
: web_contents_(web_contents) {}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(QRCodeGeneratorBubbleController)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(QRCodeGeneratorBubbleController);
} // namespace qrcode_generator
diff --git a/chrome/browser/ui/recently_audible_helper.cc b/chrome/browser/ui/recently_audible_helper.cc
index b01d1b2..ae31eeb7 100644
--- a/chrome/browser/ui/recently_audible_helper.cc
+++ b/chrome/browser/ui/recently_audible_helper.cc
@@ -117,4 +117,4 @@
recently_audible_timer_.Stop();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(RecentlyAudibleHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(RecentlyAudibleHelper);
diff --git a/chrome/browser/ui/sad_tab_helper.cc b/chrome/browser/ui/sad_tab_helper.cc
index 1452e0f..7baf463 100644
--- a/chrome/browser/ui/sad_tab_helper.cc
+++ b/chrome/browser/ui/sad_tab_helper.cc
@@ -84,4 +84,4 @@
SadTab::Create(web_contents(), SadTabKindFromTerminationStatus(status)));
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SadTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SadTabHelper);
diff --git a/chrome/browser/ui/search/search_tab_helper.cc b/chrome/browser/ui/search/search_tab_helper.cc
index 1980c00f..48ef471 100644
--- a/chrome/browser/ui/search/search_tab_helper.cc
+++ b/chrome/browser/ui/search/search_tab_helper.cc
@@ -388,4 +388,4 @@
return search::IsOmniboxInputInProgress(web_contents_);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SearchTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SearchTabHelper);
diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
index 91b3973..9d65969 100644
--- a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
+++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
@@ -243,4 +243,4 @@
url_service->Add(std::make_unique<TemplateURL>(data));
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SearchEngineTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SearchEngineTabHelper);
diff --git a/chrome/browser/ui/send_tab_to_self/send_tab_to_self_bubble_controller.cc b/chrome/browser/ui/send_tab_to_self/send_tab_to_self_bubble_controller.cc
index 95e18be..c3e74c0 100644
--- a/chrome/browser/ui/send_tab_to_self/send_tab_to_self_bubble_controller.cc
+++ b/chrome/browser/ui/send_tab_to_self/send_tab_to_self_bubble_controller.cc
@@ -187,6 +187,6 @@
DCHECK(web_contents);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SendTabToSelfBubbleController)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SendTabToSelfBubbleController);
} // namespace send_tab_to_self
diff --git a/chrome/browser/ui/sharing_hub/screenshot/screenshot_captured_bubble_controller.cc b/chrome/browser/ui/sharing_hub/screenshot/screenshot_captured_bubble_controller.cc
index 27b35ad..56c46e9 100644
--- a/chrome/browser/ui/sharing_hub/screenshot/screenshot_captured_bubble_controller.cc
+++ b/chrome/browser/ui/sharing_hub/screenshot/screenshot_captured_bubble_controller.cc
@@ -79,6 +79,6 @@
content::WebContents* web_contents)
: web_contents_(web_contents) {}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ScreenshotCapturedBubbleController)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ScreenshotCapturedBubbleController);
} // namespace sharing_hub
diff --git a/chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.cc b/chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.cc
index e1e2686..9c1be1f 100644
--- a/chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.cc
+++ b/chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.cc
@@ -266,6 +266,6 @@
DCHECK(web_contents);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SharingHubBubbleController)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SharingHubBubbleController);
} // namespace sharing_hub
diff --git a/chrome/browser/ui/side_search/side_search_side_contents_helper.cc b/chrome/browser/ui/side_search/side_search_side_contents_helper.cc
index 22bed6b..85fd649 100644
--- a/chrome/browser/ui/side_search/side_search_side_contents_helper.cc
+++ b/chrome/browser/ui/side_search/side_search_side_contents_helper.cc
@@ -177,4 +177,4 @@
web_contents->SetDelegate(this);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SideSearchSideContentsHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SideSearchSideContentsHelper);
diff --git a/chrome/browser/ui/side_search/side_search_tab_contents_helper.cc b/chrome/browser/ui/side_search/side_search_tab_contents_helper.cc
index f82c3285..6c80340 100644
--- a/chrome/browser/ui/side_search/side_search_tab_contents_helper.cc
+++ b/chrome/browser/ui/side_search/side_search_tab_contents_helper.cc
@@ -202,4 +202,4 @@
delegate_->SidePanelAvailabilityChanged();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SideSearchTabContentsHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SideSearchTabContentsHelper);
diff --git a/chrome/browser/ui/sync/browser_synced_tab_delegate.cc b/chrome/browser/ui/sync/browser_synced_tab_delegate.cc
index 5b529cdc0..d67c109 100644
--- a/chrome/browser/ui/sync/browser_synced_tab_delegate.cc
+++ b/chrome/browser/ui/sync/browser_synced_tab_delegate.cc
@@ -28,4 +28,4 @@
return false;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(BrowserSyncedTabDelegate)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(BrowserSyncedTabDelegate);
diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.cc b/chrome/browser/ui/tab_contents/core_tab_helper.cc
index 6a155640..5da5dfbe 100644
--- a/chrome/browser/ui/tab_contents/core_tab_helper.cc
+++ b/chrome/browser/ui/tab_contents/core_tab_helper.cc
@@ -400,4 +400,4 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(CoreTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(CoreTabHelper);
diff --git a/chrome/browser/ui/tab_ui_helper.cc b/chrome/browser/ui/tab_ui_helper.cc
index 1a848cc..01134de 100644
--- a/chrome/browser/ui/tab_ui_helper.cc
+++ b/chrome/browser/ui/tab_ui_helper.cc
@@ -152,4 +152,4 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(TabUIHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(TabUIHelper);
diff --git a/chrome/browser/ui/tabs/tab_utils.cc b/chrome/browser/ui/tabs/tab_utils.cc
index aa18fa3..7220753d 100644
--- a/chrome/browser/ui/tabs/tab_utils.cc
+++ b/chrome/browser/ui/tabs/tab_utils.cc
@@ -197,4 +197,4 @@
} // namespace chrome
-WEB_CONTENTS_USER_DATA_KEY_IMPL(LastMuteMetadata)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(LastMuteMetadata);
diff --git a/chrome/browser/ui/thumbnails/thumbnail_tab_helper.cc b/chrome/browser/ui/thumbnails/thumbnail_tab_helper.cc
index a7df42c6..7413ffb 100644
--- a/chrome/browser/ui/thumbnails/thumbnail_tab_helper.cc
+++ b/chrome/browser/ui/thumbnails/thumbnail_tab_helper.cc
@@ -353,4 +353,4 @@
return capture_info;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ThumbnailTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ThumbnailTabHelper);
diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc
index f6bfb44..16a9bb1 100644
--- a/chrome/browser/ui/views/collected_cookies_views.cc
+++ b/chrome/browser/ui/views/collected_cookies_views.cc
@@ -163,7 +163,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(CollectedCookiesViews::WebContentsUserData)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(CollectedCookiesViews::WebContentsUserData);
// This DrawingProvider allows TreeModelNodes to be annotated with auxiliary
// text. Annotated nodes will be drawn in a lighter color than normal to
diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc
index ae6743d0..eb0d0b7 100644
--- a/chrome/browser/ui/views/find_bar_host.cc
+++ b/chrome/browser/ui/views/find_bar_host.cc
@@ -71,7 +71,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(FindBarHostHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(FindBarHostHelper);
gfx::Rect GetLocationForFindBarView(gfx::Rect view_location,
const gfx::Rect& dialog_bounds,
diff --git a/chrome/browser/ui/views/media_router/media_router_dialog_controller_views.cc b/chrome/browser/ui/views/media_router/media_router_dialog_controller_views.cc
index 62d476b8..7b02719 100644
--- a/chrome/browser/ui/views/media_router/media_router_dialog_controller_views.cc
+++ b/chrome/browser/ui/views/media_router/media_router_dialog_controller_views.cc
@@ -182,6 +182,6 @@
return media_router_ui_service_->action_controller();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(MediaRouterDialogControllerViews)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(MediaRouterDialogControllerViews);
} // namespace media_router
diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_focus_helper.cc b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_focus_helper.cc
index 914f0d3dea..a0d8f1f 100644
--- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_focus_helper.cc
+++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_focus_helper.cc
@@ -89,4 +89,4 @@
return toplevel_widget ? toplevel_widget->GetFocusManager() : NULL;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ChromeWebContentsViewFocusHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ChromeWebContentsViewFocusHelper);
diff --git a/chrome/browser/ui/web_applications/web_app_metrics_tab_helper.cc b/chrome/browser/ui/web_applications/web_app_metrics_tab_helper.cc
index 1e3e557..380874d 100644
--- a/chrome/browser/ui/web_applications/web_app_metrics_tab_helper.cc
+++ b/chrome/browser/ui/web_applications/web_app_metrics_tab_helper.cc
@@ -58,6 +58,6 @@
metrics->NotifyInstallableWebAppStatusUpdated(contents);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebAppMetricsTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebAppMetricsTabHelper);
} // namespace web_app
diff --git a/chrome/browser/usb/frame_usb_services.cc b/chrome/browser/usb/frame_usb_services.cc
index d5133a5..0a28a89 100644
--- a/chrome/browser/usb/frame_usb_services.cc
+++ b/chrome/browser/usb/frame_usb_services.cc
@@ -80,4 +80,4 @@
->InitializeWebUsbService(std::move(receiver));
}
-RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(FrameUsbServices)
+RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(FrameUsbServices);
diff --git a/chrome/browser/usb/usb_tab_helper.cc b/chrome/browser/usb/usb_tab_helper.cc
index 7b6a8ca..86e02f0 100644
--- a/chrome/browser/usb/usb_tab_helper.cc
+++ b/chrome/browser/usb/usb_tab_helper.cc
@@ -75,4 +75,4 @@
return device_connection_count_ > 0;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(UsbTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(UsbTabHelper);
diff --git a/chrome/browser/video_tutorials/video_tutorial_tab_helper.cc b/chrome/browser/video_tutorials/video_tutorial_tab_helper.cc
index 7a093c3..7cd8b29 100644
--- a/chrome/browser/video_tutorials/video_tutorial_tab_helper.cc
+++ b/chrome/browser/video_tutorials/video_tutorial_tab_helper.cc
@@ -43,6 +43,6 @@
blink::mojom::kAutoplayFlagUserException);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(VideoTutorialTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(VideoTutorialTabHelper);
} // namespace video_tutorials
diff --git a/chrome/browser/visibility_timer_tab_helper.cc b/chrome/browser/visibility_timer_tab_helper.cc
index f4241a9..a8e6c303 100644
--- a/chrome/browser/visibility_timer_tab_helper.cc
+++ b/chrome/browser/visibility_timer_tab_helper.cc
@@ -12,7 +12,7 @@
#include "content/public/browser/visibility.h"
#include "content/public/browser/web_contents.h"
-WEB_CONTENTS_USER_DATA_KEY_IMPL(VisibilityTimerTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(VisibilityTimerTabHelper);
struct VisibilityTimerTabHelper::Task {
base::TimeDelta visible_delay;
diff --git a/chrome/browser/vr/vr_tab_helper.cc b/chrome/browser/vr/vr_tab_helper.cc
index 0fcc15a..dfe8ab6 100644
--- a/chrome/browser/vr/vr_tab_helper.cc
+++ b/chrome/browser/vr/vr_tab_helper.cc
@@ -137,6 +137,6 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(VrTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(VrTabHelper);
} // namespace vr
diff --git a/chrome/browser/web_applications/policy/pre_redirection_url_observer.cc b/chrome/browser/web_applications/policy/pre_redirection_url_observer.cc
index a8083f2..a0f771e 100644
--- a/chrome/browser/web_applications/policy/pre_redirection_url_observer.cc
+++ b/chrome/browser/web_applications/policy/pre_redirection_url_observer.cc
@@ -30,6 +30,6 @@
last_url_ = handle->GetRedirectChain()[0];
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PreRedirectionURLObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PreRedirectionURLObserver);
} // namespace webapps
diff --git a/chrome/browser/web_applications/web_app_tab_helper.cc b/chrome/browser/web_applications/web_app_tab_helper.cc
index 614713d..c1882d0a 100644
--- a/chrome/browser/web_applications/web_app_tab_helper.cc
+++ b/chrome/browser/web_applications/web_app_tab_helper.cc
@@ -206,6 +206,6 @@
return provider_->registrar().FindAppWithUrlInScope(url).value_or(AppId());
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebAppTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebAppTabHelper);
} // namespace web_app
diff --git a/chrome/browser/web_launch/web_launch_files_helper.cc b/chrome/browser/web_launch/web_launch_files_helper.cc
index c7bae88..2e248de 100644
--- a/chrome/browser/web_launch/web_launch_files_helper.cc
+++ b/chrome/browser/web_launch/web_launch_files_helper.cc
@@ -36,7 +36,7 @@
namespace web_launch {
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebLaunchFilesHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebLaunchFilesHelper);
namespace {
diff --git a/chrome/test/media_router/media_router_ui_for_test.cc b/chrome/test/media_router/media_router_ui_for_test.cc
index e74e578..2dfd051 100644
--- a/chrome/test/media_router/media_router_ui_for_test.cc
+++ b/chrome/test/media_router/media_router_ui_for_test.cc
@@ -434,6 +434,6 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(MediaRouterUiForTest)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(MediaRouterUiForTest);
} // namespace media_router
diff --git a/chromecast/browser/extensions/cast_extension_web_contents_observer.cc b/chromecast/browser/extensions/cast_extension_web_contents_observer.cc
index d3c37b6..136b1acb 100644
--- a/chromecast/browser/extensions/cast_extension_web_contents_observer.cc
+++ b/chromecast/browser/extensions/cast_extension_web_contents_observer.cc
@@ -21,6 +21,6 @@
FromWebContents(web_contents)->Initialize();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(CastExtensionWebContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(CastExtensionWebContentsObserver);
} // namespace extensions
diff --git a/components/accuracy_tips/accuracy_web_contents_observer.cc b/components/accuracy_tips/accuracy_web_contents_observer.cc
index a9e359a..2801a6f 100644
--- a/components/accuracy_tips/accuracy_web_contents_observer.cc
+++ b/components/accuracy_tips/accuracy_web_contents_observer.cc
@@ -85,5 +85,5 @@
accuracy_service_->MaybeShowAccuracyTip(web_contents());
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AccuracyWebContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AccuracyWebContentsObserver);
} // namespace accuracy_tips
diff --git a/components/android_autofill/browser/autofill_provider.cc b/components/android_autofill/browser/autofill_provider.cc
index 16f0a41..91e386f 100644
--- a/components/android_autofill/browser/autofill_provider.cc
+++ b/components/android_autofill/browser/autofill_provider.cc
@@ -14,7 +14,7 @@
bool g_is_download_manager_disabled_for_testing = false;
} // namespace
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AutofillProvider)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AutofillProvider);
bool AutofillProvider::is_download_manager_disabled_for_testing() {
return g_is_download_manager_disabled_for_testing;
diff --git a/components/autofill_assistant/browser/public/runtime_manager_impl.cc b/components/autofill_assistant/browser/public/runtime_manager_impl.cc
index 81c02da..e05c45f 100644
--- a/components/autofill_assistant/browser/public/runtime_manager_impl.cc
+++ b/components/autofill_assistant/browser/public/runtime_manager_impl.cc
@@ -45,5 +45,5 @@
return weak_ptr_factory_.GetWeakPtr();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(RuntimeManagerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(RuntimeManagerImpl);
} // namespace autofill_assistant
diff --git a/components/blocked_content/android/popup_blocked_message_delegate.cc b/components/blocked_content/android/popup_blocked_message_delegate.cc
index 1f92d609..6a0c282a 100644
--- a/components/blocked_content/android/popup_blocked_message_delegate.cc
+++ b/components/blocked_content/android/popup_blocked_message_delegate.cc
@@ -99,6 +99,6 @@
std::move(on_show_popups_callback_).Run();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PopupBlockedMessageDelegate)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PopupBlockedMessageDelegate);
} // namespace blocked_content
diff --git a/components/blocked_content/popup_blocker_tab_helper.cc b/components/blocked_content/popup_blocker_tab_helper.cc
index 5a8f09d2..885658a 100644
--- a/components/blocked_content/popup_blocker_tab_helper.cc
+++ b/components/blocked_content/popup_blocker_tab_helper.cc
@@ -178,6 +178,6 @@
UMA_HISTOGRAM_ENUMERATION("ContentSettings.Popups.BlockerActions", action);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PopupBlockerTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PopupBlockerTabHelper);
} // namespace blocked_content
diff --git a/components/blocked_content/popup_opener_tab_helper.cc b/components/blocked_content/popup_opener_tab_helper.cc
index 1471c40b..eb3df5e 100644
--- a/components/blocked_content/popup_opener_tab_helper.cc
+++ b/components/blocked_content/popup_opener_tab_helper.cc
@@ -111,6 +111,6 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PopupOpenerTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PopupOpenerTabHelper);
} // namespace blocked_content
diff --git a/components/blocked_content/popup_tracker.cc b/components/blocked_content/popup_tracker.cc
index 7f8fb38..aa1ffa9 100644
--- a/components/blocked_content/popup_tracker.cc
+++ b/components/blocked_content/popup_tracker.cc
@@ -179,6 +179,6 @@
scoped_observation_.Reset();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PopupTracker)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PopupTracker);
} // namespace blocked_content
diff --git a/components/blocked_content/safe_browsing_triggered_popup_blocker.cc b/components/blocked_content/safe_browsing_triggered_popup_blocker.cc
index 263ed637..c29f8e5 100644
--- a/components/blocked_content/safe_browsing_triggered_popup_blocker.cc
+++ b/components/blocked_content/safe_browsing_triggered_popup_blocker.cc
@@ -209,9 +209,9 @@
return *PageData::GetOrCreateForPage(page);
}
-PAGE_USER_DATA_KEY_IMPL(SafeBrowsingTriggeredPopupBlocker::PageData)
+PAGE_USER_DATA_KEY_IMPL(SafeBrowsingTriggeredPopupBlocker::PageData);
NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(
- SafeBrowsingTriggeredPopupBlocker::NavigationHandleData)
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SafeBrowsingTriggeredPopupBlocker)
+ SafeBrowsingTriggeredPopupBlocker::NavigationHandleData);
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SafeBrowsingTriggeredPopupBlocker);
} // namespace blocked_content
diff --git a/components/browser_ui/client_certificate/android/ssl_client_certificate_request.cc b/components/browser_ui/client_certificate/android/ssl_client_certificate_request.cc
index 798f56e..94739b0 100644
--- a/components/browser_ui/client_certificate/android/ssl_client_certificate_request.cc
+++ b/components/browser_ui/client_certificate/android/ssl_client_certificate_request.cc
@@ -139,7 +139,7 @@
return view->GetWindowAndroid();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SSLClientCertPendingRequests)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SSLClientCertPendingRequests);
static void StartClientCertificateRequest(
std::unique_ptr<ClientCertRequest> request,
diff --git a/components/captive_portal/content/captive_portal_tab_helper.cc b/components/captive_portal/content/captive_portal_tab_helper.cc
index 88136b39..906e258 100644
--- a/components/captive_portal/content/captive_portal_tab_helper.cc
+++ b/components/captive_portal/content/captive_portal_tab_helper.cc
@@ -155,6 +155,6 @@
return tab_reloader_.get();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(CaptivePortalTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(CaptivePortalTabHelper);
} // namespace captive_portal
diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc
index e57befc2..3900d2f43 100644
--- a/components/content_settings/browser/page_specific_content_settings.cc
+++ b/components/content_settings/browser/page_specific_content_settings.cc
@@ -278,9 +278,10 @@
~InflightNavigationContentSettings() = default;
NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(
- PageSpecificContentSettings::InflightNavigationContentSettings)
+ PageSpecificContentSettings::InflightNavigationContentSettings);
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PageSpecificContentSettings::WebContentsHandler)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(
+ PageSpecificContentSettings::WebContentsHandler);
PageSpecificContentSettings::PendingUpdates::PendingUpdates() = default;
@@ -962,6 +963,6 @@
delegate_->UpdateLocationBar();
}
-RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(PageSpecificContentSettings)
+RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(PageSpecificContentSettings);
} // namespace content_settings
diff --git a/components/dom_distiller/content/browser/distillability_driver.cc b/components/dom_distiller/content/browser/distillability_driver.cc
index 0c74395..6be1ab0 100644
--- a/components/dom_distiller/content/browser/distillability_driver.cc
+++ b/components/dom_distiller/content/browser/distillability_driver.cc
@@ -87,6 +87,6 @@
observer.OnResult(result);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(DistillabilityDriver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(DistillabilityDriver);
} // namespace dom_distiller
diff --git a/components/dom_distiller/content/browser/distillable_page_utils_android.cc b/components/dom_distiller/content/browser/distillable_page_utils_android.cc
index cd44a24..ba2f0e2 100644
--- a/components/dom_distiller/content/browser/distillable_page_utils_android.cc
+++ b/components/dom_distiller/content/browser/distillable_page_utils_android.cc
@@ -68,7 +68,7 @@
AddObserver(web_contents, observer);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(JniDistillabilityObserverWrapper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(JniDistillabilityObserverWrapper);
} // namespace android
} // namespace dom_distiller
diff --git a/components/download/content/public/download_navigation_observer.cc b/components/download/content/public/download_navigation_observer.cc
index 88cc672..cec7cf1 100644
--- a/components/download/content/public/download_navigation_observer.cc
+++ b/components/download/content/public/download_navigation_observer.cc
@@ -30,6 +30,6 @@
navigation_monitor_->OnNavigationEvent(navigation_event);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(DownloadNavigationObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(DownloadNavigationObserver);
} // namespace download
diff --git a/components/error_page/content/browser/net_error_auto_reloader.cc b/components/error_page/content/browser/net_error_auto_reloader.cc
index 17b8602..bad6862 100644
--- a/components/error_page/content/browser/net_error_auto_reloader.cc
+++ b/components/error_page/content/browser/net_error_auto_reloader.cc
@@ -318,6 +318,6 @@
return true;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(NetErrorAutoReloader)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(NetErrorAutoReloader);
} // namespace error_page
diff --git a/components/favicon/content/content_favicon_driver.cc b/components/favicon/content/content_favicon_driver.cc
index 1c1b762..67ac048 100644
--- a/components/favicon/content/content_favicon_driver.cc
+++ b/components/favicon/content/content_favicon_driver.cc
@@ -260,9 +260,9 @@
}
NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(
- ContentFaviconDriver::NavigationManifestData)
+ ContentFaviconDriver::NavigationManifestData);
RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(
- ContentFaviconDriver::DocumentManifestData)
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ContentFaviconDriver)
+ ContentFaviconDriver::DocumentManifestData);
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ContentFaviconDriver);
} // namespace favicon
diff --git a/components/find_in_page/find_tab_helper.cc b/components/find_in_page/find_tab_helper.cc
index 04a8a8c..e7c60ee 100644
--- a/components/find_in_page/find_tab_helper.cc
+++ b/components/find_in_page/find_tab_helper.cc
@@ -181,6 +181,6 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(FindTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(FindTabHelper);
} // namespace find_in_page
diff --git a/components/history/content/browser/history_context_helper.cc b/components/history/content/browser/history_context_helper.cc
index b43106c..c7586ef 100644
--- a/components/history/content/browser/history_context_helper.cc
+++ b/components/history/content/browser/history_context_helper.cc
@@ -20,7 +20,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsContext)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsContext);
} // namespace
diff --git a/components/history/content/browser/web_contents_top_sites_observer.cc b/components/history/content/browser/web_contents_top_sites_observer.cc
index 77ddd91..7adc767e 100644
--- a/components/history/content/browser/web_contents_top_sites_observer.cc
+++ b/components/history/content/browser/web_contents_top_sites_observer.cc
@@ -40,6 +40,6 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsTopSitesObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsTopSitesObserver);
} // namespace history
diff --git a/components/infobars/content/content_infobar_manager.cc b/components/infobars/content/content_infobar_manager.cc
index 61c43de..0d05e31e 100644
--- a/components/infobars/content/content_infobar_manager.cc
+++ b/components/infobars/content/content_infobar_manager.cc
@@ -112,6 +112,6 @@
ui::PAGE_TRANSITION_LINK, false));
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ContentInfoBarManager)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ContentInfoBarManager);
} // namespace infobars
diff --git a/components/javascript_dialogs/tab_modal_dialog_manager.cc b/components/javascript_dialogs/tab_modal_dialog_manager.cc
index a2ce2e0..f2877da4 100644
--- a/components/javascript_dialogs/tab_modal_dialog_manager.cc
+++ b/components/javascript_dialogs/tab_modal_dialog_manager.cc
@@ -445,6 +445,6 @@
delegate_->DidCloseDialog();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(TabModalDialogManager)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(TabModalDialogManager);
} // namespace javascript_dialogs
diff --git a/components/media_router/browser/android/media_router_dialog_controller_android.cc b/components/media_router/browser/android/media_router_dialog_controller_android.cc
index 1e466f1..6998efc 100644
--- a/components/media_router/browser/android/media_router_dialog_controller_android.cc
+++ b/components/media_router/browser/android/media_router_dialog_controller_android.cc
@@ -182,6 +182,6 @@
env, java_dialog_controller_);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(MediaRouterDialogControllerAndroid)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(MediaRouterDialogControllerAndroid);
} // namespace media_router
diff --git a/components/media_router/browser/presentation/presentation_service_delegate_impl.cc b/components/media_router/browser/presentation/presentation_service_delegate_impl.cc
index d68c104..bcb32ed 100644
--- a/components/media_router/browser/presentation/presentation_service_delegate_impl.cc
+++ b/components/media_router/browser/presentation/presentation_service_delegate_impl.cc
@@ -762,6 +762,6 @@
state_changed_cb.Run(info);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PresentationServiceDelegateImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PresentationServiceDelegateImpl);
} // namespace media_router
diff --git a/components/media_router/browser/presentation/receiver_presentation_service_delegate_impl.cc b/components/media_router/browser/presentation/receiver_presentation_service_delegate_impl.cc
index 45006dc..7d04e6fb 100644
--- a/components/media_router/browser/presentation/receiver_presentation_service_delegate_impl.cc
+++ b/components/media_router/browser/presentation/receiver_presentation_service_delegate_impl.cc
@@ -76,6 +76,6 @@
receiver_available_callback, web_contents_);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ReceiverPresentationServiceDelegateImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ReceiverPresentationServiceDelegateImpl);
} // namespace media_router
diff --git a/components/optimization_guide/content/browser/page_content_annotations_web_contents_observer.cc b/components/optimization_guide/content/browser/page_content_annotations_web_contents_observer.cc
index 8f2c08c..c949de5c 100644
--- a/components/optimization_guide/content/browser/page_content_annotations_web_contents_observer.cc
+++ b/components/optimization_guide/content/browser/page_content_annotations_web_contents_observer.cc
@@ -119,6 +119,6 @@
visit, *result.GetMainFrameTextContent());
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PageContentAnnotationsWebContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PageContentAnnotationsWebContentsObserver);
} // namespace optimization_guide
diff --git a/components/optimization_guide/content/browser/page_text_observer.cc b/components/optimization_guide/content/browser/page_text_observer.cc
index 7c8b5d4d..b5d88968 100644
--- a/components/optimization_guide/content/browser/page_text_observer.cc
+++ b/components/optimization_guide/content/browser/page_text_observer.cc
@@ -469,6 +469,6 @@
consumers_.erase(consumer);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PageTextObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PageTextObserver);
} // namespace optimization_guide
diff --git a/components/page_load_metrics/browser/metrics_web_contents_observer.cc b/components/page_load_metrics/browser/metrics_web_contents_observer.cc
index 18c2cd8..399d074 100644
--- a/components/page_load_metrics/browser/metrics_web_contents_observer.cc
+++ b/components/page_load_metrics/browser/metrics_web_contents_observer.cc
@@ -1155,6 +1155,6 @@
web_contents()->GetBrowserContext());
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(MetricsWebContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(MetricsWebContentsObserver);
} // namespace page_load_metrics
diff --git a/components/paint_preview/browser/paint_preview_client.cc b/components/paint_preview/browser/paint_preview_client.cc
index 7cbea31..6b78059 100644
--- a/components/paint_preview/browser/paint_preview_client.cc
+++ b/components/paint_preview/browser/paint_preview_client.cc
@@ -605,6 +605,6 @@
all_document_data_.erase(guid);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PaintPreviewClient)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PaintPreviewClient);
} // namespace paint_preview
diff --git a/components/password_manager/content/browser/content_password_manager_driver_factory.cc b/components/password_manager/content/browser/content_password_manager_driver_factory.cc
index 8e45f45..801b856 100644
--- a/components/password_manager/content/browser/content_password_manager_driver_factory.cc
+++ b/components/password_manager/content/browser/content_password_manager_driver_factory.cc
@@ -105,6 +105,6 @@
frame_and_driver.second.SendLoggingAvailability();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ContentPasswordManagerDriverFactory)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ContentPasswordManagerDriverFactory);
} // namespace password_manager
diff --git a/components/payments/content/payment_credential_manager.cc b/components/payments/content/payment_credential_manager.cc
index fe0eb2d..6cdef91 100644
--- a/components/payments/content/payment_credential_manager.cc
+++ b/components/payments/content/payment_credential_manager.cc
@@ -41,6 +41,6 @@
content::WebContents* web_contents)
: content::WebContentsObserver(web_contents) {}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PaymentCredentialManager)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PaymentCredentialManager);
} // namespace payments
diff --git a/components/payments/content/payment_request_web_contents_manager.cc b/components/payments/content/payment_request_web_contents_manager.cc
index 2846d5f..8d9a0222 100644
--- a/components/payments/content/payment_request_web_contents_manager.cc
+++ b/components/payments/content/payment_request_web_contents_manager.cc
@@ -94,6 +94,6 @@
content::WebContents* web_contents)
: content::WebContentsObserver(web_contents) {}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PaymentRequestWebContentsManager)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PaymentRequestWebContentsManager);
} // namespace payments
diff --git a/components/payments/content/service_worker_payment_app_finder.cc b/components/payments/content/service_worker_payment_app_finder.cc
index 18f5c87..de302da 100644
--- a/components/payments/content/service_worker_payment_app_finder.cc
+++ b/components/payments/content/service_worker_payment_app_finder.cc
@@ -485,6 +485,6 @@
test_downloader_ = std::move(downloader);
}
-RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(ServiceWorkerPaymentAppFinder)
+RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(ServiceWorkerPaymentAppFinder);
} // namespace payments
diff --git a/components/pdf/browser/pdf_navigation_throttle.cc b/components/pdf/browser/pdf_navigation_throttle.cc
index 540f135f..0e1518d 100644
--- a/components/pdf/browser/pdf_navigation_throttle.cc
+++ b/components/pdf/browser/pdf_navigation_throttle.cc
@@ -62,7 +62,7 @@
base::WeakPtrFactory<WebContentsLifetimeHelper> weak_factory_{this};
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsLifetimeHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsLifetimeHelper);
} // namespace
diff --git a/components/pdf/browser/pdf_web_contents_helper.cc b/components/pdf/browser/pdf_web_contents_helper.cc
index 3ecfcae3..4e16e6c 100644
--- a/components/pdf/browser/pdf_web_contents_helper.cc
+++ b/components/pdf/browser/pdf_web_contents_helper.cc
@@ -298,6 +298,6 @@
client_->UpdateContentRestrictions(web_contents(), content_restrictions);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PDFWebContentsHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PDFWebContentsHelper);
} // namespace pdf
diff --git a/components/performance_manager/mechanisms/tab_loading_frame_navigation_scheduler.cc b/components/performance_manager/mechanisms/tab_loading_frame_navigation_scheduler.cc
index deb1335..59fdb096 100644
--- a/components/performance_manager/mechanisms/tab_loading_frame_navigation_scheduler.cc
+++ b/components/performance_manager/mechanisms/tab_loading_frame_navigation_scheduler.cc
@@ -136,7 +136,7 @@
TabLoadingFrameNavigationScheduler* scheduler_ = nullptr;
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(TabLoadingFrameNavigationScheduler)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(TabLoadingFrameNavigationScheduler);
TabLoadingFrameNavigationScheduler::~TabLoadingFrameNavigationScheduler() {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
diff --git a/components/performance_manager/performance_manager_tab_helper.cc b/components/performance_manager/performance_manager_tab_helper.cc
index fb1c847e..e7ab6f3a 100644
--- a/components/performance_manager/performance_manager_tab_helper.cc
+++ b/components/performance_manager/performance_manager_tab_helper.cc
@@ -535,6 +535,6 @@
primary_page_->first_time_favicon_set = false;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PerformanceManagerTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PerformanceManagerTabHelper);
} // namespace performance_manager
diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc
index f61a196..21ee24a 100644
--- a/components/permissions/permission_request_manager.cc
+++ b/components/permissions/permission_request_manager.cc
@@ -1028,6 +1028,6 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PermissionRequestManager)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PermissionRequestManager);
} // namespace permissions
diff --git a/components/printing/browser/print_composite_client.cc b/components/printing/browser/print_composite_client.cc
index d1cd419..0e03f9a8 100644
--- a/components/printing/browser/print_composite_client.cc
+++ b/components/printing/browser/print_composite_client.cc
@@ -420,6 +420,6 @@
return it->second;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PrintCompositeClient)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PrintCompositeClient);
} // namespace printing
diff --git a/components/printing/browser/print_to_pdf/pdf_print_manager.cc b/components/printing/browser/print_to_pdf/pdf_print_manager.cc
index f0b6ce7..cf97690 100644
--- a/components/printing/browser/print_to_pdf/pdf_print_manager.cc
+++ b/components/printing/browser/print_to_pdf/pdf_print_manager.cc
@@ -260,6 +260,6 @@
Reset();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PdfPrintManager)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PdfPrintManager);
} // namespace print_to_pdf
diff --git a/components/safe_browsing/content/browser/safe_browsing_subresource_tab_helper.cc b/components/safe_browsing/content/browser/safe_browsing_subresource_tab_helper.cc
index 9dbbcf22..ede7f08 100644
--- a/components/safe_browsing/content/browser/safe_browsing_subresource_tab_helper.cc
+++ b/components/safe_browsing/content/browser/safe_browsing_subresource_tab_helper.cc
@@ -40,6 +40,6 @@
SafeBrowsingUIManager* manager)
: WebContentsObserver(web_contents), manager_(manager) {}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SafeBrowsingSubresourceTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SafeBrowsingSubresourceTabHelper);
} // namespace safe_browsing
diff --git a/components/safe_browsing/content/browser/safe_browsing_tab_observer.cc b/components/safe_browsing/content/browser/safe_browsing_tab_observer.cc
index 483ba81..b4484da1 100644
--- a/components/safe_browsing/content/browser/safe_browsing_tab_observer.cc
+++ b/components/safe_browsing/content/browser/safe_browsing_tab_observer.cc
@@ -78,6 +78,6 @@
#endif
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SafeBrowsingTabObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SafeBrowsingTabObserver);
} // namespace safe_browsing
diff --git a/components/safe_browsing/content/browser/triggers/ad_sampler_trigger.cc b/components/safe_browsing/content/browser/triggers/ad_sampler_trigger.cc
index 6c484e84..7d593b4 100644
--- a/components/safe_browsing/content/browser/triggers/ad_sampler_trigger.cc
+++ b/components/safe_browsing/content/browser/triggers/ad_sampler_trigger.cc
@@ -174,6 +174,6 @@
task_runner_ = task_runner;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AdSamplerTrigger)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AdSamplerTrigger);
} // namespace safe_browsing
diff --git a/components/safe_browsing/content/browser/triggers/suspicious_site_trigger.cc b/components/safe_browsing/content/browser/triggers/suspicious_site_trigger.cc
index a7c7ba5..2e9c7a68 100644
--- a/components/safe_browsing/content/browser/triggers/suspicious_site_trigger.cc
+++ b/components/safe_browsing/content/browser/triggers/suspicious_site_trigger.cc
@@ -285,6 +285,6 @@
task_runner_ = task_runner;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SuspiciousSiteTrigger)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SuspiciousSiteTrigger);
} // namespace safe_browsing
diff --git a/components/safe_browsing/content/browser/triggers/trigger_manager.cc b/components/safe_browsing/content/browser/triggers/trigger_manager.cc
index dbad591..9088c36 100644
--- a/components/safe_browsing/content/browser/triggers/trigger_manager.cc
+++ b/components/safe_browsing/content/browser/triggers/trigger_manager.cc
@@ -253,6 +253,6 @@
trigger_manager_->WebContentsDestroyed(web_contents());
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(TriggerManagerWebContentsHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(TriggerManagerWebContentsHelper);
} // namespace safe_browsing
diff --git a/components/security_interstitials/content/insecure_form_tab_storage.cc b/components/security_interstitials/content/insecure_form_tab_storage.cc
index 1219d6240..0988a61 100644
--- a/components/security_interstitials/content/insecure_form_tab_storage.cc
+++ b/components/security_interstitials/content/insecure_form_tab_storage.cc
@@ -25,6 +25,6 @@
return storage;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(InsecureFormTabStorage)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(InsecureFormTabStorage);
} // namespace security_interstitials
\ No newline at end of file
diff --git a/components/security_interstitials/content/security_interstitial_tab_helper.cc b/components/security_interstitials/content/security_interstitial_tab_helper.cc
index 80a166e..75c0277 100644
--- a/components/security_interstitials/content/security_interstitial_tab_helper.cc
+++ b/components/security_interstitials/content/security_interstitial_tab_helper.cc
@@ -198,6 +198,6 @@
CMD_OPEN_ENHANCED_PROTECTION_SETTINGS);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SecurityInterstitialTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SecurityInterstitialTabHelper);
} // namespace security_interstitials
diff --git a/components/security_interstitials/content/ssl_error_handler.cc b/components/security_interstitials/content/ssl_error_handler.cc
index 3cb5474..31f895f 100644
--- a/components/security_interstitials/content/ssl_error_handler.cc
+++ b/components/security_interstitials/content/ssl_error_handler.cc
@@ -148,7 +148,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(CommonNameMismatchRedirectObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(CommonNameMismatchRedirectObserver);
void RecordUMA(SSLErrorHandler::UMAEvent event) {
UMA_HISTOGRAM_ENUMERATION(kHistogram, event,
@@ -1012,4 +1012,4 @@
!net::IsCertStatusError(other_errors);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SSLErrorHandler)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SSLErrorHandler);
diff --git a/components/sessions/content/session_tab_helper.cc b/components/sessions/content/session_tab_helper.cc
index bf02947..c479614 100644
--- a/components/sessions/content/session_tab_helper.cc
+++ b/components/sessions/content/session_tab_helper.cc
@@ -120,6 +120,6 @@
return delegate_lookup_ ? delegate_lookup_.Run(web_contents()) : nullptr;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SessionTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SessionTabHelper);
} // namespace sessions
diff --git a/components/site_engagement/content/site_engagement_helper.cc b/components/site_engagement/content/site_engagement_helper.cc
index 6cbe364..d953be4 100644
--- a/components/site_engagement/content/site_engagement_helper.cc
+++ b/components/site_engagement/content/site_engagement_helper.cc
@@ -254,6 +254,6 @@
}
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SiteEngagementService::Helper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SiteEngagementService::Helper);
} // namespace site_engagement
diff --git a/components/subresource_filter/content/browser/ads_blocked_message_delegate.cc b/components/subresource_filter/content/browser/ads_blocked_message_delegate.cc
index bafe4df..18a943c 100644
--- a/components/subresource_filter/content/browser/ads_blocked_message_delegate.cc
+++ b/components/subresource_filter/content/browser/ads_blocked_message_delegate.cc
@@ -160,6 +160,6 @@
ads_blocked_dialog_->Show();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AdsBlockedMessageDelegate)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AdsBlockedMessageDelegate);
} // namespace subresource_filter
diff --git a/components/subresource_filter/content/browser/content_subresource_filter_web_contents_helper.cc b/components/subresource_filter/content/browser/content_subresource_filter_web_contents_helper.cc
index f7487cf..13cb7ca 100644
--- a/components/subresource_filter/content/browser/content_subresource_filter_web_contents_helper.cc
+++ b/components/subresource_filter/content/browser/content_subresource_filter_web_contents_helper.cc
@@ -57,7 +57,7 @@
} // namespace
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ContentSubresourceFilterWebContentsHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ContentSubresourceFilterWebContentsHelper);
// static
void ContentSubresourceFilterWebContentsHelper::CreateForWebContents(
diff --git a/components/subresource_filter/content/browser/devtools_interaction_tracker.cc b/components/subresource_filter/content/browser/devtools_interaction_tracker.cc
index fd6c9feb..cd3afe07 100644
--- a/components/subresource_filter/content/browser/devtools_interaction_tracker.cc
+++ b/components/subresource_filter/content/browser/devtools_interaction_tracker.cc
@@ -20,6 +20,6 @@
activated_via_devtools_ = force_activation;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(DevtoolsInteractionTracker)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(DevtoolsInteractionTracker);
} // namespace subresource_filter
diff --git a/components/subresource_filter/content/browser/navigation_console_logger.cc b/components/subresource_filter/content/browser/navigation_console_logger.cc
index dff4fc10..9708506 100644
--- a/components/subresource_filter/content/browser/navigation_console_logger.cc
+++ b/components/subresource_filter/content/browser/navigation_console_logger.cc
@@ -59,6 +59,6 @@
web_contents()->RemoveUserData(UserDataKey());
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(NavigationConsoleLogger)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(NavigationConsoleLogger);
} // namespace subresource_filter
diff --git a/components/subresource_filter/content/browser/subresource_filter_observer_manager.cc b/components/subresource_filter/content/browser/subresource_filter_observer_manager.cc
index 3b91a3c..348018ff 100644
--- a/components/subresource_filter/content/browser/subresource_filter_observer_manager.cc
+++ b/components/subresource_filter/content/browser/subresource_filter_observer_manager.cc
@@ -56,6 +56,6 @@
observer.OnIsAdSubframeChanged(render_frame_host, is_ad_subframe);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SubresourceFilterObserverManager)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SubresourceFilterObserverManager);
} // namespace subresource_filter
diff --git a/components/ukm/content/source_url_recorder.cc b/components/ukm/content/source_url_recorder.cc
index 7228234..1b90fcb 100644
--- a/components/ukm/content/source_url_recorder.cc
+++ b/components/ukm/content/source_url_recorder.cc
@@ -117,7 +117,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(SourceUrlRecorderWebContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(SourceUrlRecorderWebContentsObserver);
SourceUrlRecorderWebContentsObserver::SourceUrlRecorderWebContentsObserver(
content::WebContents* web_contents)
diff --git a/components/web_modal/web_contents_modal_dialog_manager.cc b/components/web_modal/web_contents_modal_dialog_manager.cc
index 25bcae2..1d1074d 100644
--- a/components/web_modal/web_contents_modal_dialog_manager.cc
+++ b/components/web_modal/web_contents_modal_dialog_manager.cc
@@ -186,6 +186,6 @@
CloseAllDialogs();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsModalDialogManager)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsModalDialogManager);
} // namespace web_modal
diff --git a/components/webapps/browser/installable/installable_manager.cc b/components/webapps/browser/installable/installable_manager.cc
index 2dc079e..6f4eafdb 100644
--- a/components/webapps/browser/installable/installable_manager.cc
+++ b/components/webapps/browser/installable/installable_manager.cc
@@ -1024,6 +1024,6 @@
return worker_->has_worker;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(InstallableManager)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(InstallableManager);
} // namespace webapps
diff --git a/components/zoom/zoom_controller.cc b/components/zoom/zoom_controller.cc
index a8db729..97b16b8 100644
--- a/components/zoom/zoom_controller.cc
+++ b/components/zoom/zoom_controller.cc
@@ -419,6 +419,6 @@
return content::HostZoomMap::PageScaleFactorIsOne(web_contents());
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ZoomController)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ZoomController);
} // namespace zoom
diff --git a/content/browser/android/date_time_chooser_android.cc b/content/browser/android/date_time_chooser_android.cc
index aae7d1d..162aa25 100644
--- a/content/browser/android/date_time_chooser_android.cc
+++ b/content/browser/android/date_time_chooser_android.cc
@@ -109,6 +109,6 @@
std::move(open_date_time_response_callback_).Run(false, 0.0);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(DateTimeChooserAndroid)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(DateTimeChooserAndroid);
} // namespace content
diff --git a/content/browser/android/javascript_injector.cc b/content/browser/android/javascript_injector.cc
index 58b6d44..f06924d 100644
--- a/content/browser/android/javascript_injector.cc
+++ b/content/browser/android/javascript_injector.cc
@@ -76,6 +76,6 @@
return reinterpret_cast<intptr_t>(injector);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(JavascriptInjector)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(JavascriptInjector);
} // namespace content
diff --git a/content/browser/attribution_reporting/conversion_host.cc b/content/browser/attribution_reporting/conversion_host.cc
index 22607dd..7f618e6 100644
--- a/content/browser/attribution_reporting/conversion_host.cc
+++ b/content/browser/attribution_reporting/conversion_host.cc
@@ -430,6 +430,6 @@
g_receiver_for_testing = impl;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ConversionHost)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ConversionHost);
} // namespace content
diff --git a/content/browser/devtools/devtools_issue_storage.cc b/content/browser/devtools/devtools_issue_storage.cc
index b392f08..4a85607 100644
--- a/content/browser/devtools/devtools_issue_storage.cc
+++ b/content/browser/devtools/devtools_issue_storage.cc
@@ -15,7 +15,7 @@
static const unsigned kMaxIssueCount = 1000;
-PAGE_USER_DATA_KEY_IMPL(DevToolsIssueStorage)
+PAGE_USER_DATA_KEY_IMPL(DevToolsIssueStorage);
DevToolsIssueStorage::DevToolsIssueStorage(Page& page)
: PageUserData<DevToolsIssueStorage>(page) {}
diff --git a/content/browser/loader/object_navigation_fallback_body_loader.cc b/content/browser/loader/object_navigation_fallback_body_loader.cc
index af2cf829..dfcc9ee 100644
--- a/content/browser/loader/object_navigation_fallback_body_loader.cc
+++ b/content/browser/loader/object_navigation_fallback_body_loader.cc
@@ -189,7 +189,7 @@
} // namespace
-NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(ObjectNavigationFallbackBodyLoader)
+NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(ObjectNavigationFallbackBodyLoader);
// static
void ObjectNavigationFallbackBodyLoader::CreateAndStart(
diff --git a/content/browser/manifest/manifest_manager_host.cc b/content/browser/manifest/manifest_manager_host.cc
index b1834883..e33e1021 100644
--- a/content/browser/manifest/manifest_manager_host.cc
+++ b/content/browser/manifest/manifest_manager_host.cc
@@ -94,5 +94,5 @@
.UpdateManifestUrl(manifest_url);
}
-RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(ManifestManagerHost)
+RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(ManifestManagerHost);
} // namespace content
diff --git a/content/browser/media/android/media_player_renderer_web_contents_observer.cc b/content/browser/media/android/media_player_renderer_web_contents_observer.cc
index a705c12..2ab90ab 100644
--- a/content/browser/media/android/media_player_renderer_web_contents_observer.cc
+++ b/content/browser/media/android/media_player_renderer_web_contents_observer.cc
@@ -41,6 +41,6 @@
players_.clear();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(MediaPlayerRendererWebContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(MediaPlayerRendererWebContentsObserver);
} // namespace content
diff --git a/content/browser/media/media_interface_proxy.cc b/content/browser/media/media_interface_proxy.cc
index 88c47eb..3a914b9 100644
--- a/content/browser/media/media_interface_proxy.cc
+++ b/content/browser/media/media_interface_proxy.cc
@@ -590,6 +590,6 @@
}
#endif // defined(OS_CHROMEOS)
-RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(MediaInterfaceProxy)
+RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(MediaInterfaceProxy);
} // namespace content
diff --git a/content/browser/media/session/media_session_impl.cc b/content/browser/media/session/media_session_impl.cc
index b1f497e..01e6724a 100644
--- a/content/browser/media/session/media_session_impl.cc
+++ b/content/browser/media/session/media_session_impl.cc
@@ -1818,6 +1818,6 @@
should_throttle_duration_update_ = should_throttle;
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(MediaSessionImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(MediaSessionImpl);
} // namespace content
diff --git a/content/browser/payments/payment_app_provider_impl.cc b/content/browser/payments/payment_app_provider_impl.cc
index db3304e..ec3312a6 100644
--- a/content/browser/payments/payment_app_provider_impl.cc
+++ b/content/browser/payments/payment_app_provider_impl.cc
@@ -386,5 +386,5 @@
PaymentAppProviderImpl::~PaymentAppProviderImpl() = default;
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PaymentAppProviderImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PaymentAppProviderImpl);
} // namespace content
diff --git a/content/browser/permissions/permission_service_context.cc b/content/browser/permissions/permission_service_context.cc
index ef4768d..964bb53 100644
--- a/content/browser/permissions/permission_service_context.cc
+++ b/content/browser/permissions/permission_service_context.cc
@@ -37,7 +37,7 @@
};
RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(
- PermissionServiceContext::DocumentPermissionServiceContextHolder)
+ PermissionServiceContext::DocumentPermissionServiceContextHolder);
class PermissionServiceContext::PermissionSubscription {
public:
diff --git a/content/browser/picture_in_picture/picture_in_picture_window_controller_impl.cc b/content/browser/picture_in_picture/picture_in_picture_window_controller_impl.cc
index a32ff200..fcffd99b 100644
--- a/content/browser/picture_in_picture/picture_in_picture_window_controller_impl.cc
+++ b/content/browser/picture_in_picture/picture_in_picture_window_controller_impl.cc
@@ -437,6 +437,6 @@
return static_cast<WebContentsImpl*>(web_contents());
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PictureInPictureWindowControllerImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PictureInPictureWindowControllerImpl);
} // namespace content
diff --git a/content/browser/prerender/prerender_browsertest.cc b/content/browser/prerender/prerender_browsertest.cc
index 37a6b9e..dbb1b340 100644
--- a/content/browser/prerender/prerender_browsertest.cc
+++ b/content/browser/prerender/prerender_browsertest.cc
@@ -136,7 +136,7 @@
RENDER_DOCUMENT_HOST_USER_DATA_KEY_DECL();
};
-RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(DocumentData)
+RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(DocumentData);
class PrerenderBrowserTest : public ContentBrowserTest {
public:
diff --git a/content/browser/renderer_host/close_listener_host.cc b/content/browser/renderer_host/close_listener_host.cc
index 200c944..b2d11a7 100644
--- a/content/browser/renderer_host/close_listener_host.cc
+++ b/content/browser/renderer_host/close_listener_host.cc
@@ -31,6 +31,6 @@
return true;
}
-RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(CloseListenerHost)
+RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(CloseListenerHost);
} // namespace content
diff --git a/content/browser/renderer_host/isolated_app_throttle.cc b/content/browser/renderer_host/isolated_app_throttle.cc
index d9ba55d6..c903e6a 100644
--- a/content/browser/renderer_host/isolated_app_throttle.cc
+++ b/content/browser/renderer_host/isolated_app_throttle.cc
@@ -50,7 +50,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsIsolationInfo)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsIsolationInfo);
absl::optional<url::SchemeHostPort> GetTupleFromOptionalOrigin(
const absl::optional<url::Origin>& origin) {
diff --git a/content/browser/renderer_host/media/peer_connection_tracker_host.cc b/content/browser/renderer_host/media/peer_connection_tracker_host.cc
index 8e409ad..c4333a7 100644
--- a/content/browser/renderer_host/media/peer_connection_tracker_host.cc
+++ b/content/browser/renderer_host/media/peer_connection_tracker_host.cc
@@ -215,5 +215,5 @@
receiver_.Bind(std::move(pending_receiver));
}
-RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(PeerConnectionTrackerHost)
+RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(PeerConnectionTrackerHost);
} // namespace content
diff --git a/content/browser/renderer_host/navigation_handle_user_data_browsertest.cc b/content/browser/renderer_host/navigation_handle_user_data_browsertest.cc
index 492c323..1ca81fb 100644
--- a/content/browser/renderer_host/navigation_handle_user_data_browsertest.cc
+++ b/content/browser/renderer_host/navigation_handle_user_data_browsertest.cc
@@ -39,7 +39,7 @@
NAVIGATION_HANDLE_USER_DATA_KEY_DECL();
};
-NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(Data)
+NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(Data);
} // namespace
diff --git a/content/browser/renderer_host/page_impl_browsertest.cc b/content/browser/renderer_host/page_impl_browsertest.cc
index 62a27aa..1df7ef5 100644
--- a/content/browser/renderer_host/page_impl_browsertest.cc
+++ b/content/browser/renderer_host/page_impl_browsertest.cc
@@ -63,7 +63,7 @@
PAGE_USER_DATA_KEY_DECL();
};
-PAGE_USER_DATA_KEY_IMPL(Data)
+PAGE_USER_DATA_KEY_IMPL(Data);
Data::~Data() {
// Both Page and RenderFrameHost should be non-null and valid before Data
diff --git a/content/browser/renderer_host/render_document_host_user_data_browsertest.cc b/content/browser/renderer_host/render_document_host_user_data_browsertest.cc
index ecf5f3c..3abbcee0 100644
--- a/content/browser/renderer_host/render_document_host_user_data_browsertest.cc
+++ b/content/browser/renderer_host/render_document_host_user_data_browsertest.cc
@@ -69,7 +69,7 @@
RENDER_DOCUMENT_HOST_USER_DATA_KEY_DECL();
};
-RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(Data)
+RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(Data);
// Observer class to track creation of new popups. It is used
// in subsequent tests.
diff --git a/content/browser/renderer_host/render_frame_host_impl_browsertest.cc b/content/browser/renderer_host/render_frame_host_impl_browsertest.cc
index 40e47e1..994ebc2 100644
--- a/content/browser/renderer_host/render_frame_host_impl_browsertest.cc
+++ b/content/browser/renderer_host/render_frame_host_impl_browsertest.cc
@@ -5995,7 +5995,7 @@
};
RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(
- DestructorLifetimeRenderDocumentHostUserData)
+ DestructorLifetimeRenderDocumentHostUserData);
// Tests that when RenderFrameHostImpl is destroyed, destructors of
// commonly-used extension points (currently DocumentService and
diff --git a/content/browser/serial/serial_service.cc b/content/browser/serial/serial_service.cc
index 68005de..08a4309 100644
--- a/content/browser/serial/serial_service.cc
+++ b/content/browser/serial/serial_service.cc
@@ -209,6 +209,6 @@
web_contents_impl->DecrementSerialActiveFrameCount();
}
-RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(SerialService)
+RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(SerialService);
} // namespace content
diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc
index 5913f9f..8ca8db10c 100644
--- a/content/browser/speech/speech_recognition_manager_impl.cc
+++ b/content/browser/speech/speech_recognition_manager_impl.cc
@@ -128,7 +128,7 @@
std::set<int> sessions_;
};
-RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(FrameSessionTracker)
+RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(FrameSessionTracker);
SpeechRecognitionManager* SpeechRecognitionManager::GetInstance() {
if (manager_for_tests_)
diff --git a/content/browser/web_contents/web_contents_user_data_unittest.cc b/content/browser/web_contents/web_contents_user_data_unittest.cc
index a01df35..a370d47 100644
--- a/content/browser/web_contents/web_contents_user_data_unittest.cc
+++ b/content/browser/web_contents/web_contents_user_data_unittest.cc
@@ -24,7 +24,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsAttachedClass1)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsAttachedClass1);
class WebContentsAttachedClass2
: public WebContentsUserData<WebContentsAttachedClass2> {
@@ -37,7 +37,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsAttachedClass2)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsAttachedClass2);
typedef RenderViewHostTestHarness WebContentsUserDataTest;
@@ -149,7 +149,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AttachedClassWithParams)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AttachedClassWithParams);
TEST_F(WebContentsUserDataTest, CreateWithParameters) {
ASSERT_EQ(nullptr, AttachedClassWithParams::FromWebContents(web_contents()));
diff --git a/content/public/browser/navigation_handle_user_data.h b/content/public/browser/navigation_handle_user_data.h
index 5cd8374b..2c8c72f 100644
--- a/content/public/browser/navigation_handle_user_data.h
+++ b/content/public/browser/navigation_handle_user_data.h
@@ -25,15 +25,18 @@
// navigation. Example usage of NavigationHandleUserData:
//
// --- in foo_data.h ---
-// class FooData : public
-// content::NavigationHandleUserData<FooData> {
+// class FooData : public content::NavigationHandleUserData<FooData> {
// public:
// ~FooData() override;
+//
// // ... more public stuff here ...
+//
// private:
// explicit FooData(content::NavigationHandle& navigation_handle);
-// friend NavigationHandleUserData<FooData>;
+//
+// friend NavigationHandleUserData;
// NAVIGATION_HANDLE_USER_DATA_KEY_DECL();
+//
// // ... more private stuff here ...
// };
//
@@ -84,7 +87,7 @@
// This macro instantiates the static variable declared by the previous macro.
// It must live in a .cc file to ensure that there is only one instantiation
// of the static variable.
-#define NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(Type) const int Type::kUserDataKey;
+#define NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(Type) const int Type::kUserDataKey
} // namespace content
diff --git a/content/public/browser/page_user_data.h b/content/public/browser/page_user_data.h
index 3ea1035..71c9544 100644
--- a/content/public/browser/page_user_data.h
+++ b/content/public/browser/page_user_data.h
@@ -24,15 +24,18 @@
// Example usage of PageUserData:
//
// --- in foo_page_helper.h ---
-// class FooPageHelper : public
-// content::PageUserData<FooPageHelper> {
+// class FooPageHelper : public content::PageUserData<FooPageHelper> {
// public:
// ~FooPageHelper() override;
+//
// // ... more public stuff here ...
+//
// private:
// explicit FooPageHelper(content::Page& page);
-// friend class content::PageUserData<FooPageHelper>;
+//
+// friend PageUserData;
// PAGE_USER_DATA_KEY_DECL();
+//
// // ... more private stuff here ...
// };
//
@@ -90,7 +93,7 @@
// This macro instantiates the static variable declared by the previous macro.
// It must live in a .cc file to ensure that there is only one instantiation
// of the static variable.
-#define PAGE_USER_DATA_KEY_IMPL(Type) const int Type::kUserDataKey;
+#define PAGE_USER_DATA_KEY_IMPL(Type) const int Type::kUserDataKey
} // namespace content
diff --git a/content/public/browser/render_document_host_user_data.h b/content/public/browser/render_document_host_user_data.h
index c9d6c73..46a4b05 100644
--- a/content/public/browser/render_document_host_user_data.h
+++ b/content/public/browser/render_document_host_user_data.h
@@ -54,25 +54,29 @@
// Example usage of RenderDocumentHostUserData:
//
// --- in foo_document_helper.h ---
-// class FooDocumentHelper : public
-// content::RenderDocumentHostUserData<FooDocumentHelper> {
+// class FooDocumentHelper
+// : public content::RenderDocumentHostUserData<FooDocumentHelper> {
// public:
// ~FooDocumentHelper() override;
+//
// // ... more public stuff here ...
+//
// private:
// // No public constructors to force going through static methods of
// // RenderDocumentHostUserData (e.g. CreateForCurrentDocument).
// explicit FooDocumentHelper(content::RenderFrameHost* rfh);
-// friend class content::RenderDocumentHostUserData<FooDocumentHelper>;
+//
+// friend RenderDocumentHostUserData;
// RENDER_DOCUMENT_HOST_USER_DATA_KEY_DECL();
+//
// // ... more private stuff here ...
// };
//
// --- in foo_document_helper.cc ---
-// RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(FooDocumentHelper)
+// RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(FooDocumentHelper);
//
// FooDocumentHelper::FooDocumentHelper(content::RenderFrameHost* rfh)
-// : content::RenderDocumentHostUserData<FooDocumentHelper>(rfh) { ... }
+// : RenderDocumentHostUserData(rfh) { ... }
template <typename T>
class RenderDocumentHostUserData : public base::SupportsUserData::Data {
public:
@@ -144,7 +148,7 @@
// It must live in a .cc file to ensure that there is only one instantiation
// of the static variable.
#define RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(Type) \
- const int Type::kUserDataKey;
+ const int Type::kUserDataKey
} // namespace content
diff --git a/content/public/browser/web_contents_user_data.h b/content/public/browser/web_contents_user_data.h
index 9d9ed27..0a758be 100644
--- a/content/public/browser/web_contents_user_data.h
+++ b/content/public/browser/web_contents_user_data.h
@@ -19,11 +19,15 @@
// class FooTabHelper : public content::WebContentsUserData<FooTabHelper> {
// public:
// ~FooTabHelper() override;
+//
// // ... more public stuff here ...
+//
// private:
// explicit FooTabHelper(content::WebContents* contents);
-// friend class content::WebContentsUserData<FooTabHelper>;
+//
+// friend WebContentsUserData;
// WEB_CONTENTS_USER_DATA_KEY_DECL();
+//
// // ... more private stuff here ...
// };
//
@@ -67,7 +71,7 @@
// This macro instantiates the static variable declared by the previous macro.
// It must live in a .cc file to ensure that there is only one instantiation
// of the static variable.
-#define WEB_CONTENTS_USER_DATA_KEY_IMPL(Type) const int Type::kUserDataKey;
+#define WEB_CONTENTS_USER_DATA_KEY_IMPL(Type) const int Type::kUserDataKey
// We tried using the address of a static local variable in UserDataKey() as a
// key instead of the address of a member variable. That solution allowed us to
diff --git a/extensions/browser/api/automation_internal/automation_internal_api.cc b/extensions/browser/api/automation_internal/automation_internal_api.cc
index ba28f2ba..811d49b 100644
--- a/extensions/browser/api/automation_internal/automation_internal_api.cc
+++ b/extensions/browser/api/automation_internal/automation_internal_api.cc
@@ -298,7 +298,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AutomationWebContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AutomationWebContentsObserver);
ExtensionFunction::ResponseAction AutomationInternalEnableTabFunction::Run() {
const AutomationInfo* automation_info = AutomationInfo::Get(extension());
diff --git a/extensions/browser/extension_frame_host_browsertest.cc b/extensions/browser/extension_frame_host_browsertest.cc
index a107aaf..108dc2a 100644
--- a/extensions/browser/extension_frame_host_browsertest.cc
+++ b/extensions/browser/extension_frame_host_browsertest.cc
@@ -86,7 +86,7 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
-WEB_CONTENTS_USER_DATA_KEY_IMPL(TestShellExtensionWebContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(TestShellExtensionWebContentsObserver);
class TestShellExtensionHostDelegate : public ShellExtensionHostDelegate {
public:
diff --git a/extensions/shell/browser/shell_extension_web_contents_observer.cc b/extensions/shell/browser/shell_extension_web_contents_observer.cc
index a104c51f..a88c0d82 100644
--- a/extensions/shell/browser/shell_extension_web_contents_observer.cc
+++ b/extensions/shell/browser/shell_extension_web_contents_observer.cc
@@ -23,6 +23,6 @@
FromWebContents(web_contents)->Initialize();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ShellExtensionWebContentsObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ShellExtensionWebContentsObserver);
} // namespace extensions
diff --git a/ui/views/controls/webview/web_contents_set_background_color.cc b/ui/views/controls/webview/web_contents_set_background_color.cc
index 0cf575a7..b85526a 100644
--- a/ui/views/controls/webview/web_contents_set_background_color.cc
+++ b/ui/views/controls/webview/web_contents_set_background_color.cc
@@ -42,6 +42,6 @@
render_frame_host->GetView()->SetBackgroundColor(color_);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsSetBackgroundColor)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsSetBackgroundColor);
} // namespace views
diff --git a/weblayer/browser/autofill_client_impl.cc b/weblayer/browser/autofill_client_impl.cc
index 431aee38..22d5269 100644
--- a/weblayer/browser/autofill_client_impl.cc
+++ b/weblayer/browser/autofill_client_impl.cc
@@ -322,6 +322,6 @@
AutofillClientImpl::AutofillClientImpl(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents) {}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(AutofillClientImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(AutofillClientImpl);
} // namespace weblayer
diff --git a/weblayer/browser/favicon/favicon_tab_helper.cc b/weblayer/browser/favicon/favicon_tab_helper.cc
index 33beeec0..d7af4db 100644
--- a/weblayer/browser/favicon/favicon_tab_helper.cc
+++ b/weblayer/browser/favicon/favicon_tab_helper.cc
@@ -121,6 +121,6 @@
delegate.OnFaviconChanged(favicon_);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(FaviconTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(FaviconTabHelper);
} // namespace weblayer
diff --git a/weblayer/browser/no_state_prefetch/prerender_tab_helper.cc b/weblayer/browser/no_state_prefetch/prerender_tab_helper.cc
index a2d83af..bb0df04b 100644
--- a/weblayer/browser/no_state_prefetch/prerender_tab_helper.cc
+++ b/weblayer/browser/no_state_prefetch/prerender_tab_helper.cc
@@ -35,6 +35,6 @@
no_state_prefetch_manager->RecordNavigation(navigation_handle->GetURL());
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PrerenderTabHelper)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PrerenderTabHelper);
} // namespace weblayer
diff --git a/weblayer/browser/page_impl.cc b/weblayer/browser/page_impl.cc
index 5ca0719..38cc2e7 100644
--- a/weblayer/browser/page_impl.cc
+++ b/weblayer/browser/page_impl.cc
@@ -19,7 +19,7 @@
#endif
namespace weblayer {
-PAGE_USER_DATA_KEY_IMPL(PageImpl)
+PAGE_USER_DATA_KEY_IMPL(PageImpl);
PageImpl::PageImpl(content::Page& page)
: content::PageUserData<PageImpl>(page) {}
diff --git a/weblayer/browser/password_manager_driver_factory.cc b/weblayer/browser/password_manager_driver_factory.cc
index 7610702..84de6ca 100644
--- a/weblayer/browser/password_manager_driver_factory.cc
+++ b/weblayer/browser/password_manager_driver_factory.cc
@@ -130,6 +130,6 @@
frame_driver_map_.erase(render_frame_host);
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(PasswordManagerDriverFactory)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(PasswordManagerDriverFactory);
} // namespace weblayer
diff --git a/weblayer/browser/translate_client_impl.cc b/weblayer/browser/translate_client_impl.cc
index 9cb7e5d..123fbe5 100644
--- a/weblayer/browser/translate_client_impl.cc
+++ b/weblayer/browser/translate_client_impl.cc
@@ -191,4 +191,4 @@
} // namespace weblayer
-WEB_CONTENTS_USER_DATA_KEY_IMPL(weblayer::TranslateClientImpl)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(weblayer::TranslateClientImpl);
diff --git a/weblayer/browser/url_bar/trusted_cdn_observer.cc b/weblayer/browser/url_bar/trusted_cdn_observer.cc
index 101f72d8..f7ae9cb 100644
--- a/weblayer/browser/url_bar/trusted_cdn_observer.cc
+++ b/weblayer/browser/url_bar/trusted_cdn_observer.cc
@@ -24,6 +24,6 @@
web_contents()->DidChangeVisibleSecurityState();
}
-WEB_CONTENTS_USER_DATA_KEY_IMPL(TrustedCDNObserver)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(TrustedCDNObserver);
} // namespace weblayer