--- chromium-72.0.3626.81/components/viz/service/hit_test/hit_test_manager.cc.gcc8 2019-01-30 02:17:57.000000000 +0100 +++ chromium-72.0.3626.81/components/viz/service/hit_test/hit_test_manager.cc 2019-02-03 02:50:05.305012810 +0100 @@ -10,7 +10,7 @@ namespace viz { -namespace { +namespace internal { // TODO(gklassen): Review and select appropriate sizes based on // telemetry / UMA. constexpr uint32_t kMaxRegionsPerSurface = 1024; @@ -164,9 +164,9 @@ void HitTestManager::SetHitTestAsyncQuer bool HitTestManager::ValidateHitTestRegionList( const SurfaceId& surface_id, HitTestRegionList* hit_test_region_list) { - if (hit_test_region_list->regions.size() > kMaxRegionsPerSurface) + if (hit_test_region_list->regions.size() > internal::kMaxRegionsPerSurface) return false; - if (!FlagsAndAsyncReasonsMatch( + if (!internal::FlagsAndAsyncReasonsMatch( hit_test_region_list->flags, hit_test_region_list->async_hit_test_reasons)) { return false; @@ -178,7 +178,7 @@ bool HitTestManager::ValidateHitTestRegi region.frame_sink_id = FrameSinkId(surface_id.frame_sink_id().client_id(), region.frame_sink_id.sink_id()); } - if (!FlagsAndAsyncReasonsMatch(region.flags, region.async_hit_test_reasons)) + if (!internal::FlagsAndAsyncReasonsMatch(region.flags, region.async_hit_test_reasons)) return false; } return true; --- chromium-74.0.3729.40/content/browser/tracing/perfetto_file_tracer.h.gcc8 2019-03-27 19:50:13.000000000 +0100 +++ chromium-74.0.3729.40/content/browser/tracing/perfetto_file_tracer.h 2019-03-31 15:12:22.285562410 +0200 @@ -15,10 +15,12 @@ namespace content { -namespace { +namespace internal { class BackgroundDrainer; } // namespace +using namespace internal; + // This is currently only used for tracing startup using Perfetto // as the backend, rather than TraceLog. It will directly stream // protos to a file specified with the '--perfetto-output-file' --- chromium-74.0.3729.40/content/browser/tracing/perfetto_file_tracer.cc.gcc8 2019-03-27 19:50:13.000000000 +0100 +++ chromium-74.0.3729.40/content/browser/tracing/perfetto_file_tracer.cc 2019-03-31 15:10:35.812445295 +0200 @@ -22,7 +22,7 @@ namespace content { -namespace { +namespace internal { constexpr base::TimeDelta kReadBufferIntervalInSeconds = base::TimeDelta::FromSeconds(1); --- chromium-75.0.3766.2/chrome/browser/ui/views/desktop_capture/desktop_media_tab_list.h.gcc8 2019-04-16 03:14:00.000000000 +0200 +++ chromium-75.0.3766.2/chrome/browser/ui/views/desktop_capture/desktop_media_tab_list.h 2019-04-21 21:43:50.393548403 +0200 @@ -12,7 +12,7 @@ class TableView; class View; } // namespace views -namespace { +namespace tab_list_internal { class TabListModel; class TabListViewObserver; } // namespace @@ -56,8 +56,8 @@ class DesktopMediaTabList : public Deskt DesktopMediaTabList operator=(const DesktopMediaTabList&) = delete; DesktopMediaListController* controller_; - std::unique_ptr<TabListModel> model_; - std::unique_ptr<TabListViewObserver> view_observer_; + std::unique_ptr<tab_list_internal::TabListModel> model_; + std::unique_ptr<tab_list_internal::TabListViewObserver> view_observer_; views::TableView* child_ = nullptr; }; --- chromium-75.0.3766.2/chrome/browser/ui/views/desktop_capture/desktop_media_tab_list.cc.gcc8 2019-04-16 03:14:00.000000000 +0200 +++ chromium-75.0.3766.2/chrome/browser/ui/views/desktop_capture/desktop_media_tab_list.cc 2019-04-21 21:59:32.612639241 +0200 @@ -14,7 +14,7 @@ #include "ui/views/layout/fill_layout.h" #include "ui/views/view.h" -namespace { +namespace tab_list_internal { // ui::TableModel that wraps a DesktopMediaListController and listens for // updates from it. @@ -133,8 +133,8 @@ DesktopMediaTabList::DesktopMediaTabList SetLayoutManager(std::make_unique<views::FillLayout>()); - model_ = std::make_unique<TabListModel>(controller_); - view_observer_ = std::make_unique<TabListViewObserver>(controller_); + model_ = std::make_unique<tab_list_internal::TabListModel>(controller_); + view_observer_ = std::make_unique<tab_list_internal::TabListViewObserver>(controller_); auto child = std::make_unique<views::TableView>( model_.get(), std::vector<ui::TableColumn>(1), views::ICON_AND_TEXT, --- chromium-84.0.4147.89/chrome/browser/media/feeds/media_feeds_service.h.gcc10 2020-07-13 20:41:22.000000000 +0200 +++ chromium-84.0.4147.89/chrome/browser/media/feeds/media_feeds_service.h 2020-07-19 20:36:29.680780260 +0200 @@ -35,12 +35,14 @@ namespace user_prefs { class PrefRegistrySyncable; } // namespace user_prefs -namespace media_feeds { - -namespace { +namespace network { +namespace mojom { class CookieChangeListener; +} } // namespace +namespace media_feeds { + class MediaFeedsService : public KeyedService { public: static const char kAggregateWatchtimeHistogramName[]; @@ -232,7 +234,7 @@ class MediaFeedsService : public KeyedSe scoped_refptr<::network::SharedURLLoaderFactory> test_url_loader_factory_for_fetcher_; - std::unique_ptr<CookieChangeListener> cookie_change_listener_; + std::unique_ptr<::network::mojom::CookieChangeListener> cookie_change_listener_; base::OnceClosure cookie_change_callback_; --- chromium-85.0.4183.83/components/browsing_data/core/counters/passwords_counter.cc.gcc10 2020-08-24 23:40:32.000000000 +0200 +++ chromium-85.0.4183.83/components/browsing_data/core/counters/passwords_counter.cc 2020-09-02 11:01:29.679068545 +0200 @@ -18,7 +18,7 @@ #include "url/gurl.h" namespace browsing_data { -namespace { +namespace internal { bool IsPasswordSyncEnabled(const syncer::SyncService* sync_service) { if (!sync_service) @@ -167,10 +168,10 @@ PasswordsCounter::PasswordsCounter( scoped_refptr<password_manager::PasswordStore> account_store, syncer::SyncService* sync_service) : sync_tracker_(this, sync_service) { - profile_store_fetcher_ = std::make_unique<PasswordStoreFetcher>( + profile_store_fetcher_ = std::make_unique<internal::PasswordStoreFetcher>( profile_store, base::BindRepeating(&PasswordsCounter::Restart, base::Unretained(this))), - account_store_fetcher_ = std::make_unique<PasswordStoreFetcher>( + account_store_fetcher_ = std::make_unique<internal::PasswordStoreFetcher>( account_store, base::BindRepeating(&PasswordsCounter::Restart, base::Unretained(this))); DCHECK(profile_store); @@ -195,7 +196,7 @@ const std::vector<std::string>& Password } void PasswordsCounter::OnInitialized() { - sync_tracker_.OnInitialized(base::BindRepeating(&IsPasswordSyncEnabled)); + sync_tracker_.OnInitialized(base::BindRepeating(&internal::IsPasswordSyncEnabled)); } const char* PasswordsCounter::GetPrefName() const { --- chromium-85.0.4183.83/components/browsing_data/core/counters/passwords_counter.h.gcc10 2020-08-24 23:40:32.000000000 +0200 +++ chromium-85.0.4183.83/components/browsing_data/core/counters/passwords_counter.h 2020-09-02 11:00:17.201437600 +0200 @@ -15,7 +15,7 @@ #include "components/password_manager/core/browser/password_store_consumer.h" namespace browsing_data { -namespace { +namespace internal { class PasswordStoreFetcher; } class PasswordsCounter : public browsing_data::BrowsingDataCounter { @@ -74,8 +74,8 @@ class PasswordsCounter : public browsing void Count() override; base::CancelableTaskTracker cancelable_task_tracker_; - std::unique_ptr<PasswordStoreFetcher> profile_store_fetcher_; - std::unique_ptr<PasswordStoreFetcher> account_store_fetcher_; + std::unique_ptr<internal::PasswordStoreFetcher> profile_store_fetcher_; + std::unique_ptr<internal::PasswordStoreFetcher> account_store_fetcher_; SyncTracker sync_tracker_; int remaining_tasks_ = 0; }; --- chromium-85.0.4183.83/chrome/browser/ui/signin_reauth_view_controller.cc.gcc10 2020-08-24 23:40:29.000000000 +0200 +++ chromium-85.0.4183.83/chrome/browser/ui/signin_reauth_view_controller.cc 2020-09-02 13:40:00.589559160 +0200 @@ -32,7 +32,7 @@ #include "third_party/blink/public/common/web_preferences/web_preferences.h" #include "third_party/blink/public/mojom/css/preferred_color_scheme.mojom.h" -namespace { +namespace internal { class ReauthWebContentsObserver : public content::WebContentsObserver { public: @@ -84,7 +84,7 @@ SigninReauthViewController::SigninReauth reauth_web_contents_.get(), reauth_url, false, base::BindOnce(&SigninReauthViewController::OnGaiaReauthPageComplete, weak_ptr_factory_.GetWeakPtr())); - reauth_web_contents_observer_ = std::make_unique<ReauthWebContentsObserver>( + reauth_web_contents_observer_ = std::make_unique<internal::ReauthWebContentsObserver>( reauth_web_contents_.get(), this); } --- chromium-85.0.4183.83/chrome/browser/ui/signin_reauth_view_controller.h.gcc10 2020-08-24 23:40:29.000000000 +0200 +++ chromium-85.0.4183.83/chrome/browser/ui/signin_reauth_view_controller.h 2020-09-02 13:39:25.082226279 +0200 @@ -17,7 +17,7 @@ class Browser; -namespace { +namespace internal { class ReauthWebContentsObserver; } @@ -192,7 +192,7 @@ class SigninReauthViewController // WebContents of the Gaia reauth page. std::unique_ptr<content::WebContents> reauth_web_contents_; - std::unique_ptr<ReauthWebContentsObserver> reauth_web_contents_observer_; + std::unique_ptr<internal::ReauthWebContentsObserver> reauth_web_contents_observer_; // Raw pointer is only set if |reauth_web_contents_| was transferred to a new // tab for the SAML flow. content::WebContents* raw_reauth_web_contents_ = nullptr; --- chromium-87.0.4280.40/chrome/browser/ui/views/global_media_controls/media_notification_device_selector_view.h.gcc10 2020-10-29 23:25:30.000000000 +0100 +++ chromium-87.0.4280.40/chrome/browser/ui/views/global_media_controls/media_notification_device_selector_view.h 2020-11-01 13:43:51.953911974 +0100 @@ -12,8 +12,9 @@ #include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h" #include "media/audio/audio_device_description.h" -namespace { +namespace internal { class ExpandDeviceSelectorButton; +} namespace { const char kAudioDevicesCountHistogramName[] = "Media.GlobalMediaControls.NumberOfAvailableAudioDevices"; const char kDeviceSelectorAvailableHistogramName[] = @@ -106,7 +107,7 @@ class MediaNotificationDeviceSelectorVie // Child views views::View* expand_button_strip_ = nullptr; - ExpandDeviceSelectorButton* expand_button_ = nullptr; + internal::ExpandDeviceSelectorButton* expand_button_ = nullptr; views::View* device_entry_views_container_ = nullptr; std::unique_ptr<MediaNotificationDeviceProvider:: --- chromium-87.0.4280.40/chrome/browser/ui/views/global_media_controls/media_notification_device_selector_view.cc.gcc10 2020-11-01 13:44:45.065987517 +0100 +++ chromium-87.0.4280.40/chrome/browser/ui/views/global_media_controls/media_notification_device_selector_view.cc 2020-11-01 13:45:00.568717641 +0100 @@ -28,7 +28,8 @@ constexpr gfx::Insets kExpandButtonBorde // chosen because it would be very unlikely to see a user with 30+ audio // devices. const int kAudioDevicesCountHistogramMax = 30; - +} // anonymous namespace +namespace internal { class ExpandDeviceSelectorButton : public IconLabelBubbleView { public: explicit ExpandDeviceSelectorButton(IconLabelBubbleView::Delegate* delegate); @@ -41,9 +42,9 @@ class ExpandDeviceSelectorButton : publi IconLabelBubbleView::Delegate* delegate_; }; -} // anonymous namespace +} // namespace internal -ExpandDeviceSelectorButton::ExpandDeviceSelectorButton( +internal::ExpandDeviceSelectorButton::ExpandDeviceSelectorButton( IconLabelBubbleView::Delegate* delegate) : IconLabelBubbleView( views::style::GetFont(views::style::TextContext::CONTEXT_BUTTON, @@ -69,7 +70,7 @@ ExpandDeviceSelectorButton::ExpandDevice SetPreferredSize(size); } -void ExpandDeviceSelectorButton::OnColorsChanged() { +void internal::ExpandDeviceSelectorButton::OnColorsChanged() { UpdateLabelColors(); SetBorder(views::CreateRoundedRectBorder( 1, kExpandButtonStripSize.height() / 2, gfx::Insets(), @@ -101,7 +102,7 @@ MediaNotificationDeviceSelectorView::Med expand_button_strip_->SetPreferredSize(kExpandButtonStripSize); expand_button_ = expand_button_strip_->AddChildView( - std::make_unique<ExpandDeviceSelectorButton>(this)); + std::make_unique<internal::ExpandDeviceSelectorButton>(this)); expand_button_->SetCallback(base::BindRepeating( &MediaNotificationDeviceSelectorView::ExpandButtonPressed, base::Unretained(this))); --- chromium-87.0.4280.40/components/media_message_center/media_notification_view_modern_impl.h.gcc10 2020-10-29 23:25:34.000000000 +0100 +++ chromium-87.0.4280.40/components/media_message_center/media_notification_view_modern_impl.h 2020-11-01 13:52:43.623648761 +0100 @@ -23,7 +23,7 @@ class ToggleImageButton; namespace media_message_center { -namespace { +namespace internal { class MediaArtworkView; } // anonymous namespace @@ -140,7 +140,7 @@ class COMPONENT_EXPORT(MEDIA_MESSAGE_CEN // Container views directly attached to this view. views::View* artwork_container_ = nullptr; - MediaArtworkView* artwork_ = nullptr; + internal::MediaArtworkView* artwork_ = nullptr; views::Label* title_label_ = nullptr; views::Label* subtitle_label_ = nullptr; views::ToggleImageButton* picture_in_picture_button_ = nullptr; --- chromium-87.0.4280.40/components/media_message_center/media_notification_view_modern_impl.cc.gcc10 2020-10-29 23:25:34.000000000 +0100 +++ chromium-87.0.4280.40/components/media_message_center/media_notification_view_modern_impl.cc 2020-11-01 13:53:55.309398312 +0100 @@ -56,7 +56,7 @@ constexpr gfx::Insets kMediaControlsBord constexpr int kTitleArtistLineHeight = 20; constexpr gfx::Size kMediaButtonSize = gfx::Size(36, 36); constexpr int kMediaButtonIconSize = 20; - +} namespace internal { // An image view with a rounded rectangle vignette class MediaArtworkView : public views::ImageView { public: @@ -86,7 +86,7 @@ void MediaArtworkView::OnPaint(gfx::Canv paint_flags.setColor(vignette_color_); canvas->DrawPath(path, paint_flags); } - +} namespace { void RecordMetadataHistogram( MediaNotificationViewModernImpl::Metadata metadata) { UMA_HISTOGRAM_ENUMERATION( @@ -193,7 +193,7 @@ MediaNotificationViewModernImpl::MediaNo { auto artwork = - std::make_unique<MediaArtworkView>(kArtworkVignetteCornerRadius); + std::make_unique<internal::MediaArtworkView>(kArtworkVignetteCornerRadius); artwork_ = artwork_container->AddChildView(std::move(artwork)); } --- chromium-87.0.4280.40/chrome/browser/push_messaging/push_messaging_service_impl.h.gcc10 2020-10-29 23:25:28.000000000 +0100 +++ chromium-87.0.4280.40/chrome/browser/push_messaging/push_messaging_service_impl.h 2020-11-01 15:10:34.213112278 +0100 @@ -62,7 +62,7 @@ namespace instance_id { class InstanceIDDriver; } // namespace instance_id -namespace { +namespace internal { struct PendingMessage { PendingMessage(std::string app_id, gcm::IncomingMessage message); PendingMessage(PendingMessage&& other); @@ -405,7 +405,7 @@ class PushMessagingServiceImpl : public Profile* profile_; std::unique_ptr<AbusiveOriginPermissionRevocationRequest> abusive_origin_revocation_request_; - std::queue<PendingMessage> messages_pending_permission_check_; + std::queue<internal::PendingMessage> messages_pending_permission_check_; int push_subscription_count_; int pending_push_subscription_count_; --- chromium-87.0.4280.40/chrome/browser/push_messaging/push_messaging_service_impl.cc.gcc10 2020-10-29 23:25:28.000000000 +0100 +++ chromium-87.0.4280.40/chrome/browser/push_messaging/push_messaging_service_impl.cc 2020-11-01 15:12:36.900845849 +0100 @@ -182,7 +182,9 @@ content::RenderFrameHost* GetMainFrameFo return web_contents ? web_contents->GetMainFrame() : nullptr; } +} // namespace +namespace internal { PendingMessage::PendingMessage(std::string app_id, gcm::IncomingMessage message) : app_id(std::move(app_id)), message(std::move(message)) {} PendingMessage::PendingMessage(PendingMessage&& other) = default; --- chromium-87.0.4280.40/chrome/browser/media/kaleidoscope/kaleidoscope_service.h.gcc10 2020-10-29 23:25:28.000000000 +0100 +++ chromium-87.0.4280.40/chrome/browser/media/kaleidoscope/kaleidoscope_service.h 2020-11-01 15:40:57.603544394 +0100 @@ -20,7 +20,7 @@ class Clock; namespace kaleidoscope { -namespace { +namespace internal { class GetCollectionsRequest; } // namespace @@ -78,7 +78,7 @@ class KaleidoscopeService : public Keyed Profile* const profile_; - std::unique_ptr<GetCollectionsRequest> request_; + std::unique_ptr<internal::GetCollectionsRequest> request_; std::vector<GetCollectionsCallback> pending_callbacks_; --- chromium-87.0.4280.40/chrome/browser/media/kaleidoscope/kaleidoscope_service.cc.gcc10 2020-10-29 23:25:28.000000000 +0100 +++ chromium-87.0.4280.40/chrome/browser/media/kaleidoscope/kaleidoscope_service.cc 2020-11-01 15:43:08.105129352 +0100 @@ -33,6 +33,10 @@ const char kRequestContentType[] = "appl const char kCollectionsURLFormat[] = "/v1/collections"; +} // namespace + +namespace internal { + class GetCollectionsRequest { public: GetCollectionsRequest( @@ -264,7 +268,7 @@ void KaleidoscopeService::OnGotCachedDat // Create the request. if (!request_) { - request_ = std::make_unique<GetCollectionsRequest>( + request_ = std::make_unique<internal::GetCollectionsRequest>( std::move(credentials), gaia_id, request, GetURLLoaderFactoryForFetcher(), clock_, base::BindOnce(&KaleidoscopeService::OnURLFetchComplete,