Replace DISALLOW_COPY_AND_ASSIGN in chrome/
This replaces DISALLOW_COPY_AND_ASSIGN with explicit constructor deletes
where a local script is able to detect its insertion place (~Foo() is
public => insert before this line).
This is incomplete as not all classes have a public ~Foo() declared, so
not all DISALLOW_COPY_AND_ASSIGN occurrences are replaced.
IWYU cleanup is left as a separate pass that is easier when these macros
go away.
Bug: 1010217
Change-Id: I882202fb6295332b52c34ba12fae4705276b0b5f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3165772
Auto-Submit: Peter Boström <[email protected]>
Commit-Queue: Daniel Cheng <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Owners-Override: Daniel Cheng <[email protected]>
Cr-Commit-Position: refs/heads/main@{#922479}
diff --git a/chrome/browser/accessibility/accessibility_labels_service.cc b/chrome/browser/accessibility/accessibility_labels_service.cc
index eb8efda..b4db957 100644
--- a/chrome/browser/accessibility/accessibility_labels_service.cc
+++ b/chrome/browser/accessibility/accessibility_labels_service.cc
@@ -61,6 +61,10 @@
class ImageAnnotatorClient : public image_annotation::Annotator::Client {
public:
explicit ImageAnnotatorClient(Profile* profile) : profile_(profile) {}
+
+ ImageAnnotatorClient(const ImageAnnotatorClient&) = delete;
+ ImageAnnotatorClient& operator=(const ImageAnnotatorClient&) = delete;
+
~ImageAnnotatorClient() override = default;
// image_annotation::Annotator::Client implementation:
@@ -117,8 +121,6 @@
private:
Profile* const profile_;
data_decoder::DataDecoder data_decoder_;
-
- DISALLOW_COPY_AND_ASSIGN(ImageAnnotatorClient);
};
} // namespace
diff --git a/chrome/browser/accessibility/accessibility_labels_service.h b/chrome/browser/accessibility/accessibility_labels_service.h
index 39ae774..d79ce40 100644
--- a/chrome/browser/accessibility/accessibility_labels_service.h
+++ b/chrome/browser/accessibility/accessibility_labels_service.h
@@ -45,6 +45,10 @@
{
public:
+ AccessibilityLabelsService(const AccessibilityLabelsService&) = delete;
+ AccessibilityLabelsService& operator=(const AccessibilityLabelsService&) =
+ delete;
+
~AccessibilityLabelsService() override;
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
@@ -101,8 +105,6 @@
mojo::Remote<image_annotation::mojom::ImageAnnotationService> remote_service_;
base::WeakPtrFactory<AccessibilityLabelsService> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AccessibilityLabelsService);
};
#endif // CHROME_BROWSER_ACCESSIBILITY_ACCESSIBILITY_LABELS_SERVICE_H_
diff --git a/chrome/browser/accessibility/accessibility_ui.h b/chrome/browser/accessibility/accessibility_ui.h
index c0453b9f..8343169 100644
--- a/chrome/browser/accessibility/accessibility_ui.h
+++ b/chrome/browser/accessibility/accessibility_ui.h
@@ -53,6 +53,11 @@
class AccessibilityUIMessageHandler : public content::WebUIMessageHandler {
public:
AccessibilityUIMessageHandler();
+
+ AccessibilityUIMessageHandler(const AccessibilityUIMessageHandler&) = delete;
+ AccessibilityUIMessageHandler& operator=(
+ const AccessibilityUIMessageHandler&) = delete;
+
~AccessibilityUIMessageHandler() override;
void RegisterMessages() override;
@@ -76,8 +81,6 @@
void RequestAccessibilityEvents(const base::ListValue* args);
void Callback(const std::string&);
void StopRecording(content::WebContents* web_contents);
-
- DISALLOW_COPY_AND_ASSIGN(AccessibilityUIMessageHandler);
};
#endif // CHROME_BROWSER_ACCESSIBILITY_ACCESSIBILITY_UI_H_
diff --git a/chrome/browser/accessibility/image_annotation_browsertest.cc b/chrome/browser/accessibility/image_annotation_browsertest.cc
index 483acd5..a673d91 100644
--- a/chrome/browser/accessibility/image_annotation_browsertest.cc
+++ b/chrome/browser/accessibility/image_annotation_browsertest.cc
@@ -108,6 +108,10 @@
}
FakeAnnotator() = default;
+
+ FakeAnnotator(const FakeAnnotator&) = delete;
+ FakeAnnotator& operator=(const FakeAnnotator&) = delete;
+
~FakeAnnotator() override = default;
void BindReceiver(
@@ -169,8 +173,6 @@
static std::map<std::string, std::string> custom_label_result_mapping_;
static absl::optional<image_annotation::mojom::AnnotateImageError>
return_error_code_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeAnnotator);
};
// static
@@ -189,6 +191,11 @@
: public image_annotation::mojom::ImageAnnotationService {
public:
FakeImageAnnotationService() = default;
+
+ FakeImageAnnotationService(const FakeImageAnnotationService&) = delete;
+ FakeImageAnnotationService& operator=(const FakeImageAnnotationService&) =
+ delete;
+
~FakeImageAnnotationService() override = default;
private:
@@ -199,8 +206,6 @@
}
FakeAnnotator annotator_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeImageAnnotationService);
};
void BindImageAnnotatorService(
diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_startup_task_utils.cc
index ca2cc1df..bbde2b7f 100644
--- a/chrome/browser/after_startup_task_utils.cc
+++ b/chrome/browser/after_startup_task_utils.cc
@@ -139,6 +139,9 @@
: public performance_manager::GraphOwned,
public performance_manager::PageNode::ObserverDefaultImpl {
public:
+ StartupObserver(const StartupObserver&) = delete;
+ StartupObserver& operator=(const StartupObserver&) = delete;
+
~StartupObserver() override = default;
static void Start();
@@ -202,7 +205,6 @@
}
bool startup_complete_ = false;
- DISALLOW_COPY_AND_ASSIGN(StartupObserver);
};
// static
diff --git a/chrome/browser/android/accessibility/font_size_prefs_android.h b/chrome/browser/android/accessibility/font_size_prefs_android.h
index d2732f73..d3e7a02c 100644
--- a/chrome/browser/android/accessibility/font_size_prefs_android.h
+++ b/chrome/browser/android/accessibility/font_size_prefs_android.h
@@ -20,6 +20,10 @@
class FontSizePrefsAndroid {
public:
FontSizePrefsAndroid(JNIEnv* env, jobject obj);
+
+ FontSizePrefsAndroid(const FontSizePrefsAndroid&) = delete;
+ FontSizePrefsAndroid& operator=(const FontSizePrefsAndroid&) = delete;
+
~FontSizePrefsAndroid();
void SetFontScaleFactor(JNIEnv* env,
@@ -42,8 +46,6 @@
std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;
PrefService* const pref_service_;
base::android::ScopedJavaGlobalRef<jobject> java_ref_;
-
- DISALLOW_COPY_AND_ASSIGN(FontSizePrefsAndroid);
};
#endif // CHROME_BROWSER_ANDROID_ACCESSIBILITY_FONT_SIZE_PREFS_ANDROID_H_
diff --git a/chrome/browser/android/autofill_assistant/client_android.h b/chrome/browser/android/autofill_assistant/client_android.h
index 5c85f89..7f1c6c1 100644
--- a/chrome/browser/android/autofill_assistant/client_android.h
+++ b/chrome/browser/android/autofill_assistant/client_android.h
@@ -40,6 +40,9 @@
public AccessTokenFetcher,
public content::WebContentsUserData<ClientAndroid> {
public:
+ ClientAndroid(const ClientAndroid&) = delete;
+ ClientAndroid& operator=(const ClientAndroid&) = delete;
+
~ClientAndroid() override;
base::WeakPtr<ClientAndroid> GetWeakPtr();
@@ -181,8 +184,6 @@
fetch_access_token_callback_;
base::WeakPtrFactory<ClientAndroid> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ClientAndroid);
};
} // namespace autofill_assistant.
diff --git a/chrome/browser/android/autofill_assistant/interaction_handler_android.h b/chrome/browser/android/autofill_assistant/interaction_handler_android.h
index 40937f1..f58e553d 100644
--- a/chrome/browser/android/autofill_assistant/interaction_handler_android.h
+++ b/chrome/browser/android/autofill_assistant/interaction_handler_android.h
@@ -43,6 +43,11 @@
RadioButtonController* radio_button_controller,
base::android::ScopedJavaGlobalRef<jobject> jcontext,
base::android::ScopedJavaGlobalRef<jobject> jdelegate);
+
+ InteractionHandlerAndroid(const InteractionHandlerAndroid&) = delete;
+ InteractionHandlerAndroid& operator=(const InteractionHandlerAndroid&) =
+ delete;
+
~InteractionHandlerAndroid() override;
base::WeakPtr<InteractionHandlerAndroid> GetWeakPtr();
@@ -111,7 +116,6 @@
nested_ui_controllers_;
base::WeakPtrFactory<InteractionHandlerAndroid> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(InteractionHandlerAndroid);
};
} // namespace autofill_assistant
diff --git a/chrome/browser/android/autofill_assistant/ui_controller_android.h b/chrome/browser/android/autofill_assistant/ui_controller_android.h
index ec1fe6ee..e46e3bc 100644
--- a/chrome/browser/android/autofill_assistant/ui_controller_android.h
+++ b/chrome/browser/android/autofill_assistant/ui_controller_android.h
@@ -57,6 +57,10 @@
JNIEnv* env,
const base::android::JavaRef<jobject>& jactivity,
const base::android::JavaRef<jobject>& joverlay_coordinator);
+
+ UiControllerAndroid(const UiControllerAndroid&) = delete;
+ UiControllerAndroid& operator=(const UiControllerAndroid&) = delete;
+
~UiControllerAndroid() override;
// Attaches the UI to the given client, its web contents and delegate.
@@ -304,8 +308,6 @@
std::unique_ptr<AssistantHeaderModel> header_model_;
base::WeakPtrFactory<UiControllerAndroid> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UiControllerAndroid);
};
} // namespace autofill_assistant.
diff --git a/chrome/browser/android/background_tab_manager.h b/chrome/browser/android/background_tab_manager.h
index d8448988..c04efd6 100644
--- a/chrome/browser/android/background_tab_manager.h
+++ b/chrome/browser/android/background_tab_manager.h
@@ -31,6 +31,11 @@
public:
WebContentsDestroyedObserver(BackgroundTabManager* owner,
content::WebContents* watched_contents);
+
+ WebContentsDestroyedObserver(const WebContentsDestroyedObserver&) = delete;
+ WebContentsDestroyedObserver& operator=(const WebContentsDestroyedObserver&) =
+ delete;
+
~WebContentsDestroyedObserver() override;
// WebContentsObserver:
@@ -38,8 +43,6 @@
private:
BackgroundTabManager* owner_;
-
- DISALLOW_COPY_AND_ASSIGN(WebContentsDestroyedObserver);
};
// BackgroundTabManager is responsible for storing state for the current
diff --git a/chrome/browser/android/background_task_scheduler/proxy_native_task.h b/chrome/browser/android/background_task_scheduler/proxy_native_task.h
index 2a93c1cd..54f50f01 100644
--- a/chrome/browser/android/background_task_scheduler/proxy_native_task.h
+++ b/chrome/browser/android/background_task_scheduler/proxy_native_task.h
@@ -17,6 +17,10 @@
std::unique_ptr<background_task::BackgroundTask> background_task,
const background_task::TaskParameters& task_params,
background_task::TaskFinishedCallback finish_callback);
+
+ ProxyNativeTask(const ProxyNativeTask&) = delete;
+ ProxyNativeTask& operator=(const ProxyNativeTask&) = delete;
+
~ProxyNativeTask();
void StartBackgroundTaskInReducedMode(JNIEnv* env,
@@ -41,8 +45,6 @@
std::unique_ptr<background_task::BackgroundTask> background_task_;
background_task::TaskParameters task_params_;
background_task::TaskFinishedCallback finish_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ProxyNativeTask);
};
#endif // CHROME_BROWSER_ANDROID_BACKGROUND_TASK_SCHEDULER_PROXY_NATIVE_TASK_H_
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_reader.h b/chrome/browser/android/bookmarks/partner_bookmarks_reader.h
index a1f00d62..058a32a 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_reader.h
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_reader.h
@@ -27,6 +27,10 @@
public:
PartnerBookmarksReader(PartnerBookmarksShim* partner_bookmarks_shim,
Profile* profile);
+
+ PartnerBookmarksReader(const PartnerBookmarksReader&) = delete;
+ PartnerBookmarksReader& operator=(const PartnerBookmarksReader&) = delete;
+
~PartnerBookmarksReader();
// JNI methods
@@ -124,8 +128,6 @@
// JNI
std::unique_ptr<bookmarks::BookmarkNode> wip_partner_bookmarks_root_;
int64_t wip_next_available_id_;
-
- DISALLOW_COPY_AND_ASSIGN(PartnerBookmarksReader);
};
#endif // CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_READER_H_
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim.h b/chrome/browser/android/bookmarks/partner_bookmarks_shim.h
index f49ef01c..4f3de90 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_shim.h
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim.h
@@ -40,6 +40,9 @@
// Note that node->GetTitle() returns an original (unmodified) title.
class PartnerBookmarksShim : public base::SupportsUserData::Data {
public:
+ PartnerBookmarksShim(const PartnerBookmarksShim&) = delete;
+ PartnerBookmarksShim& operator=(const PartnerBookmarksShim&) = delete;
+
~PartnerBookmarksShim() override;
// Returns an instance of the shim for a given |browser_context|.
@@ -154,8 +157,6 @@
// The observers.
base::ObserverList<Observer>::Unchecked observers_;
-
- DISALLOW_COPY_AND_ASSIGN(PartnerBookmarksShim);
};
#endif // CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_SHIM_H_
diff --git a/chrome/browser/android/bottombar/overlay_panel_content.h b/chrome/browser/android/bottombar/overlay_panel_content.h
index 4b851d6..d874ed3 100644
--- a/chrome/browser/android/bottombar/overlay_panel_content.h
+++ b/chrome/browser/android/bottombar/overlay_panel_content.h
@@ -27,6 +27,10 @@
public:
// Constructs a native manager associated with the Java manager.
OverlayPanelContent(JNIEnv* env, jobject obj);
+
+ OverlayPanelContent(const OverlayPanelContent&) = delete;
+ OverlayPanelContent& operator=(const OverlayPanelContent&) = delete;
+
virtual ~OverlayPanelContent();
// Called by the Java OverlayPanelContent when it is being destroyed.
@@ -82,8 +86,6 @@
std::unique_ptr<content::WebContents> web_contents_;
std::unique_ptr<web_contents_delegate_android::WebContentsDelegateAndroid>
web_contents_delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(OverlayPanelContent);
};
#endif // CHROME_BROWSER_ANDROID_BOTTOMBAR_OVERLAY_PANEL_CONTENT_H_
diff --git a/chrome/browser/android/browsing_data/browsing_data_counter_bridge.h b/chrome/browser/android/browsing_data/browsing_data_counter_bridge.h
index 170ff593..4bcc888 100644
--- a/chrome/browser/android/browsing_data/browsing_data_counter_bridge.h
+++ b/chrome/browser/android/browsing_data/browsing_data_counter_bridge.h
@@ -21,6 +21,10 @@
jint data_type,
jint clear_browsing_data_tab);
+ BrowsingDataCounterBridge(const BrowsingDataCounterBridge&) = delete;
+ BrowsingDataCounterBridge& operator=(const BrowsingDataCounterBridge&) =
+ delete;
+
~BrowsingDataCounterBridge();
// Called by the Java counterpart when it is getting garbage collected.
@@ -33,8 +37,6 @@
base::android::ScopedJavaGlobalRef<jobject> jobject_;
std::unique_ptr<browsing_data::BrowsingDataCounter> counter_;
browsing_data::ClearBrowsingDataTab clear_browsing_data_tab_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowsingDataCounterBridge);
};
#endif // CHROME_BROWSER_ANDROID_BROWSING_DATA_BROWSING_DATA_COUNTER_BRIDGE_H_
diff --git a/chrome/browser/android/browsing_data/url_filter_bridge.h b/chrome/browser/android/browsing_data/url_filter_bridge.h
index 58844d6..c499dcf 100644
--- a/chrome/browser/android/browsing_data/url_filter_bridge.h
+++ b/chrome/browser/android/browsing_data/url_filter_bridge.h
@@ -17,6 +17,10 @@
public:
explicit UrlFilterBridge(
const base::RepeatingCallback<bool(const GURL&)>& url_filter);
+
+ UrlFilterBridge(const UrlFilterBridge&) = delete;
+ UrlFilterBridge& operator=(const UrlFilterBridge&) = delete;
+
~UrlFilterBridge();
// Destroys this object.
@@ -38,8 +42,6 @@
// The Java counterpart of this C++ object.
base::android::ScopedJavaGlobalRef<jobject> j_bridge_;
-
- DISALLOW_COPY_AND_ASSIGN(UrlFilterBridge);
};
#endif // CHROME_BROWSER_ANDROID_BROWSING_DATA_URL_FILTER_BRIDGE_H_
diff --git a/chrome/browser/android/chrome_backup_watcher.h b/chrome/browser/android/chrome_backup_watcher.h
index 87f7bdf..77832778 100644
--- a/chrome/browser/android/chrome_backup_watcher.h
+++ b/chrome/browser/android/chrome_backup_watcher.h
@@ -20,12 +20,15 @@
class ChromeBackupWatcher {
public:
explicit ChromeBackupWatcher(Profile* profile);
+
+ ChromeBackupWatcher(const ChromeBackupWatcher&) = delete;
+ ChromeBackupWatcher& operator=(const ChromeBackupWatcher&) = delete;
+
virtual ~ChromeBackupWatcher();
private:
PrefChangeRegistrar registrar_;
base::android::ScopedJavaGlobalRef<jobject> java_watcher_;
- DISALLOW_COPY_AND_ASSIGN(ChromeBackupWatcher);
};
} // namespace android
diff --git a/chrome/browser/android/compositor/decoration_title.h b/chrome/browser/android/compositor/decoration_title.h
index b10c0960..478c2f0 100644
--- a/chrome/browser/android/compositor/decoration_title.h
+++ b/chrome/browser/android/compositor/decoration_title.h
@@ -38,6 +38,10 @@
int favicon_end_padding,
bool is_incognito,
bool is_rtl);
+
+ DecorationTitle(const DecorationTitle&) = delete;
+ DecorationTitle& operator=(const DecorationTitle&) = delete;
+
virtual ~DecorationTitle();
void SetResourceManager(ui::ResourceManager* resource_manager);
@@ -83,8 +87,6 @@
std::unique_ptr<gfx::Transform> transform_;
ui::ResourceManager* resource_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(DecorationTitle);
};
} // namespace android
diff --git a/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h b/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h
index 0b492f0..9c6b268c 100644
--- a/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h
@@ -33,6 +33,11 @@
public:
ContextualSearchSceneLayer(JNIEnv* env,
const base::android::JavaRef<jobject>& jobj);
+
+ ContextualSearchSceneLayer(const ContextualSearchSceneLayer&) = delete;
+ ContextualSearchSceneLayer& operator=(const ContextualSearchSceneLayer&) =
+ delete;
+
~ContextualSearchSceneLayer() override;
void CreateContextualSearchLayer(
@@ -150,8 +155,6 @@
// Responsible for fading the base page content.
scoped_refptr<cc::SolidColorLayer> color_overlay_;
scoped_refptr<cc::Layer> content_container_;
-
- DISALLOW_COPY_AND_ASSIGN(ContextualSearchSceneLayer);
};
} // namespace android
diff --git a/chrome/browser/android/compositor/scene_layer/continuous_search_scene_layer.h b/chrome/browser/android/compositor/scene_layer/continuous_search_scene_layer.h
index 5d7409f..c556f4f 100644
--- a/chrome/browser/android/compositor/scene_layer/continuous_search_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/continuous_search_scene_layer.h
@@ -23,6 +23,11 @@
public:
ContinuousSearchSceneLayer(JNIEnv* env,
const base::android::JavaRef<jobject>& jobj);
+
+ ContinuousSearchSceneLayer(const ContinuousSearchSceneLayer&) = delete;
+ ContinuousSearchSceneLayer& operator=(const ContinuousSearchSceneLayer&) =
+ delete;
+
~ContinuousSearchSceneLayer() override;
// Update the compositor version of the view.
@@ -46,8 +51,6 @@
SkColor background_color_;
scoped_refptr<cc::Layer> view_container_;
scoped_refptr<cc::UIResourceLayer> view_layer_;
-
- DISALLOW_COPY_AND_ASSIGN(ContinuousSearchSceneLayer);
};
} // namespace android
diff --git a/chrome/browser/android/compositor/scene_layer/overscroll_scene_layer.h b/chrome/browser/android/compositor/scene_layer/overscroll_scene_layer.h
index 6752fee..9434a3f5 100644
--- a/chrome/browser/android/compositor/scene_layer/overscroll_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/overscroll_scene_layer.h
@@ -27,6 +27,10 @@
OverscrollSceneLayer(JNIEnv* env,
const base::android::JavaParamRef<jobject>& jobj,
const base::android::JavaParamRef<jobject>& jwindow);
+
+ OverscrollSceneLayer(const OverscrollSceneLayer&) = delete;
+ OverscrollSceneLayer& operator=(const OverscrollSceneLayer&) = delete;
+
~OverscrollSceneLayer() override;
void Prepare(JNIEnv* env,
@@ -67,8 +71,6 @@
ui::ResourceManager* resource_manager_ = nullptr;
gfx::Vector2dF start_pos_;
-
- DISALLOW_COPY_AND_ASSIGN(OverscrollSceneLayer);
};
} // namespace android
diff --git a/chrome/browser/android/compositor/scene_layer/scrolling_bottom_view_scene_layer.h b/chrome/browser/android/compositor/scene_layer/scrolling_bottom_view_scene_layer.h
index c4ff972c..ffd2534 100644
--- a/chrome/browser/android/compositor/scene_layer/scrolling_bottom_view_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/scrolling_bottom_view_scene_layer.h
@@ -23,6 +23,11 @@
public:
ScrollingBottomViewSceneLayer(JNIEnv* env,
const base::android::JavaRef<jobject>& jobj);
+
+ ScrollingBottomViewSceneLayer(const ScrollingBottomViewSceneLayer&) = delete;
+ ScrollingBottomViewSceneLayer& operator=(
+ const ScrollingBottomViewSceneLayer&) = delete;
+
~ScrollingBottomViewSceneLayer() override;
// Update the compositor version of the view.
@@ -50,8 +55,6 @@
SkColor background_color_;
scoped_refptr<cc::Layer> view_container_;
scoped_refptr<cc::UIResourceLayer> view_layer_;
-
- DISALLOW_COPY_AND_ASSIGN(ScrollingBottomViewSceneLayer);
};
} // namespace android
diff --git a/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h b/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h
index 822d216..7cfb196a 100644
--- a/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h
@@ -26,6 +26,10 @@
class StaticTabSceneLayer : public SceneLayer {
public:
StaticTabSceneLayer(JNIEnv* env, const base::android::JavaRef<jobject>& jobj);
+
+ StaticTabSceneLayer(const StaticTabSceneLayer&) = delete;
+ StaticTabSceneLayer& operator=(const StaticTabSceneLayer&) = delete;
+
~StaticTabSceneLayer() override;
bool ShouldShowBackground() override;
@@ -56,8 +60,6 @@
int last_set_tab_id_;
int background_color_;
float brightness_;
-
- DISALLOW_COPY_AND_ASSIGN(StaticTabSceneLayer);
};
} // namespace android
diff --git a/chrome/browser/android/compositor/scene_layer/status_indicator_scene_layer.h b/chrome/browser/android/compositor/scene_layer/status_indicator_scene_layer.h
index ff6be574..693df5a 100644
--- a/chrome/browser/android/compositor/scene_layer/status_indicator_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/status_indicator_scene_layer.h
@@ -23,6 +23,11 @@
public:
StatusIndicatorSceneLayer(JNIEnv* env,
const base::android::JavaRef<jobject>& jobj);
+
+ StatusIndicatorSceneLayer(const StatusIndicatorSceneLayer&) = delete;
+ StatusIndicatorSceneLayer& operator=(const StatusIndicatorSceneLayer&) =
+ delete;
+
~StatusIndicatorSceneLayer() override;
// Update the compositor version of the view.
@@ -46,8 +51,6 @@
SkColor background_color_;
scoped_refptr<cc::Layer> view_container_;
scoped_refptr<cc::UIResourceLayer> view_layer_;
-
- DISALLOW_COPY_AND_ASSIGN(StatusIndicatorSceneLayer);
};
} // namespace android
diff --git a/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h b/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h
index cbfa6cd..d8531f30 100644
--- a/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h
@@ -30,6 +30,10 @@
class TabListSceneLayer : public SceneLayer {
public:
TabListSceneLayer(JNIEnv* env, const base::android::JavaRef<jobject>& jobj);
+
+ TabListSceneLayer(const TabListSceneLayer&) = delete;
+ TabListSceneLayer& operator=(const TabListSceneLayer&) = delete;
+
~TabListSceneLayer() override;
void BeginBuildingFrame(JNIEnv* env,
@@ -134,8 +138,6 @@
SkColor background_color_;
scoped_refptr<cc::Layer> own_tree_;
-
- DISALLOW_COPY_AND_ASSIGN(TabListSceneLayer);
};
} // namespace android
diff --git a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h b/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h
index 477d64d..13a8aef4 100644
--- a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h
@@ -30,6 +30,10 @@
class TabStripSceneLayer : public SceneLayer {
public:
TabStripSceneLayer(JNIEnv* env, const base::android::JavaRef<jobject>& jobj);
+
+ TabStripSceneLayer(const TabStripSceneLayer&) = delete;
+ TabStripSceneLayer& operator=(const TabStripSceneLayer&) = delete;
+
~TabStripSceneLayer() override;
void SetContentTree(
@@ -135,8 +139,6 @@
unsigned write_index_;
TabHandleLayerList tab_handle_layers_;
SceneLayer* content_tree_;
-
- DISALLOW_COPY_AND_ASSIGN(TabStripSceneLayer);
};
} // namespace android
diff --git a/chrome/browser/android/compositor/scene_layer/top_toolbar_scene_layer.h b/chrome/browser/android/compositor/scene_layer/top_toolbar_scene_layer.h
index 2f39a8c..89d5107c 100644
--- a/chrome/browser/android/compositor/scene_layer/top_toolbar_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/top_toolbar_scene_layer.h
@@ -24,6 +24,10 @@
public:
TopToolbarSceneLayer(JNIEnv* env,
const base::android::JavaRef<jobject>& jobj);
+
+ TopToolbarSceneLayer(const TopToolbarSceneLayer&) = delete;
+ TopToolbarSceneLayer& operator=(const TopToolbarSceneLayer&) = delete;
+
~TopToolbarSceneLayer() override;
// Update the compositor version of the toolbar.
@@ -69,8 +73,6 @@
SkColor background_color_;
scoped_refptr<cc::Layer> content_container_;
scoped_refptr<ToolbarLayer> toolbar_layer_;
-
- DISALLOW_COPY_AND_ASSIGN(TopToolbarSceneLayer);
};
} // namespace android
diff --git a/chrome/browser/android/compositor/tab_content_manager.cc b/chrome/browser/android/compositor/tab_content_manager.cc
index 27a83a56..ee164b88 100644
--- a/chrome/browser/android/compositor/tab_content_manager.cc
+++ b/chrome/browser/android/compositor/tab_content_manager.cc
@@ -89,6 +89,9 @@
std::move(result_callback));
}
+ TabReadbackRequest(const TabReadbackRequest&) = delete;
+ TabReadbackRequest& operator=(const TabReadbackRequest&) = delete;
+
virtual ~TabReadbackRequest() {}
void OnFinishGetTabThumbnailBitmap(const SkBitmap& bitmap) {
@@ -110,8 +113,6 @@
bool drop_after_readback_;
base::WeakPtrFactory<TabReadbackRequest> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TabReadbackRequest);
};
// static
diff --git a/chrome/browser/android/compositor/tab_content_manager.h b/chrome/browser/android/compositor/tab_content_manager.h
index cf20912..0786899 100644
--- a/chrome/browser/android/compositor/tab_content_manager.h
+++ b/chrome/browser/android/compositor/tab_content_manager.h
@@ -48,6 +48,9 @@
jboolean use_approximation_thumbnail,
jboolean save_jpeg_thumbnails);
+ TabContentManager(const TabContentManager&) = delete;
+ TabContentManager& operator=(const TabContentManager&) = delete;
+
virtual ~TabContentManager();
void Destroy(JNIEnv* env);
@@ -154,8 +157,6 @@
JavaObjectWeakGlobalRef weak_java_tab_content_manager_;
base::WeakPtrFactory<TabContentManager> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TabContentManager);
};
} // namespace android
diff --git a/chrome/browser/android/contextualsearch/contextual_search_context.h b/chrome/browser/android/contextualsearch/contextual_search_context.h
index a7f22c7..44a54d4 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_context.h
+++ b/chrome/browser/android/contextualsearch/contextual_search_context.h
@@ -28,6 +28,10 @@
ContextualSearchContext(const std::string& home_country,
const GURL& page_url,
const std::string& encoding);
+
+ ContextualSearchContext(const ContextualSearchContext&) = delete;
+ ContextualSearchContext& operator=(const ContextualSearchContext&) = delete;
+
~ContextualSearchContext();
// Calls the destructor. Should be called when this native object is no
@@ -169,8 +173,6 @@
// that any WeakPtrs to this instance are invalidated before its members
// variable's destructors are executed, rendering them invalid.
base::WeakPtrFactory<ContextualSearchContext> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ContextualSearchContext);
};
#endif // CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_CONTEXTUAL_SEARCH_CONTEXT_H_
diff --git a/chrome/browser/android/contextualsearch/contextual_search_delegate.h b/chrome/browser/android/contextualsearch/contextual_search_delegate.h
index bc5c5683..9693026 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_delegate.h
+++ b/chrome/browser/android/contextualsearch/contextual_search_delegate.h
@@ -51,6 +51,10 @@
TemplateURLService* template_url_service,
SearchTermResolutionCallback search_term_callback,
SurroundingTextCallback surrounding_callback);
+
+ ContextualSearchDelegate(const ContextualSearchDelegate&) = delete;
+ ContextualSearchDelegate& operator=(const ContextualSearchDelegate&) = delete;
+
virtual ~ContextualSearchDelegate();
// Gathers surrounding text and saves it locally in the given context.
@@ -202,8 +206,6 @@
// Used to hold the context until an upcoming search term request is started.
// Owned by the Java ContextualSearchContext.
base::WeakPtr<ContextualSearchContext> context_;
-
- DISALLOW_COPY_AND_ASSIGN(ContextualSearchDelegate);
};
#endif // CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_CONTEXTUAL_SEARCH_DELEGATE_H_
diff --git a/chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc b/chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc
index d055d68..7365b157 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc
+++ b/chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc
@@ -42,6 +42,11 @@
class ContextualSearchDelegateTest : public testing::Test {
public:
ContextualSearchDelegateTest() {}
+
+ ContextualSearchDelegateTest(const ContextualSearchDelegateTest&) = delete;
+ ContextualSearchDelegateTest& operator=(const ContextualSearchDelegateTest&) =
+ delete;
+
~ContextualSearchDelegateTest() override {}
protected:
@@ -308,8 +313,6 @@
// Features to enable
base::test::ScopedFeatureList feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(ContextualSearchDelegateTest);
};
TEST_F(ContextualSearchDelegateTest, NormalFetchWithXssiEscape) {
diff --git a/chrome/browser/android/contextualsearch/contextual_search_field_trial_unittest.cc b/chrome/browser/android/contextualsearch/contextual_search_field_trial_unittest.cc
index 14c9f5dc..42bf5d1 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_field_trial_unittest.cc
+++ b/chrome/browser/android/contextualsearch/contextual_search_field_trial_unittest.cc
@@ -13,6 +13,12 @@
class ContextualSearchFieldTrialTest : public testing::Test {
public:
ContextualSearchFieldTrialTest() {}
+
+ ContextualSearchFieldTrialTest(const ContextualSearchFieldTrialTest&) =
+ delete;
+ ContextualSearchFieldTrialTest& operator=(
+ const ContextualSearchFieldTrialTest&) = delete;
+
~ContextualSearchFieldTrialTest() override {}
// Inner class that stubs out access to Variations and command-line switches.
@@ -43,9 +49,6 @@
}
void TearDown() override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ContextualSearchFieldTrialTest);
};
bool ContextualSearchFieldTrialTest::ContextualSearchFieldTrialStubbed::
diff --git a/chrome/browser/android/contextualsearch/contextual_search_manager.h b/chrome/browser/android/contextualsearch/contextual_search_manager.h
index 8518aae..efb96a5 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_manager.h
+++ b/chrome/browser/android/contextualsearch/contextual_search_manager.h
@@ -23,6 +23,10 @@
// Constructs a native manager associated with the Java manager.
ContextualSearchManager(JNIEnv* env,
const base::android::JavaRef<jobject>& obj);
+
+ ContextualSearchManager(const ContextualSearchManager&) = delete;
+ ContextualSearchManager& operator=(const ContextualSearchManager&) = delete;
+
~ContextualSearchManager() override;
// Called by the Java ContextualSearchManager when it is being destroyed.
@@ -107,8 +111,6 @@
// The delegate we're using the do the real work.
std::unique_ptr<ContextualSearchDelegate> delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(ContextualSearchManager);
};
#endif // CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_CONTEXTUAL_SEARCH_MANAGER_H_
diff --git a/chrome/browser/android/contextualsearch/contextual_search_observer.h b/chrome/browser/android/contextualsearch/contextual_search_observer.h
index 689aa75..35a7b28d 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_observer.h
+++ b/chrome/browser/android/contextualsearch/contextual_search_observer.h
@@ -31,6 +31,10 @@
public content::WebContentsUserData<ContextualSearchObserver> {
public:
explicit ContextualSearchObserver(content::WebContents* web_contents);
+
+ ContextualSearchObserver(const ContextualSearchObserver&) = delete;
+ ContextualSearchObserver& operator=(const ContextualSearchObserver&) = delete;
+
~ContextualSearchObserver() override;
static void SetHandlerForWebContents(content::WebContents* web_contents,
@@ -48,8 +52,6 @@
ContextualSearchJsApiHandler* api_handler_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(ContextualSearchObserver);
};
} // namespace contextual_search
diff --git a/chrome/browser/android/contextualsearch/contextual_search_ranker_logger_impl.h b/chrome/browser/android/contextualsearch/contextual_search_ranker_logger_impl.h
index 4466052..8f1097c 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_ranker_logger_impl.h
+++ b/chrome/browser/android/contextualsearch/contextual_search_ranker_logger_impl.h
@@ -35,6 +35,12 @@
class ContextualSearchRankerLoggerImpl {
public:
ContextualSearchRankerLoggerImpl(JNIEnv* env, jobject obj);
+
+ ContextualSearchRankerLoggerImpl(const ContextualSearchRankerLoggerImpl&) =
+ delete;
+ ContextualSearchRankerLoggerImpl& operator=(
+ const ContextualSearchRankerLoggerImpl&) = delete;
+
~ContextualSearchRankerLoggerImpl();
// Calls the destructor. Should be called when this native object is no
@@ -101,8 +107,6 @@
// The linked Java object.
base::android::ScopedJavaGlobalRef<jobject> java_object_;
-
- DISALLOW_COPY_AND_ASSIGN(ContextualSearchRankerLoggerImpl);
};
#endif // CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_CONTEXTUAL_SEARCH_RANKER_LOGGER_IMPL_H_
diff --git a/chrome/browser/android/contextualsearch/ctr_suppression.h b/chrome/browser/android/contextualsearch/ctr_suppression.h
index d7ddbf5..0b36300 100644
--- a/chrome/browser/android/contextualsearch/ctr_suppression.h
+++ b/chrome/browser/android/contextualsearch/ctr_suppression.h
@@ -21,6 +21,10 @@
public:
// Constructs a new CtrSuppression linked to the given Java object.
CtrSuppression(JNIEnv* env, jobject obj);
+
+ CtrSuppression(const CtrSuppression&) = delete;
+ CtrSuppression& operator=(const CtrSuppression&) = delete;
+
~CtrSuppression() override;
// Calls the destructor. Should be called when this native object is no
@@ -66,8 +70,6 @@
// The linked Java object.
base::android::ScopedJavaGlobalRef<jobject> java_object_;
-
- DISALLOW_COPY_AND_ASSIGN(CtrSuppression);
};
#endif // CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_CTR_SUPPRESSION_H_
diff --git a/chrome/browser/android/contextualsearch/resolved_search_term.h b/chrome/browser/android/contextualsearch/resolved_search_term.h
index 5b04f5dd..a8a2208 100644
--- a/chrome/browser/android/contextualsearch/resolved_search_term.h
+++ b/chrome/browser/android/contextualsearch/resolved_search_term.h
@@ -63,6 +63,10 @@
const std::string& search_url_preload,
int coca_card_tag,
const std::string& related_searches_json);
+
+ ResolvedSearchTerm(const ResolvedSearchTerm&) = delete;
+ ResolvedSearchTerm& operator=(const ResolvedSearchTerm&) = delete;
+
~ResolvedSearchTerm();
// TODO(donnd): switch to member-initialization style instead of initializers.
@@ -87,8 +91,6 @@
const std::string search_url_preload;
const int coca_card_tag;
const std::string related_searches_json;
-
- DISALLOW_COPY_AND_ASSIGN(ResolvedSearchTerm);
};
#endif // CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_RESOLVED_SEARCH_TERM_H_
diff --git a/chrome/browser/android/contextualsearch/unhandled_tap_notifier_impl.h b/chrome/browser/android/contextualsearch/unhandled_tap_notifier_impl.h
index fd4467c..84035a8 100644
--- a/chrome/browser/android/contextualsearch/unhandled_tap_notifier_impl.h
+++ b/chrome/browser/android/contextualsearch/unhandled_tap_notifier_impl.h
@@ -26,6 +26,9 @@
UnhandledTapNotifierImpl(float device_scale_factor,
UnhandledTapCallback callback);
+ UnhandledTapNotifierImpl(const UnhandledTapNotifierImpl&) = delete;
+ UnhandledTapNotifierImpl& operator=(const UnhandledTapNotifierImpl&) = delete;
+
~UnhandledTapNotifierImpl() override;
// Mojo UnhandledTapNotifier implementation.
@@ -38,8 +41,6 @@
// Callback to call when an unhandled tap notification takes place.
UnhandledTapCallback unhandled_tap_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(UnhandledTapNotifierImpl);
};
// static
diff --git a/chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.h b/chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.h
index 4c65f304..8b4f4cfa 100644
--- a/chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.h
+++ b/chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.h
@@ -27,6 +27,11 @@
// those messages.
explicit UnhandledTapWebContentsObserver(content::WebContents* web_contents);
+ UnhandledTapWebContentsObserver(const UnhandledTapWebContentsObserver&) =
+ delete;
+ UnhandledTapWebContentsObserver& operator=(
+ const UnhandledTapWebContentsObserver&) = delete;
+
~UnhandledTapWebContentsObserver() override;
void set_device_scale_factor(float factor) { device_scale_factor_ = factor; }
@@ -50,8 +55,6 @@
UnhandledTapCallback unhandled_tap_callback_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(UnhandledTapWebContentsObserver);
};
} // namespace contextual_search
diff --git a/chrome/browser/android/customtabs/detached_resource_request.h b/chrome/browser/android/customtabs/detached_resource_request.h
index 779a42f8..a40b9ff 100644
--- a/chrome/browser/android/customtabs/detached_resource_request.h
+++ b/chrome/browser/android/customtabs/detached_resource_request.h
@@ -48,6 +48,9 @@
using OnResultCallback = base::OnceCallback<void(int net_error)>;
+ DetachedResourceRequest(const DetachedResourceRequest&) = delete;
+ DetachedResourceRequest& operator=(const DetachedResourceRequest&) = delete;
+
~DetachedResourceRequest();
// Creates a detached request to a `url`, with a given initiating URL,
@@ -84,8 +87,6 @@
std::unique_ptr<network::SimpleURLLoader> url_loader_;
int redirects_;
bool is_from_aga_;
-
- DISALLOW_COPY_AND_ASSIGN(DetachedResourceRequest);
};
} // namespace customtabs
diff --git a/chrome/browser/android/customtabs/origin_verifier.h b/chrome/browser/android/customtabs/origin_verifier.h
index 16499b7a..31803d70 100644
--- a/chrome/browser/android/customtabs/origin_verifier.h
+++ b/chrome/browser/android/customtabs/origin_verifier.h
@@ -32,6 +32,10 @@
const base::android::JavaRef<jobject>& obj,
const base::android::JavaRef<jobject>& jweb_contents,
const base::android::JavaRef<jobject>& jprofile);
+
+ OriginVerifier(const OriginVerifier&) = delete;
+ OriginVerifier& operator=(const OriginVerifier&) = delete;
+
~OriginVerifier();
// Verify origin with the given parameters. No network requests can be made
@@ -59,8 +63,6 @@
base::android::ScopedJavaGlobalRef<jobject> jobject_;
static int clear_browsing_data_call_count_for_tests_;
-
- DISALLOW_COPY_AND_ASSIGN(OriginVerifier);
};
} // namespace customtabs
diff --git a/chrome/browser/android/devtools_manager_delegate_android.cc b/chrome/browser/android/devtools_manager_delegate_android.cc
index 6f38888..6f0896a 100644
--- a/chrome/browser/android/devtools_manager_delegate_android.cc
+++ b/chrome/browser/android/devtools_manager_delegate_android.cc
@@ -32,6 +32,10 @@
public:
explicit ClientProxy(content::DevToolsExternalAgentProxy* proxy)
: proxy_(proxy) {}
+
+ ClientProxy(const ClientProxy&) = delete;
+ ClientProxy& operator=(const ClientProxy&) = delete;
+
~ClientProxy() override {}
void DispatchProtocolMessage(DevToolsAgentHost* agent_host,
@@ -45,7 +49,6 @@
private:
content::DevToolsExternalAgentProxy* proxy_;
- DISALLOW_COPY_AND_ASSIGN(ClientProxy);
};
class TabProxyDelegate : public content::DevToolsExternalAgentProxyDelegate {
@@ -58,6 +61,9 @@
? DevToolsAgentHost::GetOrCreateFor(tab->web_contents())
: nullptr) {}
+ TabProxyDelegate(const TabProxyDelegate&) = delete;
+ TabProxyDelegate& operator=(const TabProxyDelegate&) = delete;
+
~TabProxyDelegate() override {}
void Attach(content::DevToolsExternalAgentProxy* proxy) override {
@@ -173,7 +179,6 @@
scoped_refptr<DevToolsAgentHost> agent_host_;
std::map<content::DevToolsExternalAgentProxy*, std::unique_ptr<ClientProxy>>
proxies_;
- DISALLOW_COPY_AND_ASSIGN(TabProxyDelegate);
};
scoped_refptr<DevToolsAgentHost> DevToolsAgentHostForTab(TabAndroid* tab) {
diff --git a/chrome/browser/android/devtools_manager_delegate_android.h b/chrome/browser/android/devtools_manager_delegate_android.h
index 8575281..e68d118 100644
--- a/chrome/browser/android/devtools_manager_delegate_android.h
+++ b/chrome/browser/android/devtools_manager_delegate_android.h
@@ -15,6 +15,12 @@
class DevToolsManagerDelegateAndroid : public content::DevToolsManagerDelegate {
public:
DevToolsManagerDelegateAndroid();
+
+ DevToolsManagerDelegateAndroid(const DevToolsManagerDelegateAndroid&) =
+ delete;
+ DevToolsManagerDelegateAndroid& operator=(
+ const DevToolsManagerDelegateAndroid&) = delete;
+
~DevToolsManagerDelegateAndroid() override;
private:
@@ -26,8 +32,6 @@
const GURL& url) override;
std::string GetDiscoveryPageHTML() override;
bool IsBrowserTargetDiscoverable() override;
-
- DISALLOW_COPY_AND_ASSIGN(DevToolsManagerDelegateAndroid);
};
#endif // CHROME_BROWSER_ANDROID_DEVTOOLS_MANAGER_DELEGATE_ANDROID_H_
diff --git a/chrome/browser/android/devtools_server.h b/chrome/browser/android/devtools_server.h
index 1d6f8e88..0d645149 100644
--- a/chrome/browser/android/devtools_server.h
+++ b/chrome/browser/android/devtools_server.h
@@ -14,6 +14,10 @@
class DevToolsServer {
public:
explicit DevToolsServer(const std::string& socket_name_prefix);
+
+ DevToolsServer(const DevToolsServer&) = delete;
+ DevToolsServer& operator=(const DevToolsServer&) = delete;
+
~DevToolsServer();
// Opens linux abstract socket to be ready for remote debugging.
@@ -27,8 +31,6 @@
private:
std::string socket_name_;
bool is_started_;
-
- DISALLOW_COPY_AND_ASSIGN(DevToolsServer);
};
#endif // CHROME_BROWSER_ANDROID_DEVTOOLS_SERVER_H_
diff --git a/chrome/browser/android/dom_distiller/distiller_ui_handle_android.h b/chrome/browser/android/dom_distiller/distiller_ui_handle_android.h
index f79b3ea..17292b8 100644
--- a/chrome/browser/android/dom_distiller/distiller_ui_handle_android.h
+++ b/chrome/browser/android/dom_distiller/distiller_ui_handle_android.h
@@ -19,6 +19,10 @@
class DistillerUIHandleAndroid : public DistillerUIHandle {
public:
DistillerUIHandleAndroid() {}
+
+ DistillerUIHandleAndroid(const DistillerUIHandleAndroid&) = delete;
+ DistillerUIHandleAndroid& operator=(const DistillerUIHandleAndroid&) = delete;
+
~DistillerUIHandleAndroid() override {}
void set_render_frame_host(content::RenderFrameHost* host) {
@@ -28,7 +32,6 @@
private:
content::RenderFrameHost* render_frame_host_ = nullptr;
- DISALLOW_COPY_AND_ASSIGN(DistillerUIHandleAndroid);
};
} // namespace android
diff --git a/chrome/browser/android/explore_sites/block_site_task_unittest.cc b/chrome/browser/android/explore_sites/block_site_task_unittest.cc
index bbd056b..fa9a3940 100644
--- a/chrome/browser/android/explore_sites/block_site_task_unittest.cc
+++ b/chrome/browser/android/explore_sites/block_site_task_unittest.cc
@@ -27,6 +27,11 @@
class ExploreSitesBlockSiteTest : public TaskTestBase {
public:
ExploreSitesBlockSiteTest() = default;
+
+ ExploreSitesBlockSiteTest(const ExploreSitesBlockSiteTest&) = delete;
+ ExploreSitesBlockSiteTest& operator=(const ExploreSitesBlockSiteTest&) =
+ delete;
+
~ExploreSitesBlockSiteTest() override = default;
void SetUp() override {
@@ -59,8 +64,6 @@
std::unique_ptr<ExploreSitesStore> store_;
bool success_;
bool callback_called_;
-
- DISALLOW_COPY_AND_ASSIGN(ExploreSitesBlockSiteTest);
};
void ExploreSitesBlockSiteTest::PopulateActivity() {
diff --git a/chrome/browser/android/explore_sites/catalog.h b/chrome/browser/android/explore_sites/catalog.h
index 239afef..53251a3 100644
--- a/chrome/browser/android/explore_sites/catalog.h
+++ b/chrome/browser/android/explore_sites/catalog.h
@@ -38,13 +38,16 @@
static std::unique_ptr<NTPCatalog> create(const base::Value& json);
explicit NTPCatalog(const std::vector<Category>& category_list);
+
+ NTPCatalog(const NTPCatalog&) = delete;
+ NTPCatalog& operator=(const NTPCatalog&) = delete;
+
~NTPCatalog();
std::vector<Category> categories;
private:
std::string ToString();
- DISALLOW_COPY_AND_ASSIGN(NTPCatalog);
};
bool operator==(const NTPCatalog::Category& a, const NTPCatalog::Category& b);
diff --git a/chrome/browser/android/explore_sites/clear_activities_task_unittest.cc b/chrome/browser/android/explore_sites/clear_activities_task_unittest.cc
index 2673b0bd..364d804 100644
--- a/chrome/browser/android/explore_sites/clear_activities_task_unittest.cc
+++ b/chrome/browser/android/explore_sites/clear_activities_task_unittest.cc
@@ -64,6 +64,10 @@
class ClearActivitiesTaskTest : public TaskTestBase {
public:
ClearActivitiesTaskTest() = default;
+
+ ClearActivitiesTaskTest(const ClearActivitiesTaskTest&) = delete;
+ ClearActivitiesTaskTest& operator=(const ClearActivitiesTaskTest&) = delete;
+
~ClearActivitiesTaskTest() override = default;
void SetUp() override {
@@ -97,8 +101,6 @@
bool callback_called_ = false;
bool success_ = false;
std::vector<ActivityInfo> activities_;
-
- DISALLOW_COPY_AND_ASSIGN(ClearActivitiesTaskTest);
};
void ClearActivitiesTaskTest::PopulateActivities() {
diff --git a/chrome/browser/android/explore_sites/clear_catalog_task_unittest.cc b/chrome/browser/android/explore_sites/clear_catalog_task_unittest.cc
index 77813a9..7be96fd 100644
--- a/chrome/browser/android/explore_sites/clear_catalog_task_unittest.cc
+++ b/chrome/browser/android/explore_sites/clear_catalog_task_unittest.cc
@@ -25,6 +25,11 @@
class ExploreSitesClearCatalogTest : public TaskTestBase {
public:
ExploreSitesClearCatalogTest() = default;
+
+ ExploreSitesClearCatalogTest(const ExploreSitesClearCatalogTest&) = delete;
+ ExploreSitesClearCatalogTest& operator=(const ExploreSitesClearCatalogTest&) =
+ delete;
+
~ExploreSitesClearCatalogTest() override = default;
void SetUp() override {
@@ -125,8 +130,6 @@
private:
std::unique_ptr<ExploreSitesStore> store_;
-
- DISALLOW_COPY_AND_ASSIGN(ExploreSitesClearCatalogTest);
};
TEST_F(ExploreSitesClearCatalogTest, StoreFailure) {
diff --git a/chrome/browser/android/explore_sites/explore_sites_fetcher.h b/chrome/browser/android/explore_sites/explore_sites_fetcher.h
index b3602675..2bd11747 100644
--- a/chrome/browser/android/explore_sites/explore_sites_fetcher.h
+++ b/chrome/browser/android/explore_sites/explore_sites_fetcher.h
@@ -44,6 +44,9 @@
scoped_refptr<network::SharedURLLoaderFactory> loader_factory,
Callback callback);
+ ExploreSitesFetcher(const ExploreSitesFetcher&) = delete;
+ ExploreSitesFetcher& operator=(const ExploreSitesFetcher&) = delete;
+
~ExploreSitesFetcher();
// Starts the fetching.
@@ -107,8 +110,6 @@
std::unique_ptr<network::SimpleURLLoader> url_loader_;
base::WeakPtrFactory<ExploreSitesFetcher> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExploreSitesFetcher);
};
} // namespace explore_sites
diff --git a/chrome/browser/android/explore_sites/explore_sites_service_impl.h b/chrome/browser/android/explore_sites/explore_sites_service_impl.h
index 06b78b8..6ec3cee 100644
--- a/chrome/browser/android/explore_sites/explore_sites_service_impl.h
+++ b/chrome/browser/android/explore_sites/explore_sites_service_impl.h
@@ -37,6 +37,10 @@
std::unique_ptr<ExploreSitesStore> store,
std::unique_ptr<URLLoaderFactoryGetter> url_loader_factory_getter,
std::unique_ptr<HistoryStatisticsReporter> history_statistics_reporter);
+
+ ExploreSitesServiceImpl(const ExploreSitesServiceImpl&) = delete;
+ ExploreSitesServiceImpl& operator=(const ExploreSitesServiceImpl&) = delete;
+
~ExploreSitesServiceImpl() override;
static bool IsExploreSitesEnabled();
@@ -101,8 +105,6 @@
std::unique_ptr<HistoryStatisticsReporter> history_statistics_reporter_;
std::vector<BooleanCallback> update_catalog_callbacks_;
base::WeakPtrFactory<ExploreSitesServiceImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExploreSitesServiceImpl);
};
} // namespace explore_sites
diff --git a/chrome/browser/android/explore_sites/explore_sites_service_impl_unittest.cc b/chrome/browser/android/explore_sites/explore_sites_service_impl_unittest.cc
index 515f18d..5f6ad82 100644
--- a/chrome/browser/android/explore_sites/explore_sites_service_impl_unittest.cc
+++ b/chrome/browser/android/explore_sites/explore_sites_service_impl_unittest.cc
@@ -41,6 +41,11 @@
class ExploreSitesServiceImplTest : public testing::Test {
public:
ExploreSitesServiceImplTest();
+
+ ExploreSitesServiceImplTest(const ExploreSitesServiceImplTest&) = delete;
+ ExploreSitesServiceImplTest& operator=(const ExploreSitesServiceImplTest&) =
+ delete;
+
~ExploreSitesServiceImplTest() override = default;
void SetUp() override {
@@ -154,8 +159,6 @@
base::test::SingleThreadTaskEnvironment task_environment_{
base::test::SingleThreadTaskEnvironment::MainThreadType::IO,
base::test::SingleThreadTaskEnvironment::TimeSource::MOCK_TIME};
-
- DISALLOW_COPY_AND_ASSIGN(ExploreSitesServiceImplTest);
};
ExploreSitesServiceImplTest::ExploreSitesServiceImplTest()
diff --git a/chrome/browser/android/explore_sites/get_catalog_task.h b/chrome/browser/android/explore_sites/get_catalog_task.h
index 3eec1870..06567636 100644
--- a/chrome/browser/android/explore_sites/get_catalog_task.h
+++ b/chrome/browser/android/explore_sites/get_catalog_task.h
@@ -40,6 +40,10 @@
GetCatalogTask(ExploreSitesStore* store,
bool update_current,
CatalogCallback callback);
+
+ GetCatalogTask(const GetCatalogTask&) = delete;
+ GetCatalogTask& operator=(const GetCatalogTask&) = delete;
+
~GetCatalogTask() override;
private:
@@ -55,8 +59,6 @@
CatalogCallback callback_;
base::WeakPtrFactory<GetCatalogTask> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(GetCatalogTask);
};
} // namespace explore_sites
diff --git a/chrome/browser/android/explore_sites/get_catalog_task_unittest.cc b/chrome/browser/android/explore_sites/get_catalog_task_unittest.cc
index 9e7324e5..5810203 100644
--- a/chrome/browser/android/explore_sites/get_catalog_task_unittest.cc
+++ b/chrome/browser/android/explore_sites/get_catalog_task_unittest.cc
@@ -129,6 +129,12 @@
class ExploreSitesGetCatalogTaskTest : public TaskTestBase {
public:
ExploreSitesGetCatalogTaskTest() = default;
+
+ ExploreSitesGetCatalogTaskTest(const ExploreSitesGetCatalogTaskTest&) =
+ delete;
+ ExploreSitesGetCatalogTaskTest& operator=(
+ const ExploreSitesGetCatalogTaskTest&) = delete;
+
~ExploreSitesGetCatalogTaskTest() override = default;
void SetUp() override {
@@ -155,8 +161,6 @@
private:
std::unique_ptr<ExploreSitesStore> store_;
-
- DISALLOW_COPY_AND_ASSIGN(ExploreSitesGetCatalogTaskTest);
};
void ExploreSitesGetCatalogTaskTest::PopulateTestingCatalog() {
diff --git a/chrome/browser/android/explore_sites/get_images_task.h b/chrome/browser/android/explore_sites/get_images_task.h
index 8b975d0..2e390065 100644
--- a/chrome/browser/android/explore_sites/get_images_task.h
+++ b/chrome/browser/android/explore_sites/get_images_task.h
@@ -38,6 +38,9 @@
int max_images,
EncodedImageListCallback callback);
+ GetImagesTask(const GetImagesTask&) = delete;
+ GetImagesTask& operator=(const GetImagesTask&) = delete;
+
~GetImagesTask() override;
private:
@@ -55,8 +58,6 @@
EncodedImageListCallback callback_;
base::WeakPtrFactory<GetImagesTask> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(GetImagesTask);
};
} // namespace explore_sites
diff --git a/chrome/browser/android/explore_sites/get_images_task_unittest.cc b/chrome/browser/android/explore_sites/get_images_task_unittest.cc
index d807fcba..ae27189 100644
--- a/chrome/browser/android/explore_sites/get_images_task_unittest.cc
+++ b/chrome/browser/android/explore_sites/get_images_task_unittest.cc
@@ -26,6 +26,11 @@
class ExploreSitesGetImagesTaskTest : public TaskTestBase {
public:
ExploreSitesGetImagesTaskTest() = default;
+
+ ExploreSitesGetImagesTaskTest(const ExploreSitesGetImagesTaskTest&) = delete;
+ ExploreSitesGetImagesTaskTest& operator=(
+ const ExploreSitesGetImagesTaskTest&) = delete;
+
~ExploreSitesGetImagesTaskTest() override = default;
void SetUp() override {
@@ -68,8 +73,6 @@
private:
std::unique_ptr<ExploreSitesStore> store_;
-
- DISALLOW_COPY_AND_ASSIGN(ExploreSitesGetImagesTaskTest);
};
void ExploreSitesGetImagesTaskTest::PopulateTestingCatalog() {
diff --git a/chrome/browser/android/explore_sites/get_version_task_unittest.cc b/chrome/browser/android/explore_sites/get_version_task_unittest.cc
index 851ec892..1518f5d 100644
--- a/chrome/browser/android/explore_sites/get_version_task_unittest.cc
+++ b/chrome/browser/android/explore_sites/get_version_task_unittest.cc
@@ -25,6 +25,12 @@
class ExploreSitesGetVersionTaskTest : public TaskTestBase {
public:
ExploreSitesGetVersionTaskTest() = default;
+
+ ExploreSitesGetVersionTaskTest(const ExploreSitesGetVersionTaskTest&) =
+ delete;
+ ExploreSitesGetVersionTaskTest& operator=(
+ const ExploreSitesGetVersionTaskTest&) = delete;
+
~ExploreSitesGetVersionTaskTest() override = default;
void SetUp() override {
@@ -64,8 +70,6 @@
std::unique_ptr<ExploreSitesStore> store_;
bool success_;
bool callback_called_;
-
- DISALLOW_COPY_AND_ASSIGN(ExploreSitesGetVersionTaskTest);
};
TEST_F(ExploreSitesGetVersionTaskTest, StoreFailure) {
diff --git a/chrome/browser/android/explore_sites/history_statistics_reporter.h b/chrome/browser/android/explore_sites/history_statistics_reporter.h
index f4e7a03..83fe2bec 100644
--- a/chrome/browser/android/explore_sites/history_statistics_reporter.h
+++ b/chrome/browser/android/explore_sites/history_statistics_reporter.h
@@ -25,6 +25,11 @@
HistoryStatisticsReporter(history::HistoryService* history_service,
PrefService* prefs);
+
+ HistoryStatisticsReporter(const HistoryStatisticsReporter&) = delete;
+ HistoryStatisticsReporter& operator=(const HistoryStatisticsReporter&) =
+ delete;
+
~HistoryStatisticsReporter() override;
// Schedules delayed task to compute/report history statistics.
@@ -53,8 +58,6 @@
history_service_observation_{this};
bool attempted_to_report_once_ = false;
base::WeakPtrFactory<HistoryStatisticsReporter> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(HistoryStatisticsReporter);
};
} // namespace explore_sites
diff --git a/chrome/browser/android/explore_sites/history_statistics_reporter_unittest.cc b/chrome/browser/android/explore_sites/history_statistics_reporter_unittest.cc
index 7eb8416..d4d0ad7 100644
--- a/chrome/browser/android/explore_sites/history_statistics_reporter_unittest.cc
+++ b/chrome/browser/android/explore_sites/history_statistics_reporter_unittest.cc
@@ -33,6 +33,11 @@
HistoryStatisticsReporterTest()
: task_environment_(
base::test::SingleThreadTaskEnvironment::TimeSource::MOCK_TIME) {}
+
+ HistoryStatisticsReporterTest(const HistoryStatisticsReporterTest&) = delete;
+ HistoryStatisticsReporterTest& operator=(
+ const HistoryStatisticsReporterTest&) = delete;
+
~HistoryStatisticsReporterTest() override {}
void SetUp() override {
@@ -81,8 +86,6 @@
base::HistogramTester histogram_tester_;
std::unique_ptr<history::HistoryService> history_service_;
std::unique_ptr<HistoryStatisticsReporter> reporter_;
-
- DISALLOW_COPY_AND_ASSIGN(HistoryStatisticsReporterTest);
};
TEST_F(HistoryStatisticsReporterTest, HistoryNotLoaded) {
diff --git a/chrome/browser/android/explore_sites/image_helper.cc b/chrome/browser/android/explore_sites/image_helper.cc
index e9ef7c2..cd21d6b 100644
--- a/chrome/browser/android/explore_sites/image_helper.cc
+++ b/chrome/browser/android/explore_sites/image_helper.cc
@@ -32,6 +32,10 @@
BitmapCallback bitmap_callback,
EncodedImageList images,
int pixel_size);
+
+ Job(const Job&) = delete;
+ Job& operator=(const Job&) = delete;
+
~Job();
// Start begins the work that a Job performs (decoding and composition).
@@ -53,8 +57,6 @@
std::vector<SkBitmap> bitmaps_;
base::WeakPtrFactory<Job> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(Job);
};
ImageHelper::Job::Job(ImageHelper* image_helper,
diff --git a/chrome/browser/android/explore_sites/image_helper.h b/chrome/browser/android/explore_sites/image_helper.h
index cf7b2f6b..02c8bde 100644
--- a/chrome/browser/android/explore_sites/image_helper.h
+++ b/chrome/browser/android/explore_sites/image_helper.h
@@ -26,6 +26,10 @@
class ImageHelper {
public:
ImageHelper();
+
+ ImageHelper(const ImageHelper&) = delete;
+ ImageHelper& operator=(const ImageHelper&) = delete;
+
virtual ~ImageHelper();
// Compose a single site icon and return via |callback|.
@@ -57,8 +61,6 @@
int last_used_job_id_;
base::WeakPtrFactory<ImageHelper> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ImageHelper);
};
} // namespace explore_sites
diff --git a/chrome/browser/android/explore_sites/import_catalog_task_unittest.cc b/chrome/browser/android/explore_sites/import_catalog_task_unittest.cc
index 1aa89daf..02e1fd7 100644
--- a/chrome/browser/android/explore_sites/import_catalog_task_unittest.cc
+++ b/chrome/browser/android/explore_sites/import_catalog_task_unittest.cc
@@ -47,6 +47,12 @@
class ExploreSitesImportCatalogTaskTest : public TaskTestBase {
public:
ExploreSitesImportCatalogTaskTest() = default;
+
+ ExploreSitesImportCatalogTaskTest(const ExploreSitesImportCatalogTaskTest&) =
+ delete;
+ ExploreSitesImportCatalogTaskTest& operator=(
+ const ExploreSitesImportCatalogTaskTest&) = delete;
+
~ExploreSitesImportCatalogTaskTest() override = default;
void SetUp() override {
@@ -77,8 +83,6 @@
std::unique_ptr<ExploreSitesStore> store_;
bool success_;
bool callback_called_;
-
- DISALLOW_COPY_AND_ASSIGN(ExploreSitesImportCatalogTaskTest);
};
TEST_F(ExploreSitesImportCatalogTaskTest, StoreFailure) {
diff --git a/chrome/browser/android/explore_sites/increment_shown_count_task_unittest.cc b/chrome/browser/android/explore_sites/increment_shown_count_task_unittest.cc
index 56ca932..4e1eeea 100644
--- a/chrome/browser/android/explore_sites/increment_shown_count_task_unittest.cc
+++ b/chrome/browser/android/explore_sites/increment_shown_count_task_unittest.cc
@@ -21,6 +21,12 @@
class ExploreSitesIncrementShownCountTaskTest : public TaskTestBase {
public:
ExploreSitesIncrementShownCountTaskTest() = default;
+
+ ExploreSitesIncrementShownCountTaskTest(
+ const ExploreSitesIncrementShownCountTaskTest&) = delete;
+ ExploreSitesIncrementShownCountTaskTest& operator=(
+ const ExploreSitesIncrementShownCountTaskTest&) = delete;
+
~ExploreSitesIncrementShownCountTaskTest() override = default;
void SetUp() override {
@@ -53,8 +59,6 @@
std::unique_ptr<ExploreSitesStore> store_;
bool success_;
bool callback_called_;
-
- DISALLOW_COPY_AND_ASSIGN(ExploreSitesIncrementShownCountTaskTest);
};
void ExploreSitesIncrementShownCountTaskTest::PopulateCategories() {
diff --git a/chrome/browser/android/explore_sites/ntp_json_fetcher.h b/chrome/browser/android/explore_sites/ntp_json_fetcher.h
index 8a89c7a..c173738 100644
--- a/chrome/browser/android/explore_sites/ntp_json_fetcher.h
+++ b/chrome/browser/android/explore_sites/ntp_json_fetcher.h
@@ -33,6 +33,10 @@
typedef base::OnceCallback<void(std::unique_ptr<NTPCatalog>)> Callback;
explicit NTPJsonFetcher(content::BrowserContext* browser_context);
+
+ NTPJsonFetcher(const NTPJsonFetcher&) = delete;
+ NTPJsonFetcher& operator=(const NTPJsonFetcher&) = delete;
+
~NTPJsonFetcher();
// Starts to fetch results for the given |query_url|.
@@ -50,8 +54,6 @@
content::BrowserContext* browser_context_;
std::unique_ptr<network::SimpleURLLoader> simple_loader_;
base::WeakPtrFactory<NTPJsonFetcher> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NTPJsonFetcher);
};
} // namespace explore_sites
diff --git a/chrome/browser/android/explore_sites/record_site_click_task_unittest.cc b/chrome/browser/android/explore_sites/record_site_click_task_unittest.cc
index 92c9fe0b..006ff96 100644
--- a/chrome/browser/android/explore_sites/record_site_click_task_unittest.cc
+++ b/chrome/browser/android/explore_sites/record_site_click_task_unittest.cc
@@ -26,6 +26,12 @@
class ExploreSitesRecordSiteClickTest : public TaskTestBase {
public:
ExploreSitesRecordSiteClickTest() = default;
+
+ ExploreSitesRecordSiteClickTest(const ExploreSitesRecordSiteClickTest&) =
+ delete;
+ ExploreSitesRecordSiteClickTest& operator=(
+ const ExploreSitesRecordSiteClickTest&) = delete;
+
~ExploreSitesRecordSiteClickTest() override = default;
void SetUp() override {
@@ -49,8 +55,6 @@
private:
std::unique_ptr<ExploreSitesStore> store_;
bool success_;
-
- DISALLOW_COPY_AND_ASSIGN(ExploreSitesRecordSiteClickTest);
};
void ExploreSitesRecordSiteClickTest::PopulateActivity() {
diff --git a/chrome/browser/android/foreign_session_helper.h b/chrome/browser/android/foreign_session_helper.h
index efbbe60a..1929094 100644
--- a/chrome/browser/android/foreign_session_helper.h
+++ b/chrome/browser/android/foreign_session_helper.h
@@ -17,6 +17,10 @@
class ForeignSessionHelper {
public:
explicit ForeignSessionHelper(Profile* profile);
+
+ ForeignSessionHelper(const ForeignSessionHelper&) = delete;
+ ForeignSessionHelper& operator=(const ForeignSessionHelper&) = delete;
+
~ForeignSessionHelper();
void Destroy(JNIEnv* env);
@@ -48,8 +52,6 @@
Profile* profile_; // weak
base::android::ScopedJavaGlobalRef<jobject> callback_;
base::CallbackListSubscription foreign_session_updated_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(ForeignSessionHelper);
};
#endif // CHROME_BROWSER_ANDROID_FOREIGN_SESSION_HELPER_H_
diff --git a/chrome/browser/android/history_report/data_observer.h b/chrome/browser/android/history_report/data_observer.h
index 5c315004..b0639706 100644
--- a/chrome/browser/android/history_report/data_observer.h
+++ b/chrome/browser/android/history_report/data_observer.h
@@ -37,6 +37,10 @@
UsageReportsBufferService* usage_reports_buffer_service,
bookmarks::BookmarkModel* bookmark_model,
history::HistoryService* history_service);
+
+ DataObserver(const DataObserver&) = delete;
+ DataObserver& operator=(const DataObserver&) = delete;
+
~DataObserver() override;
// BookmarkModelObserver implementation.
@@ -94,8 +98,6 @@
base::RepeatingCallback<void(void)> stop_reporting_callback_;
DeltaFileService* delta_file_service_;
UsageReportsBufferService* usage_reports_buffer_service_;
-
- DISALLOW_COPY_AND_ASSIGN(DataObserver);
};
} // namespace history_report
diff --git a/chrome/browser/android/history_report/data_provider.h b/chrome/browser/android/history_report/data_provider.h
index d6b7a4d..d970b94 100644
--- a/chrome/browser/android/history_report/data_provider.h
+++ b/chrome/browser/android/history_report/data_provider.h
@@ -37,6 +37,10 @@
DataProvider(Profile* profile,
DeltaFileService* delta_file_service,
bookmarks::BookmarkModel* bookmark_model);
+
+ DataProvider(const DataProvider&) = delete;
+ DataProvider& operator=(const DataProvider&) = delete;
+
~DataProvider();
// Provides up to limit delta file entries with sequence number > last_seq_no.
@@ -53,8 +57,6 @@
scoped_refptr<bookmarks::ModelLoader> bookmark_model_loader_;
DeltaFileService* delta_file_service_;
base::CancelableTaskTracker history_task_tracker_;
-
- DISALLOW_COPY_AND_ASSIGN(DataProvider);
};
} // namespace history_report
diff --git a/chrome/browser/android/history_report/delta_file_backend_leveldb.h b/chrome/browser/android/history_report/delta_file_backend_leveldb.h
index 924db72..fe35a2d 100644
--- a/chrome/browser/android/history_report/delta_file_backend_leveldb.h
+++ b/chrome/browser/android/history_report/delta_file_backend_leveldb.h
@@ -28,6 +28,10 @@
class DeltaFileBackend : public base::trace_event::MemoryDumpProvider {
public:
explicit DeltaFileBackend(const base::FilePath& dir);
+
+ DeltaFileBackend(const DeltaFileBackend&) = delete;
+ DeltaFileBackend& operator=(const DeltaFileBackend&) = delete;
+
~DeltaFileBackend() override;
// Adds new addition entry to delta file
@@ -66,8 +70,6 @@
base::FilePath path_;
std::unique_ptr<leveldb::DB> db_;
std::unique_ptr<DigitsComparator> leveldb_cmp_;
-
- DISALLOW_COPY_AND_ASSIGN(DeltaFileBackend);
};
} // namespace history_report
diff --git a/chrome/browser/android/history_report/delta_file_backend_leveldb_unittest.cc b/chrome/browser/android/history_report/delta_file_backend_leveldb_unittest.cc
index 6c03299..afffffd 100644
--- a/chrome/browser/android/history_report/delta_file_backend_leveldb_unittest.cc
+++ b/chrome/browser/android/history_report/delta_file_backend_leveldb_unittest.cc
@@ -21,6 +21,10 @@
class DeltaFileBackendTest : public testing::Test {
public:
DeltaFileBackendTest() {}
+
+ DeltaFileBackendTest(const DeltaFileBackendTest&) = delete;
+ DeltaFileBackendTest& operator=(const DeltaFileBackendTest&) = delete;
+
~DeltaFileBackendTest() override {}
protected:
@@ -33,8 +37,6 @@
private:
base::ScopedTempDir temp_dir_;
-
- DISALLOW_COPY_AND_ASSIGN(DeltaFileBackendTest);
};
TEST_F(DeltaFileBackendTest, AddPage) {
diff --git a/chrome/browser/android/history_report/delta_file_commons_unittest.cc b/chrome/browser/android/history_report/delta_file_commons_unittest.cc
index 5210bdeb..a61effd 100644
--- a/chrome/browser/android/history_report/delta_file_commons_unittest.cc
+++ b/chrome/browser/android/history_report/delta_file_commons_unittest.cc
@@ -24,6 +24,11 @@
DeltaFileEntryWithDataTest()
: entry_(),
data_(entry_) {}
+
+ DeltaFileEntryWithDataTest(const DeltaFileEntryWithDataTest&) = delete;
+ DeltaFileEntryWithDataTest& operator=(const DeltaFileEntryWithDataTest&) =
+ delete;
+
~DeltaFileEntryWithDataTest() override {}
protected:
@@ -31,9 +36,6 @@
DeltaFileEntry entry_;
DeltaFileEntryWithData data_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DeltaFileEntryWithDataTest);
};
TEST_F(DeltaFileEntryWithDataTest, NotValid) {
diff --git a/chrome/browser/android/history_report/delta_file_service.h b/chrome/browser/android/history_report/delta_file_service.h
index 0c8208a..b20187d 100644
--- a/chrome/browser/android/history_report/delta_file_service.h
+++ b/chrome/browser/android/history_report/delta_file_service.h
@@ -30,6 +30,10 @@
class DeltaFileService {
public:
explicit DeltaFileService(const base::FilePath& dir);
+
+ DeltaFileService(const DeltaFileService&) = delete;
+ DeltaFileService& operator=(const DeltaFileService&) = delete;
+
virtual ~DeltaFileService();
// Adds new addition entry to delta file.
@@ -55,8 +59,6 @@
private:
const scoped_refptr<base::SequencedTaskRunner> task_runner_;
std::unique_ptr<DeltaFileBackend> delta_file_backend_;
-
- DISALLOW_COPY_AND_ASSIGN(DeltaFileService);
};
} // namespace history_report
diff --git a/chrome/browser/android/history_report/history_report_jni_bridge.h b/chrome/browser/android/history_report/history_report_jni_bridge.h
index 893ed35..57fe4f0 100644
--- a/chrome/browser/android/history_report/history_report_jni_bridge.h
+++ b/chrome/browser/android/history_report/history_report_jni_bridge.h
@@ -25,6 +25,10 @@
class HistoryReportJniBridge {
public:
HistoryReportJniBridge(JNIEnv* env, jobject obj);
+
+ HistoryReportJniBridge(const HistoryReportJniBridge&) = delete;
+ HistoryReportJniBridge& operator=(const HistoryReportJniBridge&) = delete;
+
~HistoryReportJniBridge();
// Removes entries with seqno <= seq_no_lower_bound from delta file.
@@ -74,8 +78,6 @@
std::unique_ptr<DeltaFileService> delta_file_service_;
std::unique_ptr<bookmarks::BookmarkModel> bookmark_model_;
std::unique_ptr<UsageReportsBufferService> usage_reports_buffer_service_;
-
- DISALLOW_COPY_AND_ASSIGN(HistoryReportJniBridge);
};
} // namespace history_report
diff --git a/chrome/browser/android/history_report/usage_reports_buffer_backend.h b/chrome/browser/android/history_report/usage_reports_buffer_backend.h
index 4e274cb..dd60a067c 100644
--- a/chrome/browser/android/history_report/usage_reports_buffer_backend.h
+++ b/chrome/browser/android/history_report/usage_reports_buffer_backend.h
@@ -32,6 +32,10 @@
public:
explicit UsageReportsBufferBackend(const base::FilePath& dir);
+ UsageReportsBufferBackend(const UsageReportsBufferBackend&) = delete;
+ UsageReportsBufferBackend& operator=(const UsageReportsBufferBackend&) =
+ delete;
+
~UsageReportsBufferBackend() override;
// Creates and initializes the internal data structures.
@@ -58,8 +62,6 @@
// NULL until Init method is called.
std::unique_ptr<leveldb::DB> db_;
base::FilePath db_file_name_;
-
- DISALLOW_COPY_AND_ASSIGN(UsageReportsBufferBackend);
};
} // namespace history_report
diff --git a/chrome/browser/android/history_report/usage_reports_buffer_backend_unittest.cc b/chrome/browser/android/history_report/usage_reports_buffer_backend_unittest.cc
index 4252043..31a1e2f 100644
--- a/chrome/browser/android/history_report/usage_reports_buffer_backend_unittest.cc
+++ b/chrome/browser/android/history_report/usage_reports_buffer_backend_unittest.cc
@@ -31,6 +31,11 @@
class UsageReportsBufferBackendTest : public testing::Test {
public:
UsageReportsBufferBackendTest() {}
+
+ UsageReportsBufferBackendTest(const UsageReportsBufferBackendTest&) = delete;
+ UsageReportsBufferBackendTest& operator=(
+ const UsageReportsBufferBackendTest&) = delete;
+
~UsageReportsBufferBackendTest() override {}
protected:
@@ -42,9 +47,6 @@
std::unique_ptr<UsageReportsBufferBackend> buffer_;
base::ScopedTempDir temp_dir_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(UsageReportsBufferBackendTest);
};
TEST_F(UsageReportsBufferBackendTest, AddTypedVisit) {
diff --git a/chrome/browser/android/history_report/usage_reports_buffer_service.h b/chrome/browser/android/history_report/usage_reports_buffer_service.h
index b90af42..75cead1 100644
--- a/chrome/browser/android/history_report/usage_reports_buffer_service.h
+++ b/chrome/browser/android/history_report/usage_reports_buffer_service.h
@@ -29,6 +29,11 @@
class UsageReportsBufferService {
public:
explicit UsageReportsBufferService(const base::FilePath& dir);
+
+ UsageReportsBufferService(const UsageReportsBufferService&) = delete;
+ UsageReportsBufferService& operator=(const UsageReportsBufferService&) =
+ delete;
+
virtual ~UsageReportsBufferService();
// Init buffer. All calls to buffer before it's initialized are ignored. It's
@@ -57,8 +62,6 @@
scoped_refptr<base::SequencedTaskRunner> task_runner_;
// Non thread safe backend.
std::unique_ptr<UsageReportsBufferBackend> backend_;
-
- DISALLOW_COPY_AND_ASSIGN(UsageReportsBufferService);
};
} // namespace history_report
diff --git a/chrome/browser/android/instantapps/instant_apps_infobar_delegate.h b/chrome/browser/android/instantapps/instant_apps_infobar_delegate.h
index cd451d0..d1d447e 100644
--- a/chrome/browser/android/instantapps/instant_apps_infobar_delegate.h
+++ b/chrome/browser/android/instantapps/instant_apps_infobar_delegate.h
@@ -15,6 +15,10 @@
class InstantAppsInfoBarDelegate : public ConfirmInfoBarDelegate,
public content::WebContentsObserver {
public:
+ InstantAppsInfoBarDelegate(const InstantAppsInfoBarDelegate&) = delete;
+ InstantAppsInfoBarDelegate& operator=(const InstantAppsInfoBarDelegate&) =
+ delete;
+
~InstantAppsInfoBarDelegate() override;
static void Create(content::WebContents* web_contents,
@@ -51,8 +55,6 @@
std::string url_;
bool user_navigated_away_from_launch_url_;
bool instant_app_is_default_;
-
- DISALLOW_COPY_AND_ASSIGN(InstantAppsInfoBarDelegate);
};
#endif // CHROME_BROWSER_ANDROID_INSTANTAPPS_INSTANT_APPS_INFOBAR_DELEGATE_H_
diff --git a/chrome/browser/android/locale/locale_template_url_loader.h b/chrome/browser/android/locale/locale_template_url_loader.h
index 5e5591c..20290e0 100644
--- a/chrome/browser/android/locale/locale_template_url_loader.h
+++ b/chrome/browser/android/locale/locale_template_url_loader.h
@@ -23,6 +23,9 @@
void OverrideDefaultSearchProvider(JNIEnv* env);
void SetGoogleAsDefaultSearch(JNIEnv* env);
+ LocaleTemplateUrlLoader(const LocaleTemplateUrlLoader&) = delete;
+ LocaleTemplateUrlLoader& operator=(const LocaleTemplateUrlLoader&) = delete;
+
virtual ~LocaleTemplateUrlLoader();
protected:
@@ -38,8 +41,6 @@
// Pointer to the TemplateUrlService for the main profile.
TemplateURLService* template_url_service_;
-
- DISALLOW_COPY_AND_ASSIGN(LocaleTemplateUrlLoader);
};
#endif // CHROME_BROWSER_ANDROID_LOCALE_LOCALE_TEMPLATE_URL_LOADER_H_
diff --git a/chrome/browser/android/logo_bridge.cc b/chrome/browser/android/logo_bridge.cc
index 13b82c4..1df1de69 100644
--- a/chrome/browser/android/logo_bridge.cc
+++ b/chrome/browser/android/logo_bridge.cc
@@ -80,6 +80,9 @@
j_logo_observer_.Reset(env, j_logo_observer);
}
+ LogoObserverAndroid(const LogoObserverAndroid&) = delete;
+ LogoObserverAndroid& operator=(const LogoObserverAndroid&) = delete;
+
~LogoObserverAndroid() override {}
// seach_provider_logos::LogoObserver:
@@ -111,8 +114,6 @@
base::WeakPtr<LogoBridge> logo_bridge_;
base::android::ScopedJavaGlobalRef<jobject> j_logo_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(LogoObserverAndroid);
};
} // namespace
diff --git a/chrome/browser/android/metrics/android_session_durations_service_unittest.cc b/chrome/browser/android/metrics/android_session_durations_service_unittest.cc
index 2341f58..78918e9d 100644
--- a/chrome/browser/android/metrics/android_session_durations_service_unittest.cc
+++ b/chrome/browser/android/metrics/android_session_durations_service_unittest.cc
@@ -19,10 +19,13 @@
class AndroidIncognitoSessionDurationsServiceTest : public testing::Test {
public:
AndroidIncognitoSessionDurationsServiceTest() = default;
- ~AndroidIncognitoSessionDurationsServiceTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(AndroidIncognitoSessionDurationsServiceTest);
+ AndroidIncognitoSessionDurationsServiceTest(
+ const AndroidIncognitoSessionDurationsServiceTest&) = delete;
+ AndroidIncognitoSessionDurationsServiceTest& operator=(
+ const AndroidIncognitoSessionDurationsServiceTest&) = delete;
+
+ ~AndroidIncognitoSessionDurationsServiceTest() override = default;
};
TEST_F(AndroidIncognitoSessionDurationsServiceTest, RegularIncognitoClose) {
diff --git a/chrome/browser/android/omnibox/omnibox_prerender.h b/chrome/browser/android/omnibox/omnibox_prerender.h
index f2f0a7b9..0cf45d6 100644
--- a/chrome/browser/android/omnibox/omnibox_prerender.h
+++ b/chrome/browser/android/omnibox/omnibox_prerender.h
@@ -23,6 +23,10 @@
class OmniboxPrerender {
public:
OmniboxPrerender(JNIEnv* env, jobject obj);
+
+ OmniboxPrerender(const OmniboxPrerender&) = delete;
+ OmniboxPrerender& operator=(const OmniboxPrerender&) = delete;
+
virtual ~OmniboxPrerender();
// Clears the transitional matches. This should be called when the user
@@ -62,8 +66,6 @@
content::WebContents* web_contents);
void DoPreconnect(const AutocompleteMatch& match, Profile* profile);
JavaObjectWeakGlobalRef weak_java_omnibox_;
-
- DISALLOW_COPY_AND_ASSIGN(OmniboxPrerender);
};
#endif // CHROME_BROWSER_ANDROID_OMNIBOX_OMNIBOX_PRERENDER_H_
diff --git a/chrome/browser/android/oom_intervention/near_oom_monitor.h b/chrome/browser/android/oom_intervention/near_oom_monitor.h
index 60618760..14fe7a4 100644
--- a/chrome/browser/android/oom_intervention/near_oom_monitor.h
+++ b/chrome/browser/android/oom_intervention/near_oom_monitor.h
@@ -24,6 +24,9 @@
// OomInterventionConfig::is_swap_monitor_enabled().
static NearOomMonitor* GetInstance();
+ NearOomMonitor(const NearOomMonitor&) = delete;
+ NearOomMonitor& operator=(const NearOomMonitor&) = delete;
+
virtual ~NearOomMonitor();
base::TimeDelta GetMonitoringInterval() const { return monitoring_interval_; }
@@ -78,8 +81,6 @@
bool component_callback_is_enabled_;
base::android::ScopedJavaGlobalRef<jobject> j_object_;
-
- DISALLOW_COPY_AND_ASSIGN(NearOomMonitor);
};
#endif // CHROME_BROWSER_ANDROID_OOM_INTERVENTION_NEAR_OOM_MONITOR_H_
diff --git a/chrome/browser/android/oom_intervention/oom_intervention_decider.h b/chrome/browser/android/oom_intervention/oom_intervention_decider.h
index 00ee2ac..8d1cc239 100644
--- a/chrome/browser/android/oom_intervention/oom_intervention_decider.h
+++ b/chrome/browser/android/oom_intervention/oom_intervention_decider.h
@@ -44,6 +44,9 @@
static OomInterventionDecider* GetForBrowserContext(
content::BrowserContext* context);
+ OomInterventionDecider(const OomInterventionDecider&) = delete;
+ OomInterventionDecider& operator=(const OomInterventionDecider&) = delete;
+
~OomInterventionDecider() override;
bool CanTriggerIntervention(const std::string& host) const;
@@ -79,8 +82,6 @@
std::unique_ptr<Delegate> delegate_;
PrefService* prefs_;
-
- DISALLOW_COPY_AND_ASSIGN(OomInterventionDecider);
};
#endif // CHROME_BROWSER_ANDROID_OOM_INTERVENTION_OOM_INTERVENTION_DECIDER_H_
diff --git a/chrome/browser/android/password_edit_delegate.h b/chrome/browser/android/password_edit_delegate.h
index 5d7f146..a36f2db 100644
--- a/chrome/browser/android/password_edit_delegate.h
+++ b/chrome/browser/android/password_edit_delegate.h
@@ -14,14 +14,16 @@
class PasswordEditDelegate {
public:
PasswordEditDelegate() = default;
+
+ PasswordEditDelegate(const PasswordEditDelegate&) = delete;
+ PasswordEditDelegate& operator=(const PasswordEditDelegate&) = delete;
+
virtual ~PasswordEditDelegate() = default;
// The method edits a password form held by the delegate. |new_username| and
// |new_password| are user input from the PasswordEntryEditor.
virtual void EditSavedPassword(const std::u16string& new_username,
const std::u16string& new_password) = 0;
-
- DISALLOW_COPY_AND_ASSIGN(PasswordEditDelegate);
};
#endif // CHROME_BROWSER_ANDROID_PASSWORD_EDIT_DELEGATE_H_
diff --git a/chrome/browser/android/preferences/cookie_controls_service_bridge.h b/chrome/browser/android/preferences/cookie_controls_service_bridge.h
index ff9451b..c757ede3 100644
--- a/chrome/browser/android/preferences/cookie_controls_service_bridge.h
+++ b/chrome/browser/android/preferences/cookie_controls_service_bridge.h
@@ -16,6 +16,10 @@
CookieControlsServiceBridge(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj);
+ CookieControlsServiceBridge(const CookieControlsServiceBridge&) = delete;
+ CookieControlsServiceBridge& operator=(const CookieControlsServiceBridge&) =
+ delete;
+
~CookieControlsServiceBridge() override;
// Called by the Java counterpart when it is getting garbage collected.
@@ -38,8 +42,6 @@
CookieControlsService* service_;
base::android::ScopedJavaGlobalRef<jobject> jobject_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieControlsServiceBridge);
};
#endif // CHROME_BROWSER_ANDROID_PREFERENCES_COOKIE_CONTROLS_SERVICE_BRIDGE_H_
diff --git a/chrome/browser/android/rlz/rlz_ping_handler.h b/chrome/browser/android/rlz/rlz_ping_handler.h
index ae9f12f..99766ae4 100644
--- a/chrome/browser/android/rlz/rlz_ping_handler.h
+++ b/chrome/browser/android/rlz/rlz_ping_handler.h
@@ -24,6 +24,10 @@
class RlzPingHandler {
public:
explicit RlzPingHandler(const base::android::JavaRef<jobject>& jprofile);
+
+ RlzPingHandler(const RlzPingHandler&) = delete;
+ RlzPingHandler& operator=(const RlzPingHandler&) = delete;
+
~RlzPingHandler();
// Makes a GET request to the designated web end point with the given
@@ -43,8 +47,6 @@
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
std::unique_ptr<network::SimpleURLLoader> simple_url_loader_;
base::android::ScopedJavaGlobalRef<jobject> j_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(RlzPingHandler);
};
} // namespace android
diff --git a/chrome/browser/android/search_permissions/search_geolocation_disclosure_infobar_delegate.h b/chrome/browser/android/search_permissions/search_geolocation_disclosure_infobar_delegate.h
index bdb54da..31ac1a02 100644
--- a/chrome/browser/android/search_permissions/search_geolocation_disclosure_infobar_delegate.h
+++ b/chrome/browser/android/search_permissions/search_geolocation_disclosure_infobar_delegate.h
@@ -29,6 +29,11 @@
class SearchGeolocationDisclosureInfoBarDelegate
: public infobars::InfoBarDelegate {
public:
+ SearchGeolocationDisclosureInfoBarDelegate(
+ const SearchGeolocationDisclosureInfoBarDelegate&) = delete;
+ SearchGeolocationDisclosureInfoBarDelegate& operator=(
+ const SearchGeolocationDisclosureInfoBarDelegate&) = delete;
+
~SearchGeolocationDisclosureInfoBarDelegate() override;
// Create and show the infobar.
@@ -81,8 +86,6 @@
// The time the infobar was created.
base::Time creation_time_;
-
- DISALLOW_COPY_AND_ASSIGN(SearchGeolocationDisclosureInfoBarDelegate);
};
#endif // CHROME_BROWSER_ANDROID_SEARCH_PERMISSIONS_SEARCH_GEOLOCATION_DISCLOSURE_INFOBAR_DELEGATE_H_
diff --git a/chrome/browser/android/search_permissions/search_geolocation_disclosure_tab_helper.h b/chrome/browser/android/search_permissions/search_geolocation_disclosure_tab_helper.h
index 55dee5cb..e8ed374 100644
--- a/chrome/browser/android/search_permissions/search_geolocation_disclosure_tab_helper.h
+++ b/chrome/browser/android/search_permissions/search_geolocation_disclosure_tab_helper.h
@@ -22,6 +22,11 @@
public content::WebContentsUserData<
SearchGeolocationDisclosureTabHelper> {
public:
+ SearchGeolocationDisclosureTabHelper(
+ const SearchGeolocationDisclosureTabHelper&) = delete;
+ SearchGeolocationDisclosureTabHelper& operator=(
+ const SearchGeolocationDisclosureTabHelper&) = delete;
+
~SearchGeolocationDisclosureTabHelper() override;
// content::WebContentsObserver overrides.
@@ -63,8 +68,6 @@
Profile* GetProfile();
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(SearchGeolocationDisclosureTabHelper);
};
#endif // CHROME_BROWSER_ANDROID_SEARCH_PERMISSIONS_SEARCH_GEOLOCATION_DISCLOSURE_TAB_HELPER_H_
diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc
index f654ff6..36f34f3b 100644
--- a/chrome/browser/android/signin/signin_manager_android.cc
+++ b/chrome/browser/android/signin/signin_manager_android.cc
@@ -83,6 +83,9 @@
}
}
+ ProfileDataRemover(const ProfileDataRemover&) = delete;
+ ProfileDataRemover& operator=(const ProfileDataRemover&) = delete;
+
~ProfileDataRemover() override {}
void OnBrowsingDataRemoverDone(uint64_t failed_data_types) override {
@@ -106,8 +109,6 @@
base::OnceClosure callback_;
scoped_refptr<base::SingleThreadTaskRunner> origin_runner_;
content::BrowsingDataRemover* remover_;
-
- DISALLOW_COPY_AND_ASSIGN(ProfileDataRemover);
};
// Returns whether the user is a managed user or not.
diff --git a/chrome/browser/android/signin/signin_manager_android.h b/chrome/browser/android/signin/signin_manager_android.h
index 5585e3b..a4961e6 100644
--- a/chrome/browser/android/signin/signin_manager_android.h
+++ b/chrome/browser/android/signin/signin_manager_android.h
@@ -40,6 +40,9 @@
SigninManagerAndroid(Profile* profile,
signin::IdentityManager* identity_manager);
+ SigninManagerAndroid(const SigninManagerAndroid&) = delete;
+ SigninManagerAndroid& operator=(const SigninManagerAndroid&) = delete;
+
~SigninManagerAndroid() override;
void Shutdown() override;
@@ -131,8 +134,6 @@
base::ThreadChecker thread_checker_;
base::WeakPtrFactory<SigninManagerAndroid> weak_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(SigninManagerAndroid);
};
#endif // CHROME_BROWSER_ANDROID_SIGNIN_SIGNIN_MANAGER_ANDROID_H_
diff --git a/chrome/browser/android/signin/signin_manager_android_unittest.cc b/chrome/browser/android/signin/signin_manager_android_unittest.cc
index fc5e096..89ab893 100644
--- a/chrome/browser/android/signin/signin_manager_android_unittest.cc
+++ b/chrome/browser/android/signin/signin_manager_android_unittest.cc
@@ -53,6 +53,10 @@
class SigninManagerAndroidTest : public ::testing::Test {
public:
SigninManagerAndroidTest() = default;
+
+ SigninManagerAndroidTest(const SigninManagerAndroidTest&) = delete;
+ SigninManagerAndroidTest& operator=(const SigninManagerAndroidTest&) = delete;
+
~SigninManagerAndroidTest() override = default;
void SetUp() override {
@@ -101,8 +105,6 @@
private:
content::BrowserTaskEnvironment task_environment_;
std::unique_ptr<TestingProfile> profile_;
-
- DISALLOW_COPY_AND_ASSIGN(SigninManagerAndroidTest);
};
// TODO(crbug.com/929456): This test does not actually test anything; the
diff --git a/chrome/browser/android/signin/web_signin_bridge.h b/chrome/browser/android/signin/web_signin_bridge.h
index 762a4e7..cd36078 100644
--- a/chrome/browser/android/signin/web_signin_bridge.h
+++ b/chrome/browser/android/signin/web_signin_bridge.h
@@ -23,6 +23,10 @@
AccountReconcilor* account_reconcilor,
CoreAccountInfo signin_account,
OnSigninCompletedCallback on_signin_completed);
+
+ WebSigninBridge(const WebSigninBridge&) = delete;
+ WebSigninBridge& operator=(const WebSigninBridge&) = delete;
+
~WebSigninBridge() override;
void OnAccountsInCookieUpdated(
@@ -38,8 +42,6 @@
AccountReconcilor* account_reconcilor_;
CoreAccountInfo signin_account_;
OnSigninCompletedCallback on_signin_completed_;
-
- DISALLOW_COPY_AND_ASSIGN(WebSigninBridge);
};
#endif // CHROME_BROWSER_ANDROID_SIGNIN_WEB_SIGNIN_BRIDGE_H_
diff --git a/chrome/browser/android/signin/web_signin_bridge_unittest.cc b/chrome/browser/android/signin/web_signin_bridge_unittest.cc
index b0c83db..4d030af1 100644
--- a/chrome/browser/android/signin/web_signin_bridge_unittest.cc
+++ b/chrome/browser/android/signin/web_signin_bridge_unittest.cc
@@ -79,6 +79,9 @@
identity_test_env_.identity_manager(), &signin_client_);
}
+ WebSigninBridgeTest(const WebSigninBridgeTest&) = delete;
+ WebSigninBridgeTest& operator=(const WebSigninBridgeTest&) = delete;
+
~WebSigninBridgeTest() override { account_reconcilor_->Shutdown(); }
std::unique_ptr<WebSigninBridge> CreateWebSigninBridge(
@@ -95,8 +98,6 @@
TestSigninClient signin_client_;
signin::IdentityTestEnvironment identity_test_env_;
std::unique_ptr<StubAccountReconcilor> account_reconcilor_;
-
- DISALLOW_COPY_AND_ASSIGN(WebSigninBridgeTest);
};
TEST_F(WebSigninBridgeTest,
diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h
index 8cb2831..c74f2f4 100644
--- a/chrome/browser/android/tab_android.h
+++ b/chrome/browser/android/tab_android.h
@@ -65,6 +65,10 @@
static void AttachTabHelpers(content::WebContents* web_contents);
TabAndroid(JNIEnv* env, const base::android::JavaRef<jobject>& obj);
+
+ TabAndroid(const TabAndroid&) = delete;
+ TabAndroid& operator=(const TabAndroid&) = delete;
+
~TabAndroid() override;
base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
@@ -165,8 +169,6 @@
std::unique_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
base::ObserverList<Observer> observers_;
-
- DISALLOW_COPY_AND_ASSIGN(TabAndroid);
};
#endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
diff --git a/chrome/browser/android/tab_web_contents_delegate_android.h b/chrome/browser/android/tab_web_contents_delegate_android.h
index d5fbf74..7f3c188b 100644
--- a/chrome/browser/android/tab_web_contents_delegate_android.h
+++ b/chrome/browser/android/tab_web_contents_delegate_android.h
@@ -40,6 +40,11 @@
public find_in_page::FindResultObserver {
public:
TabWebContentsDelegateAndroid(JNIEnv* env, jobject obj);
+
+ TabWebContentsDelegateAndroid(const TabWebContentsDelegateAndroid&) = delete;
+ TabWebContentsDelegateAndroid& operator=(
+ const TabWebContentsDelegateAndroid&) = delete;
+
~TabWebContentsDelegateAndroid() override;
void PortalWebContentsCreated(content::WebContents* portal_contents) override;
@@ -149,8 +154,6 @@
base::ScopedMultiSourceObservation<find_in_page::FindTabHelper,
find_in_page::FindResultObserver>
find_result_observations_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TabWebContentsDelegateAndroid);
};
} // namespace android
diff --git a/chrome/browser/android/thin_webview/chrome_thin_webview_initializer.h b/chrome/browser/android/thin_webview/chrome_thin_webview_initializer.h
index 2db7140..d92b5ef 100644
--- a/chrome/browser/android/thin_webview/chrome_thin_webview_initializer.h
+++ b/chrome/browser/android/thin_webview/chrome_thin_webview_initializer.h
@@ -16,12 +16,14 @@
static void Initialize();
ChromeThinWebViewInitializer() = default;
+
+ ChromeThinWebViewInitializer(const ChromeThinWebViewInitializer&) = delete;
+ ChromeThinWebViewInitializer& operator=(const ChromeThinWebViewInitializer&) =
+ delete;
+
~ChromeThinWebViewInitializer() = default;
void AttachTabHelpers(content::WebContents* web_contents) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeThinWebViewInitializer);
};
} // namespace android
diff --git a/chrome/browser/android/usage_stats/usage_stats_bridge.h b/chrome/browser/android/usage_stats/usage_stats_bridge.h
index 997cd96..dc0cbbf 100644
--- a/chrome/browser/android/usage_stats/usage_stats_bridge.h
+++ b/chrome/browser/android/usage_stats/usage_stats_bridge.h
@@ -40,6 +40,10 @@
std::unique_ptr<UsageStatsDatabase> usage_stats_database,
Profile* profile,
const JavaRef<jobject>& j_this);
+
+ UsageStatsBridge(const UsageStatsBridge&) = delete;
+ UsageStatsBridge& operator=(const UsageStatsBridge&) = delete;
+
~UsageStatsBridge() override;
void Destroy(JNIEnv* j_env, const JavaRef<jobject>& j_this);
@@ -128,8 +132,6 @@
scoped_history_service_observer_{this};
base::WeakPtrFactory<UsageStatsBridge> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UsageStatsBridge);
};
} // namespace usage_stats
diff --git a/chrome/browser/android/usage_stats/usage_stats_database.h b/chrome/browser/android/usage_stats/usage_stats_database.h
index b0a3a88..c869bf6d 100644
--- a/chrome/browser/android/usage_stats/usage_stats_database.h
+++ b/chrome/browser/android/usage_stats/usage_stats_database.h
@@ -52,6 +52,9 @@
// Initializes the database with user |profile|.
explicit UsageStatsDatabase(Profile* profile);
+ UsageStatsDatabase(const UsageStatsDatabase&) = delete;
+ UsageStatsDatabase& operator=(const UsageStatsDatabase&) = delete;
+
~UsageStatsDatabase();
void GetAllEvents(EventsCallback callback);
@@ -154,8 +157,6 @@
base::queue<base::OnceClosure> token_mapping_db_callbacks_;
base::WeakPtrFactory<UsageStatsDatabase> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UsageStatsDatabase);
};
} // namespace usage_stats
diff --git a/chrome/browser/android/usb/web_usb_chooser_android.h b/chrome/browser/android/usb/web_usb_chooser_android.h
index 9909e85..c3b271c 100644
--- a/chrome/browser/android/usb/web_usb_chooser_android.h
+++ b/chrome/browser/android/usb/web_usb_chooser_android.h
@@ -20,6 +20,10 @@
class WebUsbChooserAndroid : public WebUsbChooser {
public:
explicit WebUsbChooserAndroid(content::RenderFrameHost* render_frame_host);
+
+ WebUsbChooserAndroid(const WebUsbChooserAndroid&) = delete;
+ WebUsbChooserAndroid& operator=(const WebUsbChooserAndroid&) = delete;
+
~WebUsbChooserAndroid() override;
// WebUsbChooser implementation
@@ -33,8 +37,6 @@
std::unique_ptr<UsbChooserDialogAndroid> dialog_;
base::WeakPtrFactory<WebUsbChooserAndroid> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WebUsbChooserAndroid);
};
#endif // CHROME_BROWSER_ANDROID_USB_WEB_USB_CHOOSER_ANDROID_H_
diff --git a/chrome/browser/android/vr/android_ui_gesture_target.h b/chrome/browser/android/vr/android_ui_gesture_target.h
index 0296f17..6ffbbb3 100644
--- a/chrome/browser/android/vr/android_ui_gesture_target.h
+++ b/chrome/browser/android/vr/android_ui_gesture_target.h
@@ -28,6 +28,10 @@
float scale_factor,
float scroll_ratio,
int touch_slop);
+
+ AndroidUiGestureTarget(const AndroidUiGestureTarget&) = delete;
+ AndroidUiGestureTarget& operator=(const AndroidUiGestureTarget&) = delete;
+
~AndroidUiGestureTarget();
static AndroidUiGestureTarget* FromJavaObject(
@@ -52,8 +56,6 @@
int touch_slop_;
JavaObjectWeakGlobalRef java_ref_;
-
- DISALLOW_COPY_AND_ASSIGN(AndroidUiGestureTarget);
};
} // namespace vr
diff --git a/chrome/browser/android/vr/android_vsync_helper.h b/chrome/browser/android/vr/android_vsync_helper.h
index 60318b7f..ce3a070 100644
--- a/chrome/browser/android/vr/android_vsync_helper.h
+++ b/chrome/browser/android/vr/android_vsync_helper.h
@@ -18,6 +18,10 @@
public:
using Callback = base::RepeatingCallback<void(base::TimeTicks)>;
explicit AndroidVSyncHelper(Callback callback);
+
+ AndroidVSyncHelper(const AndroidVSyncHelper&) = delete;
+ AndroidVSyncHelper& operator=(const AndroidVSyncHelper&) = delete;
+
~AndroidVSyncHelper();
void OnVSync(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
@@ -40,8 +44,6 @@
bool vsync_requested_ = false;
base::android::ScopedJavaGlobalRef<jobject> j_object_;
-
- DISALLOW_COPY_AND_ASSIGN(AndroidVSyncHelper);
};
} // namespace vr
diff --git a/chrome/browser/android/vr/arcore_device/fake_arcore.h b/chrome/browser/android/vr/arcore_device/fake_arcore.h
index e4ce1cc..27a36a8 100644
--- a/chrome/browser/android/vr/arcore_device/fake_arcore.h
+++ b/chrome/browser/android/vr/arcore_device/fake_arcore.h
@@ -21,6 +21,10 @@
class FakeArCore : public ArCore {
public:
FakeArCore();
+
+ FakeArCore(const FakeArCore&) = delete;
+ FakeArCore& operator=(const FakeArCore&) = delete;
+
~FakeArCore() override;
// ArCore implementation.
@@ -112,8 +116,6 @@
};
std::unordered_map<uint64_t, FakeAnchorData> anchors_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeArCore);
};
class FakeArCoreFactory : public ArCoreFactory {
diff --git a/chrome/browser/android/vr/autocomplete_controller.h b/chrome/browser/android/vr/autocomplete_controller.h
index 0b99c2f..be35e10 100644
--- a/chrome/browser/android/vr/autocomplete_controller.h
+++ b/chrome/browser/android/vr/autocomplete_controller.h
@@ -27,6 +27,10 @@
explicit AutocompleteController(SuggestionCallback callback);
AutocompleteController();
+
+ AutocompleteController(const AutocompleteController&) = delete;
+ AutocompleteController& operator=(const AutocompleteController&) = delete;
+
~AutocompleteController() override;
void Start(const AutocompleteRequest& request);
@@ -56,8 +60,6 @@
// batch incoming suggestions that arrive before that period of time has been
// exceeded.
base::CancelableOnceClosure suggestions_timeout_;
-
- DISALLOW_COPY_AND_ASSIGN(AutocompleteController);
};
} // namespace vr
diff --git a/chrome/browser/android/vr/cardboard_input_delegate.h b/chrome/browser/android/vr/cardboard_input_delegate.h
index bde39bf..05edda89 100644
--- a/chrome/browser/android/vr/cardboard_input_delegate.h
+++ b/chrome/browser/android/vr/cardboard_input_delegate.h
@@ -17,6 +17,10 @@
class CardboardInputDelegate : public InputDelegate {
public:
explicit CardboardInputDelegate(gvr::GvrApi* gvr_api);
+
+ CardboardInputDelegate(const CardboardInputDelegate&) = delete;
+ CardboardInputDelegate& operator=(const CardboardInputDelegate&) = delete;
+
~CardboardInputDelegate() override;
// InputDelegate implementation.
@@ -35,8 +39,6 @@
gvr::GvrApi* gvr_api_;
bool cardboard_trigger_pressed_ = false;
bool cardboard_trigger_clicked_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(CardboardInputDelegate);
};
} // namespace vr
diff --git a/chrome/browser/android/vr/gvr_graphics_delegate.h b/chrome/browser/android/vr/gvr_graphics_delegate.h
index 4ee8e56..31f3fdcc 100644
--- a/chrome/browser/android/vr/gvr_graphics_delegate.h
+++ b/chrome/browser/android/vr/gvr_graphics_delegate.h
@@ -82,6 +82,10 @@
bool pause_content,
bool low_density,
size_t sliding_time_size);
+
+ GvrGraphicsDelegate(const GvrGraphicsDelegate&) = delete;
+ GvrGraphicsDelegate& operator=(const GvrGraphicsDelegate&) = delete;
+
~GvrGraphicsDelegate() override;
void set_webxr_presentation_state(device::WebXrPresentationState* webxr) {
@@ -220,8 +224,6 @@
unsigned int last_bound_buffer_index_;
base::WeakPtrFactory<GvrGraphicsDelegate> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(GvrGraphicsDelegate);
};
} // namespace vr
diff --git a/chrome/browser/android/vr/gvr_input_delegate.h b/chrome/browser/android/vr/gvr_input_delegate.h
index 4487611..f5b9de9 100644
--- a/chrome/browser/android/vr/gvr_input_delegate.h
+++ b/chrome/browser/android/vr/gvr_input_delegate.h
@@ -22,6 +22,10 @@
class GvrInputDelegate : public InputDelegate {
public:
explicit GvrInputDelegate(gvr::GvrApi* gvr_api);
+
+ GvrInputDelegate(const GvrInputDelegate&) = delete;
+ GvrInputDelegate& operator=(const GvrInputDelegate&) = delete;
+
~GvrInputDelegate() override;
// InputDelegate implementation.
@@ -42,8 +46,6 @@
gvr::GvrApi* gvr_api_;
bool was_select_button_down_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(GvrInputDelegate);
};
} // namespace vr
diff --git a/chrome/browser/android/vr/gvr_keyboard_delegate.h b/chrome/browser/android/vr/gvr_keyboard_delegate.h
index aac426c..6bf2a61b 100644
--- a/chrome/browser/android/vr/gvr_keyboard_delegate.h
+++ b/chrome/browser/android/vr/gvr_keyboard_delegate.h
@@ -20,6 +20,10 @@
// Constructs a GvrKeyboardDelegate by dynamically loading the GVR keyboard
// api. A null pointer is returned upon failure.
static std::unique_ptr<GvrKeyboardDelegate> Create();
+
+ GvrKeyboardDelegate(const GvrKeyboardDelegate&) = delete;
+ GvrKeyboardDelegate& operator=(const GvrKeyboardDelegate&) = delete;
+
~GvrKeyboardDelegate() override;
typedef int32_t EventType;
@@ -62,8 +66,6 @@
KeyboardUiInterface* ui_;
gvr_keyboard_context* gvr_keyboard_ = nullptr;
OnEventCallback keyboard_event_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(GvrKeyboardDelegate);
};
} // namespace vr
diff --git a/chrome/browser/android/vr/gvr_scheduler_delegate.h b/chrome/browser/android/vr/gvr_scheduler_delegate.h
index 10c4795..edee83c 100644
--- a/chrome/browser/android/vr/gvr_scheduler_delegate.h
+++ b/chrome/browser/android/vr/gvr_scheduler_delegate.h
@@ -63,6 +63,10 @@
bool start_in_webxr_mode,
bool cardboard_gamepad,
size_t sliding_time_size);
+
+ GvrSchedulerDelegate(const GvrSchedulerDelegate&) = delete;
+ GvrSchedulerDelegate& operator=(const GvrSchedulerDelegate&) = delete;
+
~GvrSchedulerDelegate() override;
device::WebXrPresentationState* webxr() { return &webxr_; }
@@ -255,8 +259,6 @@
device::SlidingTimeDeltaAverage webvr_js_wait_time_;
base::WeakPtrFactory<GvrSchedulerDelegate> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(GvrSchedulerDelegate);
};
} // namespace vr
diff --git a/chrome/browser/android/vr/scoped_gpu_trace.h b/chrome/browser/android/vr/scoped_gpu_trace.h
index 7774d99..4df94bf 100644
--- a/chrome/browser/android/vr/scoped_gpu_trace.h
+++ b/chrome/browser/android/vr/scoped_gpu_trace.h
@@ -28,6 +28,9 @@
public:
explicit ScopedGpuTrace(const char* name);
+ ScopedGpuTrace(const ScopedGpuTrace&) = delete;
+ ScopedGpuTrace& operator=(const ScopedGpuTrace&) = delete;
+
virtual ~ScopedGpuTrace();
gl::GLFenceAndroidNativeFenceSync* fence() { return fence_.get(); }
@@ -39,8 +42,6 @@
std::unique_ptr<gl::GLFenceAndroidNativeFenceSync> fence_;
const char* const name_;
uint32_t trace_id_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedGpuTrace);
};
} // namespace vr
diff --git a/chrome/browser/android/vr/test/ar_test_suite.h b/chrome/browser/android/vr/test/ar_test_suite.h
index 2154b66b..1804eae8 100644
--- a/chrome/browser/android/vr/test/ar_test_suite.h
+++ b/chrome/browser/android/vr/test/ar_test_suite.h
@@ -18,6 +18,10 @@
class ArTestSuite : public base::TestSuite {
public:
ArTestSuite(int argc, char** argv);
+
+ ArTestSuite(const ArTestSuite&) = delete;
+ ArTestSuite& operator=(const ArTestSuite&) = delete;
+
~ArTestSuite() override;
protected:
@@ -26,8 +30,6 @@
private:
std::unique_ptr<base::test::TaskEnvironment> task_environment_;
-
- DISALLOW_COPY_AND_ASSIGN(ArTestSuite);
};
} // namespace vr
diff --git a/chrome/browser/android/vr/ui_factory.h b/chrome/browser/android/vr/ui_factory.h
index 3bafeba..10f3c162 100644
--- a/chrome/browser/android/vr/ui_factory.h
+++ b/chrome/browser/android/vr/ui_factory.h
@@ -31,6 +31,10 @@
class UiFactory {
public:
UiFactory() {}
+
+ UiFactory(const UiFactory&) = delete;
+ UiFactory& operator=(const UiFactory&) = delete;
+
virtual ~UiFactory() {}
virtual std::unique_ptr<UiInterface> Create(
@@ -40,9 +44,6 @@
std::unique_ptr<TextInputDelegate> text_input_delegate,
std::unique_ptr<AudioDelegate> audio_delegate,
const UiInitialState& ui_initial_state) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(UiFactory);
};
// Creates a UI factory appropriate for the current build. Bundle builds will
diff --git a/chrome/browser/android/vr/vr_controller.h b/chrome/browser/android/vr/vr_controller.h
index f1f7de775..a0f73b9 100644
--- a/chrome/browser/android/vr/vr_controller.h
+++ b/chrome/browser/android/vr/vr_controller.h
@@ -39,6 +39,10 @@
public:
// Controller API entry point.
explicit VrController(gvr::GvrApi* gvr_api);
+
+ VrController(const VrController&) = delete;
+ VrController& operator=(const VrController&) = delete;
+
~VrController() override;
// Must be called when the Activity gets OnResume().
@@ -122,8 +126,6 @@
int64_t last_timestamp_nanos_ = 0;
float alpha_value_ = 1.0f;
-
- DISALLOW_COPY_AND_ASSIGN(VrController);
};
} // namespace vr
diff --git a/chrome/browser/android/vr/vr_gl_thread.h b/chrome/browser/android/vr/vr_gl_thread.h
index bf7faf6d..c8e631f1 100644
--- a/chrome/browser/android/vr/vr_gl_thread.h
+++ b/chrome/browser/android/vr/vr_gl_thread.h
@@ -57,6 +57,9 @@
base::WaitableEvent* gl_surface_created_event,
base::OnceCallback<gfx::AcceleratedWidget()> surface_callback);
+ VrGLThread(const VrGLThread&) = delete;
+ VrGLThread& operator=(const VrGLThread&) = delete;
+
~VrGLThread() override;
base::WeakPtr<BrowserRenderer> GetBrowserRenderer();
void SetInputConnection(VrInputConnection* input_connection);
@@ -182,8 +185,6 @@
// This state is used for initializing the BrowserRenderer.
std::unique_ptr<BrowserRendererFactory::Params> factory_params_;
-
- DISALLOW_COPY_AND_ASSIGN(VrGLThread);
};
} // namespace vr
diff --git a/chrome/browser/android/vr/vr_input_connection.h b/chrome/browser/android/vr/vr_input_connection.h
index 17fe4c5..f51097d 100644
--- a/chrome/browser/android/vr/vr_input_connection.h
+++ b/chrome/browser/android/vr/vr_input_connection.h
@@ -23,6 +23,10 @@
class VrInputConnection {
public:
explicit VrInputConnection(content::WebContents* web_contents);
+
+ VrInputConnection(const VrInputConnection&) = delete;
+ VrInputConnection& operator=(const VrInputConnection&) = delete;
+
~VrInputConnection();
void OnKeyboardEdit(const TextEdits& edits);
@@ -37,8 +41,6 @@
private:
base::android::ScopedJavaGlobalRef<jobject> j_object_;
std::queue<vr::TextStateUpdateCallback> text_state_update_callbacks_;
-
- DISALLOW_COPY_AND_ASSIGN(VrInputConnection);
};
} // namespace vr
diff --git a/chrome/browser/android/vr/vr_shell_delegate.cc b/chrome/browser/android/vr/vr_shell_delegate.cc
index 271a354..8e30cff 100644
--- a/chrome/browser/android/vr/vr_shell_delegate.cc
+++ b/chrome/browser/android/vr/vr_shell_delegate.cc
@@ -35,11 +35,14 @@
: public device::GvrDelegateProviderFactory {
public:
VrShellDelegateProviderFactory() = default;
+
+ VrShellDelegateProviderFactory(const VrShellDelegateProviderFactory&) =
+ delete;
+ VrShellDelegateProviderFactory& operator=(
+ const VrShellDelegateProviderFactory&) = delete;
+
~VrShellDelegateProviderFactory() override = default;
device::GvrDelegateProvider* CreateGvrDelegateProvider() override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(VrShellDelegateProviderFactory);
};
device::GvrDelegateProvider*
diff --git a/chrome/browser/android/vr/vr_shell_delegate.h b/chrome/browser/android/vr/vr_shell_delegate.h
index 2ba5232c..9f9059e 100644
--- a/chrome/browser/android/vr/vr_shell_delegate.h
+++ b/chrome/browser/android/vr/vr_shell_delegate.h
@@ -26,6 +26,10 @@
class VrShellDelegate : public device::GvrDelegateProvider {
public:
VrShellDelegate(JNIEnv* env, jobject obj);
+
+ VrShellDelegate(const VrShellDelegate&) = delete;
+ VrShellDelegate& operator=(const VrShellDelegate&) = delete;
+
~VrShellDelegate() override;
static device::GvrDelegateProvider* CreateVrShellDelegate();
@@ -85,8 +89,6 @@
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
base::WeakPtrFactory<VrShellDelegate> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(VrShellDelegate);
};
} // namespace vr
diff --git a/chrome/browser/android/webapk/webapk_handler_delegate.h b/chrome/browser/android/webapk/webapk_handler_delegate.h
index af810de9..2d8e585 100644
--- a/chrome/browser/android/webapk/webapk_handler_delegate.h
+++ b/chrome/browser/android/webapk/webapk_handler_delegate.h
@@ -18,6 +18,10 @@
using WebApkInfoCallback = base::RepeatingCallback<void(const WebApkInfo&)>;
explicit WebApkHandlerDelegate(const WebApkInfoCallback& callback);
+
+ WebApkHandlerDelegate(const WebApkHandlerDelegate&) = delete;
+ WebApkHandlerDelegate& operator=(const WebApkHandlerDelegate&) = delete;
+
~WebApkHandlerDelegate();
// Fetches information about each WebAPK.
@@ -51,8 +55,6 @@
WebApkInfoCallback callback_;
base::android::ScopedJavaGlobalRef<jobject> j_obj_;
-
- DISALLOW_COPY_AND_ASSIGN(WebApkHandlerDelegate);
};
#endif // CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_HANDLER_DELEGATE_H_
diff --git a/chrome/browser/android/webapk/webapk_icon_hasher_browsertest.cc b/chrome/browser/android/webapk/webapk_icon_hasher_browsertest.cc
index 664b577..1d5c07016 100644
--- a/chrome/browser/android/webapk/webapk_icon_hasher_browsertest.cc
+++ b/chrome/browser/android/webapk/webapk_icon_hasher_browsertest.cc
@@ -35,6 +35,11 @@
scoped_feature_list_.InitAndEnableFeature(
net::features::kSplitCacheByNetworkIsolationKey);
}
+
+ WebApkIconHasherBrowserTest(const WebApkIconHasherBrowserTest&) = delete;
+ WebApkIconHasherBrowserTest& operator=(const WebApkIconHasherBrowserTest&) =
+ delete;
+
~WebApkIconHasherBrowserTest() override = default;
void SetUpOnMainThread() override {
@@ -65,8 +70,6 @@
private:
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(WebApkIconHasherBrowserTest);
};
namespace {
diff --git a/chrome/browser/android/webapk/webapk_install_service.h b/chrome/browser/android/webapk/webapk_install_service.h
index 903d8024..7be20aa 100644
--- a/chrome/browser/android/webapk/webapk_install_service.h
+++ b/chrome/browser/android/webapk/webapk_install_service.h
@@ -60,6 +60,10 @@
static WebApkInstallService* Get(content::BrowserContext* browser_context);
explicit WebApkInstallService(content::BrowserContext* browser_context);
+
+ WebApkInstallService(const WebApkInstallService&) = delete;
+ WebApkInstallService& operator=(const WebApkInstallService&) = delete;
+
~WebApkInstallService() override;
// Returns whether an install for |web_manifest_url| is in progress.
@@ -111,8 +115,6 @@
// Used to get |weak_ptr_|.
base::WeakPtrFactory<WebApkInstallService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WebApkInstallService);
};
#endif // CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_INSTALL_SERVICE_H_
diff --git a/chrome/browser/android/webapk/webapk_installer.cc b/chrome/browser/android/webapk/webapk_installer.cc
index d7c1906..a80f245d 100644
--- a/chrome/browser/android/webapk/webapk_installer.cc
+++ b/chrome/browser/android/webapk/webapk_installer.cc
@@ -69,6 +69,9 @@
class CacheClearer : public content::BrowsingDataRemover::Observer {
public:
+ CacheClearer(const CacheClearer&) = delete;
+ CacheClearer& operator=(const CacheClearer&) = delete;
+
~CacheClearer() override { remover_->RemoveObserver(this); }
// Clear Chrome's cache. Run |callback| once clearing the cache is complete.
@@ -96,8 +99,6 @@
content::BrowsingDataRemover* remover_;
base::OnceClosure install_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(CacheClearer);
};
// Reads |file| and returns contents. Must be called on a background thread.
diff --git a/chrome/browser/android/webapk/webapk_installer.h b/chrome/browser/android/webapk/webapk_installer.h
index 51e77c1b..b4b6f719 100644
--- a/chrome/browser/android/webapk/webapk_installer.h
+++ b/chrome/browser/android/webapk/webapk_installer.h
@@ -57,6 +57,9 @@
public:
using FinishCallback = WebApkInstallService::FinishCallback;
+ WebApkInstaller(const WebApkInstaller&) = delete;
+ WebApkInstaller& operator=(const WebApkInstaller&) = delete;
+
virtual ~WebApkInstaller();
// Creates a self-owned WebApkInstaller instance and talks to the Chrome
@@ -248,8 +251,6 @@
// Used to get |weak_ptr_|.
base::WeakPtrFactory<WebApkInstaller> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WebApkInstaller);
};
#endif // CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_INSTALLER_H_
diff --git a/chrome/browser/android/webapk/webapk_installer_unittest.cc b/chrome/browser/android/webapk/webapk_installer_unittest.cc
index f936297..59424388 100644
--- a/chrome/browser/android/webapk/webapk_installer_unittest.cc
+++ b/chrome/browser/android/webapk/webapk_installer_unittest.cc
@@ -106,6 +106,9 @@
public:
WebApkInstallerRunner() {}
+ WebApkInstallerRunner(const WebApkInstallerRunner&) = delete;
+ WebApkInstallerRunner& operator=(const WebApkInstallerRunner&) = delete;
+
~WebApkInstallerRunner() {}
void RunInstallWebApk(std::unique_ptr<WebApkInstaller> installer,
@@ -151,8 +154,6 @@
// The result of the installation process.
WebApkInstallResult result_;
-
- DISALLOW_COPY_AND_ASSIGN(WebApkInstallerRunner);
};
// Helper class for calling WebApkInstaller::StoreUpdateRequestToFile()
@@ -204,6 +205,10 @@
class BuildProtoRunner {
public:
BuildProtoRunner() {}
+
+ BuildProtoRunner(const BuildProtoRunner&) = delete;
+ BuildProtoRunner& operator=(const BuildProtoRunner&) = delete;
+
~BuildProtoRunner() {}
void BuildSync(const GURL& best_primary_icon_url,
@@ -256,22 +261,21 @@
// Called after the |webapk_request_| is built.
base::OnceClosure on_completed_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(BuildProtoRunner);
};
class ScopedTempFile {
public:
ScopedTempFile() { CHECK(base::CreateTemporaryFile(&file_path_)); }
+ ScopedTempFile(const ScopedTempFile&) = delete;
+ ScopedTempFile& operator=(const ScopedTempFile&) = delete;
+
~ScopedTempFile() { base::DeleteFile(file_path_); }
const base::FilePath& GetFilePath() { return file_path_; }
private:
base::FilePath file_path_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedTempFile);
};
} // anonymous namespace
@@ -284,6 +288,10 @@
WebApkInstallerTest()
: task_environment_(content::BrowserTaskEnvironment::IO_MAINLOOP) {}
+
+ WebApkInstallerTest(const WebApkInstallerTest&) = delete;
+ WebApkInstallerTest& operator=(const WebApkInstallerTest&) = delete;
+
~WebApkInstallerTest() override {}
void SetUp() override {
@@ -359,8 +367,6 @@
// Builds response to the WebAPK creation request.
WebApkResponseBuilder webapk_response_builder_;
-
- DISALLOW_COPY_AND_ASSIGN(WebApkInstallerTest);
};
// Test installation succeeding.
diff --git a/chrome/browser/android/webapps/webapp_registry.h b/chrome/browser/android/webapps/webapp_registry.h
index f5a4e07..7b1cb07a 100644
--- a/chrome/browser/android/webapps/webapp_registry.h
+++ b/chrome/browser/android/webapps/webapp_registry.h
@@ -18,6 +18,10 @@
class WebappRegistry {
public:
WebappRegistry() { }
+
+ WebappRegistry(const WebappRegistry&) = delete;
+ WebappRegistry& operator=(const WebappRegistry&) = delete;
+
virtual ~WebappRegistry() { }
// Cleans up data stored by web apps on URLs matching |url_filter|.
@@ -28,9 +32,6 @@
// URLs matching |url_filter|, whilst leaving other data intact.
virtual void ClearWebappHistoryForUrls(
const base::RepeatingCallback<bool(const GURL&)>& url_filter);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WebappRegistry);
};
#endif // CHROME_BROWSER_ANDROID_WEBAPPS_WEBAPP_REGISTRY_H_
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index c9a29da..8dd911f 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -443,6 +443,10 @@
storage_observer_.Observe(&profile_manager_->GetProfileAttributesStorage());
}
+ AppControllerProfileObserver(const AppControllerProfileObserver&) = delete;
+ AppControllerProfileObserver& operator=(const AppControllerProfileObserver&) =
+ delete;
+
~AppControllerProfileObserver() override = default;
private:
@@ -511,8 +515,6 @@
ProfileManager* const profile_manager_;
AppController* const app_controller_; // Weak; owns us.
-
- DISALLOW_COPY_AND_ASSIGN(AppControllerProfileObserver);
};
#if BUILDFLAG(USE_ALLOCATOR_SHIM)
diff --git a/chrome/browser/ash/accessibility/accessibility_extension_loader.h b/chrome/browser/ash/accessibility/accessibility_extension_loader.h
index aac6dac..b3b4704 100644
--- a/chrome/browser/ash/accessibility/accessibility_extension_loader.h
+++ b/chrome/browser/ash/accessibility/accessibility_extension_loader.h
@@ -21,6 +21,11 @@
const base::FilePath::CharType* manifest_filename,
const base::FilePath::CharType* guest_manifest_filename,
base::RepeatingClosure unload_callback);
+
+ AccessibilityExtensionLoader(const AccessibilityExtensionLoader&) = delete;
+ AccessibilityExtensionLoader& operator=(const AccessibilityExtensionLoader&) =
+ delete;
+
~AccessibilityExtensionLoader();
void SetProfile(Profile* profile, base::OnceClosure done_callback);
@@ -53,8 +58,6 @@
base::RepeatingClosure unload_callback_;
base::WeakPtrFactory<AccessibilityExtensionLoader> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AccessibilityExtensionLoader);
};
} // namespace ash
diff --git a/chrome/browser/ash/accessibility/accessibility_manager.cc b/chrome/browser/ash/accessibility/accessibility_manager.cc
index 150b86b..4ca6dce 100644
--- a/chrome/browser/ash/accessibility/accessibility_manager.cc
+++ b/chrome/browser/ash/accessibility/accessibility_manager.cc
@@ -216,6 +216,11 @@
widget_->AddObserver(this);
}
+ AccessibilityPanelWidgetObserver(const AccessibilityPanelWidgetObserver&) =
+ delete;
+ AccessibilityPanelWidgetObserver& operator=(
+ const AccessibilityPanelWidgetObserver&) = delete;
+
~AccessibilityPanelWidgetObserver() override { CHECK(!IsInObserverList()); }
void OnWidgetClosing(views::Widget* widget) override {
@@ -236,8 +241,6 @@
views::Widget* widget_;
base::OnceCallback<void()> on_destroying_;
-
- DISALLOW_COPY_AND_ASSIGN(AccessibilityPanelWidgetObserver);
};
///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ash/accessibility/accessibility_manager_browsertest.cc b/chrome/browser/ash/accessibility/accessibility_manager_browsertest.cc
index af6d572..7a54243 100644
--- a/chrome/browser/ash/accessibility/accessibility_manager_browsertest.cc
+++ b/chrome/browser/ash/accessibility/accessibility_manager_browsertest.cc
@@ -78,6 +78,10 @@
base::Unretained(this)));
}
+ MockAccessibilityObserver(const MockAccessibilityObserver&) = delete;
+ MockAccessibilityObserver& operator=(const MockAccessibilityObserver&) =
+ delete;
+
virtual ~MockAccessibilityObserver() = default;
bool observed() const { return observed_; }
@@ -104,8 +108,6 @@
absl::optional<AccessibilityNotificationType> observed_type_;
base::CallbackListSubscription accessibility_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(MockAccessibilityObserver);
};
Profile* GetActiveUserProfile() {
diff --git a/chrome/browser/ash/accessibility/accessibility_panel.cc b/chrome/browser/ash/accessibility/accessibility_panel.cc
index 8be0a9ce..809761d8 100644
--- a/chrome/browser/ash/accessibility/accessibility_panel.cc
+++ b/chrome/browser/ash/accessibility/accessibility_panel.cc
@@ -30,6 +30,12 @@
AccessibilityPanelWebContentsObserver(content::WebContents* web_contents,
AccessibilityPanel* panel)
: content::WebContentsObserver(web_contents), panel_(panel) {}
+
+ AccessibilityPanelWebContentsObserver(
+ const AccessibilityPanelWebContentsObserver&) = delete;
+ AccessibilityPanelWebContentsObserver& operator=(
+ const AccessibilityPanelWebContentsObserver&) = delete;
+
~AccessibilityPanelWebContentsObserver() override = default;
// content::WebContentsObserver overrides.
@@ -39,8 +45,6 @@
private:
AccessibilityPanel* panel_;
-
- DISALLOW_COPY_AND_ASSIGN(AccessibilityPanelWebContentsObserver);
};
AccessibilityPanel::AccessibilityPanel(content::BrowserContext* browser_context,
diff --git a/chrome/browser/ash/accessibility/accessibility_panel.h b/chrome/browser/ash/accessibility/accessibility_panel.h
index 5e86fa00..d6bfc3f 100644
--- a/chrome/browser/ash/accessibility/accessibility_panel.h
+++ b/chrome/browser/ash/accessibility/accessibility_panel.h
@@ -31,6 +31,10 @@
explicit AccessibilityPanel(content::BrowserContext* browser_context,
std::string content_url,
std::string widget_name);
+
+ AccessibilityPanel(const AccessibilityPanel&) = delete;
+ AccessibilityPanel& operator=(const AccessibilityPanel&) = delete;
+
~AccessibilityPanel() override;
// Closes the panel immediately, deleting the WebView/WebContents.
@@ -62,8 +66,6 @@
std::unique_ptr<AccessibilityPanelWebContentsObserver> web_contents_observer_;
views::Widget* widget_ = nullptr;
views::View* web_view_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(AccessibilityPanel);
};
} // namespace ash
diff --git a/chrome/browser/ash/accessibility/chromevox_panel.cc b/chrome/browser/ash/accessibility/chromevox_panel.cc
index 198ed6f..b5311c0 100644
--- a/chrome/browser/ash/accessibility/chromevox_panel.cc
+++ b/chrome/browser/ash/accessibility/chromevox_panel.cc
@@ -31,6 +31,12 @@
ChromeVoxPanelWebContentsObserver(content::WebContents* web_contents,
ChromeVoxPanel* panel)
: content::WebContentsObserver(web_contents), panel_(panel) {}
+
+ ChromeVoxPanelWebContentsObserver(const ChromeVoxPanelWebContentsObserver&) =
+ delete;
+ ChromeVoxPanelWebContentsObserver& operator=(
+ const ChromeVoxPanelWebContentsObserver&) = delete;
+
~ChromeVoxPanelWebContentsObserver() override {}
void DidFinishNavigation(
@@ -50,8 +56,6 @@
private:
ChromeVoxPanel* panel_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeVoxPanelWebContentsObserver);
};
ChromeVoxPanel::ChromeVoxPanel(content::BrowserContext* browser_context)
diff --git a/chrome/browser/ash/accessibility/chromevox_panel.h b/chrome/browser/ash/accessibility/chromevox_panel.h
index b53219a..c1c8845 100644
--- a/chrome/browser/ash/accessibility/chromevox_panel.h
+++ b/chrome/browser/ash/accessibility/chromevox_panel.h
@@ -14,6 +14,10 @@
class ChromeVoxPanel : public AccessibilityPanel {
public:
explicit ChromeVoxPanel(content::BrowserContext* browser_context);
+
+ ChromeVoxPanel(const ChromeVoxPanel&) = delete;
+ ChromeVoxPanel& operator=(const ChromeVoxPanel&) = delete;
+
~ChromeVoxPanel() override;
class ChromeVoxPanelWebContentsObserver;
@@ -30,8 +34,6 @@
std::string GetUrlForContent();
std::unique_ptr<ChromeVoxPanelWebContentsObserver> web_contents_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeVoxPanel);
};
} // namespace ash
diff --git a/chrome/browser/ash/accessibility/dictation.h b/chrome/browser/ash/accessibility/dictation.h
index 94c99d4..2452cbb 100644
--- a/chrome/browser/ash/accessibility/dictation.h
+++ b/chrome/browser/ash/accessibility/dictation.h
@@ -42,6 +42,10 @@
static const base::flat_map<std::string, bool> GetAllSupportedLocales();
explicit Dictation(Profile* profile);
+
+ Dictation(const Dictation&) = delete;
+ Dictation& operator=(const Dictation&) = delete;
+
~Dictation() override;
// User-initiated dictation.
@@ -96,8 +100,6 @@
base::ElapsedTimer listening_duration_timer_;
base::WeakPtrFactory<Dictation> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(Dictation);
};
} // namespace ash
diff --git a/chrome/browser/ash/accessibility/magnification_manager_browsertest.cc b/chrome/browser/ash/accessibility/magnification_manager_browsertest.cc
index f79331c..eb418be 100644
--- a/chrome/browser/ash/accessibility/magnification_manager_browsertest.cc
+++ b/chrome/browser/ash/accessibility/magnification_manager_browsertest.cc
@@ -121,6 +121,10 @@
base::Unretained(this)));
}
+ MockMagnificationObserver(const MockMagnificationObserver&) = delete;
+ MockMagnificationObserver& operator=(const MockMagnificationObserver&) =
+ delete;
+
virtual ~MockMagnificationObserver() {}
bool observed() const { return observed_; }
@@ -142,8 +146,6 @@
bool observed_enabled_ = false;
base::CallbackListSubscription accessibility_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(MockMagnificationObserver);
};
class MagnificationManagerTest : public InProcessBrowserTest {
diff --git a/chrome/browser/ash/accessibility/select_to_speak_event_handler_delegate_impl.h b/chrome/browser/ash/accessibility/select_to_speak_event_handler_delegate_impl.h
index 9b59c717..3046a9bb 100644
--- a/chrome/browser/ash/accessibility/select_to_speak_event_handler_delegate_impl.h
+++ b/chrome/browser/ash/accessibility/select_to_speak_event_handler_delegate_impl.h
@@ -16,14 +16,18 @@
: public SelectToSpeakEventHandlerDelegate {
public:
SelectToSpeakEventHandlerDelegateImpl();
+
+ SelectToSpeakEventHandlerDelegateImpl(
+ const SelectToSpeakEventHandlerDelegateImpl&) = delete;
+ SelectToSpeakEventHandlerDelegateImpl& operator=(
+ const SelectToSpeakEventHandlerDelegateImpl&) = delete;
+
virtual ~SelectToSpeakEventHandlerDelegateImpl();
private:
// SelectToSpeakEventHandlerDelegate:
void DispatchKeyEvent(const ui::KeyEvent& event) override;
void DispatchMouseEvent(const ui::MouseEvent& event) override;
-
- DISALLOW_COPY_AND_ASSIGN(SelectToSpeakEventHandlerDelegateImpl);
};
} // namespace ash
diff --git a/chrome/browser/ash/accessibility/speech_monitor.h b/chrome/browser/ash/accessibility/speech_monitor.h
index ece9e14..ee8093f1 100644
--- a/chrome/browser/ash/accessibility/speech_monitor.h
+++ b/chrome/browser/ash/accessibility/speech_monitor.h
@@ -31,6 +31,10 @@
class SpeechMonitor : public content::TtsPlatform {
public:
SpeechMonitor();
+
+ SpeechMonitor(const SpeechMonitor&) = delete;
+ SpeechMonitor& operator=(const SpeechMonitor&) = delete;
+
virtual ~SpeechMonitor();
// Use these apis if you want to write an async test e.g.
@@ -132,8 +136,6 @@
int stop_count_ = 0;
base::WeakPtrFactory<SpeechMonitor> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SpeechMonitor);
};
} // namespace test
diff --git a/chrome/browser/ash/accessibility/spoken_feedback_app_list_browsertest.cc b/chrome/browser/ash/accessibility/spoken_feedback_app_list_browsertest.cc
index 4c761d4..5977f7a6 100644
--- a/chrome/browser/ash/accessibility/spoken_feedback_app_list_browsertest.cc
+++ b/chrome/browser/ash/accessibility/spoken_feedback_app_list_browsertest.cc
@@ -48,10 +48,11 @@
set_display_type(SearchResultDisplayType::kChip);
set_title(title);
}
- ~TestSuggestionChipResult() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(TestSuggestionChipResult);
+ TestSuggestionChipResult(const TestSuggestionChipResult&) = delete;
+ TestSuggestionChipResult& operator=(const TestSuggestionChipResult&) = delete;
+
+ ~TestSuggestionChipResult() override = default;
};
class SpokenFeedbackAppListTest
diff --git a/chrome/browser/ash/accessibility/spoken_feedback_browsertest.h b/chrome/browser/ash/accessibility/spoken_feedback_browsertest.h
index 728c76e..2d2b63d 100644
--- a/chrome/browser/ash/accessibility/spoken_feedback_browsertest.h
+++ b/chrome/browser/ash/accessibility/spoken_feedback_browsertest.h
@@ -21,6 +21,11 @@
class LoggedInSpokenFeedbackTest : public InProcessBrowserTest {
public:
LoggedInSpokenFeedbackTest();
+
+ LoggedInSpokenFeedbackTest(const LoggedInSpokenFeedbackTest&) = delete;
+ LoggedInSpokenFeedbackTest& operator=(const LoggedInSpokenFeedbackTest&) =
+ delete;
+
~LoggedInSpokenFeedbackTest() override;
// InProcessBrowserTest:
@@ -57,8 +62,6 @@
StubBrailleController braille_controller_;
ui::ScopedAnimationDurationScaleMode animation_mode_;
std::unique_ptr<ExtensionConsoleErrorObserver> console_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(LoggedInSpokenFeedbackTest);
};
} // namespace ash
diff --git a/chrome/browser/ash/accessibility/touch_exploration_controller_browsertest.cc b/chrome/browser/ash/accessibility/touch_exploration_controller_browsertest.cc
index f6f872b..5fea29d 100644
--- a/chrome/browser/ash/accessibility/touch_exploration_controller_browsertest.cc
+++ b/chrome/browser/ash/accessibility/touch_exploration_controller_browsertest.cc
@@ -36,6 +36,10 @@
// Tests fail if time is ever 0.
simulated_clock_->Advance(base::TimeDelta::FromMilliseconds(10));
}
+
+ TouchExplorationTest(const TouchExplorationTest&) = delete;
+ TouchExplorationTest& operator=(const TouchExplorationTest&) = delete;
+
~TouchExplorationTest() override {}
protected:
@@ -70,9 +74,6 @@
base::SimpleTestTickClock* simulated_clock_;
aura::Window* root_window_;
std::unique_ptr<ui::test::TestEventHandler> event_handler_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TouchExplorationTest);
};
#if BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/ash/account_manager/account_manager_policy_controller.h b/chrome/browser/ash/account_manager/account_manager_policy_controller.h
index 6e6b35ee..a2e3ba50 100644
--- a/chrome/browser/ash/account_manager/account_manager_policy_controller.h
+++ b/chrome/browser/ash/account_manager/account_manager_policy_controller.h
@@ -35,6 +35,12 @@
account_manager::AccountManager* account_manager,
account_manager::AccountManagerFacade* account_manager_facade,
const AccountId& device_account_id);
+
+ AccountManagerPolicyController(const AccountManagerPolicyController&) =
+ delete;
+ AccountManagerPolicyController& operator=(
+ const AccountManagerPolicyController&) = delete;
+
~AccountManagerPolicyController() override;
// Starts applying the behaviour required by |account_manager::AccountManager|
@@ -85,8 +91,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<AccountManagerPolicyController> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AccountManagerPolicyController);
};
} // namespace ash
diff --git a/chrome/browser/ash/account_manager/account_manager_policy_controller_browsertest.cc b/chrome/browser/ash/account_manager/account_manager_policy_controller_browsertest.cc
index 607bcbbf..6fca2ad5 100644
--- a/chrome/browser/ash/account_manager/account_manager_policy_controller_browsertest.cc
+++ b/chrome/browser/ash/account_manager/account_manager_policy_controller_browsertest.cc
@@ -36,6 +36,12 @@
class AccountManagerPolicyControllerTest : public InProcessBrowserTest {
public:
AccountManagerPolicyControllerTest() = default;
+
+ AccountManagerPolicyControllerTest(
+ const AccountManagerPolicyControllerTest&) = delete;
+ AccountManagerPolicyControllerTest& operator=(
+ const AccountManagerPolicyControllerTest&) = delete;
+
~AccountManagerPolicyControllerTest() override = default;
void SetUpOnMainThread() override {
@@ -125,7 +131,6 @@
identity_test_environment_adaptor_;
std::unique_ptr<user_manager::ScopedUserManager> scoped_user_manager_;
AccountId primary_account_id_;
- DISALLOW_COPY_AND_ASSIGN(AccountManagerPolicyControllerTest);
};
IN_PROC_BROWSER_TEST_F(AccountManagerPolicyControllerTest,
diff --git a/chrome/browser/ash/apps/apk_web_app_installer_unittest.cc b/chrome/browser/ash/apps/apk_web_app_installer_unittest.cc
index 4e31079..302f6e7d 100644
--- a/chrome/browser/ash/apps/apk_web_app_installer_unittest.cc
+++ b/chrome/browser/ash/apps/apk_web_app_installer_unittest.cc
@@ -52,6 +52,9 @@
: ApkWebAppInstaller(profile, base::DoNothing(), weak_owner),
quit_closure_(std::move(quit_closure)) {}
+ FakeApkWebAppInstaller(const FakeApkWebAppInstaller&) = delete;
+ FakeApkWebAppInstaller& operator=(const FakeApkWebAppInstaller&) = delete;
+
~FakeApkWebAppInstaller() override = default;
using ApkWebAppInstaller::has_web_app_info;
@@ -81,9 +84,6 @@
bool complete_installation_called_ = false;
bool do_install_called_ = false;
base::OnceClosure quit_closure_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FakeApkWebAppInstaller);
};
class ApkWebAppInstallerTest : public ChromeRenderViewHostTestHarness,
diff --git a/chrome/browser/ash/apps/apk_web_app_service.h b/chrome/browser/ash/apps/apk_web_app_service.h
index 613e71d..db5dc82 100644
--- a/chrome/browser/ash/apps/apk_web_app_service.h
+++ b/chrome/browser/ash/apps/apk_web_app_service.h
@@ -44,6 +44,10 @@
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
explicit ApkWebAppService(Profile* profile);
+
+ ApkWebAppService(const ApkWebAppService&) = delete;
+ ApkWebAppService& operator=(const ApkWebAppService&) = delete;
+
~ApkWebAppService() override;
void SetArcAppListPrefsForTesting(ArcAppListPrefs* prefs);
@@ -122,8 +126,6 @@
// Must go last.
base::WeakPtrFactory<ApkWebAppService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ApkWebAppService);
};
} // namespace ash
diff --git a/chrome/browser/ash/apps/intent_helper/common_apps_navigation_throttle.h b/chrome/browser/ash/apps/intent_helper/common_apps_navigation_throttle.h
index 96367ca6..8840a60 100644
--- a/chrome/browser/ash/apps/intent_helper/common_apps_navigation_throttle.h
+++ b/chrome/browser/ash/apps/intent_helper/common_apps_navigation_throttle.h
@@ -35,14 +35,17 @@
explicit CommonAppsNavigationThrottle(
content::NavigationHandle* navigation_handle);
+
+ CommonAppsNavigationThrottle(const CommonAppsNavigationThrottle&) = delete;
+ CommonAppsNavigationThrottle& operator=(const CommonAppsNavigationThrottle&) =
+ delete;
+
~CommonAppsNavigationThrottle() override;
private:
bool ShouldCancelNavigation(content::NavigationHandle* handle) override;
bool ShouldShowDisablePage(content::NavigationHandle* handle) override;
ThrottleCheckResult MaybeShowCustomResult() override;
-
- DISALLOW_COPY_AND_ASSIGN(CommonAppsNavigationThrottle);
};
} // namespace apps
diff --git a/chrome/browser/ash/arc/accessibility/accessibility_node_info_data_wrapper.h b/chrome/browser/ash/arc/accessibility/accessibility_node_info_data_wrapper.h
index 55371ac..c21310a 100644
--- a/chrome/browser/ash/arc/accessibility/accessibility_node_info_data_wrapper.h
+++ b/chrome/browser/ash/arc/accessibility/accessibility_node_info_data_wrapper.h
@@ -22,6 +22,11 @@
AccessibilityNodeInfoDataWrapper(AXTreeSourceArc* tree_source,
mojom::AccessibilityNodeInfoData* node);
+ AccessibilityNodeInfoDataWrapper(const AccessibilityNodeInfoDataWrapper&) =
+ delete;
+ AccessibilityNodeInfoDataWrapper& operator=(
+ const AccessibilityNodeInfoDataWrapper&) = delete;
+
~AccessibilityNodeInfoDataWrapper() override;
// AccessibilityInfoDataWrapper overrides.
@@ -90,8 +95,6 @@
// This property is a cached value so that we can avoid same computation.
// mutable because once the value is computed it won't change.
mutable absl::optional<bool> has_important_property_cache_;
-
- DISALLOW_COPY_AND_ASSIGN(AccessibilityNodeInfoDataWrapper);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/accessibility/arc_accessibility_helper_bridge.h b/chrome/browser/ash/arc/accessibility/arc_accessibility_helper_bridge.h
index 1d374b03..060bc8a 100644
--- a/chrome/browser/ash/arc/accessibility/arc_accessibility_helper_bridge.h
+++ b/chrome/browser/ash/arc/accessibility/arc_accessibility_helper_bridge.h
@@ -64,6 +64,11 @@
ArcAccessibilityHelperBridge(content::BrowserContext* browser_context,
ArcBridgeService* arc_bridge_service);
+
+ ArcAccessibilityHelperBridge(const ArcAccessibilityHelperBridge&) = delete;
+ ArcAccessibilityHelperBridge& operator=(const ArcAccessibilityHelperBridge&) =
+ delete;
+
~ArcAccessibilityHelperBridge() override;
// Sets ChromeVox or TalkBack active for the current task.
@@ -150,8 +155,6 @@
base::ScopedObservation<extensions::AutomationEventRouter,
extensions::AutomationEventRouterObserver>
automation_event_router_observer_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcAccessibilityHelperBridge);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc b/chrome/browser/ash/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc
index a05bd3d4..00e53cf 100644
--- a/chrome/browser/ash/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc
+++ b/chrome/browser/ash/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc
@@ -76,6 +76,11 @@
event_router_->AddEventObserver(this);
}
+ TestArcAccessibilityHelperBridge(const TestArcAccessibilityHelperBridge&) =
+ delete;
+ TestArcAccessibilityHelperBridge& operator=(
+ const TestArcAccessibilityHelperBridge&) = delete;
+
~TestArcAccessibilityHelperBridge() override = default;
int GetEventCount(const std::string& event_name) const {
@@ -103,8 +108,6 @@
extensions::TestEventRouter* const event_router_;
arc::mojom::AccessibilityFilterType filter_type_for_test_ =
arc::mojom::AccessibilityFilterType::ALL;
-
- DISALLOW_COPY_AND_ASSIGN(TestArcAccessibilityHelperBridge);
};
class ArcNotificationSurfaceManagerTest
diff --git a/chrome/browser/ash/arc/accessibility/ax_tree_source_arc.h b/chrome/browser/ash/arc/accessibility/ax_tree_source_arc.h
index 3796180..da034d7 100644
--- a/chrome/browser/ash/arc/accessibility/ax_tree_source_arc.h
+++ b/chrome/browser/ash/arc/accessibility/ax_tree_source_arc.h
@@ -66,6 +66,10 @@
};
AXTreeSourceArc(Delegate* delegate, aura::Window* window);
+
+ AXTreeSourceArc(const AXTreeSourceArc&) = delete;
+ AXTreeSourceArc& operator=(const AXTreeSourceArc&) = delete;
+
~AXTreeSourceArc() override;
// Notify automation of an accessibility event.
@@ -216,8 +220,6 @@
extensions::AutomationEventRouterInterface*
automation_event_router_for_test_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(AXTreeSourceArc);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder.h b/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder.h
index eb9fd87..2e1059dd 100644
--- a/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder.h
+++ b/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder.h
@@ -31,6 +31,11 @@
int64_t display_id,
int command_id_first,
int command_id_last);
+
+ ArcAppShortcutsMenuBuilder(const ArcAppShortcutsMenuBuilder&) = delete;
+ ArcAppShortcutsMenuBuilder& operator=(const ArcAppShortcutsMenuBuilder&) =
+ delete;
+
~ArcAppShortcutsMenuBuilder();
// Builds arc app shortcuts menu.
@@ -62,8 +67,6 @@
// Handles requesting app shortcuts from Android.
std::unique_ptr<ArcAppShortcutsRequest> arc_app_shortcuts_request_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppShortcutsMenuBuilder);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder_unittest.cc b/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder_unittest.cc
index 67b8cb8..a0b4333 100644
--- a/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder_unittest.cc
+++ b/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder_unittest.cc
@@ -34,6 +34,12 @@
class ArcAppShortcutsMenuBuilderTest : public testing::Test {
public:
ArcAppShortcutsMenuBuilderTest() = default;
+
+ ArcAppShortcutsMenuBuilderTest(const ArcAppShortcutsMenuBuilderTest&) =
+ delete;
+ ArcAppShortcutsMenuBuilderTest& operator=(
+ const ArcAppShortcutsMenuBuilderTest&) = delete;
+
~ArcAppShortcutsMenuBuilderTest() override = default;
void SetUp() override {
@@ -54,8 +60,6 @@
ArcAppTest arc_app_test_;
content::BrowserTaskEnvironment task_environment_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppShortcutsMenuBuilderTest);
};
TEST_F(ArcAppShortcutsMenuBuilderTest, Basic) {
diff --git a/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request.h b/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request.h
index b18bde3..842973b 100644
--- a/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request.h
+++ b/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request.h
@@ -26,6 +26,10 @@
base::OnceCallback<void(std::unique_ptr<apps::AppShortcutItems>)>;
explicit ArcAppShortcutsRequest(GetAppShortcutItemsCallback callback);
+
+ ArcAppShortcutsRequest(const ArcAppShortcutsRequest&) = delete;
+ ArcAppShortcutsRequest& operator=(const ArcAppShortcutsRequest&) = delete;
+
~ArcAppShortcutsRequest();
// Starts querying app shortcuts for |package_name|. Results are retruned in
@@ -57,8 +61,6 @@
std::vector<std::unique_ptr<IconDecodeRequest>> icon_decode_requests_;
base::WeakPtrFactory<ArcAppShortcutsRequest> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppShortcutsRequest);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request_unittest.cc b/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request_unittest.cc
index ab74ce1..634cef3 100644
--- a/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request_unittest.cc
+++ b/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request_unittest.cc
@@ -24,6 +24,11 @@
class ArcAppShortcutsRequestTest : public testing::Test {
public:
ArcAppShortcutsRequestTest() = default;
+
+ ArcAppShortcutsRequestTest(const ArcAppShortcutsRequestTest&) = delete;
+ ArcAppShortcutsRequestTest& operator=(const ArcAppShortcutsRequestTest&) =
+ delete;
+
~ArcAppShortcutsRequestTest() override = default;
void SetUp() override {
@@ -42,8 +47,6 @@
ArcAppTest arc_app_test_;
content::BrowserTaskEnvironment task_environment_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppShortcutsRequestTest);
};
TEST_F(ArcAppShortcutsRequestTest, Basic) {
diff --git a/chrome/browser/ash/arc/arc_support_host_unittest.cc b/chrome/browser/ash/arc/arc_support_host_unittest.cc
index 1de5ff1..9c7c6f9 100644
--- a/chrome/browser/ash/arc/arc_support_host_unittest.cc
+++ b/chrome/browser/ash/arc/arc_support_host_unittest.cc
@@ -70,6 +70,10 @@
class ArcSupportHostTest : public BrowserWithTestWindowTest {
public:
ArcSupportHostTest() = default;
+
+ ArcSupportHostTest(const ArcSupportHostTest&) = delete;
+ ArcSupportHostTest& operator=(const ArcSupportHostTest&) = delete;
+
~ArcSupportHostTest() override = default;
void SetUp() override {
@@ -153,8 +157,6 @@
std::unique_ptr<MockAuthDelegate> auth_delegate_;
std::unique_ptr<MockTermsOfServiceDelegate> tos_delegate_;
std::unique_ptr<MockErrorDelegate> error_delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcSupportHostTest);
};
namespace {
diff --git a/chrome/browser/ash/arc/arc_ui_availability_reporter.cc b/chrome/browser/ash/arc/arc_ui_availability_reporter.cc
index 570dec9..86f41f6 100644
--- a/chrome/browser/ash/arc/arc_ui_availability_reporter.cc
+++ b/chrome/browser/ash/arc/arc_ui_availability_reporter.cc
@@ -13,6 +13,9 @@
class ArcUiAvailabilityReporter::ConnectionNotifierBase {
public:
+ ConnectionNotifierBase(const ConnectionNotifierBase&) = delete;
+ ConnectionNotifierBase& operator=(const ConnectionNotifierBase&) = delete;
+
virtual ~ConnectionNotifierBase() = default;
// Returns true if connection is ready.
@@ -26,8 +29,6 @@
private:
ArcUiAvailabilityReporter* const owner_;
-
- DISALLOW_COPY_AND_ASSIGN(ConnectionNotifierBase);
};
namespace {
@@ -50,6 +51,9 @@
holder_->AddObserver(this);
}
+ ConnectionNotifier(const ConnectionNotifier&) = delete;
+ ConnectionNotifier& operator=(const ConnectionNotifier&) = delete;
+
~ConnectionNotifier() override { holder_->RemoveObserver(this); }
// ArcUiAvailabilityReporter::ConnectionNotifierBase:
@@ -60,8 +64,6 @@
private:
ConnectionHolder<InstanceType, HostType>* const holder_;
-
- DISALLOW_COPY_AND_ASSIGN(ConnectionNotifier);
};
} // namespace
diff --git a/chrome/browser/ash/arc/arc_ui_availability_reporter.h b/chrome/browser/ash/arc/arc_ui_availability_reporter.h
index 1fd536a..d6ad6e5 100644
--- a/chrome/browser/ash/arc/arc_ui_availability_reporter.h
+++ b/chrome/browser/ash/arc/arc_ui_availability_reporter.h
@@ -30,6 +30,11 @@
};
ArcUiAvailabilityReporter(Profile* profile, Mode mode);
+
+ ArcUiAvailabilityReporter(const ArcUiAvailabilityReporter&) = delete;
+ ArcUiAvailabilityReporter& operator=(const ArcUiAvailabilityReporter&) =
+ delete;
+
~ArcUiAvailabilityReporter();
static std::string GetHistogramNameForMode(Mode mode);
@@ -43,8 +48,6 @@
const base::TimeTicks start_ticks_;
std::vector<std::unique_ptr<ConnectionNotifierBase>> connection_notifiers_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcUiAvailabilityReporter);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/arc_ui_availability_reporter_unittest.cc b/chrome/browser/ash/arc/arc_ui_availability_reporter_unittest.cc
index 3f232c40..4b2ef0f4 100644
--- a/chrome/browser/ash/arc/arc_ui_availability_reporter_unittest.cc
+++ b/chrome/browser/ash/arc/arc_ui_availability_reporter_unittest.cc
@@ -49,6 +49,11 @@
class ArcUiAvailabilityReporterTest : public testing::Test {
public:
ArcUiAvailabilityReporterTest() {}
+
+ ArcUiAvailabilityReporterTest(const ArcUiAvailabilityReporterTest&) = delete;
+ ArcUiAvailabilityReporterTest& operator=(
+ const ArcUiAvailabilityReporterTest&) = delete;
+
~ArcUiAvailabilityReporterTest() override = default;
void SetUp() override {
@@ -98,8 +103,6 @@
std::unique_ptr<ArcIntentHelperBridge> arc_intent_helper_bridge_;
std::unique_ptr<FakeAppInstance> app_instance_;
std::unique_ptr<FakeIntentHelperInstance> intent_helper_instance_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcUiAvailabilityReporterTest);
};
// Reporting is triggered in case both instances are connected.
diff --git a/chrome/browser/ash/arc/arc_util_unittest.cc b/chrome/browser/ash/arc/arc_util_unittest.cc
index 81c7caa..655d668 100644
--- a/chrome/browser/ash/arc/arc_util_unittest.cc
+++ b/chrome/browser/ash/arc/arc_util_unittest.cc
@@ -127,6 +127,9 @@
}
}
+ ScopedLogIn(const ScopedLogIn&) = delete;
+ ScopedLogIn& operator=(const ScopedLogIn&) = delete;
+
~ScopedLogIn() { fake_user_manager_->RemoveUserFromList(account_id_); }
private:
@@ -147,8 +150,6 @@
FakeUserManagerWithLocalState* fake_user_manager_;
const AccountId account_id_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedLogIn);
};
bool IsArcAllowedForProfileOnFirstCall(const Profile* profile) {
@@ -161,6 +162,10 @@
class ChromeArcUtilTest : public testing::Test {
public:
ChromeArcUtilTest() = default;
+
+ ChromeArcUtilTest(const ChromeArcUtilTest&) = delete;
+ ChromeArcUtilTest& operator=(const ChromeArcUtilTest&) = delete;
+
~ChromeArcUtilTest() override = default;
void SetUp() override {
@@ -212,8 +217,6 @@
std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
// Owned by |profile_manager_|
TestingProfile* profile_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeArcUtilTest);
};
TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile) {
@@ -763,6 +766,9 @@
oobe_configuration_ = std::make_unique<ash::OobeConfiguration>();
}
+ ArcOobeTest(const ArcOobeTest&) = delete;
+ ArcOobeTest& operator=(const ArcOobeTest&) = delete;
+
~ArcOobeTest() override {
// Fake display host have to be shut down first, as it may access
// configuration.
@@ -785,8 +791,6 @@
private:
std::unique_ptr<ash::OobeConfiguration> oobe_configuration_;
std::unique_ptr<ash::FakeLoginDisplayHost> fake_login_display_host_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcOobeTest);
};
TEST_F(ArcOobeTest, TermsOfServiceOobeNegotiationNeededForManagedUser) {
diff --git a/chrome/browser/ash/arc/arc_web_contents_data.h b/chrome/browser/ash/arc/arc_web_contents_data.h
index db9fb593..0c607d4 100644
--- a/chrome/browser/ash/arc/arc_web_contents_data.h
+++ b/chrome/browser/ash/arc/arc_web_contents_data.h
@@ -19,13 +19,15 @@
static const char kArcTransitionFlag[];
ArcWebContentsData() = default;
+
+ ArcWebContentsData(const ArcWebContentsData&) = delete;
+ ArcWebContentsData& operator=(const ArcWebContentsData&) = delete;
+
~ArcWebContentsData() override = default;
private:
friend class content::WebContentsUserData<ArcWebContentsData>;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(ArcWebContentsData);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher.h b/chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher.h
index 92020fd0..344f4c88 100644
--- a/chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher.h
+++ b/chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher.h
@@ -34,6 +34,12 @@
public:
explicit ArcActiveDirectoryEnrollmentTokenFetcher(
ArcSupportHost* support_host);
+
+ ArcActiveDirectoryEnrollmentTokenFetcher(
+ const ArcActiveDirectoryEnrollmentTokenFetcher&) = delete;
+ ArcActiveDirectoryEnrollmentTokenFetcher& operator=(
+ const ArcActiveDirectoryEnrollmentTokenFetcher&) = delete;
+
~ArcActiveDirectoryEnrollmentTokenFetcher() override;
enum class Status {
@@ -97,8 +103,6 @@
base::WeakPtrFactory<ArcActiveDirectoryEnrollmentTokenFetcher>
weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcActiveDirectoryEnrollmentTokenFetcher);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/auth/arc_auth_context.h b/chrome/browser/ash/arc/auth/arc_auth_context.h
index a225f37..5e7cd67 100644
--- a/chrome/browser/ash/arc/auth/arc_auth_context.h
+++ b/chrome/browser/ash/arc/auth/arc_auth_context.h
@@ -25,6 +25,10 @@
// Note: |account_id| can be the Device Account or a Secondary Account stored
// in Chrome OS Account Manager.
ArcAuthContext(Profile* profile, const CoreAccountId& account_id);
+
+ ArcAuthContext(const ArcAuthContext&) = delete;
+ ArcAuthContext& operator=(const ArcAuthContext&) = delete;
+
~ArcAuthContext() override;
// Prepares the context. Calling while an inflight operation exists will
@@ -60,8 +64,6 @@
bool context_prepared_ = false;
base::OneShotTimer refresh_token_timeout_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcAuthContext);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/auth/arc_auth_service.h b/chrome/browser/ash/arc/auth/arc_auth_service.h
index 275c0838..82537691 100644
--- a/chrome/browser/ash/arc/auth/arc_auth_service.h
+++ b/chrome/browser/ash/arc/auth/arc_auth_service.h
@@ -57,6 +57,10 @@
ArcAuthService(content::BrowserContext* profile,
ArcBridgeService* bridge_service);
+
+ ArcAuthService(const ArcAuthService&) = delete;
+ ArcAuthService& operator=(const ArcAuthService&) = delete;
+
~ArcAuthService() override;
// Gets the list of Google accounts currently stored in ARC. This is used by
@@ -201,8 +205,6 @@
GetGoogleAccountsInArcCallback pending_get_arc_accounts_callback_;
base::WeakPtrFactory<ArcAuthService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcAuthService);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/auth/arc_auth_service_browsertest.cc b/chrome/browser/ash/arc/auth/arc_auth_service_browsertest.cc
index 62c754a..4f9987d8 100644
--- a/chrome/browser/ash/arc/auth/arc_auth_service_browsertest.cc
+++ b/chrome/browser/ash/arc/auth/arc_auth_service_browsertest.cc
@@ -97,6 +97,10 @@
class FakeAuthInstance : public mojom::AuthInstance {
public:
FakeAuthInstance() = default;
+
+ FakeAuthInstance(const FakeAuthInstance&) = delete;
+ FakeAuthInstance& operator=(const FakeAuthInstance&) = delete;
+
~FakeAuthInstance() override = default;
void Init(mojo::PendingRemote<mojom::AuthHost> host_remote,
@@ -193,7 +197,6 @@
std::string last_removed_account_;
base::WeakPtrFactory<FakeAuthInstance> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(FakeAuthInstance);
};
class ArcAuthServiceTest : public InProcessBrowserTest {
@@ -845,6 +848,12 @@
class ArcRobotAccountAuthServiceTest : public ArcAuthServiceTest {
public:
ArcRobotAccountAuthServiceTest() = default;
+
+ ArcRobotAccountAuthServiceTest(const ArcRobotAccountAuthServiceTest&) =
+ delete;
+ ArcRobotAccountAuthServiceTest& operator=(
+ const ArcRobotAccountAuthServiceTest&) = delete;
+
~ArcRobotAccountAuthServiceTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -892,8 +901,6 @@
cloud_policy_client->SetDMToken("fake-dm-token");
cloud_policy_client->client_id_ = "client-id";
}
-
- DISALLOW_COPY_AND_ASSIGN(ArcRobotAccountAuthServiceTest);
};
// Tests that when ARC requests account info for a demo session account,
diff --git a/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.h b/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.h
index 07fcc0e..78505f2 100644
--- a/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.h
+++ b/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.h
@@ -43,6 +43,11 @@
const CoreAccountId& account_id,
bool initial_signin,
bool is_primary_account);
+
+ ArcBackgroundAuthCodeFetcher(const ArcBackgroundAuthCodeFetcher&) = delete;
+ ArcBackgroundAuthCodeFetcher& operator=(const ArcBackgroundAuthCodeFetcher&) =
+ delete;
+
~ArcBackgroundAuthCodeFetcher() override;
// ArcAuthCodeFetcher:
@@ -91,8 +96,6 @@
bool bypass_proxy_ = false;
base::WeakPtrFactory<ArcBackgroundAuthCodeFetcher> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcBackgroundAuthCodeFetcher);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.h b/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.h
index 162f2294..51290e0 100644
--- a/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.h
+++ b/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.h
@@ -25,6 +25,10 @@
class ArcRobotAuthCodeFetcher : public ArcAuthCodeFetcher {
public:
ArcRobotAuthCodeFetcher();
+
+ ArcRobotAuthCodeFetcher(const ArcRobotAuthCodeFetcher&) = delete;
+ ArcRobotAuthCodeFetcher& operator=(const ArcRobotAuthCodeFetcher&) = delete;
+
~ArcRobotAuthCodeFetcher() override;
// ArcAuthCodeFetcher:
@@ -40,8 +44,6 @@
std::unique_ptr<policy::DeviceManagementService::Job> fetch_request_job_;
base::WeakPtrFactory<ArcRobotAuthCodeFetcher> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcRobotAuthCodeFetcher);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.h b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.h
index 76866ab..ce84b81c 100644
--- a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.h
+++ b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.h
@@ -74,6 +74,10 @@
ArcBluetoothBridge(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+
+ ArcBluetoothBridge(const ArcBluetoothBridge&) = delete;
+ ArcBluetoothBridge& operator=(const ArcBluetoothBridge&) = delete;
+
~ArcBluetoothBridge() override;
void OnAdapterInitialized(scoped_refptr<device::BluetoothAdapter> adapter);
@@ -752,8 +756,6 @@
// WeakPtrFactory to use for callbacks.
base::WeakPtrFactory<ArcBluetoothBridge> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcBluetoothBridge);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_task_queue.h b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_task_queue.h
index 6ff984f..4133aed 100644
--- a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_task_queue.h
+++ b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_task_queue.h
@@ -14,6 +14,10 @@
class ArcBluetoothTaskQueue {
public:
ArcBluetoothTaskQueue();
+
+ ArcBluetoothTaskQueue(const ArcBluetoothTaskQueue&) = delete;
+ ArcBluetoothTaskQueue& operator=(const ArcBluetoothTaskQueue&) = delete;
+
~ArcBluetoothTaskQueue();
// Pushes |task| into this queue.
@@ -24,7 +28,6 @@
private:
base::queue<base::OnceClosure> queue_;
- DISALLOW_COPY_AND_ASSIGN(ArcBluetoothTaskQueue);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/cast_receiver/arc_cast_receiver_service.h b/chrome/browser/ash/arc/cast_receiver/arc_cast_receiver_service.h
index 96e4a69..af42e82 100644
--- a/chrome/browser/ash/arc/cast_receiver/arc_cast_receiver_service.h
+++ b/chrome/browser/ash/arc/cast_receiver/arc_cast_receiver_service.h
@@ -37,6 +37,10 @@
ArcCastReceiverService(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+
+ ArcCastReceiverService(const ArcCastReceiverService&) = delete;
+ ArcCastReceiverService& operator=(const ArcCastReceiverService&) = delete;
+
~ArcCastReceiverService() override;
// ConnectionObserver<mojom::CastReceiverInstance> overrides:
@@ -54,8 +58,6 @@
// Observers for preferences and settings changes.
std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;
base::CallbackListSubscription receiver_name_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcCastReceiverService);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/enterprise/arc_enterprise_reporting_service.h b/chrome/browser/ash/arc/enterprise/arc_enterprise_reporting_service.h
index 58649574b..d292ba1 100644
--- a/chrome/browser/ash/arc/enterprise/arc_enterprise_reporting_service.h
+++ b/chrome/browser/ash/arc/enterprise/arc_enterprise_reporting_service.h
@@ -31,6 +31,11 @@
ArcEnterpriseReportingService(content::BrowserContext* context,
ArcBridgeService* arc_bridge_service);
+
+ ArcEnterpriseReportingService(const ArcEnterpriseReportingService&) = delete;
+ ArcEnterpriseReportingService& operator=(
+ const ArcEnterpriseReportingService&) = delete;
+
~ArcEnterpriseReportingService() override;
// mojom::EnterpriseReportingHost overrides:
@@ -42,8 +47,6 @@
ArcBridgeService* const arc_bridge_service_; // Owned by ArcServiceManager.
base::WeakPtrFactory<ArcEnterpriseReportingService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcEnterpriseReportingService);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/enterprise/cert_store/arc_cert_installer.h b/chrome/browser/ash/arc/enterprise/cert_store/arc_cert_installer.h
index 631e82f..d6e2316 100644
--- a/chrome/browser/ash/arc/enterprise/cert_store/arc_cert_installer.h
+++ b/chrome/browser/ash/arc/enterprise/cert_store/arc_cert_installer.h
@@ -64,6 +64,10 @@
// This constructor should be used only for testing.
ArcCertInstaller(Profile* profile,
std::unique_ptr<policy::RemoteCommandsQueue> queue);
+
+ ArcCertInstaller(const ArcCertInstaller&) = delete;
+ ArcCertInstaller& operator=(const ArcCertInstaller&) = delete;
+
~ArcCertInstaller() override;
using InstallArcCertsCallback = base::OnceCallback<void(bool result)>;
@@ -117,8 +121,6 @@
int next_id_ = 1;
base::WeakPtrFactory<ArcCertInstaller> weak_ptr_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcCertInstaller);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/enterprise/cert_store/arc_cert_installer_unittest.cc b/chrome/browser/ash/arc/enterprise/cert_store/arc_cert_installer_unittest.cc
index 6e40b863..4311f45 100644
--- a/chrome/browser/ash/arc/enterprise/cert_store/arc_cert_installer_unittest.cc
+++ b/chrome/browser/ash/arc/enterprise/cert_store/arc_cert_installer_unittest.cc
@@ -99,6 +99,9 @@
policy_instance_.get());
}
+ ArcCertInstallerTest(const ArcCertInstallerTest&) = delete;
+ ArcCertInstallerTest& operator=(const ArcCertInstallerTest&) = delete;
+
~ArcCertInstallerTest() override {
arc_service_manager_->arc_bridge_service()->policy()->CloseInstance(
policy_instance_.get());
@@ -148,8 +151,6 @@
policy::RemoteCommandsQueue* queue_;
std::unique_ptr<ArcCertInstaller> installer_;
MockRemoteCommandsQueueObserver observer_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcCertInstallerTest);
};
// Tests that installation of an empty cert list completes successfully.
diff --git a/chrome/browser/ash/arc/extensions/arc_support_message_host_unittest.cc b/chrome/browser/ash/arc/extensions/arc_support_message_host_unittest.cc
index 4985c6a4..1b64283 100644
--- a/chrome/browser/ash/arc/extensions/arc_support_message_host_unittest.cc
+++ b/chrome/browser/ash/arc/extensions/arc_support_message_host_unittest.cc
@@ -21,6 +21,10 @@
class TestClient : public extensions::NativeMessageHost::Client {
public:
TestClient() = default;
+
+ TestClient(const TestClient&) = delete;
+ TestClient& operator=(const TestClient&) = delete;
+
~TestClient() override = default;
void PostMessageFromNativeHost(const std::string& message) override {
@@ -35,13 +39,15 @@
private:
std::vector<std::string> messages_;
-
- DISALLOW_COPY_AND_ASSIGN(TestClient);
};
class TestObserver : public ArcSupportMessageHost::Observer {
public:
TestObserver() = default;
+
+ TestObserver(const TestObserver&) = delete;
+ TestObserver& operator=(const TestObserver&) = delete;
+
~TestObserver() override = default;
void OnMessage(const base::DictionaryValue& message) override {
@@ -54,13 +60,16 @@
private:
std::vector<std::unique_ptr<base::DictionaryValue>> values_;
-
- DISALLOW_COPY_AND_ASSIGN(TestObserver);
};
class ArcSupportMessageHostTest : public testing::Test {
public:
ArcSupportMessageHostTest() = default;
+
+ ArcSupportMessageHostTest(const ArcSupportMessageHostTest&) = delete;
+ ArcSupportMessageHostTest& operator=(const ArcSupportMessageHostTest&) =
+ delete;
+
~ArcSupportMessageHostTest() override = default;
void SetUp() override {
@@ -90,8 +99,6 @@
std::unique_ptr<TestClient> client_;
std::unique_ptr<extensions::NativeMessageHost> message_host_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcSupportMessageHostTest);
};
TEST_F(ArcSupportMessageHostTest, SendMessage) {
diff --git a/chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.cc b/chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.cc
index eb1693e..00a47510 100644
--- a/chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.cc
+++ b/chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.cc
@@ -205,6 +205,10 @@
FileSystemWatcher(const Callback& callback,
const base::FilePath& cros_dir,
const base::FilePath& android_dir);
+
+ FileSystemWatcher(const FileSystemWatcher&) = delete;
+ FileSystemWatcher& operator=(const FileSystemWatcher&) = delete;
+
~FileSystemWatcher();
// Starts watching directory.
@@ -240,8 +244,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate the weak pointers before any other members are destroyed.
base::WeakPtrFactory<FileSystemWatcher> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FileSystemWatcher);
};
ArcFileSystemWatcherService::FileSystemWatcher::FileSystemWatcher(
diff --git a/chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.h b/chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.h
index 3ae4f18..a5131e3 100644
--- a/chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.h
+++ b/chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.h
@@ -47,6 +47,10 @@
ArcFileSystemWatcherService(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+ ArcFileSystemWatcherService(const ArcFileSystemWatcherService&) = delete;
+ ArcFileSystemWatcherService& operator=(const ArcFileSystemWatcherService&) =
+ delete;
+
~ArcFileSystemWatcherService() override;
// ConnectionObserver<mojom::FileSystemInstance> overrides.
@@ -87,8 +91,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate the weak pointers before any other members are destroyed.
base::WeakPtrFactory<ArcFileSystemWatcherService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcFileSystemWatcherService);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util.h b/chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util.h
index 84e7b202..7553859 100644
--- a/chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util.h
+++ b/chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util.h
@@ -14,6 +14,12 @@
class ArcContentFileSystemAsyncFileUtil : public storage::AsyncFileUtil {
public:
ArcContentFileSystemAsyncFileUtil();
+
+ ArcContentFileSystemAsyncFileUtil(const ArcContentFileSystemAsyncFileUtil&) =
+ delete;
+ ArcContentFileSystemAsyncFileUtil& operator=(
+ const ArcContentFileSystemAsyncFileUtil&) = delete;
+
~ArcContentFileSystemAsyncFileUtil() override;
// storage::AsyncFileUtil overrides.
@@ -82,9 +88,6 @@
std::unique_ptr<storage::FileSystemOperationContext> context,
const storage::FileSystemURL& url,
CreateSnapshotFileCallback callback) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ArcContentFileSystemAsyncFileUtil);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util_unittest.cc b/chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util_unittest.cc
index 45ea38c6..16c89a2 100644
--- a/chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util_unittest.cc
+++ b/chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util_unittest.cc
@@ -47,6 +47,12 @@
class ArcContentFileSystemAsyncFileUtilTest : public testing::Test {
public:
ArcContentFileSystemAsyncFileUtilTest() = default;
+
+ ArcContentFileSystemAsyncFileUtilTest(
+ const ArcContentFileSystemAsyncFileUtilTest&) = delete;
+ ArcContentFileSystemAsyncFileUtilTest& operator=(
+ const ArcContentFileSystemAsyncFileUtilTest&) = delete;
+
~ArcContentFileSystemAsyncFileUtilTest() override = default;
void SetUp() override {
@@ -92,9 +98,6 @@
std::unique_ptr<ArcServiceManager> arc_service_manager_;
std::unique_ptr<TestingProfile> profile_;
std::unique_ptr<ArcContentFileSystemAsyncFileUtil> async_file_util_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ArcContentFileSystemAsyncFileUtilTest);
};
} // namespace
diff --git a/chrome/browser/ash/arc/fileapi/arc_content_file_system_backend_delegate.h b/chrome/browser/ash/arc/fileapi/arc_content_file_system_backend_delegate.h
index 4b9d98a..1d8e276 100644
--- a/chrome/browser/ash/arc/fileapi/arc_content_file_system_backend_delegate.h
+++ b/chrome/browser/ash/arc/fileapi/arc_content_file_system_backend_delegate.h
@@ -18,6 +18,12 @@
: public chromeos::FileSystemBackendDelegate {
public:
ArcContentFileSystemBackendDelegate();
+
+ ArcContentFileSystemBackendDelegate(
+ const ArcContentFileSystemBackendDelegate&) = delete;
+ ArcContentFileSystemBackendDelegate& operator=(
+ const ArcContentFileSystemBackendDelegate&) = delete;
+
~ArcContentFileSystemBackendDelegate() override;
// FileSystemBackend::Delegate overrides.
@@ -40,8 +46,6 @@
private:
std::unique_ptr<storage::AsyncFileUtil> async_file_util_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcContentFileSystemBackendDelegate);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader.h b/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader.h
index bf7885ba..6198c9e 100644
--- a/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader.h
+++ b/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader.h
@@ -30,6 +30,12 @@
class ArcContentFileSystemFileStreamReader : public storage::FileStreamReader {
public:
ArcContentFileSystemFileStreamReader(const GURL& arc_url, int64_t offset);
+
+ ArcContentFileSystemFileStreamReader(
+ const ArcContentFileSystemFileStreamReader&) = delete;
+ ArcContentFileSystemFileStreamReader& operator=(
+ const ArcContentFileSystemFileStreamReader&) = delete;
+
~ArcContentFileSystemFileStreamReader() override;
// storage::FileStreamReader override:
@@ -88,8 +94,6 @@
base::WeakPtrFactory<ArcContentFileSystemFileStreamReader> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcContentFileSystemFileStreamReader);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc b/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc
index f20412e..b1aa21f 100644
--- a/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc
+++ b/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc
@@ -80,6 +80,11 @@
public:
ArcContentFileSystemFileStreamReaderTest() = default;
+ ArcContentFileSystemFileStreamReaderTest(
+ const ArcContentFileSystemFileStreamReaderTest&) = delete;
+ ArcContentFileSystemFileStreamReaderTest& operator=(
+ const ArcContentFileSystemFileStreamReaderTest&) = delete;
+
~ArcContentFileSystemFileStreamReaderTest() override = default;
void SetUp() override {
@@ -117,8 +122,6 @@
// ChromeBrowserMainPartsChromeos.
std::unique_ptr<ArcServiceManager> arc_service_manager_;
std::unique_ptr<TestingProfile> profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcContentFileSystemFileStreamReaderTest);
};
} // namespace
diff --git a/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer.h b/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer.h
index ed951db..5d1465e 100644
--- a/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer.h
+++ b/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer.h
@@ -31,6 +31,12 @@
class ArcContentFileSystemFileStreamWriter : public storage::FileStreamWriter {
public:
ArcContentFileSystemFileStreamWriter(const GURL& arc_url, int64_t offset);
+
+ ArcContentFileSystemFileStreamWriter(
+ const ArcContentFileSystemFileStreamWriter&) = delete;
+ ArcContentFileSystemFileStreamWriter& operator=(
+ const ArcContentFileSystemFileStreamWriter&) = delete;
+
~ArcContentFileSystemFileStreamWriter() override;
// storage::FileStreamReader override:
@@ -79,7 +85,6 @@
base::WeakPtrFactory<ArcContentFileSystemFileStreamWriter> weak_ptr_factory_{
this};
- DISALLOW_COPY_AND_ASSIGN(ArcContentFileSystemFileStreamWriter);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer_unittest.cc b/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer_unittest.cc
index 3abb316..40b2b2d3 100644
--- a/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer_unittest.cc
+++ b/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer_unittest.cc
@@ -41,6 +41,11 @@
public:
ArcContentFileSystemFileStreamWriterTest() = default;
+ ArcContentFileSystemFileStreamWriterTest(
+ const ArcContentFileSystemFileStreamWriterTest&) = delete;
+ ArcContentFileSystemFileStreamWriterTest& operator=(
+ const ArcContentFileSystemFileStreamWriterTest&) = delete;
+
~ArcContentFileSystemFileStreamWriterTest() override = default;
void SetUp() override {
@@ -111,8 +116,6 @@
// ChromeBrowserMainPartsChromeos.
std::unique_ptr<ArcServiceManager> arc_service_manager_;
std::unique_ptr<TestingProfile> profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcContentFileSystemFileStreamWriterTest);
};
void NeverCalled(int unused) {
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_async_file_util.h b/chrome/browser/ash/arc/fileapi/arc_documents_provider_async_file_util.h
index de305cf..c7987e9 100644
--- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_async_file_util.h
+++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_async_file_util.h
@@ -25,6 +25,12 @@
class ArcDocumentsProviderAsyncFileUtil : public storage::AsyncFileUtil {
public:
ArcDocumentsProviderAsyncFileUtil();
+
+ ArcDocumentsProviderAsyncFileUtil(const ArcDocumentsProviderAsyncFileUtil&) =
+ delete;
+ ArcDocumentsProviderAsyncFileUtil& operator=(
+ const ArcDocumentsProviderAsyncFileUtil&) = delete;
+
~ArcDocumentsProviderAsyncFileUtil() override;
// storage::AsyncFileUtil overrides.
@@ -93,9 +99,6 @@
std::unique_ptr<storage::FileSystemOperationContext> context,
const storage::FileSystemURL& url,
CreateSnapshotFileCallback callback) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ArcDocumentsProviderAsyncFileUtil);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_backend_delegate.h b/chrome/browser/ash/arc/fileapi/arc_documents_provider_backend_delegate.h
index 56d57b6b..b7fb476 100644
--- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_backend_delegate.h
+++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_backend_delegate.h
@@ -20,6 +20,12 @@
: public chromeos::FileSystemBackendDelegate {
public:
ArcDocumentsProviderBackendDelegate();
+
+ ArcDocumentsProviderBackendDelegate(
+ const ArcDocumentsProviderBackendDelegate&) = delete;
+ ArcDocumentsProviderBackendDelegate& operator=(
+ const ArcDocumentsProviderBackendDelegate&) = delete;
+
~ArcDocumentsProviderBackendDelegate() override;
// FileSystemBackend::Delegate overrides.
@@ -43,8 +49,6 @@
private:
ArcDocumentsProviderAsyncFileUtil async_file_util_;
ArcDocumentsProviderWatcherManager watcher_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcDocumentsProviderBackendDelegate);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_reader.h b/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_reader.h
index 66f50c0..207fb0b 100644
--- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_reader.h
+++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_reader.h
@@ -31,6 +31,12 @@
public:
ArcDocumentsProviderFileStreamReader(const storage::FileSystemURL& url,
int64_t offset);
+
+ ArcDocumentsProviderFileStreamReader(
+ const ArcDocumentsProviderFileStreamReader&) = delete;
+ ArcDocumentsProviderFileStreamReader& operator=(
+ const ArcDocumentsProviderFileStreamReader&) = delete;
+
~ArcDocumentsProviderFileStreamReader() override;
// storage::FileStreamReader override:
@@ -53,8 +59,6 @@
base::WeakPtrFactory<ArcDocumentsProviderFileStreamReader> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcDocumentsProviderFileStreamReader);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_writer.h b/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_writer.h
index bca0e009..fa66f36 100644
--- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_writer.h
+++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_writer.h
@@ -29,6 +29,12 @@
public:
ArcDocumentsProviderFileStreamWriter(const storage::FileSystemURL& url,
int64_t offset);
+
+ ArcDocumentsProviderFileStreamWriter(
+ const ArcDocumentsProviderFileStreamWriter&) = delete;
+ ArcDocumentsProviderFileStreamWriter& operator=(
+ const ArcDocumentsProviderFileStreamWriter&) = delete;
+
~ArcDocumentsProviderFileStreamWriter() override;
// storage::FileStreamWriter overrides:
@@ -53,8 +59,6 @@
base::WeakPtrFactory<ArcDocumentsProviderFileStreamWriter> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcDocumentsProviderFileStreamWriter);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_root.h b/chrome/browser/ash/arc/fileapi/arc_documents_provider_root.h
index 4cb45aa..dbe2b40 100644
--- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_root.h
+++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_root.h
@@ -89,6 +89,10 @@
const std::string& root_id,
bool read_only,
const std::vector<std::string>& mime_types);
+
+ ArcDocumentsProviderRoot(const ArcDocumentsProviderRoot&) = delete;
+ ArcDocumentsProviderRoot& operator=(const ArcDocumentsProviderRoot&) = delete;
+
~ArcDocumentsProviderRoot() override;
// Queries information of a file just like AsyncFileUtil.GetFileInfo(). If the
@@ -415,8 +419,6 @@
uint64_t next_watcher_request_id_ = 1;
base::WeakPtrFactory<ArcDocumentsProviderRoot> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcDocumentsProviderRoot);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_root_map.h b/chrome/browser/ash/arc/fileapi/arc_documents_provider_root_map.h
index 83018c3e..9feb3ebc 100644
--- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_root_map.h
+++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_root_map.h
@@ -35,6 +35,10 @@
// All member function must be called on the UI thread.
class ArcDocumentsProviderRootMap : public KeyedService {
public:
+ ArcDocumentsProviderRootMap(const ArcDocumentsProviderRootMap&) = delete;
+ ArcDocumentsProviderRootMap& operator=(const ArcDocumentsProviderRootMap&) =
+ delete;
+
~ArcDocumentsProviderRootMap() override;
// Returns an instance for the given browser context, or nullptr if ARC is not
@@ -87,8 +91,6 @@
// Key is (authority, root_document_id).
using Key = std::pair<std::string, std::string>;
std::map<Key, std::unique_ptr<ArcDocumentsProviderRoot>> map_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcDocumentsProviderRootMap);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_root_unittest.cc b/chrome/browser/ash/arc/fileapi/arc_documents_provider_root_unittest.cc
index 9e1ad4d..e89f335 100644
--- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_root_unittest.cc
+++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_root_unittest.cc
@@ -254,6 +254,11 @@
class ArcDocumentsProviderRootTest : public testing::Test {
public:
ArcDocumentsProviderRootTest() = default;
+
+ ArcDocumentsProviderRootTest(const ArcDocumentsProviderRootTest&) = delete;
+ ArcDocumentsProviderRootTest& operator=(const ArcDocumentsProviderRootTest&) =
+ delete;
+
~ArcDocumentsProviderRootTest() override = default;
void SetUp() override {
@@ -323,9 +328,6 @@
std::unique_ptr<ArcDocumentsProviderRoot> no_capacity_root_;
std::unique_ptr<ArcDocumentsProviderRoot> no_available_root_;
std::unique_ptr<ArcDocumentsProviderRoot> read_only_root_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ArcDocumentsProviderRootTest);
};
} // namespace
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_watcher_manager.h b/chrome/browser/ash/arc/fileapi/arc_documents_provider_watcher_manager.h
index c6c957c..312e4d0 100644
--- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_watcher_manager.h
+++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_watcher_manager.h
@@ -22,6 +22,12 @@
class ArcDocumentsProviderWatcherManager : public storage::WatcherManager {
public:
ArcDocumentsProviderWatcherManager();
+
+ ArcDocumentsProviderWatcherManager(
+ const ArcDocumentsProviderWatcherManager&) = delete;
+ ArcDocumentsProviderWatcherManager& operator=(
+ const ArcDocumentsProviderWatcherManager&) = delete;
+
~ArcDocumentsProviderWatcherManager() override;
// storage::WatcherManager overrides.
@@ -41,8 +47,6 @@
base::WeakPtrFactory<ArcDocumentsProviderWatcherManager> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcDocumentsProviderWatcherManager);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/fileapi/arc_file_system_mounter.h b/chrome/browser/ash/arc/fileapi/arc_file_system_mounter.h
index a7374f90..e5ce852 100644
--- a/chrome/browser/ash/arc/fileapi/arc_file_system_mounter.h
+++ b/chrome/browser/ash/arc/fileapi/arc_file_system_mounter.h
@@ -26,10 +26,11 @@
ArcFileSystemMounter(content::BrowserContext* context,
ArcBridgeService* bridge_service);
- ~ArcFileSystemMounter() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(ArcFileSystemMounter);
+ ArcFileSystemMounter(const ArcFileSystemMounter&) = delete;
+ ArcFileSystemMounter& operator=(const ArcFileSystemMounter&) = delete;
+
+ ~ArcFileSystemMounter() override;
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner_unittest.cc b/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner_unittest.cc
index bac5675..5395f0e 100644
--- a/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner_unittest.cc
+++ b/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner_unittest.cc
@@ -37,6 +37,12 @@
class ArcFileSystemOperationRunnerTest : public testing::Test {
public:
ArcFileSystemOperationRunnerTest() = default;
+
+ ArcFileSystemOperationRunnerTest(const ArcFileSystemOperationRunnerTest&) =
+ delete;
+ ArcFileSystemOperationRunnerTest& operator=(
+ const ArcFileSystemOperationRunnerTest&) = delete;
+
~ArcFileSystemOperationRunnerTest() override = default;
void SetUp() override {
@@ -142,9 +148,6 @@
std::unique_ptr<ArcServiceManager> arc_service_manager_;
std::unique_ptr<TestingProfile> profile_;
std::unique_ptr<ArcFileSystemOperationRunner> runner_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ArcFileSystemOperationRunnerTest);
};
TEST_F(ArcFileSystemOperationRunnerTest, RunImmediately) {
diff --git a/chrome/browser/ash/arc/fileapi/arc_select_files_handler.h b/chrome/browser/ash/arc/fileapi/arc_select_files_handler.h
index 231a4ce..e615d171 100644
--- a/chrome/browser/ash/arc/fileapi/arc_select_files_handler.h
+++ b/chrome/browser/ash/arc/fileapi/arc_select_files_handler.h
@@ -38,6 +38,11 @@
class ArcSelectFilesHandlersManager {
public:
explicit ArcSelectFilesHandlersManager(content::BrowserContext* context);
+
+ ArcSelectFilesHandlersManager(const ArcSelectFilesHandlersManager&) = delete;
+ ArcSelectFilesHandlersManager& operator=(
+ const ArcSelectFilesHandlersManager&) = delete;
+
~ArcSelectFilesHandlersManager();
// Delete all handlers and close all SelectFileDialogs.
@@ -73,14 +78,16 @@
std::map<int, std::unique_ptr<ArcSelectFilesHandler>> handlers_by_task_id_;
base::WeakPtrFactory<ArcSelectFilesHandlersManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcSelectFilesHandlersManager);
};
// Manages a single SelectFileDialog instance.
class ArcSelectFilesHandler : public ui::SelectFileDialog::Listener {
public:
explicit ArcSelectFilesHandler(content::BrowserContext* context);
+
+ ArcSelectFilesHandler(const ArcSelectFilesHandler&) = delete;
+ ArcSelectFilesHandler& operator=(const ArcSelectFilesHandler&) = delete;
+
~ArcSelectFilesHandler() override;
void SelectFiles(const mojom::SelectFilesRequestPtr& request,
@@ -115,8 +122,6 @@
mojom::FileSystemHost::SelectFilesCallback callback_;
std::unique_ptr<SelectFileDialogHolder> dialog_holder_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcSelectFilesHandler);
};
// Wrapper for SelectFileDialogExtension.
diff --git a/chrome/browser/ash/arc/icon_decode_request.cc b/chrome/browser/ash/arc/icon_decode_request.cc
index 075340a..040c3a57 100644
--- a/chrome/browser/ash/arc/icon_decode_request.cc
+++ b/chrome/browser/ash/arc/icon_decode_request.cc
@@ -32,6 +32,10 @@
class IconSource : public gfx::ImageSkiaSource {
public:
IconSource(const SkBitmap& bitmap, int dimension_dip, bool normalize);
+
+ IconSource(const IconSource&) = delete;
+ IconSource& operator=(const IconSource&) = delete;
+
~IconSource() override = default;
private:
@@ -40,8 +44,6 @@
const SkBitmap bitmap_;
const int dimension_dip_;
const bool normalize_;
-
- DISALLOW_COPY_AND_ASSIGN(IconSource);
};
IconSource::IconSource(const SkBitmap& bitmap,
diff --git a/chrome/browser/ash/arc/icon_decode_request.h b/chrome/browser/ash/arc/icon_decode_request.h
index 8557c815..35fc1ebe 100644
--- a/chrome/browser/ash/arc/icon_decode_request.h
+++ b/chrome/browser/ash/arc/icon_decode_request.h
@@ -32,6 +32,10 @@
using SetIconCallback = base::OnceCallback<void(const gfx::ImageSkia& icon)>;
IconDecodeRequest(SetIconCallback set_icon_callback, int dimension_dip);
+
+ IconDecodeRequest(const IconDecodeRequest&) = delete;
+ IconDecodeRequest& operator=(const IconDecodeRequest&) = delete;
+
~IconDecodeRequest() override;
// Disables async safe decoding requests when unit tests are executed.
@@ -56,8 +60,6 @@
SetIconCallback set_icon_callback_;
const int dimension_dip_;
bool normalized_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(IconDecodeRequest);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_bridge_impl.h b/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_bridge_impl.h
index ca1ee04..0c02c547 100644
--- a/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_bridge_impl.h
+++ b/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_bridge_impl.h
@@ -24,6 +24,12 @@
public:
ArcInputMethodManagerBridgeImpl(Delegate* delegate,
ArcBridgeService* bridge_service);
+
+ ArcInputMethodManagerBridgeImpl(const ArcInputMethodManagerBridgeImpl&) =
+ delete;
+ ArcInputMethodManagerBridgeImpl& operator=(
+ const ArcInputMethodManagerBridgeImpl&) = delete;
+
~ArcInputMethodManagerBridgeImpl() override;
// ArcInputMethodManagerBridge overrides:
@@ -49,8 +55,6 @@
private:
Delegate* const delegate_;
ArcBridgeService* const bridge_service_; // Owned by ArcServiceManager
-
- DISALLOW_COPY_AND_ASSIGN(ArcInputMethodManagerBridgeImpl);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc b/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc
index 9408f8f5..d636fea 100644
--- a/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc
+++ b/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc
@@ -186,6 +186,11 @@
public:
explicit InputMethodEngineObserver(ArcInputMethodManagerService* owner)
: owner_(owner) {}
+
+ InputMethodEngineObserver(const InputMethodEngineObserver&) = delete;
+ InputMethodEngineObserver& operator=(const InputMethodEngineObserver&) =
+ delete;
+
~InputMethodEngineObserver() override = default;
// chromeos::InputMethodEngineBase::Observer overrides:
@@ -248,8 +253,6 @@
private:
ArcInputMethodManagerService* const owner_;
-
- DISALLOW_COPY_AND_ASSIGN(InputMethodEngineObserver);
};
class ArcInputMethodManagerService::InputMethodObserver
@@ -257,6 +260,10 @@
public:
explicit InputMethodObserver(ArcInputMethodManagerService* owner)
: owner_(owner) {}
+
+ InputMethodObserver(const InputMethodObserver&) = delete;
+ InputMethodObserver& operator=(const InputMethodObserver&) = delete;
+
~InputMethodObserver() override = default;
// ui::InputMethodObserver overrides:
@@ -273,8 +280,6 @@
private:
ArcInputMethodManagerService* const owner_;
-
- DISALLOW_COPY_AND_ASSIGN(InputMethodObserver);
};
class ArcInputMethodManagerService::TabletModeObserver
@@ -282,6 +287,10 @@
public:
explicit TabletModeObserver(ArcInputMethodManagerService* owner)
: owner_(owner) {}
+
+ TabletModeObserver(const TabletModeObserver&) = delete;
+ TabletModeObserver& operator=(const TabletModeObserver&) = delete;
+
~TabletModeObserver() override = default;
// ash::TabletModeObserver overrides:
@@ -295,8 +304,6 @@
}
ArcInputMethodManagerService* owner_;
-
- DISALLOW_COPY_AND_ASSIGN(TabletModeObserver);
};
// static
diff --git a/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.h b/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.h
index ad3aae1..fc7491d 100644
--- a/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.h
+++ b/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.h
@@ -57,6 +57,11 @@
ArcInputMethodManagerService(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+
+ ArcInputMethodManagerService(const ArcInputMethodManagerService&) = delete;
+ ArcInputMethodManagerService& operator=(const ArcInputMethodManagerService&) =
+ delete;
+
~ArcInputMethodManagerService() override;
void SetInputMethodManagerBridgeForTesting(
@@ -164,8 +169,6 @@
base::CallbackListSubscription accessibility_status_subscription_;
base::ObserverList<Observer> observers_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcInputMethodManagerService);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/input_method_manager/input_connection_impl.h b/chrome/browser/ash/arc/input_method_manager/input_connection_impl.h
index 5ccaedd..6cad05e 100644
--- a/chrome/browser/ash/arc/input_method_manager/input_connection_impl.h
+++ b/chrome/browser/ash/arc/input_method_manager/input_connection_impl.h
@@ -27,6 +27,10 @@
InputConnectionImpl(ash::input_method::InputMethodEngine* ime_engine,
ArcInputMethodManagerBridge* imm_bridge,
int input_context_id);
+
+ InputConnectionImpl(const InputConnectionImpl&) = delete;
+ InputConnectionImpl& operator=(const InputConnectionImpl&) = delete;
+
~InputConnectionImpl() override;
// Binds this class to a passed pending remote.
@@ -67,8 +71,6 @@
mojo::Receiver<mojom::InputConnection> receiver_{this};
base::OneShotTimer state_update_timer_;
-
- DISALLOW_COPY_AND_ASSIGN(InputConnectionImpl);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/input_method_manager/input_connection_impl_unittest.cc b/chrome/browser/ash/arc/input_method_manager/input_connection_impl_unittest.cc
index d3c44d1..be5363e03 100644
--- a/chrome/browser/ash/arc/input_method_manager/input_connection_impl_unittest.cc
+++ b/chrome/browser/ash/arc/input_method_manager/input_connection_impl_unittest.cc
@@ -24,6 +24,12 @@
: public ash::input_method::InputMethodEngineBase::Observer {
public:
DummyInputMethodEngineObserver() = default;
+
+ DummyInputMethodEngineObserver(const DummyInputMethodEngineObserver&) =
+ delete;
+ DummyInputMethodEngineObserver& operator=(
+ const DummyInputMethodEngineObserver&) = delete;
+
~DummyInputMethodEngineObserver() override = default;
void OnActivate(const std::string& engine_id) override {}
@@ -56,9 +62,6 @@
void OnSuggestionsChanged(
const std::vector<std::string>& suggestions) override {}
void OnInputMethodOptionsChanged(const std::string& engine_id) override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DummyInputMethodEngineObserver);
};
class TestInputMethodManager
@@ -67,6 +70,10 @@
TestInputMethodManager()
: state_(base::MakeRefCounted<
chromeos::input_method::MockInputMethodManager::State>()) {}
+
+ TestInputMethodManager(const TestInputMethodManager&) = delete;
+ TestInputMethodManager& operator=(const TestInputMethodManager&) = delete;
+
~TestInputMethodManager() override = default;
scoped_refptr<InputMethodManager::State> GetActiveIMEState() override {
@@ -75,14 +82,17 @@
private:
scoped_refptr<State> state_;
-
- DISALLOW_COPY_AND_ASSIGN(TestInputMethodManager);
};
class TestIMEInputContextHandler : public ui::MockIMEInputContextHandler {
public:
explicit TestIMEInputContextHandler(ui::InputMethod* input_method)
: input_method_(input_method) {}
+
+ TestIMEInputContextHandler(const TestIMEInputContextHandler&) = delete;
+ TestIMEInputContextHandler& operator=(const TestIMEInputContextHandler&) =
+ delete;
+
~TestIMEInputContextHandler() override = default;
ui::InputMethod* GetInputMethod() override { return input_method_; }
@@ -118,8 +128,6 @@
int send_key_event_call_count_ = 0;
std::vector<std::tuple<int, int>> composition_range_history_;
-
- DISALLOW_COPY_AND_ASSIGN(TestIMEInputContextHandler);
};
class MockTextInputClient : public ui::DummyTextInputClient {
@@ -162,6 +170,10 @@
class InputConnectionImplTest : public testing::Test {
public:
InputConnectionImplTest() = default;
+
+ InputConnectionImplTest(const InputConnectionImplTest&) = delete;
+ InputConnectionImplTest& operator=(const InputConnectionImplTest&) = delete;
+
~InputConnectionImplTest() override = default;
std::unique_ptr<InputConnectionImpl> CreateNewConnection(int context_id) {
@@ -219,8 +231,6 @@
TestIMEInputContextHandler context_handler_{&input_method_};
std::unique_ptr<ChromeKeyboardControllerClientTestHelper>
chrome_keyboard_controller_client_test_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(InputConnectionImplTest);
};
} // anonymous namespace
diff --git a/chrome/browser/ash/arc/input_method_manager/test_input_method_manager_bridge.h b/chrome/browser/ash/arc/input_method_manager/test_input_method_manager_bridge.h
index f51dcd7..263479b6 100644
--- a/chrome/browser/ash/arc/input_method_manager/test_input_method_manager_bridge.h
+++ b/chrome/browser/ash/arc/input_method_manager/test_input_method_manager_bridge.h
@@ -19,6 +19,11 @@
class TestInputMethodManagerBridge : public ArcInputMethodManagerBridge {
public:
TestInputMethodManagerBridge();
+
+ TestInputMethodManagerBridge(const TestInputMethodManagerBridge&) = delete;
+ TestInputMethodManagerBridge& operator=(const TestInputMethodManagerBridge&) =
+ delete;
+
~TestInputMethodManagerBridge() override;
// ArcInputMethodManagerBridge overrides:
@@ -39,9 +44,6 @@
int update_text_input_state_calls_count_ = 0;
mojom::TextInputStatePtr last_text_input_state_ = nullptr;
int show_virtual_keyboard_calls_count_ = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestInputMethodManagerBridge);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/instance_throttle/arc_active_window_throttle_observer.h b/chrome/browser/ash/arc/instance_throttle/arc_active_window_throttle_observer.h
index 0baad5b6..b8fafe81 100644
--- a/chrome/browser/ash/arc/instance_throttle/arc_active_window_throttle_observer.h
+++ b/chrome/browser/ash/arc/instance_throttle/arc_active_window_throttle_observer.h
@@ -16,15 +16,18 @@
: public chromeos::WindowThrottleObserverBase {
public:
ArcActiveWindowThrottleObserver();
+
+ ArcActiveWindowThrottleObserver(const ArcActiveWindowThrottleObserver&) =
+ delete;
+ ArcActiveWindowThrottleObserver& operator=(
+ const ArcActiveWindowThrottleObserver&) = delete;
+
~ArcActiveWindowThrottleObserver() override = default;
// WindowThrottleObserverBase:
bool ProcessWindowActivation(ActivationReason reason,
aura::Window* gained_active,
aura::Window* lost_active) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ArcActiveWindowThrottleObserver);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/instance_throttle/arc_app_launch_throttle_observer.h b/chrome/browser/ash/arc/instance_throttle/arc_app_launch_throttle_observer.h
index a4264e7..0bdbcb3 100644
--- a/chrome/browser/ash/arc/instance_throttle/arc_app_launch_throttle_observer.h
+++ b/chrome/browser/ash/arc/instance_throttle/arc_app_launch_throttle_observer.h
@@ -27,6 +27,11 @@
public AppLaunchObserver {
public:
ArcAppLaunchThrottleObserver();
+
+ ArcAppLaunchThrottleObserver(const ArcAppLaunchThrottleObserver&) = delete;
+ ArcAppLaunchThrottleObserver& operator=(const ArcAppLaunchThrottleObserver&) =
+ delete;
+
~ArcAppLaunchThrottleObserver() override;
// chromeos::ThrottleObserver:
@@ -50,8 +55,6 @@
std::set<std::string> current_requests_;
// Must go last.
base::WeakPtrFactory<ArcAppLaunchThrottleObserver> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppLaunchThrottleObserver);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/instance_throttle/arc_boot_phase_throttle_observer.h b/chrome/browser/ash/arc/instance_throttle/arc_boot_phase_throttle_observer.h
index 2a7d65c..684960f 100644
--- a/chrome/browser/ash/arc/instance_throttle/arc_boot_phase_throttle_observer.h
+++ b/chrome/browser/ash/arc/instance_throttle/arc_boot_phase_throttle_observer.h
@@ -25,6 +25,11 @@
public SessionRestoreObserver {
public:
ArcBootPhaseThrottleObserver();
+
+ ArcBootPhaseThrottleObserver(const ArcBootPhaseThrottleObserver&) = delete;
+ ArcBootPhaseThrottleObserver& operator=(const ArcBootPhaseThrottleObserver&) =
+ delete;
+
~ArcBootPhaseThrottleObserver() override = default;
// chromeos::ThrottleObserver:
@@ -53,8 +58,6 @@
ArcBootPhaseMonitorBridge* boot_phase_monitor_ = nullptr;
bool session_restore_loading_ = false;
bool arc_is_booting_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ArcBootPhaseThrottleObserver);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/instance_throttle/arc_instance_throttle.cc b/chrome/browser/ash/arc/instance_throttle/arc_instance_throttle.cc
index f5ca0f9..f296e773e6 100644
--- a/chrome/browser/ash/arc/instance_throttle/arc_instance_throttle.cc
+++ b/chrome/browser/ash/arc/instance_throttle/arc_instance_throttle.cc
@@ -25,6 +25,10 @@
class DefaultDelegateImpl : public ArcInstanceThrottle::Delegate {
public:
DefaultDelegateImpl() = default;
+
+ DefaultDelegateImpl(const DefaultDelegateImpl&) = delete;
+ DefaultDelegateImpl& operator=(const DefaultDelegateImpl&) = delete;
+
~DefaultDelegateImpl() override = default;
void SetCpuRestriction(CpuRestrictionState cpu_restriction_state) override {
SetArcCpuRestriction(cpu_restriction_state);
@@ -37,9 +41,6 @@
<< " ms due to: " << observer_name;
UmaHistogramLongTimes("Arc.CpuRestrictionDisabled." + observer_name, delta);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DefaultDelegateImpl);
};
// Singleton factory for ArcInstanceThrottle.
diff --git a/chrome/browser/ash/arc/keymaster/arc_keymaster_bridge.h b/chrome/browser/ash/arc/keymaster/arc_keymaster_bridge.h
index 1e3261a0c..9ea9218 100644
--- a/chrome/browser/ash/arc/keymaster/arc_keymaster_bridge.h
+++ b/chrome/browser/ash/arc/keymaster/arc_keymaster_bridge.h
@@ -40,6 +40,10 @@
ArcKeymasterBridge(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+
+ ArcKeymasterBridge(const ArcKeymasterBridge&) = delete;
+ ArcKeymasterBridge& operator=(const ArcKeymasterBridge&) = delete;
+
~ArcKeymasterBridge() override;
// Return the factory instance for this class.
@@ -79,8 +83,6 @@
// WeakPtrFactory to use for callbacks.
base::WeakPtrFactory<ArcKeymasterBridge> weak_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcKeymasterBridge);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/kiosk/arc_kiosk_bridge.h b/chrome/browser/ash/arc/kiosk/arc_kiosk_bridge.h
index 02602f2..b32a4548 100644
--- a/chrome/browser/ash/arc/kiosk/arc_kiosk_bridge.h
+++ b/chrome/browser/ash/arc/kiosk/arc_kiosk_bridge.h
@@ -42,6 +42,10 @@
ArcKioskBridge(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+
+ ArcKioskBridge(const ArcKioskBridge&) = delete;
+ ArcKioskBridge& operator=(const ArcKioskBridge&) = delete;
+
~ArcKioskBridge() override;
// mojom::KioskHost overrides.
@@ -58,8 +62,6 @@
// Tracks current maintenance session id.
int32_t session_id_ = -1;
-
- DISALLOW_COPY_AND_ASSIGN(ArcKioskBridge);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/metrics/arc_metrics_service_proxy.h b/chrome/browser/ash/arc/metrics/arc_metrics_service_proxy.h
index 1addce3..79e66fb 100644
--- a/chrome/browser/ash/arc/metrics/arc_metrics_service_proxy.h
+++ b/chrome/browser/ash/arc/metrics/arc_metrics_service_proxy.h
@@ -32,6 +32,10 @@
ArcMetricsServiceProxy(content::BrowserContext* context,
ArcBridgeService* arc_bridge_service);
+
+ ArcMetricsServiceProxy(const ArcMetricsServiceProxy&) = delete;
+ ArcMetricsServiceProxy& operator=(const ArcMetricsServiceProxy&) = delete;
+
~ArcMetricsServiceProxy() override = default;
// KeyedService overrides.
@@ -56,8 +60,6 @@
private:
ArcAppListPrefs* const arc_app_list_prefs_;
ArcMetricsService* const arc_metrics_service_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcMetricsServiceProxy);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/notification/arc_boot_error_notification.h b/chrome/browser/ash/arc/notification/arc_boot_error_notification.h
index a2483a0b..ca93627 100644
--- a/chrome/browser/ash/arc/notification/arc_boot_error_notification.h
+++ b/chrome/browser/ash/arc/notification/arc_boot_error_notification.h
@@ -28,6 +28,10 @@
ArcBootErrorNotification(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+
+ ArcBootErrorNotification(const ArcBootErrorNotification&) = delete;
+ ArcBootErrorNotification& operator=(const ArcBootErrorNotification&) = delete;
+
~ArcBootErrorNotification() override;
// ArcSessionManagerObserver:
@@ -35,8 +39,6 @@
private:
content::BrowserContext* const context_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcBootErrorNotification);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/notification/arc_provision_notification_service.h b/chrome/browser/ash/arc/notification/arc_provision_notification_service.h
index abb219d..1b59569 100644
--- a/chrome/browser/ash/arc/notification/arc_provision_notification_service.h
+++ b/chrome/browser/ash/arc/notification/arc_provision_notification_service.h
@@ -34,6 +34,12 @@
ArcProvisionNotificationService(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+
+ ArcProvisionNotificationService(const ArcProvisionNotificationService&) =
+ delete;
+ ArcProvisionNotificationService& operator=(
+ const ArcProvisionNotificationService&) = delete;
+
~ArcProvisionNotificationService() override;
// session_manager::SessionManagerObserver:
@@ -61,8 +67,6 @@
// Indicates whether notification should be shown right after session starts.
bool show_on_session_starts_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ArcProvisionNotificationService);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/oemcrypto/arc_oemcrypto_bridge.h b/chrome/browser/ash/arc/oemcrypto/arc_oemcrypto_bridge.h
index 32fbcaa4..f9eab60 100644
--- a/chrome/browser/ash/arc/oemcrypto/arc_oemcrypto_bridge.h
+++ b/chrome/browser/ash/arc/oemcrypto/arc_oemcrypto_bridge.h
@@ -33,6 +33,10 @@
ArcOemCryptoBridge(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+
+ ArcOemCryptoBridge(const ArcOemCryptoBridge&) = delete;
+ ArcOemCryptoBridge& operator=(const ArcOemCryptoBridge&) = delete;
+
~ArcOemCryptoBridge() override;
// OemCrypto Mojo host interface
@@ -48,8 +52,6 @@
// WeakPtrFactory to use for callbacks.
base::WeakPtrFactory<ArcOemCryptoBridge> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcOemCryptoBridge);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/optin/arc_optin_preference_handler.h b/chrome/browser/ash/arc/optin/arc_optin_preference_handler.h
index 8807379..c4af15f 100644
--- a/chrome/browser/ash/arc/optin/arc_optin_preference_handler.h
+++ b/chrome/browser/ash/arc/optin/arc_optin_preference_handler.h
@@ -29,6 +29,11 @@
public:
ArcOptInPreferenceHandler(ArcOptInPreferenceHandlerObserver* observer,
PrefService* pref_serive);
+
+ ArcOptInPreferenceHandler(const ArcOptInPreferenceHandler&) = delete;
+ ArcOptInPreferenceHandler& operator=(const ArcOptInPreferenceHandler&) =
+ delete;
+
~ArcOptInPreferenceHandler();
void Start();
@@ -57,8 +62,6 @@
PrefChangeRegistrar pref_change_registrar_;
// Metrics consent observer.
base::CallbackListSubscription reporting_consent_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcOptInPreferenceHandler);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/optin/arc_terms_of_service_default_negotiator.h b/chrome/browser/ash/arc/optin/arc_terms_of_service_default_negotiator.h
index a0462eb..80396ef 100644
--- a/chrome/browser/ash/arc/optin/arc_terms_of_service_default_negotiator.h
+++ b/chrome/browser/ash/arc/optin/arc_terms_of_service_default_negotiator.h
@@ -27,6 +27,12 @@
public:
ArcTermsOfServiceDefaultNegotiator(PrefService* pref_service,
ArcSupportHost* support_host);
+
+ ArcTermsOfServiceDefaultNegotiator(
+ const ArcTermsOfServiceDefaultNegotiator&) = delete;
+ ArcTermsOfServiceDefaultNegotiator& operator=(
+ const ArcTermsOfServiceDefaultNegotiator&) = delete;
+
~ArcTermsOfServiceDefaultNegotiator() override;
private:
@@ -51,8 +57,6 @@
ArcSupportHost* const support_host_;
std::unique_ptr<ArcOptInPreferenceHandler> preference_handler_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceDefaultNegotiator);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc b/chrome/browser/ash/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc
index f0423112..40585340 100644
--- a/chrome/browser/ash/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc
+++ b/chrome/browser/ash/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc
@@ -58,6 +58,12 @@
: public BrowserWithTestWindowTest {
public:
ArcTermsOfServiceDefaultNegotiatorTest() = default;
+
+ ArcTermsOfServiceDefaultNegotiatorTest(
+ const ArcTermsOfServiceDefaultNegotiatorTest&) = delete;
+ ArcTermsOfServiceDefaultNegotiatorTest& operator=(
+ const ArcTermsOfServiceDefaultNegotiatorTest&) = delete;
+
~ArcTermsOfServiceDefaultNegotiatorTest() override = default;
void SetUp() override {
@@ -115,8 +121,6 @@
std::unique_ptr<ArcSupportHost> support_host_;
std::unique_ptr<FakeArcSupport> fake_arc_support_;
std::unique_ptr<ArcTermsOfServiceNegotiator> negotiator_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceDefaultNegotiatorTest);
};
namespace {
diff --git a/chrome/browser/ash/arc/optin/arc_terms_of_service_negotiator.h b/chrome/browser/ash/arc/optin/arc_terms_of_service_negotiator.h
index c48452d..9574e29 100644
--- a/chrome/browser/ash/arc/optin/arc_terms_of_service_negotiator.h
+++ b/chrome/browser/ash/arc/optin/arc_terms_of_service_negotiator.h
@@ -14,6 +14,11 @@
class ArcTermsOfServiceNegotiator {
public:
ArcTermsOfServiceNegotiator();
+
+ ArcTermsOfServiceNegotiator(const ArcTermsOfServiceNegotiator&) = delete;
+ ArcTermsOfServiceNegotiator& operator=(const ArcTermsOfServiceNegotiator&) =
+ delete;
+
virtual ~ArcTermsOfServiceNegotiator();
// Invokes the|callback| asynchronously with "|accepted| = true" if user
@@ -33,8 +38,6 @@
virtual void StartNegotiationImpl() = 0;
NegotiationCallback pending_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceNegotiator);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/optin/arc_terms_of_service_oobe_negotiator.h b/chrome/browser/ash/arc/optin/arc_terms_of_service_oobe_negotiator.h
index 308326c..cde0d33 100644
--- a/chrome/browser/ash/arc/optin/arc_terms_of_service_oobe_negotiator.h
+++ b/chrome/browser/ash/arc/optin/arc_terms_of_service_oobe_negotiator.h
@@ -24,6 +24,12 @@
public chromeos::ConsolidatedConsentScreen::Observer {
public:
ArcTermsOfServiceOobeNegotiator();
+
+ ArcTermsOfServiceOobeNegotiator(const ArcTermsOfServiceOobeNegotiator&) =
+ delete;
+ ArcTermsOfServiceOobeNegotiator& operator=(
+ const ArcTermsOfServiceOobeNegotiator&) = delete;
+
~ArcTermsOfServiceOobeNegotiator() override;
// Injects ARC OOBE screen handler in unit tests, where OOBE UI is not
@@ -60,8 +66,6 @@
base::ScopedObservation<chromeos::ConsolidatedConsentScreen,
chromeos::ConsolidatedConsentScreen::Observer>
consolidated_consent_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceOobeNegotiator);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/pip/arc_picture_in_picture_window_controller_impl.h b/chrome/browser/ash/arc/pip/arc_picture_in_picture_window_controller_impl.h
index d75d66b..c536627b 100644
--- a/chrome/browser/ash/arc/pip/arc_picture_in_picture_window_controller_impl.h
+++ b/chrome/browser/ash/arc/pip/arc_picture_in_picture_window_controller_impl.h
@@ -27,6 +27,12 @@
public:
explicit ArcPictureInPictureWindowControllerImpl(
arc::ArcPipBridge* arc_pip_bridge);
+
+ ArcPictureInPictureWindowControllerImpl(
+ const ArcPictureInPictureWindowControllerImpl&) = delete;
+ ArcPictureInPictureWindowControllerImpl& operator=(
+ const ArcPictureInPictureWindowControllerImpl&) = delete;
+
~ArcPictureInPictureWindowControllerImpl() override;
// PictureInPictureWindowController:
@@ -49,8 +55,6 @@
private:
arc::ArcPipBridge* const arc_pip_bridge_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcPictureInPictureWindowControllerImpl);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/pip/arc_pip_bridge.h b/chrome/browser/ash/arc/pip/arc_pip_bridge.h
index 67e556d..f01fbf5 100644
--- a/chrome/browser/ash/arc/pip/arc_pip_bridge.h
+++ b/chrome/browser/ash/arc/pip/arc_pip_bridge.h
@@ -32,6 +32,10 @@
ArcPipBridge(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+
+ ArcPipBridge(const ArcPipBridge&) = delete;
+ ArcPipBridge& operator=(const ArcPipBridge&) = delete;
+
~ArcPipBridge() override;
// ConnectionObserver<mojom::PipInstance> overrides.
@@ -51,8 +55,6 @@
pip_window_controller_;
bool prevent_closing_pip_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ArcPipBridge);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/policy/arc_android_management_checker.h b/chrome/browser/ash/arc/policy/arc_android_management_checker.h
index 4e74662..fd94400 100644
--- a/chrome/browser/ash/arc/policy/arc_android_management_checker.h
+++ b/chrome/browser/ash/arc/policy/arc_android_management_checker.h
@@ -19,6 +19,11 @@
class ArcAndroidManagementChecker : public signin::IdentityManager::Observer {
public:
ArcAndroidManagementChecker(Profile* profile, bool retry_on_error);
+
+ ArcAndroidManagementChecker(const ArcAndroidManagementChecker&) = delete;
+ ArcAndroidManagementChecker& operator=(const ArcAndroidManagementChecker&) =
+ delete;
+
~ArcAndroidManagementChecker() override;
static void StartClient();
@@ -64,8 +69,6 @@
CheckCallback callback_;
base::WeakPtrFactory<ArcAndroidManagementChecker> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcAndroidManagementChecker);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/policy/arc_policy_bridge_unittest.cc b/chrome/browser/ash/arc/policy/arc_policy_bridge_unittest.cc
index f9a8c8f4..1551232 100644
--- a/chrome/browser/ash/arc/policy/arc_policy_bridge_unittest.cc
+++ b/chrome/browser/ash/arc/policy/arc_policy_bridge_unittest.cc
@@ -152,13 +152,15 @@
class MockArcPolicyBridgeObserver : public ArcPolicyBridge::Observer {
public:
MockArcPolicyBridgeObserver() = default;
+
+ MockArcPolicyBridgeObserver(const MockArcPolicyBridgeObserver&) = delete;
+ MockArcPolicyBridgeObserver& operator=(const MockArcPolicyBridgeObserver&) =
+ delete;
+
~MockArcPolicyBridgeObserver() override = default;
MOCK_METHOD1(OnPolicySent, void(const std::string&));
MOCK_METHOD1(OnComplianceReportReceived, void(const base::Value*));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockArcPolicyBridgeObserver);
};
// Helper class to define callbacks that verify that they were run.
@@ -167,14 +169,16 @@
class CheckedBoolean {
public:
CheckedBoolean() {}
+
+ CheckedBoolean(const CheckedBoolean&) = delete;
+ CheckedBoolean& operator=(const CheckedBoolean&) = delete;
+
~CheckedBoolean() { EXPECT_TRUE(value_); }
void set_value(bool value) { value_ = value; }
private:
bool value_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(CheckedBoolean);
};
void ExpectString(std::unique_ptr<CheckedBoolean> was_run,
diff --git a/chrome/browser/ash/arc/print_spooler/arc_print_spooler_bridge.h b/chrome/browser/ash/arc/print_spooler/arc_print_spooler_bridge.h
index e0677bc..64f5a1f 100644
--- a/chrome/browser/ash/arc/print_spooler/arc_print_spooler_bridge.h
+++ b/chrome/browser/ash/arc/print_spooler/arc_print_spooler_bridge.h
@@ -35,6 +35,10 @@
ArcPrintSpoolerBridge(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+
+ ArcPrintSpoolerBridge(const ArcPrintSpoolerBridge&) = delete;
+ ArcPrintSpoolerBridge& operator=(const ArcPrintSpoolerBridge&) = delete;
+
~ArcPrintSpoolerBridge() override;
// mojom::PrintSpoolerHost:
@@ -63,8 +67,6 @@
Profile* const profile_;
base::WeakPtrFactory<ArcPrintSpoolerBridge> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcPrintSpoolerBridge);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/process/arc_process.h b/chrome/browser/ash/arc/process/arc_process.h
index 5470eca1..02ddd17 100644
--- a/chrome/browser/ash/arc/process/arc_process.h
+++ b/chrome/browser/ash/arc/process/arc_process.h
@@ -25,6 +25,10 @@
mojom::ProcessState process_state,
bool is_focused,
int64_t last_activity_time);
+
+ ArcProcess(const ArcProcess&) = delete;
+ ArcProcess& operator=(const ArcProcess&) = delete;
+
~ArcProcess();
ArcProcess(ArcProcess&& other);
@@ -84,8 +88,6 @@
friend std::ostream& operator<<(std::ostream& out,
const ArcProcess& arc_process);
-
- DISALLOW_COPY_AND_ASSIGN(ArcProcess);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/process/arc_process_service.h b/chrome/browser/ash/arc/process/arc_process_service.h
index c5901aa4..737b7a7 100644
--- a/chrome/browser/ash/arc/process/arc_process_service.h
+++ b/chrome/browser/ash/arc/process/arc_process_service.h
@@ -80,6 +80,10 @@
ArcProcessService(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+
+ ArcProcessService(const ArcProcessService&) = delete;
+ ArcProcessService& operator=(const ArcProcessService&) = delete;
+
~ArcProcessService() override;
// TODO(afakhry): The value of this delay was chosen to match the refresh time
@@ -202,8 +206,6 @@
// Always keep this the last member of this class to make sure it's the
// first thing to be destructed.
base::WeakPtrFactory<ArcProcessService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcProcessService);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/screen_capture/arc_screen_capture_bridge.h b/chrome/browser/ash/arc/screen_capture/arc_screen_capture_bridge.h
index 641f269..b33d303f 100644
--- a/chrome/browser/ash/arc/screen_capture/arc_screen_capture_bridge.h
+++ b/chrome/browser/ash/arc/screen_capture/arc_screen_capture_bridge.h
@@ -33,6 +33,10 @@
ArcScreenCaptureBridge(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+
+ ArcScreenCaptureBridge(const ArcScreenCaptureBridge&) = delete;
+ ArcScreenCaptureBridge& operator=(const ArcScreenCaptureBridge&) = delete;
+
~ArcScreenCaptureBridge() override;
// mojom::ScreenCaptureHost overrides:
@@ -92,8 +96,6 @@
// WeakPtrFactory to use for callbacks.
base::WeakPtrFactory<ArcScreenCaptureBridge> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcScreenCaptureBridge);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/session/arc_app_id_provider_impl.h b/chrome/browser/ash/arc/session/arc_app_id_provider_impl.h
index ce9e6dd7..e385c27f 100644
--- a/chrome/browser/ash/arc/session/arc_app_id_provider_impl.h
+++ b/chrome/browser/ash/arc/session/arc_app_id_provider_impl.h
@@ -13,13 +13,14 @@
class ArcAppIdProviderImpl : public ash::ArcAppIdProvider {
public:
ArcAppIdProviderImpl();
+
+ ArcAppIdProviderImpl(const ArcAppIdProviderImpl&) = delete;
+ ArcAppIdProviderImpl& operator=(const ArcAppIdProviderImpl&) = delete;
+
~ArcAppIdProviderImpl() override;
// ash::ArcAppIdProvider:
std::string GetAppIdByPackageName(const std::string& package_name) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ArcAppIdProviderImpl);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/session/arc_play_store_enabled_preference_handler.h b/chrome/browser/ash/arc/session/arc_play_store_enabled_preference_handler.h
index c0e9f4d..0a3d786 100644
--- a/chrome/browser/ash/arc/session/arc_play_store_enabled_preference_handler.h
+++ b/chrome/browser/ash/arc/session/arc_play_store_enabled_preference_handler.h
@@ -21,6 +21,12 @@
public:
ArcPlayStoreEnabledPreferenceHandler(Profile* profile,
ArcSessionManager* arc_session_manager);
+
+ ArcPlayStoreEnabledPreferenceHandler(
+ const ArcPlayStoreEnabledPreferenceHandler&) = delete;
+ ArcPlayStoreEnabledPreferenceHandler& operator=(
+ const ArcPlayStoreEnabledPreferenceHandler&) = delete;
+
~ArcPlayStoreEnabledPreferenceHandler();
// Starts observing Google Play Store enabled preference change.
@@ -47,8 +53,6 @@
// Must be the last member.
base::WeakPtrFactory<ArcPlayStoreEnabledPreferenceHandler> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcPlayStoreEnabledPreferenceHandler);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/session/arc_service_launcher.h b/chrome/browser/ash/arc/session/arc_service_launcher.h
index 947a5da..b46a1cd 100644
--- a/chrome/browser/ash/arc/session/arc_service_launcher.h
+++ b/chrome/browser/ash/arc/session/arc_service_launcher.h
@@ -31,6 +31,10 @@
// |scheduler_configuration_manager| must outlive |this| object.
explicit ArcServiceLauncher(chromeos::SchedulerConfigurationManagerBase*
scheduler_configuration_manager);
+
+ ArcServiceLauncher(const ArcServiceLauncher&) = delete;
+ ArcServiceLauncher& operator=(const ArcServiceLauncher&) = delete;
+
~ArcServiceLauncher();
// Returns a global instance.
@@ -67,8 +71,6 @@
// |scheduler_configuration_manager_| outlives |this|.
chromeos::SchedulerConfigurationManagerBase* const
scheduler_configuration_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcServiceLauncher);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/session/arc_session_manager.cc b/chrome/browser/ash/arc/session/arc_session_manager.cc
index 92403fc4..8735fc1 100644
--- a/chrome/browser/ash/arc/session/arc_session_manager.cc
+++ b/chrome/browser/ash/arc/session/arc_session_manager.cc
@@ -487,6 +487,9 @@
UpdateOptInFlowResultUMA(OptInFlowResult::STARTED);
}
+ ScopedOptInFlowTracker(const ScopedOptInFlowTracker&) = delete;
+ ScopedOptInFlowTracker& operator=(const ScopedOptInFlowTracker&) = delete;
+
~ScopedOptInFlowTracker() {
if (shutdown_)
return;
@@ -522,8 +525,6 @@
bool error_ = false;
bool success_ = false;
bool shutdown_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedOptInFlowTracker);
};
ArcSessionManager::ArcSessionManager(
diff --git a/chrome/browser/ash/arc/session/arc_session_manager.h b/chrome/browser/ash/arc/session/arc_session_manager.h
index 6636c47..02d63da 100644
--- a/chrome/browser/ash/arc/session/arc_session_manager.h
+++ b/chrome/browser/ash/arc/session/arc_session_manager.h
@@ -122,6 +122,10 @@
ArcSessionManager(std::unique_ptr<ArcSessionRunner> arc_session_runner,
std::unique_ptr<AdbSideloadingAvailabilityDelegateImpl>
adb_sideloading_availability_delegate);
+
+ ArcSessionManager(const ArcSessionManager&) = delete;
+ ArcSessionManager& operator=(const ArcSessionManager&) = delete;
+
~ArcSessionManager() override;
static ArcSessionManager* Get();
@@ -476,8 +480,6 @@
// Must be the last member.
base::WeakPtrFactory<ArcSessionManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcSessionManager);
};
// Outputs the stringified |state| to |os|. This is only for logging purposes.
diff --git a/chrome/browser/ash/arc/session/arc_session_manager_browsertest.cc b/chrome/browser/ash/arc/session/arc_session_manager_browsertest.cc
index 400c7ae..2326e74 100644
--- a/chrome/browser/ash/arc/session/arc_session_manager_browsertest.cc
+++ b/chrome/browser/ash/arc/session/arc_session_manager_browsertest.cc
@@ -83,6 +83,10 @@
public:
ArcPlayStoreDisabledWaiter() { ArcSessionManager::Get()->AddObserver(this); }
+ ArcPlayStoreDisabledWaiter(const ArcPlayStoreDisabledWaiter&) = delete;
+ ArcPlayStoreDisabledWaiter& operator=(const ArcPlayStoreDisabledWaiter&) =
+ delete;
+
~ArcPlayStoreDisabledWaiter() override {
ArcSessionManager::Get()->RemoveObserver(this);
}
@@ -103,8 +107,6 @@
}
base::RunLoop* run_loop_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(ArcPlayStoreDisabledWaiter);
};
class ArcSessionManagerTest : public MixinBasedInProcessBrowserTest {
diff --git a/chrome/browser/ash/arc/session/arc_session_manager_unittest.cc b/chrome/browser/ash/arc/session/arc_session_manager_unittest.cc
index e1f18a4..73b9e40 100644
--- a/chrome/browser/ash/arc/session/arc_session_manager_unittest.cc
+++ b/chrome/browser/ash/arc/session/arc_session_manager_unittest.cc
@@ -91,6 +91,9 @@
session_manager->AddObserver(this);
}
+ ArcInitialStartHandler(const ArcInitialStartHandler&) = delete;
+ ArcInitialStartHandler& operator=(const ArcInitialStartHandler&) = delete;
+
~ArcInitialStartHandler() override { session_manager_->RemoveObserver(this); }
// ArcSessionManagerObserver:
@@ -105,8 +108,6 @@
bool was_called_ = false;
ArcSessionManager* const session_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcInitialStartHandler);
};
class FileExpansionObserver : public ArcSessionManagerObserver {
@@ -173,6 +174,11 @@
base::BindRepeating(FakeArcSession::Create)));
}
+ ArcSessionManagerInLoginScreenTest(
+ const ArcSessionManagerInLoginScreenTest&) = delete;
+ ArcSessionManagerInLoginScreenTest& operator=(
+ const ArcSessionManagerInLoginScreenTest&) = delete;
+
~ArcSessionManagerInLoginScreenTest() override {
arc_session_manager_->Shutdown();
arc_session_manager_.reset();
@@ -198,8 +204,6 @@
std::unique_ptr<ArcServiceManager> arc_service_manager_;
std::unique_ptr<ArcSessionManager> arc_session_manager_;
user_manager::ScopedUserManager user_manager_enabler_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcSessionManagerInLoginScreenTest);
};
// We expect mini instance starts to run if EmitLoginPromptVisible signal is
@@ -248,6 +252,11 @@
test_local_state_(std::make_unique<TestingPrefServiceSimple>()) {
arc::prefs::RegisterLocalStatePrefs(test_local_state_->registry());
}
+
+ ArcSessionManagerTestBase(const ArcSessionManagerTestBase&) = delete;
+ ArcSessionManagerTestBase& operator=(const ArcSessionManagerTestBase&) =
+ delete;
+
~ArcSessionManagerTestBase() override = default;
void SetUp() override {
@@ -352,8 +361,6 @@
user_manager::ScopedUserManager user_manager_enabler_;
base::ScopedTempDir temp_dir_;
std::unique_ptr<TestingPrefServiceSimple> test_local_state_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcSessionManagerTestBase);
};
class ArcSessionManagerTest : public ArcSessionManagerTestBase {
diff --git a/chrome/browser/ash/arc/test/arc_data_removed_waiter.h b/chrome/browser/ash/arc/test/arc_data_removed_waiter.h
index 5033462c..b6a70eca 100644
--- a/chrome/browser/ash/arc/test/arc_data_removed_waiter.h
+++ b/chrome/browser/ash/arc/test/arc_data_removed_waiter.h
@@ -20,6 +20,10 @@
class ArcDataRemovedWaiter : public ArcSessionManagerObserver {
public:
ArcDataRemovedWaiter();
+
+ ArcDataRemovedWaiter(const ArcDataRemovedWaiter&) = delete;
+ ArcDataRemovedWaiter& operator=(const ArcDataRemovedWaiter&) = delete;
+
~ArcDataRemovedWaiter() override;
// Waits until ARC data is removed. Waiting is end once ArcSessionManager
@@ -31,8 +35,6 @@
void OnArcDataRemoved() override;
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcDataRemovedWaiter);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing.h b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing.h
index 65011ee..cccd00e9 100644
--- a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing.h
+++ b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing.h
@@ -51,6 +51,10 @@
ArcAppPerformanceTracing(content::BrowserContext* context,
ArcBridgeService* bridge);
+
+ ArcAppPerformanceTracing(const ArcAppPerformanceTracing&) = delete;
+ ArcAppPerformanceTracing& operator=(const ArcAppPerformanceTracing&) = delete;
+
~ArcAppPerformanceTracing() override;
// Returns singleton instance for the given BrowserContext,
@@ -179,8 +183,6 @@
// Timer for jankiness tracing.
base::OneShotTimer jankiness_timer_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppPerformanceTracing);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_custom_session.h b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_custom_session.h
index b43df35..bbce75ac 100644
--- a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_custom_session.h
+++ b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_custom_session.h
@@ -25,6 +25,12 @@
explicit ArcAppPerformanceTracingCustomSession(
ArcAppPerformanceTracing* owner);
+
+ ArcAppPerformanceTracingCustomSession(
+ const ArcAppPerformanceTracingCustomSession&) = delete;
+ ArcAppPerformanceTracingCustomSession& operator=(
+ const ArcAppPerformanceTracingCustomSession&) = delete;
+
~ArcAppPerformanceTracingCustomSession() override;
// ArcAppPerformanceTracingSession:
@@ -42,8 +48,6 @@
private:
ResultCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppPerformanceTracingCustomSession);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_session.h b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_session.h
index b72be177..b920382 100644
--- a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_session.h
+++ b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_session.h
@@ -30,6 +30,12 @@
class ArcAppPerformanceTracingSession : public exo::SurfaceObserver {
public:
explicit ArcAppPerformanceTracingSession(ArcAppPerformanceTracing* owner);
+
+ ArcAppPerformanceTracingSession(const ArcAppPerformanceTracingSession&) =
+ delete;
+ ArcAppPerformanceTracingSession& operator=(
+ const ArcAppPerformanceTracingSession&) = delete;
+
~ArcAppPerformanceTracingSession() override;
// Performs initial scheduling of tracing based on session type.
@@ -110,8 +116,6 @@
// Indicates that tracing is in active state.
bool tracing_active_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppPerformanceTracingSession);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_test_helper.h b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_test_helper.h
index 4df303bb..fd216d91 100644
--- a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_test_helper.h
+++ b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_test_helper.h
@@ -31,6 +31,12 @@
class ArcAppPerformanceTracingTestHelper {
public:
ArcAppPerformanceTracingTestHelper();
+
+ ArcAppPerformanceTracingTestHelper(
+ const ArcAppPerformanceTracingTestHelper&) = delete;
+ ArcAppPerformanceTracingTestHelper& operator=(
+ const ArcAppPerformanceTracingTestHelper&) = delete;
+
virtual ~ArcAppPerformanceTracingTestHelper();
// Creates app window as ARC++ window.
@@ -64,8 +70,6 @@
Profile* profile_ = nullptr;
std::unique_ptr<exo::WMHelper> wm_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppPerformanceTracingTestHelper);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_uma_session.h b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_uma_session.h
index 66a072e..aa3f3c6 100644
--- a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_uma_session.h
+++ b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_uma_session.h
@@ -22,6 +22,12 @@
public:
ArcAppPerformanceTracingUmaSession(ArcAppPerformanceTracing* owner,
const std::string& category);
+
+ ArcAppPerformanceTracingUmaSession(
+ const ArcAppPerformanceTracingUmaSession&) = delete;
+ ArcAppPerformanceTracingUmaSession& operator=(
+ const ArcAppPerformanceTracingUmaSession&) = delete;
+
~ArcAppPerformanceTracingUmaSession() override;
static void SetTracingPeriodForTesting(const base::TimeDelta& period);
@@ -43,8 +49,6 @@
// Tracing category.
const std::string category_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppPerformanceTracingUmaSession);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_unittest.cc b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_unittest.cc
index 7ec16bf..7b17bdba 100644
--- a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_unittest.cc
+++ b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_unittest.cc
@@ -65,6 +65,11 @@
class ArcAppPerformanceTracingTest : public BrowserWithTestWindowTest {
public:
ArcAppPerformanceTracingTest() = default;
+
+ ArcAppPerformanceTracingTest(const ArcAppPerformanceTracingTest&) = delete;
+ ArcAppPerformanceTracingTest& operator=(const ArcAppPerformanceTracingTest&) =
+ delete;
+
~ArcAppPerformanceTracingTest() override = default;
// testing::Test:
@@ -120,8 +125,6 @@
private:
ArcAppPerformanceTracingTestHelper tracing_helper_;
ArcAppTest arc_test_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppPerformanceTracingTest);
};
TEST_F(ArcAppPerformanceTracingTest, TracingScheduled) {
diff --git a/chrome/browser/ash/arc/tracing/arc_graphics_jank_detector.h b/chrome/browser/ash/arc/tracing/arc_graphics_jank_detector.h
index 03052d9..d651f53 100644
--- a/chrome/browser/ash/arc/tracing/arc_graphics_jank_detector.h
+++ b/chrome/browser/ash/arc/tracing/arc_graphics_jank_detector.h
@@ -56,6 +56,10 @@
static constexpr int kJankDetectionThresholdPercent = 190;
explicit ArcGraphicsJankDetector(const JankCallback& callback);
+
+ ArcGraphicsJankDetector(const ArcGraphicsJankDetector&) = delete;
+ ArcGraphicsJankDetector& operator=(const ArcGraphicsJankDetector&) = delete;
+
~ArcGraphicsJankDetector();
// Resets detector to its initial state, stage is set to |Stage::kWarmUp| with
@@ -90,8 +94,6 @@
base::TimeDelta period_;
// Period fixed.
bool period_fixed_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ArcGraphicsJankDetector);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/tracing/arc_system_model.h b/chrome/browser/ash/arc/tracing/arc_system_model.h
index de79135..ce97f71 100644
--- a/chrome/browser/ash/arc/tracing/arc_system_model.h
+++ b/chrome/browser/ash/arc/tracing/arc_system_model.h
@@ -35,6 +35,10 @@
using ThreadMap = std::map<int, ThreadInfo>;
ArcSystemModel();
+
+ ArcSystemModel(const ArcSystemModel&) = delete;
+ ArcSystemModel& operator=(const ArcSystemModel&) = delete;
+
~ArcSystemModel();
void Reset();
@@ -69,8 +73,6 @@
// TODO(khmel): For simplification and performance use separate channels
// for each event type.
ValueEvents memory_events_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcSystemModel);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/tracing/arc_system_stat_collector.h b/chrome/browser/ash/arc/tracing/arc_system_stat_collector.h
index cf7965d..8974b0b 100644
--- a/chrome/browser/ash/arc/tracing/arc_system_stat_collector.h
+++ b/chrome/browser/ash/arc/tracing/arc_system_stat_collector.h
@@ -70,6 +70,10 @@
};
ArcSystemStatCollector();
+
+ ArcSystemStatCollector(const ArcSystemStatCollector&) = delete;
+ ArcSystemStatCollector& operator=(const ArcSystemStatCollector&) = delete;
+
~ArcSystemStatCollector();
// Starts sample collection, |max_interval| defines the maximum interval and
@@ -163,8 +167,6 @@
std::unique_ptr<SystemReadersContext> context_;
base::WeakPtrFactory<ArcSystemStatCollector> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcSystemStatCollector);
};
// Helper that reads and parses stat file containing decimal number separated by
diff --git a/chrome/browser/ash/arc/tracing/arc_tracing_bridge.h b/chrome/browser/ash/arc/tracing/arc_tracing_bridge.h
index 2a33f0c4..ba59630 100644
--- a/chrome/browser/ash/arc/tracing/arc_tracing_bridge.h
+++ b/chrome/browser/ash/arc/tracing/arc_tracing_bridge.h
@@ -42,6 +42,10 @@
ArcTracingBridge(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+
+ ArcTracingBridge(const ArcTracingBridge&) = delete;
+ ArcTracingBridge& operator=(const ArcTracingBridge&) = delete;
+
~ArcTracingBridge() override;
void GetCategories(std::set<std::string>* category_set);
@@ -70,6 +74,10 @@
class ArcTracingAgent : public tracing::BaseAgent {
public:
explicit ArcTracingAgent(ArcTracingBridge* bridge);
+
+ ArcTracingAgent(const ArcTracingAgent&) = delete;
+ ArcTracingAgent& operator=(const ArcTracingAgent&) = delete;
+
~ArcTracingAgent() override;
private:
@@ -77,8 +85,6 @@
void GetCategories(std::set<std::string>* category_set) override;
ArcTracingBridge* const bridge_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcTracingAgent);
};
// A helper class for reading trace data from the client side. We separate
@@ -88,6 +94,10 @@
class ArcTracingReader {
public:
ArcTracingReader();
+
+ ArcTracingReader(const ArcTracingReader&) = delete;
+ ArcTracingReader& operator=(const ArcTracingReader&) = delete;
+
~ArcTracingReader();
// Starts reading trace data from the given file descriptor.
@@ -104,8 +114,6 @@
base::ScopedFD read_fd_;
std::unique_ptr<base::FileDescriptorWatcher::Controller> fd_watcher_;
base::RingBuffer<std::string, kTraceEventBufferSize> ring_buffer_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcTracingReader);
};
struct Category;
@@ -134,8 +142,6 @@
// NOTE: Weak pointers must be invalidated before all other member variables
// so it must be the last member.
base::WeakPtrFactory<ArcTracingBridge> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcTracingBridge);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/tracing/arc_tracing_event.h b/chrome/browser/ash/arc/tracing/arc_tracing_event.h
index ad3c19a..3415045e 100644
--- a/chrome/browser/ash/arc/tracing/arc_tracing_event.h
+++ b/chrome/browser/ash/arc/tracing/arc_tracing_event.h
@@ -30,6 +30,10 @@
};
explicit ArcTracingEvent(base::Value dictionary);
+
+ ArcTracingEvent(const ArcTracingEvent&) = delete;
+ ArcTracingEvent& operator=(const ArcTracingEvent&) = delete;
+
~ArcTracingEvent();
ArcTracingEvent(ArcTracingEvent&&);
@@ -121,8 +125,6 @@
private:
std::vector<std::unique_ptr<ArcTracingEvent>> children_;
base::Value dictionary_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcTracingEvent);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/tracing/arc_tracing_graphics_model.cc b/chrome/browser/ash/arc/tracing/arc_tracing_graphics_model.cc
index 93cbbfc..fd133f1 100644
--- a/chrome/browser/ash/arc/tracing/arc_tracing_graphics_model.cc
+++ b/chrome/browser/ash/arc/tracing/arc_tracing_graphics_model.cc
@@ -246,6 +246,10 @@
BufferEventType::kChromeOSSwapDone));
}
+ BufferGraphicsEventMapper(const BufferGraphicsEventMapper&) = delete;
+ BufferGraphicsEventMapper& operator=(const BufferGraphicsEventMapper&) =
+ delete;
+
~BufferGraphicsEventMapper() = default;
void Produce(const ArcTracingEvent& event,
@@ -259,8 +263,6 @@
private:
MappingRules rules_;
-
- DISALLOW_COPY_AND_ASSIGN(BufferGraphicsEventMapper);
};
BufferGraphicsEventMapper& GetEventMapper() {
@@ -450,6 +452,10 @@
uint64_t input_timestamp,
ui::EventType type)
: event_(event), input_timestamp_(input_timestamp), type_(type) {}
+
+ ExoInputEvent(const ExoInputEvent&) = delete;
+ ExoInputEvent& operator=(const ExoInputEvent&) = delete;
+
~ExoInputEvent() = default;
// Parses |event| and extracts information for Wayland input event. Returns
@@ -481,8 +487,6 @@
const uint64_t input_timestamp_;
// Type of the event;
const ui::EventType type_;
-
- DISALLOW_COPY_AND_ASSIGN(ExoInputEvent);
};
bool SortExoByInputTimestampPred(const std::unique_ptr<ExoInputEvent>& a,
@@ -511,6 +515,9 @@
source_(source),
sequence_id_(sequence_id) {}
+ AndroidInputEvent(const AndroidInputEvent&) = delete;
+ AndroidInputEvent& operator=(const AndroidInputEvent&) = delete;
+
~AndroidInputEvent() = default;
// Parses |event| and extracts information for Android input event. Returns
@@ -595,8 +602,6 @@
const Source source_;
const int sequence_id_;
-
- DISALLOW_COPY_AND_ASSIGN(AndroidInputEvent);
};
// Maps Android sources to possible input types from Chrome.
diff --git a/chrome/browser/ash/arc/tracing/arc_tracing_graphics_model.h b/chrome/browser/ash/arc/tracing/arc_tracing_graphics_model.h
index 03f615c..d99d21a 100644
--- a/chrome/browser/ash/arc/tracing/arc_tracing_graphics_model.h
+++ b/chrome/browser/ash/arc/tracing/arc_tracing_graphics_model.h
@@ -121,6 +121,10 @@
class EventsContainer {
public:
EventsContainer();
+
+ EventsContainer(const EventsContainer&) = delete;
+ EventsContainer& operator=(const EventsContainer&) = delete;
+
~EventsContainer();
void Reset();
@@ -139,8 +143,6 @@
std::vector<BufferEvents> buffer_events_;
// Global events that do not belong to any graphics buffer.
BufferEvents global_events_;
-
- DISALLOW_COPY_AND_ASSIGN(EventsContainer);
};
using ViewMap = std::map<ViewId, EventsContainer>;
diff --git a/chrome/browser/ash/arc/tracing/arc_tracing_model.h b/chrome/browser/ash/arc/tracing/arc_tracing_model.h
index e2f413f..e3624a8c 100644
--- a/chrome/browser/ash/arc/tracing/arc_tracing_model.h
+++ b/chrome/browser/ash/arc/tracing/arc_tracing_model.h
@@ -31,6 +31,10 @@
using TracingEventPtrs = std::vector<const ArcTracingEvent*>;
ArcTracingModel();
+
+ ArcTracingModel(const ArcTracingModel&) = delete;
+ ArcTracingModel& operator=(const ArcTracingModel&) = delete;
+
~ArcTracingModel();
// Limits events by the requested interval. All events outside of this
@@ -88,8 +92,6 @@
uint64_t min_timestamp_ = 0;
uint64_t max_timestamp_ = std::numeric_limits<uint64_t>::max();
-
- DISALLOW_COPY_AND_ASSIGN(ArcTracingModel);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/tracing/arc_tracing_model_unittest.cc b/chrome/browser/ash/arc/tracing/arc_tracing_model_unittest.cc
index 9c71ace..9fabdeb 100644
--- a/chrome/browser/ash/arc/tracing/arc_tracing_model_unittest.cc
+++ b/chrome/browser/ash/arc/tracing/arc_tracing_model_unittest.cc
@@ -147,10 +147,11 @@
class ArcTracingModelTest : public testing::Test {
public:
ArcTracingModelTest() = default;
- ~ArcTracingModelTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(ArcTracingModelTest);
+ ArcTracingModelTest(const ArcTracingModelTest&) = delete;
+ ArcTracingModelTest& operator=(const ArcTracingModelTest&) = delete;
+
+ ~ArcTracingModelTest() override = default;
};
// TopLevel test is performed on the data collected from the real test device.
diff --git a/chrome/browser/ash/arc/tracing/arc_value_event_trimmer.h b/chrome/browser/ash/arc/tracing/arc_value_event_trimmer.h
index 6954fed..c007dd0 100644
--- a/chrome/browser/ash/arc/tracing/arc_value_event_trimmer.h
+++ b/chrome/browser/ash/arc/tracing/arc_value_event_trimmer.h
@@ -17,6 +17,10 @@
class ArcValueEventTrimmer {
public:
ArcValueEventTrimmer(ValueEvents* events, ArcValueEvent::Type type);
+
+ ArcValueEventTrimmer(const ArcValueEventTrimmer&) = delete;
+ ArcValueEventTrimmer& operator=(const ArcValueEventTrimmer&) = delete;
+
~ArcValueEventTrimmer();
// May be add the next event, in case it is not trimmed out.
@@ -39,8 +43,6 @@
int64_t last_trimmed_timestamp_;
// Value of the last event.
int last_value_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(ArcValueEventTrimmer);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/tts/arc_tts_service.h b/chrome/browser/ash/arc/tts/arc_tts_service.h
index 79b9979b..3623507 100644
--- a/chrome/browser/ash/arc/tts/arc_tts_service.h
+++ b/chrome/browser/ash/arc/tts/arc_tts_service.h
@@ -33,6 +33,10 @@
ArcTtsService(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+
+ ArcTtsService(const ArcTtsService&) = delete;
+ ArcTtsService& operator=(const ArcTtsService&) = delete;
+
~ArcTtsService() override;
// mojom::TtsHost overrides:
@@ -55,8 +59,6 @@
ArcBridgeService* const arc_bridge_service_; // Owned by ArcServiceManager.
content::TtsController* tts_controller_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcTtsService);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/tts/arc_tts_service_unittest.cc b/chrome/browser/ash/arc/tts/arc_tts_service_unittest.cc
index 540ff41..82f5548 100644
--- a/chrome/browser/ash/arc/tts/arc_tts_service_unittest.cc
+++ b/chrome/browser/ash/arc/tts/arc_tts_service_unittest.cc
@@ -24,6 +24,10 @@
class TestableTtsController : public content::TtsController {
public:
TestableTtsController() = default;
+
+ TestableTtsController(const TestableTtsController&) = delete;
+ TestableTtsController& operator=(const TestableTtsController&) = delete;
+
~TestableTtsController() override = default;
void OnTtsEvent(int utterance_id,
@@ -71,9 +75,6 @@
int last_char_index_;
int last_length_;
std::string last_error_message_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestableTtsController);
};
class ArcTtsServiceTest : public testing::Test {
@@ -87,6 +88,9 @@
tts_service_->set_tts_controller_for_testing(tts_controller_.get());
}
+ ArcTtsServiceTest(const ArcTtsServiceTest&) = delete;
+ ArcTtsServiceTest& operator=(const ArcTtsServiceTest&) = delete;
+
~ArcTtsServiceTest() override { tts_service_->Shutdown(); }
protected:
@@ -101,8 +105,6 @@
std::unique_ptr<TestingProfile> testing_profile_;
std::unique_ptr<TestableTtsController> tts_controller_;
ArcTtsService* const tts_service_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcTtsServiceTest);
};
// Tests that ArcTtsService can be constructed and destructed.
diff --git a/chrome/browser/ash/arc/user_session/arc_user_session_service.h b/chrome/browser/ash/arc/user_session/arc_user_session_service.h
index 3f6cecfcd..f6dcee3 100644
--- a/chrome/browser/ash/arc/user_session/arc_user_session_service.h
+++ b/chrome/browser/ash/arc/user_session/arc_user_session_service.h
@@ -33,6 +33,10 @@
ArcUserSessionService(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+
+ ArcUserSessionService(const ArcUserSessionService&) = delete;
+ ArcUserSessionService& operator=(const ArcUserSessionService&) = delete;
+
~ArcUserSessionService() override;
// ConnectionObserver<mojom::IntentHelperInstance> override.
@@ -44,8 +48,6 @@
private:
ArcBridgeService* const arc_bridge_service_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcUserSessionService);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/user_session/arc_user_session_service_browsertest.cc b/chrome/browser/ash/arc/user_session/arc_user_session_service_browsertest.cc
index ad8885a..8ea7297 100644
--- a/chrome/browser/ash/arc/user_session/arc_user_session_service_browsertest.cc
+++ b/chrome/browser/ash/arc/user_session/arc_user_session_service_browsertest.cc
@@ -52,6 +52,11 @@
// pinned app sync. https://crbug.com/1085597
SkipPinnedAppsFromSyncForTest();
}
+
+ ArcUserSessionServiceTest(const ArcUserSessionServiceTest&) = delete;
+ ArcUserSessionServiceTest& operator=(const ArcUserSessionServiceTest&) =
+ delete;
+
~ArcUserSessionServiceTest() override = default;
// InProcessBrowserTest:
@@ -81,9 +86,6 @@
protected:
std::unique_ptr<FakeIntentHelperInstance> fake_intent_helper_instance_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ArcUserSessionServiceTest);
};
IN_PROC_BROWSER_TEST_F(ArcUserSessionServiceTest,
diff --git a/chrome/browser/ash/arc/video/gpu_arc_video_service_host.cc b/chrome/browser/ash/arc/video/gpu_arc_video_service_host.cc
index 07cd81c..8da48dc 100644
--- a/chrome/browser/ash/arc/video/gpu_arc_video_service_host.cc
+++ b/chrome/browser/ash/arc/video/gpu_arc_video_service_host.cc
@@ -56,6 +56,11 @@
public:
VideoAcceleratorFactoryService() = default;
+ VideoAcceleratorFactoryService(const VideoAcceleratorFactoryService&) =
+ delete;
+ VideoAcceleratorFactoryService& operator=(
+ const VideoAcceleratorFactoryService&) = delete;
+
~VideoAcceleratorFactoryService() override = default;
void CreateDecodeAccelerator(
@@ -94,9 +99,6 @@
std::move(receiver)));
}
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(VideoAcceleratorFactoryService);
};
} // namespace
diff --git a/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service.cc b/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service.cc
index f4ef505..243fbea3 100644
--- a/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service.cc
+++ b/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service.cc
@@ -75,6 +75,10 @@
public:
DecodeRequest(ArcWallpaperService* service, int32_t android_id)
: service_(service), android_id_(android_id) {}
+
+ DecodeRequest(const DecodeRequest&) = delete;
+ DecodeRequest& operator=(const DecodeRequest&) = delete;
+
~DecodeRequest() override = default;
// ImageDecoder::ImageRequest overrides.
@@ -101,8 +105,6 @@
// ArcWallpaperService owns DecodeRequest, so it will outlive this.
ArcWallpaperService* const service_;
const int32_t android_id_;
-
- DISALLOW_COPY_AND_ASSIGN(DecodeRequest);
};
ArcWallpaperService::DecodeRequestSender::~DecodeRequestSender() = default;
diff --git a/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service.h b/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service.h
index a3798bb..2a41b6bde 100644
--- a/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service.h
+++ b/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service.h
@@ -37,6 +37,10 @@
ArcWallpaperService(content::BrowserContext* context,
ArcBridgeService* bridge_service);
+
+ ArcWallpaperService(const ArcWallpaperService&) = delete;
+ ArcWallpaperService& operator=(const ArcWallpaperService&) = delete;
+
~ArcWallpaperService() override;
// mojom::WallpaperHost overrides.
@@ -77,8 +81,6 @@
ArcBridgeService* const arc_bridge_service_; // Owned by ArcServiceManager.
std::unique_ptr<DecodeRequest> decode_request_;
std::unique_ptr<DecodeRequestSender> decode_request_sender_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcWallpaperService);
};
} // namespace arc
diff --git a/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service_unittest.cc b/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service_unittest.cc
index 0597819..e5c8a15 100644
--- a/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service_unittest.cc
+++ b/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service_unittest.cc
@@ -64,6 +64,10 @@
: task_environment_(std::make_unique<content::BrowserTaskEnvironment>()),
user_manager_(new ash::FakeChromeUserManager()),
user_manager_enabler_(base::WrapUnique(user_manager_)) {}
+
+ ArcWallpaperServiceTest(const ArcWallpaperServiceTest&) = delete;
+ ArcWallpaperServiceTest& operator=(const ArcWallpaperServiceTest&) = delete;
+
~ArcWallpaperServiceTest() override = default;
void SetUp() override {
@@ -126,8 +130,6 @@
// testing_profile_ needs to be deleted before arc_service_manager_.
TestingProfile testing_profile_;
TestingPrefServiceSimple pref_service_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcWallpaperServiceTest);
};
} // namespace
diff --git a/chrome/browser/ash/assistant/assistant_util_unittest.cc b/chrome/browser/ash/assistant/assistant_util_unittest.cc
index 4ee0be9..ea4302e 100644
--- a/chrome/browser/ash/assistant/assistant_util_unittest.cc
+++ b/chrome/browser/ash/assistant/assistant_util_unittest.cc
@@ -87,6 +87,9 @@
MakeAccountAvailableAsPrimaryAccount(user_type);
}
+ ScopedLogIn(const ScopedLogIn&) = delete;
+ ScopedLogIn& operator=(const ScopedLogIn&) = delete;
+
~ScopedLogIn() { fake_user_manager_->RemoveUserFromList(account_id_); }
private:
@@ -173,8 +176,6 @@
FakeUserManagerWithLocalState* fake_user_manager_;
signin::IdentityTestEnvironment* identity_test_env_;
const AccountId account_id_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedLogIn);
};
} // namespace
@@ -182,6 +183,10 @@
class ChromeAssistantUtilTest : public testing::Test {
public:
ChromeAssistantUtilTest() = default;
+
+ ChromeAssistantUtilTest(const ChromeAssistantUtilTest&) = delete;
+ ChromeAssistantUtilTest& operator=(const ChromeAssistantUtilTest&) = delete;
+
~ChromeAssistantUtilTest() override = default;
void SetUp() override {
@@ -256,8 +261,6 @@
std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
// Owned by |profile_manager_|
TestingProfile* profile_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeAssistantUtilTest);
};
TEST_F(ChromeAssistantUtilTest, IsAssistantAllowedForProfile_PrimaryUser) {
diff --git a/chrome/browser/ash/attestation/attestation_ca_client.h b/chrome/browser/ash/attestation/attestation_ca_client.h
index aa8deb9..187d8f1 100644
--- a/chrome/browser/ash/attestation/attestation_ca_client.h
+++ b/chrome/browser/ash/attestation/attestation_ca_client.h
@@ -31,6 +31,10 @@
class AttestationCAClient : public ServerProxy {
public:
AttestationCAClient();
+
+ AttestationCAClient(const AttestationCAClient&) = delete;
+ AttestationCAClient& operator=(const AttestationCAClient&) = delete;
+
~AttestationCAClient() override;
// chromeos::attestation::ServerProxy:
@@ -66,8 +70,6 @@
std::list<std::unique_ptr<network::SimpleURLLoader>> url_loaders_;
network::mojom::NetworkContext* network_context_for_testing_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(AttestationCAClient);
};
} // namespace attestation
diff --git a/chrome/browser/ash/attestation/attestation_policy_observer.h b/chrome/browser/ash/attestation/attestation_policy_observer.h
index d22b02ca..5541ab4 100644
--- a/chrome/browser/ash/attestation/attestation_policy_observer.h
+++ b/chrome/browser/ash/attestation/attestation_policy_observer.h
@@ -25,6 +25,10 @@
explicit AttestationPolicyObserver(
MachineCertificateUploader* certificate_uploader);
+ AttestationPolicyObserver(const AttestationPolicyObserver&) = delete;
+ AttestationPolicyObserver& operator=(const AttestationPolicyObserver&) =
+ delete;
+
~AttestationPolicyObserver();
private:
@@ -38,8 +42,6 @@
MachineCertificateUploader* certificate_uploader_;
base::CallbackListSubscription attestation_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(AttestationPolicyObserver);
};
} // namespace attestation
diff --git a/chrome/browser/ash/attestation/enrollment_certificate_uploader_impl.h b/chrome/browser/ash/attestation/enrollment_certificate_uploader_impl.h
index b17d3e0..214f1b0 100644
--- a/chrome/browser/ash/attestation/enrollment_certificate_uploader_impl.h
+++ b/chrome/browser/ash/attestation/enrollment_certificate_uploader_impl.h
@@ -37,6 +37,11 @@
EnrollmentCertificateUploaderImpl(policy::CloudPolicyClient* policy_client,
AttestationFlow* attestation_flow);
+ EnrollmentCertificateUploaderImpl(const EnrollmentCertificateUploaderImpl&) =
+ delete;
+ EnrollmentCertificateUploaderImpl& operator=(
+ const EnrollmentCertificateUploaderImpl&) = delete;
+
~EnrollmentCertificateUploaderImpl() override;
// Sets the retry limit in number of tries; useful in testing.
@@ -105,8 +110,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate the weak pointers before any other members are destroyed.
base::WeakPtrFactory<EnrollmentCertificateUploaderImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EnrollmentCertificateUploaderImpl);
};
} // namespace attestation
diff --git a/chrome/browser/ash/attestation/machine_certificate_uploader_impl.h b/chrome/browser/ash/attestation/machine_certificate_uploader_impl.h
index d098ba4..2ce95968 100644
--- a/chrome/browser/ash/attestation/machine_certificate_uploader_impl.h
+++ b/chrome/browser/ash/attestation/machine_certificate_uploader_impl.h
@@ -35,6 +35,11 @@
MachineCertificateUploaderImpl(policy::CloudPolicyClient* policy_client,
AttestationFlow* attestation_flow);
+ MachineCertificateUploaderImpl(const MachineCertificateUploaderImpl&) =
+ delete;
+ MachineCertificateUploaderImpl& operator=(
+ const MachineCertificateUploaderImpl&) = delete;
+
~MachineCertificateUploaderImpl() override;
// Sets the retry limit in number of tries; useful in testing.
@@ -114,8 +119,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate the weak pointers before any other members are destroyed.
base::WeakPtrFactory<MachineCertificateUploaderImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MachineCertificateUploaderImpl);
};
} // namespace attestation
diff --git a/chrome/browser/ash/attestation/mock_enrollment_certificate_uploader.h b/chrome/browser/ash/attestation/mock_enrollment_certificate_uploader.h
index 2e3225d..ab404e54 100644
--- a/chrome/browser/ash/attestation/mock_enrollment_certificate_uploader.h
+++ b/chrome/browser/ash/attestation/mock_enrollment_certificate_uploader.h
@@ -15,14 +15,17 @@
class MockEnrollmentCertificateUploader : public EnrollmentCertificateUploader {
public:
MockEnrollmentCertificateUploader();
+
+ MockEnrollmentCertificateUploader(const MockEnrollmentCertificateUploader&) =
+ delete;
+ MockEnrollmentCertificateUploader& operator=(
+ const MockEnrollmentCertificateUploader&) = delete;
+
~MockEnrollmentCertificateUploader();
MOCK_METHOD1(ObtainAndUploadCertificate, void(UploadCallback));
MOCK_METHOD2(ObtainAndUploadCertificateWithRsuDeviceId,
void(const std::string&, UploadCallback));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockEnrollmentCertificateUploader);
};
} // namespace attestation
diff --git a/chrome/browser/ash/attestation/mock_machine_certificate_uploader.h b/chrome/browser/ash/attestation/mock_machine_certificate_uploader.h
index 953a900..52b2dd67 100644
--- a/chrome/browser/ash/attestation/mock_machine_certificate_uploader.h
+++ b/chrome/browser/ash/attestation/mock_machine_certificate_uploader.h
@@ -15,14 +15,17 @@
class MockMachineCertificateUploader : public MachineCertificateUploader {
public:
MockMachineCertificateUploader();
+
+ MockMachineCertificateUploader(const MockMachineCertificateUploader&) =
+ delete;
+ MockMachineCertificateUploader& operator=(
+ const MockMachineCertificateUploader&) = delete;
+
~MockMachineCertificateUploader();
MOCK_METHOD1(UploadCertificateIfNeeded, void(UploadCallback));
MOCK_METHOD1(RefreshAndUploadCertificate, void(UploadCallback));
MOCK_METHOD1(WaitForUploadComplete, void(UploadCallback));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockMachineCertificateUploader);
};
} // namespace attestation
diff --git a/chrome/browser/ash/attestation/platform_verification_flow.cc b/chrome/browser/ash/attestation/platform_verification_flow.cc
index 5846cf7..9b049f8 100644
--- a/chrome/browser/ash/attestation/platform_verification_flow.cc
+++ b/chrome/browser/ash/attestation/platform_verification_flow.cc
@@ -74,6 +74,10 @@
class DefaultDelegate : public PlatformVerificationFlow::Delegate {
public:
DefaultDelegate() {}
+
+ DefaultDelegate(const DefaultDelegate&) = delete;
+ DefaultDelegate& operator=(const DefaultDelegate&) = delete;
+
~DefaultDelegate() override {}
bool IsInSupportedMode() override {
@@ -81,9 +85,6 @@
return !command_line->HasSwitch(chromeos::switches::kSystemDevMode) ||
command_line->HasSwitch(chromeos::switches::kAllowRAInDevMode);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DefaultDelegate);
};
PlatformVerificationFlow::ChallengeContext::ChallengeContext(
diff --git a/chrome/browser/ash/attestation/platform_verification_flow_unittest.cc b/chrome/browser/ash/attestation/platform_verification_flow_unittest.cc
index 9d3715a..f10eeb3 100644
--- a/chrome/browser/ash/attestation/platform_verification_flow_unittest.cc
+++ b/chrome/browser/ash/attestation/platform_verification_flow_unittest.cc
@@ -47,6 +47,9 @@
public:
FakeDelegate() : is_in_supported_mode_(true) {}
+ FakeDelegate(const FakeDelegate&) = delete;
+ FakeDelegate& operator=(const FakeDelegate&) = delete;
+
~FakeDelegate() override {}
bool IsInSupportedMode() override { return is_in_supported_mode_; }
@@ -57,8 +60,6 @@
private:
bool is_in_supported_mode_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeDelegate);
};
} // namespace
diff --git a/chrome/browser/ash/authpolicy/authpolicy_credentials_manager.h b/chrome/browser/ash/authpolicy/authpolicy_credentials_manager.h
index cac6399..e7258f54 100644
--- a/chrome/browser/ash/authpolicy/authpolicy_credentials_manager.h
+++ b/chrome/browser/ash/authpolicy/authpolicy_credentials_manager.h
@@ -42,6 +42,11 @@
public chromeos::NetworkStateHandlerObserver {
public:
explicit AuthPolicyCredentialsManager(Profile* profile);
+
+ AuthPolicyCredentialsManager(const AuthPolicyCredentialsManager&) = delete;
+ AuthPolicyCredentialsManager& operator=(const AuthPolicyCredentialsManager&) =
+ delete;
+
~AuthPolicyCredentialsManager() override;
// KeyedService overrides.
@@ -116,7 +121,6 @@
base::CancelableOnceClosure scheduled_get_user_status_call_;
base::WeakPtrFactory<AuthPolicyCredentialsManager> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(AuthPolicyCredentialsManager);
};
// Singleton that owns all AuthPolicyCredentialsManagers and associates them
diff --git a/chrome/browser/ash/authpolicy/authpolicy_credentials_manager_unittest.cc b/chrome/browser/ash/authpolicy/authpolicy_credentials_manager_unittest.cc
index 716730f..5007bd46 100644
--- a/chrome/browser/ash/authpolicy/authpolicy_credentials_manager_unittest.cc
+++ b/chrome/browser/ash/authpolicy/authpolicy_credentials_manager_unittest.cc
@@ -50,6 +50,12 @@
AuthPolicyCredentialsManagerTest()
: user_manager_enabler_(std::make_unique<MockUserManager>()),
local_state_(TestingBrowserProcess::GetGlobal()) {}
+
+ AuthPolicyCredentialsManagerTest(const AuthPolicyCredentialsManagerTest&) =
+ delete;
+ AuthPolicyCredentialsManagerTest& operator=(
+ const AuthPolicyCredentialsManagerTest&) = delete;
+
~AuthPolicyCredentialsManagerTest() override = default;
void SetUp() override {
@@ -136,9 +142,6 @@
std::unique_ptr<NotificationDisplayServiceTester> display_service_;
ScopedTestingLocalState local_state_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AuthPolicyCredentialsManagerTest);
};
// Tests saving display and given name into user manager. No error means no
diff --git a/chrome/browser/ash/authpolicy/authpolicy_helper.h b/chrome/browser/ash/authpolicy/authpolicy_helper.h
index 38b3a53..9ebe100 100644
--- a/chrome/browser/ash/authpolicy/authpolicy_helper.h
+++ b/chrome/browser/ash/authpolicy/authpolicy_helper.h
@@ -28,6 +28,10 @@
base::OnceCallback<void(std::string decrypted_data)>;
AuthPolicyHelper();
+
+ AuthPolicyHelper(const AuthPolicyHelper&) = delete;
+ AuthPolicyHelper& operator=(const AuthPolicyHelper&) = delete;
+
~AuthPolicyHelper();
// Tries to get Kerberos TGT. To get TGT and password statuses one should use
@@ -116,7 +120,6 @@
RefreshPolicyCallback device_policy_callback_;
base::WeakPtrFactory<AuthPolicyHelper> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(AuthPolicyHelper);
};
} // namespace ash
diff --git a/chrome/browser/ash/authpolicy/authpolicy_helper_unittest.cc b/chrome/browser/ash/authpolicy/authpolicy_helper_unittest.cc
index d482065..859b603 100644
--- a/chrome/browser/ash/authpolicy/authpolicy_helper_unittest.cc
+++ b/chrome/browser/ash/authpolicy/authpolicy_helper_unittest.cc
@@ -19,6 +19,10 @@
class MockAuthPolicyClient : public chromeos::FakeAuthPolicyClient {
public:
MockAuthPolicyClient() { SetStarted(true); }
+
+ MockAuthPolicyClient(const MockAuthPolicyClient&) = delete;
+ MockAuthPolicyClient& operator=(const MockAuthPolicyClient&) = delete;
+
~MockAuthPolicyClient() override = default;
void JoinAdDomain(const authpolicy::JoinDomainRequest& request,
@@ -49,8 +53,6 @@
bool join_ad_domain_called_ = false;
bool refresh_device_policy_called_ = false;
std::string dm_token_;
-
- DISALLOW_COPY_AND_ASSIGN(MockAuthPolicyClient);
};
} // namespace
diff --git a/chrome/browser/ash/authpolicy/kerberos_files_handler.h b/chrome/browser/ash/authpolicy/kerberos_files_handler.h
index a903c74a..9a7822e 100644
--- a/chrome/browser/ash/authpolicy/kerberos_files_handler.h
+++ b/chrome/browser/ash/authpolicy/kerberos_files_handler.h
@@ -38,6 +38,10 @@
class KerberosFilesHandler {
public:
explicit KerberosFilesHandler(base::RepeatingClosure get_kerberos_files);
+
+ KerberosFilesHandler(const KerberosFilesHandler&) = delete;
+ KerberosFilesHandler& operator=(const KerberosFilesHandler&) = delete;
+
virtual ~KerberosFilesHandler();
// Writes the Kerberos credentials to disk asynchronously.
@@ -66,7 +70,6 @@
base::OnceClosure files_changed_for_testing_;
base::WeakPtrFactory<KerberosFilesHandler> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(KerberosFilesHandler);
};
} // namespace ash
diff --git a/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc b/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc
index ff474e17..b45ac4ed 100644
--- a/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc
+++ b/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc
@@ -71,6 +71,10 @@
using OnFetchComplete = base::OnceCallback<void(const std::string& response)>;
BackdropFetcher() = default;
+
+ BackdropFetcher(const BackdropFetcher&) = delete;
+ BackdropFetcher& operator=(const BackdropFetcher&) = delete;
+
~BackdropFetcher() = default;
// Starts downloading the proto. |request_body| is a serialized proto and
@@ -138,8 +142,6 @@
// The fetcher request callback.
OnFetchComplete callback_;
-
- DISALLOW_COPY_AND_ASSIGN(BackdropFetcher);
};
CollectionInfoFetcher::CollectionInfoFetcher() {
diff --git a/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.h b/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.h
index 194686d..f3695bf 100644
--- a/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.h
+++ b/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.h
@@ -27,6 +27,10 @@
void(bool success, const std::vector<backdrop::Collection>& collections)>;
CollectionInfoFetcher();
+
+ CollectionInfoFetcher(const CollectionInfoFetcher&) = delete;
+ CollectionInfoFetcher& operator=(const CollectionInfoFetcher&) = delete;
+
~CollectionInfoFetcher();
// Starts the fetcher.
@@ -42,8 +46,6 @@
// The callback upon completion of downloading and deserializing the
// collections info.
OnCollectionsInfoFetched callback_;
-
- DISALLOW_COPY_AND_ASSIGN(CollectionInfoFetcher);
};
// Downloads the wallpaper images info from the Backdrop service.
@@ -55,6 +57,10 @@
const std::vector<backdrop::Image>& images)>;
explicit ImageInfoFetcher(const std::string& collection_id);
+
+ ImageInfoFetcher(const ImageInfoFetcher&) = delete;
+ ImageInfoFetcher& operator=(const ImageInfoFetcher&) = delete;
+
~ImageInfoFetcher();
// Starts the fetcher.
@@ -73,8 +79,6 @@
// The callback upon completion of downloading and deserializing the images
// info.
OnImagesInfoFetched callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ImageInfoFetcher);
};
// Downloads the surprise me image info from the Backdrop service.
@@ -87,6 +91,10 @@
SurpriseMeImageFetcher(const std::string& collection_id,
const std::string& resume_token);
+
+ SurpriseMeImageFetcher(const SurpriseMeImageFetcher&) = delete;
+ SurpriseMeImageFetcher& operator=(const SurpriseMeImageFetcher&) = delete;
+
~SurpriseMeImageFetcher();
// Starts the fetcher.
@@ -109,8 +117,6 @@
// The callback upon completion of downloading and deserializing the surprise
// me image info.
OnSurpriseMeImageFetched callback_;
-
- DISALLOW_COPY_AND_ASSIGN(SurpriseMeImageFetcher);
};
} // namespace backdrop_wallpaper_handlers
diff --git a/chrome/browser/ash/base/file_flusher.cc b/chrome/browser/ash/base/file_flusher.cc
index 23b54b2..dc6034c 100644
--- a/chrome/browser/ash/base/file_flusher.cc
+++ b/chrome/browser/ash/base/file_flusher.cc
@@ -28,6 +28,10 @@
bool recursive,
const FileFlusher::OnFlushCallback& on_flush_callback,
base::OnceClosure callback);
+
+ Job(const Job&) = delete;
+ Job& operator=(const Job&) = delete;
+
~Job() = default;
void Start();
@@ -55,8 +59,6 @@
bool started_ = false;
base::AtomicFlag cancel_flag_;
bool finish_scheduled_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(Job);
};
FileFlusher::Job::Job(const base::WeakPtr<FileFlusher>& flusher,
diff --git a/chrome/browser/ash/base/file_flusher.h b/chrome/browser/ash/base/file_flusher.h
index f1144b9..f7a16fc 100644
--- a/chrome/browser/ash/base/file_flusher.h
+++ b/chrome/browser/ash/base/file_flusher.h
@@ -20,6 +20,10 @@
class FileFlusher {
public:
FileFlusher();
+
+ FileFlusher(const FileFlusher&) = delete;
+ FileFlusher& operator=(const FileFlusher&) = delete;
+
~FileFlusher();
// Flush files under |path|.
@@ -59,8 +63,6 @@
bool paused_for_test_ = false;
base::WeakPtrFactory<FileFlusher> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FileFlusher);
};
} // namespace ash
diff --git a/chrome/browser/ash/base/file_flusher_unittest.cc b/chrome/browser/ash/base/file_flusher_unittest.cc
index c8224aeb..500aa31 100644
--- a/chrome/browser/ash/base/file_flusher_unittest.cc
+++ b/chrome/browser/ash/base/file_flusher_unittest.cc
@@ -37,6 +37,10 @@
class FileFlusherTest : public testing::Test {
public:
FileFlusherTest() {}
+
+ FileFlusherTest(const FileFlusherTest&) = delete;
+ FileFlusherTest& operator=(const FileFlusherTest&) = delete;
+
~FileFlusherTest() override {}
// testing::Test
@@ -82,8 +86,6 @@
content::BrowserTaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
std::map<base::FilePath, int> flush_counts_;
-
- DISALLOW_COPY_AND_ASSIGN(FileFlusherTest);
};
TEST_F(FileFlusherTest, Flush) {
diff --git a/chrome/browser/ash/bluetooth/debug_logs_manager.h b/chrome/browser/ash/bluetooth/debug_logs_manager.h
index 35e9016ae..c7a93f8 100644
--- a/chrome/browser/ash/bluetooth/debug_logs_manager.h
+++ b/chrome/browser/ash/bluetooth/debug_logs_manager.h
@@ -27,6 +27,10 @@
public:
DebugLogsManager(const std::string& primary_user_email,
PrefService* pref_service);
+
+ DebugLogsManager(const DebugLogsManager&) = delete;
+ DebugLogsManager& operator=(const DebugLogsManager&) = delete;
+
~DebugLogsManager() override;
// State for capturing debug Bluetooth logs; logs are only captured when
@@ -64,8 +68,6 @@
mojo::ReceiverSet<mojom::DebugLogsChangeHandler> receivers_;
base::WeakPtrFactory<DebugLogsManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DebugLogsManager);
};
} // namespace bluetooth
diff --git a/chrome/browser/ash/bluetooth/debug_logs_manager_factory.cc b/chrome/browser/ash/bluetooth/debug_logs_manager_factory.cc
index 4c918cbf4..05379f4d 100644
--- a/chrome/browser/ash/bluetooth/debug_logs_manager_factory.cc
+++ b/chrome/browser/ash/bluetooth/debug_logs_manager_factory.cc
@@ -27,13 +27,15 @@
ProfileHelper::Get()->GetUserByProfile(profile)->GetDisplayEmail(),
profile->GetPrefs()) {}
+ DebugLogsManagerService(const DebugLogsManagerService&) = delete;
+ DebugLogsManagerService& operator=(const DebugLogsManagerService&) = delete;
+
~DebugLogsManagerService() override = default;
DebugLogsManager* debug_logs_manager() { return &debug_logs_manager_; }
private:
DebugLogsManager debug_logs_manager_;
- DISALLOW_COPY_AND_ASSIGN(DebugLogsManagerService);
};
} // namespace
diff --git a/chrome/browser/ash/certificate_provider/certificate_provider_service.cc b/chrome/browser/ash/certificate_provider/certificate_provider_service.cc
index 85bad97..4a921d2 100644
--- a/chrome/browser/ash/certificate_provider/certificate_provider_service.cc
+++ b/chrome/browser/ash/certificate_provider/certificate_provider_service.cc
@@ -51,6 +51,10 @@
// CertificateProviderService.
explicit CertificateProviderImpl(
const base::WeakPtr<CertificateProviderService>& service);
+
+ CertificateProviderImpl(const CertificateProviderImpl&) = delete;
+ CertificateProviderImpl& operator=(const CertificateProviderImpl&) = delete;
+
~CertificateProviderImpl() override;
void GetCertificates(
@@ -60,8 +64,6 @@
const base::WeakPtr<CertificateProviderService> service_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(CertificateProviderImpl);
};
// Implements an SSLPrivateKey backed by the signing function exposed by an
@@ -97,6 +99,10 @@
ClientCertIdentity(scoped_refptr<net::X509Certificate> cert,
base::WeakPtr<CertificateProviderService> service)
: net::ClientCertIdentity(std::move(cert)), service_(service) {}
+
+ ClientCertIdentity(const ClientCertIdentity&) = delete;
+ ClientCertIdentity& operator=(const ClientCertIdentity&) = delete;
+
~ClientCertIdentity() override;
void AcquirePrivateKey(
@@ -106,8 +112,6 @@
private:
SEQUENCE_CHECKER(sequence_checker_);
const base::WeakPtr<CertificateProviderService> service_;
-
- DISALLOW_COPY_AND_ASSIGN(ClientCertIdentity);
};
CertificateProviderService::ClientCertIdentity::~ClientCertIdentity() {
diff --git a/chrome/browser/ash/certificate_provider/certificate_provider_service.h b/chrome/browser/ash/certificate_provider/certificate_provider_service.h
index f464500..47a0a053 100644
--- a/chrome/browser/ash/certificate_provider/certificate_provider_service.h
+++ b/chrome/browser/ash/certificate_provider/certificate_provider_service.h
@@ -71,6 +71,10 @@
class Delegate {
public:
Delegate() {}
+
+ Delegate(const Delegate&) = delete;
+ Delegate& operator=(const Delegate&) = delete;
+
virtual ~Delegate() {}
// Returns the ids of the extensions that want to provide certificates and
@@ -92,9 +96,6 @@
uint16_t algorithm,
const scoped_refptr<net::X509Certificate>& certificate,
base::span<const uint8_t> input) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Delegate);
};
class Observer : public base::CheckedObserver {
diff --git a/chrome/browser/ash/certificate_provider/test_certificate_provider_extension.h b/chrome/browser/ash/certificate_provider/test_certificate_provider_extension.h
index f9e5012..cb51e4d 100644
--- a/chrome/browser/ash/certificate_provider/test_certificate_provider_extension.h
+++ b/chrome/browser/ash/certificate_provider/test_certificate_provider_extension.h
@@ -51,6 +51,12 @@
explicit TestCertificateProviderExtension(
content::BrowserContext* browser_context);
+
+ TestCertificateProviderExtension(const TestCertificateProviderExtension&) =
+ delete;
+ TestCertificateProviderExtension& operator=(
+ const TestCertificateProviderExtension&) = delete;
+
~TestCertificateProviderExtension();
// Causes the extension to call chrome.certificateProvider.setCertificates,
@@ -110,8 +116,6 @@
bool should_provide_certificates_ = true;
bool should_fail_sign_digest_requests_ = false;
ExtensionTestMessageListener message_listener_;
-
- DISALLOW_COPY_AND_ASSIGN(TestCertificateProviderExtension);
};
#endif // CHROME_BROWSER_ASH_CERTIFICATE_PROVIDER_TEST_CERTIFICATE_PROVIDER_EXTENSION_H_
diff --git a/chrome/browser/ash/child_accounts/child_policy_observer.h b/chrome/browser/ash/child_accounts/child_policy_observer.h
index 0117b26..2b87246 100644
--- a/chrome/browser/ash/child_accounts/child_policy_observer.h
+++ b/chrome/browser/ash/child_accounts/child_policy_observer.h
@@ -47,6 +47,10 @@
base::OnceCallback<void(Profile*, InitialPolicyRefreshResult)>;
explicit ChildPolicyObserver(Profile* profile);
+
+ ChildPolicyObserver(const ChildPolicyObserver&) = delete;
+ ChildPolicyObserver& operator=(const ChildPolicyObserver&) = delete;
+
~ChildPolicyObserver() override;
// policy::CloudPolicyService::Observer:
@@ -87,8 +91,6 @@
// Profile of the child user, not owned.
Profile* const profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ChildPolicyObserver);
};
} // namespace ash
diff --git a/chrome/browser/ash/child_accounts/event_based_status_reporting_service.h b/chrome/browser/ash/child_accounts/event_based_status_reporting_service.h
index b4a610b49..c6751f54 100644
--- a/chrome/browser/ash/child_accounts/event_based_status_reporting_service.h
+++ b/chrome/browser/ash/child_accounts/event_based_status_reporting_service.h
@@ -55,6 +55,12 @@
"Supervision.StatusReport.Event";
explicit EventBasedStatusReportingService(content::BrowserContext* context);
+
+ EventBasedStatusReportingService(const EventBasedStatusReportingService&) =
+ delete;
+ EventBasedStatusReportingService& operator=(
+ const EventBasedStatusReportingService&) = delete;
+
~EventBasedStatusReportingService() override;
// ArcAppListPrefs::Observer:
@@ -87,8 +93,6 @@
content::BrowserContext* const context_;
bool session_just_started_ = true;
-
- DISALLOW_COPY_AND_ASSIGN(EventBasedStatusReportingService);
};
} // namespace ash
diff --git a/chrome/browser/ash/child_accounts/event_based_status_reporting_service_unittest.cc b/chrome/browser/ash/child_accounts/event_based_status_reporting_service_unittest.cc
index 4e7a2fa..ce2a01d 100644
--- a/chrome/browser/ash/child_accounts/event_based_status_reporting_service_unittest.cc
+++ b/chrome/browser/ash/child_accounts/event_based_status_reporting_service_unittest.cc
@@ -38,6 +38,12 @@
explicit TestingConsumerStatusReportingService(
content::BrowserContext* context)
: ChildStatusReportingService(context) {}
+
+ TestingConsumerStatusReportingService(
+ const TestingConsumerStatusReportingService&) = delete;
+ TestingConsumerStatusReportingService& operator=(
+ const TestingConsumerStatusReportingService&) = delete;
+
~TestingConsumerStatusReportingService() override = default;
bool RequestImmediateStatusReport() override {
@@ -49,22 +55,22 @@
private:
int performed_status_reports_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(TestingConsumerStatusReportingService);
};
class TestingScreenTimeController : public ScreenTimeController {
public:
explicit TestingScreenTimeController(content::BrowserContext* context)
: ScreenTimeController(context) {}
+
+ TestingScreenTimeController(const TestingScreenTimeController&) = delete;
+ TestingScreenTimeController& operator=(const TestingScreenTimeController&) =
+ delete;
+
~TestingScreenTimeController() override = default;
// Override this method so that it doesn't call the StatusUploader instance in
// ConsumerStatusReportingService, which doesn't exist in these tests.
base::TimeDelta GetScreenTimeDuration() override { return base::TimeDelta(); }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestingScreenTimeController);
};
std::unique_ptr<KeyedService> CreateTestingConsumerStatusReportingService(
diff --git a/chrome/browser/ash/child_accounts/parent_access_code/authenticator.h b/chrome/browser/ash/child_accounts/parent_access_code/authenticator.h
index b7a6ac0..86a0115 100644
--- a/chrome/browser/ash/child_accounts/parent_access_code/authenticator.h
+++ b/chrome/browser/ash/child_accounts/parent_access_code/authenticator.h
@@ -43,6 +43,10 @@
base::TimeDelta clock_drift_tolerance);
AccessCodeConfig(AccessCodeConfig&&);
AccessCodeConfig& operator=(AccessCodeConfig&&);
+
+ AccessCodeConfig(const AccessCodeConfig&) = delete;
+ AccessCodeConfig& operator=(const AccessCodeConfig&) = delete;
+
~AccessCodeConfig();
// Secret shared between child and parent devices.
@@ -63,8 +67,6 @@
std::string shared_secret_;
base::TimeDelta code_validity_;
base::TimeDelta clock_drift_tolerance_;
-
- DISALLOW_COPY_AND_ASSIGN(AccessCodeConfig);
};
// Parent access code that can be used to authorize various actions on child
@@ -113,6 +115,10 @@
base::TimeDelta::FromMinutes(1);
explicit Authenticator(AccessCodeConfig config);
+
+ Authenticator(const Authenticator&) = delete;
+ Authenticator& operator=(const Authenticator&) = delete;
+
~Authenticator();
// Generates parent access code from the given |timestamp|. Returns the code
@@ -140,8 +146,6 @@
// Keyed-hash message authentication generator.
crypto::HMAC hmac_{crypto::HMAC::SHA1};
-
- DISALLOW_COPY_AND_ASSIGN(Authenticator);
};
} // namespace parent_access
diff --git a/chrome/browser/ash/child_accounts/parent_access_code/config_source.h b/chrome/browser/ash/child_accounts/parent_access_code/config_source.h
index 4db5572..effcf617 100644
--- a/chrome/browser/ash/child_accounts/parent_access_code/config_source.h
+++ b/chrome/browser/ash/child_accounts/parent_access_code/config_source.h
@@ -34,6 +34,10 @@
AuthenticatorsMap;
ConfigSource();
+
+ ConfigSource(const ConfigSource&) = delete;
+ ConfigSource& operator=(const ConfigSource&) = delete;
+
~ConfigSource();
const AuthenticatorsMap& config_map() const { return config_map_; }
@@ -50,8 +54,6 @@
// Holds the Parent Access Code Authenticators for all children signed in this
// device.
AuthenticatorsMap config_map_;
-
- DISALLOW_COPY_AND_ASSIGN(ConfigSource);
};
} // namespace parent_access
diff --git a/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc
index d4dee22f..a9d1647e 100644
--- a/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc
+++ b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc
@@ -66,6 +66,12 @@
public:
explicit TestParentAccessServiceObserver(const AccountId& account_id)
: account_id_(account_id) {}
+
+ TestParentAccessServiceObserver(const TestParentAccessServiceObserver&) =
+ delete;
+ TestParentAccessServiceObserver& operator=(
+ const TestParentAccessServiceObserver&) = delete;
+
~TestParentAccessServiceObserver() override = default;
void OnAccessCodeValidation(ParentCodeValidationResult result,
@@ -81,8 +87,6 @@
private:
const AccountId account_id_;
-
- DISALLOW_COPY_AND_ASSIGN(TestParentAccessServiceObserver);
};
class ParentAccessServiceTest : public MixinBasedInProcessBrowserTest {
@@ -90,6 +94,10 @@
ParentAccessServiceTest()
: test_observer_(std::make_unique<TestParentAccessServiceObserver>(
logged_in_user_mixin_.GetAccountId())) {}
+
+ ParentAccessServiceTest(const ParentAccessServiceTest&) = delete;
+ ParentAccessServiceTest& operator=(const ParentAccessServiceTest&) = delete;
+
~ParentAccessServiceTest() override = default;
void SetUpOnMainThread() override {
@@ -151,9 +159,6 @@
absl::nullopt /*account_id*/,
true /*include_initial_user*/};
std::unique_ptr<TestParentAccessServiceObserver> test_observer_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ParentAccessServiceTest);
};
IN_PROC_BROWSER_TEST_F(ParentAccessServiceTest, NoConfigAvailable) {
diff --git a/chrome/browser/ash/child_accounts/screen_time_controller.h b/chrome/browser/ash/child_accounts/screen_time_controller.h
index 6042aa0d..5ff9a120 100644
--- a/chrome/browser/ash/child_accounts/screen_time_controller.h
+++ b/chrome/browser/ash/child_accounts/screen_time_controller.h
@@ -62,6 +62,10 @@
static void RegisterProfilePrefs(PrefRegistrySimple* registry);
explicit ScreenTimeController(content::BrowserContext* context);
+
+ ScreenTimeController(const ScreenTimeController&) = delete;
+ ScreenTimeController& operator=(const ScreenTimeController&) = delete;
+
~ScreenTimeController() override;
// Returns the child's screen time duration. This is how long the child has
@@ -171,8 +175,6 @@
TimeLimitNotifier time_limit_notifier_;
PrefChangeRegistrar pref_change_registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(ScreenTimeController);
};
} // namespace ash
diff --git a/chrome/browser/ash/child_accounts/screen_time_controller_browsertest.cc b/chrome/browser/ash/child_accounts/screen_time_controller_browsertest.cc
index 591605b1..063a7248 100644
--- a/chrome/browser/ash/child_accounts/screen_time_controller_browsertest.cc
+++ b/chrome/browser/ash/child_accounts/screen_time_controller_browsertest.cc
@@ -41,6 +41,12 @@
class TestScreenTimeControllerObserver : public ScreenTimeController::Observer {
public:
TestScreenTimeControllerObserver() = default;
+
+ TestScreenTimeControllerObserver(const TestScreenTimeControllerObserver&) =
+ delete;
+ TestScreenTimeControllerObserver& operator=(
+ const TestScreenTimeControllerObserver&) = delete;
+
~TestScreenTimeControllerObserver() override = default;
int usage_time_limit_warnings() const { return usage_time_limit_warnings_; }
@@ -49,8 +55,6 @@
void UsageTimeLimitWarning() override { usage_time_limit_warnings_++; }
int usage_time_limit_warnings_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(TestScreenTimeControllerObserver);
};
} // namespace
@@ -61,6 +65,9 @@
public:
ScreenTimeControllerTest() = default;
+ ScreenTimeControllerTest(const ScreenTimeControllerTest&) = delete;
+ ScreenTimeControllerTest& operator=(const ScreenTimeControllerTest&) = delete;
+
~ScreenTimeControllerTest() override = default;
// MixinBasedInProcessBrowserTest:
@@ -144,8 +151,6 @@
true /*should_launch_browser*/,
absl::nullopt /*account_id*/,
false /*include_initial_user*/};
-
- DISALLOW_COPY_AND_ASSIGN(ScreenTimeControllerTest);
};
// Tests a simple lock override.
diff --git a/chrome/browser/ash/child_accounts/time_limit_notifier.h b/chrome/browser/ash/child_accounts/time_limit_notifier.h
index 66682fb..1d6e0e5b 100644
--- a/chrome/browser/ash/child_accounts/time_limit_notifier.h
+++ b/chrome/browser/ash/child_accounts/time_limit_notifier.h
@@ -28,6 +28,10 @@
enum class LimitType { kScreenTime, kBedTime, kOverride };
explicit TimeLimitNotifier(content::BrowserContext* context);
+
+ TimeLimitNotifier(const TimeLimitNotifier&) = delete;
+ TimeLimitNotifier& operator=(const TimeLimitNotifier&) = delete;
+
~TimeLimitNotifier();
// Schedules warning and/or exit notifications based on the time remaining.
@@ -53,8 +57,6 @@
// Called to show warning and exit notifications.
base::OneShotTimer warning_notification_timer_;
base::OneShotTimer exit_notification_timer_;
-
- DISALLOW_COPY_AND_ASSIGN(TimeLimitNotifier);
};
} // namespace ash
diff --git a/chrome/browser/ash/child_accounts/time_limit_notifier_unittest.cc b/chrome/browser/ash/child_accounts/time_limit_notifier_unittest.cc
index e574da2..8884c32f 100644
--- a/chrome/browser/ash/child_accounts/time_limit_notifier_unittest.cc
+++ b/chrome/browser/ash/child_accounts/time_limit_notifier_unittest.cc
@@ -21,6 +21,10 @@
: task_runner_(base::MakeRefCounted<base::TestMockTimeTaskRunner>()),
notification_tester_(&profile_),
notifier_(&profile_, task_runner_) {}
+
+ TimeLimitNotifierTest(const TimeLimitNotifierTest&) = delete;
+ TimeLimitNotifierTest& operator=(const TimeLimitNotifierTest&) = delete;
+
~TimeLimitNotifierTest() override = default;
protected:
@@ -57,9 +61,6 @@
TestingProfile profile_;
NotificationDisplayServiceTester notification_tester_;
TimeLimitNotifier notifier_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TimeLimitNotifierTest);
};
TEST_F(TimeLimitNotifierTest, ShowLockNotifications) {
diff --git a/chrome/browser/ash/child_accounts/time_limit_override.h b/chrome/browser/ash/child_accounts/time_limit_override.h
index c29ac22..f411df0 100644
--- a/chrome/browser/ash/child_accounts/time_limit_override.h
+++ b/chrome/browser/ash/child_accounts/time_limit_override.h
@@ -48,6 +48,10 @@
TimeLimitOverride(Action action,
base::Time created_at,
absl::optional<base::TimeDelta> duration);
+
+ TimeLimitOverride(const TimeLimitOverride&) = delete;
+ TimeLimitOverride& operator=(const TimeLimitOverride&) = delete;
+
~TimeLimitOverride();
TimeLimitOverride(TimeLimitOverride&&);
TimeLimitOverride& operator=(TimeLimitOverride&&);
@@ -75,8 +79,6 @@
Action action_;
base::Time created_at_;
absl::optional<base::TimeDelta> duration_;
-
- DISALLOW_COPY_AND_ASSIGN(TimeLimitOverride);
};
} // namespace usage_time_limit
diff --git a/chrome/browser/ash/child_accounts/usage_time_limit_processor.h b/chrome/browser/ash/child_accounts/usage_time_limit_processor.h
index e55d3fb..1286218 100644
--- a/chrome/browser/ash/child_accounts/usage_time_limit_processor.h
+++ b/chrome/browser/ash/child_accounts/usage_time_limit_processor.h
@@ -68,6 +68,10 @@
class TimeWindowLimit {
public:
explicit TimeWindowLimit(const base::Value& window_limit_dict);
+
+ TimeWindowLimit(const TimeWindowLimit&) = delete;
+ TimeWindowLimit& operator=(const TimeWindowLimit&) = delete;
+
~TimeWindowLimit();
TimeWindowLimit(TimeWindowLimit&&);
TimeWindowLimit& operator=(TimeWindowLimit&&);
@@ -75,9 +79,6 @@
bool operator!=(const TimeWindowLimit& rhs) const { return !(*this == rhs); }
std::unordered_map<Weekday, absl::optional<TimeWindowLimitEntry>> entries;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TimeWindowLimit);
};
struct TimeUsageLimitEntry {
@@ -94,6 +95,10 @@
class TimeUsageLimit {
public:
explicit TimeUsageLimit(const base::Value& usage_limit_dict);
+
+ TimeUsageLimit(const TimeUsageLimit&) = delete;
+ TimeUsageLimit& operator=(const TimeUsageLimit&) = delete;
+
~TimeUsageLimit();
TimeUsageLimit(TimeUsageLimit&&);
TimeUsageLimit& operator=(TimeUsageLimit&&);
@@ -102,9 +107,6 @@
std::unordered_map<Weekday, absl::optional<TimeUsageLimitEntry>> entries;
base::TimeDelta resets_at;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TimeUsageLimit);
};
} // namespace internal
diff --git a/chrome/browser/ash/child_accounts/usage_time_state_notifier_unittest.cc b/chrome/browser/ash/child_accounts/usage_time_state_notifier_unittest.cc
index a51e4c37..6d048f9 100644
--- a/chrome/browser/ash/child_accounts/usage_time_state_notifier_unittest.cc
+++ b/chrome/browser/ash/child_accounts/usage_time_state_notifier_unittest.cc
@@ -21,6 +21,12 @@
: public UsageTimeStateNotifier::Observer {
public:
TestUsageTimeStateNotifierObserver() = default;
+
+ TestUsageTimeStateNotifierObserver(
+ const TestUsageTimeStateNotifierObserver&) = delete;
+ TestUsageTimeStateNotifierObserver& operator=(
+ const TestUsageTimeStateNotifierObserver&) = delete;
+
~TestUsageTimeStateNotifierObserver() override = default;
const std::vector<UsageTimeStateNotifier::UsageTimeState>& events() const {
@@ -34,8 +40,6 @@
}
std::vector<UsageTimeStateNotifier::UsageTimeState> usage_time_state_changes_;
-
- DISALLOW_COPY_AND_ASSIGN(TestUsageTimeStateNotifierObserver);
};
} // namespace
diff --git a/chrome/browser/ash/crostini/ansible/ansible_management_service.h b/chrome/browser/ash/crostini/ansible/ansible_management_service.h
index cb5d0ab..cba67623 100644
--- a/chrome/browser/ash/crostini/ansible/ansible_management_service.h
+++ b/chrome/browser/ash/crostini/ansible/ansible_management_service.h
@@ -34,6 +34,10 @@
static AnsibleManagementService* GetForProfile(Profile* profile);
explicit AnsibleManagementService(Profile* profile);
+
+ AnsibleManagementService(const AnsibleManagementService&) = delete;
+ AnsibleManagementService& operator=(const AnsibleManagementService&) = delete;
+
~AnsibleManagementService() override;
// |callback| is called once default Crostini container configuration is
@@ -75,8 +79,6 @@
base::OnceCallback<void(bool success)> configuration_finished_callback_;
std::string playbook_;
base::WeakPtrFactory<AnsibleManagementService> weak_ptr_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(AnsibleManagementService);
};
} // namespace crostini
diff --git a/chrome/browser/ash/crostini/ansible/ansible_management_service_unittest.cc b/chrome/browser/ash/crostini/ansible/ansible_management_service_unittest.cc
index aab7483..5cc07f68 100644
--- a/chrome/browser/ash/crostini/ansible/ansible_management_service_unittest.cc
+++ b/chrome/browser/ash/crostini/ansible/ansible_management_service_unittest.cc
@@ -37,6 +37,10 @@
SetUpViewsEnvironmentForTesting();
}
+ AnsibleManagementServiceTest(const AnsibleManagementServiceTest&) = delete;
+ AnsibleManagementServiceTest& operator=(const AnsibleManagementServiceTest&) =
+ delete;
+
~AnsibleManagementServiceTest() override {
crostini::CloseCrostiniAnsibleSoftwareConfigViewForTesting();
// Wait for view triggered to be closed.
@@ -79,8 +83,6 @@
std::unique_ptr<TestingProfile> profile_;
CrostiniManager* crostini_manager_;
AnsibleManagementService* ansible_management_service_;
-
- DISALLOW_COPY_AND_ASSIGN(AnsibleManagementServiceTest);
};
TEST_F(AnsibleManagementServiceTest, ConfigureDefaultContainerSuccess) {
diff --git a/chrome/browser/ash/crostini/crostini_export_import.h b/chrome/browser/ash/crostini/crostini_export_import.h
index e56eabd..8a1cc79 100644
--- a/chrome/browser/ash/crostini/crostini_export_import.h
+++ b/chrome/browser/ash/crostini/crostini_export_import.h
@@ -89,6 +89,10 @@
static CrostiniExportImport* GetForProfile(Profile* profile);
explicit CrostiniExportImport(Profile* profile);
+
+ CrostiniExportImport(const CrostiniExportImport&) = delete;
+ CrostiniExportImport& operator=(const CrostiniExportImport&) = delete;
+
~CrostiniExportImport() override;
void AddObserver(Observer* observer) { observers_.AddObserver(observer); }
@@ -250,8 +254,6 @@
base::ObserverList<Observer> observers_;
// weak_ptr_factory_ should always be last member.
base::WeakPtrFactory<CrostiniExportImport> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniExportImport);
};
} // namespace crostini
diff --git a/chrome/browser/ash/crostini/crostini_export_import_notification_controller.h b/chrome/browser/ash/crostini/crostini_export_import_notification_controller.h
index 9f54a7f..01f5cfc 100644
--- a/chrome/browser/ash/crostini/crostini_export_import_notification_controller.h
+++ b/chrome/browser/ash/crostini/crostini_export_import_notification_controller.h
@@ -57,6 +57,11 @@
base::FilePath path,
ContainerId container_id);
+ CrostiniExportImportNotificationController(
+ const CrostiniExportImportNotificationController&) = delete;
+ CrostiniExportImportNotificationController& operator=(
+ const CrostiniExportImportNotificationController&) = delete;
+
~CrostiniExportImportNotificationController() override;
// Getters for testing.
@@ -99,8 +104,6 @@
bool hidden_ = false;
base::WeakPtrFactory<CrostiniExportImportNotificationController>
weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniExportImportNotificationController);
};
} // namespace crostini
diff --git a/chrome/browser/ash/crostini/crostini_export_import_unittest.cc b/chrome/browser/ash/crostini/crostini_export_import_unittest.cc
index c661d36..8255109 100644
--- a/chrome/browser/ash/crostini/crostini_export_import_unittest.cc
+++ b/chrome/browser/ash/crostini/crostini_export_import_unittest.cc
@@ -130,6 +130,9 @@
fake_cicerone_client_ = chromeos::FakeCiceroneClient::Get();
}
+ CrostiniExportImportTest(const CrostiniExportImportTest&) = delete;
+ CrostiniExportImportTest& operator=(const CrostiniExportImportTest&) = delete;
+
~CrostiniExportImportTest() override {
chromeos::SeneschalClient::Shutdown();
chromeos::ConciergeClient::Shutdown();
@@ -192,9 +195,6 @@
base::FilePath tarball_;
content::BrowserTaskEnvironment task_environment_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CrostiniExportImportTest);
};
TEST_F(CrostiniExportImportTest, TestNotAllowed) {
diff --git a/chrome/browser/ash/crostini/crostini_force_close_watcher.h b/chrome/browser/ash/crostini/crostini_force_close_watcher.h
index 9307a8f2..45235a8 100644
--- a/chrome/browser/ash/crostini/crostini_force_close_watcher.h
+++ b/chrome/browser/ash/crostini/crostini_force_close_watcher.h
@@ -104,6 +104,11 @@
ShellSurfaceForceCloseDelegate(exo::ShellSurfaceBase* shell_surface,
std::string app_name);
+ ShellSurfaceForceCloseDelegate(const ShellSurfaceForceCloseDelegate&) =
+ delete;
+ ShellSurfaceForceCloseDelegate& operator=(
+ const ShellSurfaceForceCloseDelegate&) = delete;
+
~ShellSurfaceForceCloseDelegate() override;
// Callback for the "Force close" button in the dialog.
@@ -133,8 +138,6 @@
views::Widget* current_dialog_ = nullptr;
base::WeakPtrFactory<ShellSurfaceForceCloseDelegate> weak_ptr_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(ShellSurfaceForceCloseDelegate);
};
} // namespace crostini
diff --git a/chrome/browser/ash/crostini/crostini_installer.h b/chrome/browser/ash/crostini/crostini_installer.h
index aa79334..ba94aa9 100644
--- a/chrome/browser/ash/crostini/crostini_installer.h
+++ b/chrome/browser/ash/crostini/crostini_installer.h
@@ -78,6 +78,10 @@
static CrostiniInstaller* GetForProfile(Profile* profile);
explicit CrostiniInstaller(Profile* profile);
+
+ CrostiniInstaller(const CrostiniInstaller&) = delete;
+ CrostiniInstaller& operator=(const CrostiniInstaller&) = delete;
+
~CrostiniInstaller() override;
void Shutdown() override;
@@ -166,8 +170,6 @@
ansible_management_service_observation_{this};
base::WeakPtrFactory<CrostiniInstaller> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniInstaller);
};
} // namespace crostini
diff --git a/chrome/browser/ash/crostini/crostini_low_disk_notification.h b/chrome/browser/ash/crostini/crostini_low_disk_notification.h
index 4aa2aab..10a314d 100644
--- a/chrome/browser/ash/crostini/crostini_low_disk_notification.h
+++ b/chrome/browser/ash/crostini/crostini_low_disk_notification.h
@@ -32,6 +32,10 @@
// Registers this class as a Cicerone Observer.
CrostiniLowDiskNotification();
+ CrostiniLowDiskNotification(const CrostiniLowDiskNotification&) = delete;
+ CrostiniLowDiskNotification& operator=(const CrostiniLowDiskNotification&) =
+ delete;
+
// Unregisters from observing events.
~CrostiniLowDiskNotification() override;
@@ -68,8 +72,6 @@
THREAD_CHECKER(thread_checker_);
base::WeakPtrFactory<CrostiniLowDiskNotification> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniLowDiskNotification);
};
} // namespace crostini
diff --git a/chrome/browser/ash/crostini/crostini_manager.h b/chrome/browser/ash/crostini/crostini_manager.h
index e1209f0..2a6747c 100644
--- a/chrome/browser/ash/crostini/crostini_manager.h
+++ b/chrome/browser/ash/crostini/crostini_manager.h
@@ -213,6 +213,10 @@
static CrostiniManager* GetForProfile(Profile* profile);
explicit CrostiniManager(Profile* profile);
+
+ CrostiniManager(const CrostiniManager&) = delete;
+ CrostiniManager& operator=(const CrostiniManager&) = delete;
+
~CrostiniManager() override;
base::WeakPtr<CrostiniManager> GetWeakPtr();
@@ -933,8 +937,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate its weak pointers before any other members are destroyed.
base::WeakPtrFactory<CrostiniManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniManager);
};
} // namespace crostini
diff --git a/chrome/browser/ash/crostini/crostini_manager_unittest.cc b/chrome/browser/ash/crostini/crostini_manager_unittest.cc
index 2b0d13b..5ece46c7 100644
--- a/chrome/browser/ash/crostini/crostini_manager_unittest.cc
+++ b/chrome/browser/ash/crostini/crostini_manager_unittest.cc
@@ -202,6 +202,9 @@
chromeos::DBusThreadManager::Get()->GetAnomalyDetectorClient());
}
+ CrostiniManagerTest(const CrostiniManagerTest&) = delete;
+ CrostiniManagerTest& operator=(const CrostiniManagerTest&) = delete;
+
~CrostiniManagerTest() override {
chromeos::SeneschalClient::Shutdown();
chromeos::ConciergeClient::Shutdown();
@@ -291,8 +294,6 @@
std::unique_ptr<ScopedTestingLocalState> local_state_;
scoped_refptr<component_updater::FakeCrOSComponentManager> component_manager_;
BrowserProcessPlatformPartTestApi browser_part_;
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniManagerTest);
};
TEST_F(CrostiniManagerTest, CreateDiskImageEmptyNameError) {
diff --git a/chrome/browser/ash/crostini/crostini_package_notification.h b/chrome/browser/ash/crostini/crostini_package_notification.h
index 1842c5c..e74d200 100644
--- a/chrome/browser/ash/crostini/crostini_package_notification.h
+++ b/chrome/browser/ash/crostini/crostini_package_notification.h
@@ -41,6 +41,11 @@
const std::u16string& app_name,
const std::string& notification_id,
CrostiniPackageService* installer_service);
+
+ CrostiniPackageNotification(const CrostiniPackageNotification&) = delete;
+ CrostiniPackageNotification& operator=(const CrostiniPackageNotification&) =
+ delete;
+
~CrostiniPackageNotification() override;
void UpdateProgress(PackageOperationStatus status,
@@ -127,8 +132,6 @@
int app_count_ = 0;
base::WeakPtrFactory<CrostiniPackageNotification> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniPackageNotification);
};
} // namespace crostini
diff --git a/chrome/browser/ash/crostini/crostini_package_service.h b/chrome/browser/ash/crostini/crostini_package_service.h
index 96ce711..2f1f1a3 100644
--- a/chrome/browser/ash/crostini/crostini_package_service.h
+++ b/chrome/browser/ash/crostini/crostini_package_service.h
@@ -36,6 +36,10 @@
static CrostiniPackageService* GetForProfile(Profile* profile);
explicit CrostiniPackageService(Profile* profile);
+
+ CrostiniPackageService(const CrostiniPackageService&) = delete;
+ CrostiniPackageService& operator=(const CrostiniPackageService&) = delete;
+
~CrostiniPackageService() override;
// For testing: Set a callback that will be called each time a notification
@@ -195,8 +199,6 @@
int next_notification_id_ = 0;
base::WeakPtrFactory<CrostiniPackageService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniPackageService);
};
} // namespace crostini
diff --git a/chrome/browser/ash/crostini/crostini_port_forwarder.h b/chrome/browser/ash/crostini/crostini_port_forwarder.h
index 73cbb2a..ea58c5d6 100644
--- a/chrome/browser/ash/crostini/crostini_port_forwarder.h
+++ b/chrome/browser/ash/crostini/crostini_port_forwarder.h
@@ -114,6 +114,10 @@
static CrostiniPortForwarder* GetForProfile(Profile* profile);
explicit CrostiniPortForwarder(Profile* profile);
+
+ CrostiniPortForwarder(const CrostiniPortForwarder&) = delete;
+ CrostiniPortForwarder& operator=(const CrostiniPortForwarder&) = delete;
+
~CrostiniPortForwarder() override;
private:
@@ -157,8 +161,6 @@
base::WeakPtrFactory<CrostiniPortForwarder> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(CrostiniPortForwarder);
-
}; // class
} // namespace crostini
diff --git a/chrome/browser/ash/crostini/crostini_port_forwarder_unittest.cc b/chrome/browser/ash/crostini/crostini_port_forwarder_unittest.cc
index 618ba689..2b41bcc3 100644
--- a/chrome/browser/ash/crostini/crostini_port_forwarder_unittest.cc
+++ b/chrome/browser/ash/crostini/crostini_port_forwarder_unittest.cc
@@ -36,6 +36,10 @@
other_container_id_(ContainerId("other", "other")),
inactive_container_id_(ContainerId("inactive", "inactive")) {}
+ CrostiniPortForwarderTest(const CrostiniPortForwarderTest&) = delete;
+ CrostiniPortForwarderTest& operator=(const CrostiniPortForwarderTest&) =
+ delete;
+
~CrostiniPortForwarderTest() override {}
void SetUp() override {
@@ -196,9 +200,6 @@
std::unique_ptr<TestingProfile> profile_;
std::unique_ptr<CrostiniPortForwarder> crostini_port_forwarder_;
content::BrowserTaskEnvironment task_environment_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CrostiniPortForwarderTest);
};
TEST_F(CrostiniPortForwarderTest, AddPort) {
diff --git a/chrome/browser/ash/crostini/crostini_sshfs.h b/chrome/browser/ash/crostini/crostini_sshfs.h
index 503087b..aba9e3b 100644
--- a/chrome/browser/ash/crostini/crostini_sshfs.h
+++ b/chrome/browser/ash/crostini/crostini_sshfs.h
@@ -22,6 +22,10 @@
ContainerShutdownObserver {
public:
explicit CrostiniSshfs(Profile* profile);
+
+ CrostiniSshfs(const CrostiniSshfs&) = delete;
+ CrostiniSshfs& operator=(const CrostiniSshfs&) = delete;
+
~CrostiniSshfs() override;
using MountCrostiniFilesCallback = base::OnceCallback<void(bool succeeded)>;
@@ -125,8 +129,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate its weak pointers before any other members are destroyed.
base::WeakPtrFactory<CrostiniSshfs> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniSshfs);
};
} // namespace crostini
diff --git a/chrome/browser/ash/crostini/crostini_sshfs_unittest.cc b/chrome/browser/ash/crostini/crostini_sshfs_unittest.cc
index 75b478a..3374fdc0f 100644
--- a/chrome/browser/ash/crostini/crostini_sshfs_unittest.cc
+++ b/chrome/browser/ash/crostini/crostini_sshfs_unittest.cc
@@ -96,6 +96,9 @@
fake_concierge_client_ = chromeos::FakeConciergeClient::Get();
}
+ CrostiniSshfsHelperTest(const CrostiniSshfsHelperTest&) = delete;
+ CrostiniSshfsHelperTest& operator=(const CrostiniSshfsHelperTest&) = delete;
+
~CrostiniSshfsHelperTest() override {
storage::ExternalMountPoints::GetSystemInstance()->RevokeFileSystem(
kMountName);
@@ -149,8 +152,6 @@
std::unique_ptr<CrostiniSshfs> crostini_sshfs_;
CrostiniManager* crostini_manager_;
base::HistogramTester histogram_tester{};
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniSshfsHelperTest);
};
TEST_F(CrostiniSshfsHelperTest, MountDiskMountsDisk) {
diff --git a/chrome/browser/ash/crostini/crostini_unsupported_action_notifier.h b/chrome/browser/ash/crostini/crostini_unsupported_action_notifier.h
index 64be8cc..0363da8 100644
--- a/chrome/browser/ash/crostini/crostini_unsupported_action_notifier.h
+++ b/chrome/browser/ash/crostini/crostini_unsupported_action_notifier.h
@@ -77,6 +77,12 @@
CrostiniUnsupportedActionNotifier();
explicit CrostiniUnsupportedActionNotifier(
std::unique_ptr<Delegate> delegate);
+
+ CrostiniUnsupportedActionNotifier(const CrostiniUnsupportedActionNotifier&) =
+ delete;
+ CrostiniUnsupportedActionNotifier& operator=(
+ const CrostiniUnsupportedActionNotifier&) = delete;
+
~CrostiniUnsupportedActionNotifier() override;
// ash::TabletModeObserver:
@@ -115,8 +121,6 @@
std::unique_ptr<Delegate> delegate_;
bool virtual_keyboard_unsupported_message_shown_ = false;
bool ime_unsupported_message_shown_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniUnsupportedActionNotifier);
};
} // namespace crostini
diff --git a/chrome/browser/ash/crostini/crostini_upgrade_available_notification_unittest.cc b/chrome/browser/ash/crostini/crostini_upgrade_available_notification_unittest.cc
index b0288d0..cd23916d1 100644
--- a/chrome/browser/ash/crostini/crostini_upgrade_available_notification_unittest.cc
+++ b/chrome/browser/ash/crostini/crostini_upgrade_available_notification_unittest.cc
@@ -43,6 +43,11 @@
Browser::TYPE_NORMAL,
content::BrowserTaskEnvironment::REAL_IO_THREAD) {}
+ CrostiniUpgradeAvailableNotificationTest(
+ const CrostiniUpgradeAvailableNotificationTest&) = delete;
+ CrostiniUpgradeAvailableNotificationTest& operator=(
+ const CrostiniUpgradeAvailableNotificationTest&) = delete;
+
~CrostiniUpgradeAvailableNotificationTest() override {}
void SetUp() override {
@@ -125,8 +130,6 @@
private:
std::unique_ptr<NotificationDisplayServiceTester> display_service_;
session_manager::SessionManager session_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniUpgradeAvailableNotificationTest);
};
TEST_F(CrostiniUpgradeAvailableNotificationTest, ShowsWhenNotified) {
diff --git a/chrome/browser/ash/crostini/crosvm_metrics.h b/chrome/browser/ash/crostini/crosvm_metrics.h
index cc0394b2..a5f25c7 100644
--- a/chrome/browser/ash/crostini/crosvm_metrics.h
+++ b/chrome/browser/ash/crostini/crosvm_metrics.h
@@ -21,6 +21,10 @@
class CrosvmMetrics {
public:
CrosvmMetrics();
+
+ CrosvmMetrics(const CrosvmMetrics&) = delete;
+ CrosvmMetrics& operator=(const CrosvmMetrics&) = delete;
+
~CrosvmMetrics();
// Start taking snapshot of crosvm process resource usage.
@@ -63,8 +67,6 @@
base::FilePath slash_proc_ = base::FilePath("/proc");
base::WeakPtrFactory<CrosvmMetrics> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CrosvmMetrics);
};
} // namespace crostini
diff --git a/chrome/browser/ash/crostini/crosvm_process_list_unittest.cc b/chrome/browser/ash/crostini/crosvm_process_list_unittest.cc
index 3ba53510..cc0e5d7 100644
--- a/chrome/browser/ash/crostini/crosvm_process_list_unittest.cc
+++ b/chrome/browser/ash/crostini/crosvm_process_list_unittest.cc
@@ -21,6 +21,10 @@
slash_proc_ = temp_dir_.GetPath().Append("proc");
CHECK(base::CreateDirectory(slash_proc_));
}
+
+ CrosvmProcessListTest(const CrosvmProcessListTest&) = delete;
+ CrosvmProcessListTest& operator=(const CrosvmProcessListTest&) = delete;
+
~CrosvmProcessListTest() override = default;
// Create a directory |dir_name| under /proc and write |contents| to file
@@ -40,8 +44,6 @@
private:
base::ScopedTempDir temp_dir_;
-
- DISALLOW_COPY_AND_ASSIGN(CrosvmProcessListTest);
};
TEST_F(CrosvmProcessListTest, ConciergeIsTheOnlyCrosvmProcess) {
diff --git a/chrome/browser/ash/crostini/throttle/crostini_active_window_throttle_observer.h b/chrome/browser/ash/crostini/throttle/crostini_active_window_throttle_observer.h
index f81965f..b295f2ee 100644
--- a/chrome/browser/ash/crostini/throttle/crostini_active_window_throttle_observer.h
+++ b/chrome/browser/ash/crostini/throttle/crostini_active_window_throttle_observer.h
@@ -16,15 +16,18 @@
: public chromeos::WindowThrottleObserverBase {
public:
CrostiniActiveWindowThrottleObserver();
+
+ CrostiniActiveWindowThrottleObserver(
+ const CrostiniActiveWindowThrottleObserver&) = delete;
+ CrostiniActiveWindowThrottleObserver& operator=(
+ const CrostiniActiveWindowThrottleObserver&) = delete;
+
~CrostiniActiveWindowThrottleObserver() override = default;
// WindowThrottleObserverBase:
bool ProcessWindowActivation(ActivationReason reason,
aura::Window* gained_active,
aura::Window* lost_active) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CrostiniActiveWindowThrottleObserver);
};
} // namespace crostini
diff --git a/chrome/browser/ash/crostini/throttle/crostini_throttle.cc b/chrome/browser/ash/crostini/throttle/crostini_throttle.cc
index cdb6f10..24373e8 100644
--- a/chrome/browser/ash/crostini/throttle/crostini_throttle.cc
+++ b/chrome/browser/ash/crostini/throttle/crostini_throttle.cc
@@ -20,6 +20,10 @@
public:
explicit DefaultDelegateImpl(content::BrowserContext* context)
: context_(context) {}
+
+ DefaultDelegateImpl(const DefaultDelegateImpl&) = delete;
+ DefaultDelegateImpl& operator=(const DefaultDelegateImpl&) = delete;
+
~DefaultDelegateImpl() override = default;
void SetCpuRestriction(bool do_restrict) override {
@@ -29,8 +33,6 @@
private:
content::BrowserContext* context_;
-
- DISALLOW_COPY_AND_ASSIGN(DefaultDelegateImpl);
};
class CrostiniThrottleFactory : public BrowserContextKeyedServiceFactory {
diff --git a/chrome/browser/ash/crostini/throttle/crostini_throttle.h b/chrome/browser/ash/crostini/throttle/crostini_throttle.h
index 3ec0ed8..4f452c5 100644
--- a/chrome/browser/ash/crostini/throttle/crostini_throttle.h
+++ b/chrome/browser/ash/crostini/throttle/crostini_throttle.h
@@ -26,12 +26,13 @@
class Delegate {
public:
Delegate() = default;
+
+ Delegate(const Delegate&) = delete;
+ Delegate& operator=(const Delegate&) = delete;
+
virtual ~Delegate() = default;
virtual void SetCpuRestriction(bool) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Delegate);
};
// Returns singleton instance for the given BrowserContext, or nullptr if
@@ -40,6 +41,10 @@
content::BrowserContext* context);
explicit CrostiniThrottle(content::BrowserContext* context);
+
+ CrostiniThrottle(const CrostiniThrottle&) = delete;
+ CrostiniThrottle& operator=(const CrostiniThrottle&) = delete;
+
~CrostiniThrottle() override;
// KeyedService:
@@ -57,8 +62,6 @@
base::TimeDelta delta) override {}
std::unique_ptr<Delegate> delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniThrottle);
};
} // namespace crostini
diff --git a/chrome/browser/ash/crostini/throttle/crostini_throttle_unittest.cc b/chrome/browser/ash/crostini/throttle/crostini_throttle_unittest.cc
index 011ee97..bb75341b 100644
--- a/chrome/browser/ash/crostini/throttle/crostini_throttle_unittest.cc
+++ b/chrome/browser/ash/crostini/throttle/crostini_throttle_unittest.cc
@@ -38,6 +38,10 @@
class TestDelegateImpl : public CrostiniThrottle::Delegate {
public:
explicit TestDelegateImpl(CrostiniThrottleTest* test) : test_(test) {}
+
+ TestDelegateImpl(const TestDelegateImpl&) = delete;
+ TestDelegateImpl& operator=(const TestDelegateImpl&) = delete;
+
~TestDelegateImpl() override = default;
void SetCpuRestriction(bool restrict) override {
@@ -48,7 +52,6 @@
}
CrostiniThrottleTest* test_;
- DISALLOW_COPY_AND_ASSIGN(TestDelegateImpl);
};
content::BrowserTaskEnvironment task_environment_;
diff --git a/chrome/browser/ash/customization/customization_document.h b/chrome/browser/ash/customization/customization_document.h
index 4d8e7526..560f478 100644
--- a/chrome/browser/ash/customization/customization_document.h
+++ b/chrome/browser/ash/customization/customization_document.h
@@ -59,6 +59,9 @@
// Base class for OEM customization document classes.
class CustomizationDocument {
public:
+ CustomizationDocument(const CustomizationDocument&) = delete;
+ CustomizationDocument& operator=(const CustomizationDocument&) = delete;
+
virtual ~CustomizationDocument();
// Return true if the document was successfully fetched and parsed.
@@ -79,9 +82,6 @@
// Value of the "version" attribute that is supported.
// Otherwise config is not loaded.
std::string accepted_version_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CustomizationDocument);
};
// OEM startup customization document class.
diff --git a/chrome/browser/ash/customization/customization_wallpaper_downloader.h b/chrome/browser/ash/customization/customization_wallpaper_downloader.h
index c8933c96..005b823 100644
--- a/chrome/browser/ash/customization/customization_wallpaper_downloader.h
+++ b/chrome/browser/ash/customization/customization_wallpaper_downloader.h
@@ -38,6 +38,11 @@
base::OnceCallback<void(bool success, const GURL&)>
on_wallpaper_fetch_completed);
+ CustomizationWallpaperDownloader(const CustomizationWallpaperDownloader&) =
+ delete;
+ CustomizationWallpaperDownloader& operator=(
+ const CustomizationWallpaperDownloader&) = delete;
+
~CustomizationWallpaperDownloader();
// Start download.
@@ -101,8 +106,6 @@
on_wallpaper_fetch_completed_;
base::WeakPtrFactory<CustomizationWallpaperDownloader> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CustomizationWallpaperDownloader);
};
} // namespace ash
diff --git a/chrome/browser/ash/customization/customization_wallpaper_downloader_browsertest.cc b/chrome/browser/ash/customization/customization_wallpaper_downloader_browsertest.cc
index 5f20ef6..7d3239e 100644
--- a/chrome/browser/ash/customization/customization_wallpaper_downloader_browsertest.cc
+++ b/chrome/browser/ash/customization/customization_wallpaper_downloader_browsertest.cc
@@ -125,6 +125,9 @@
WallpaperControllerClientImpl::Get()->AddObserver(this);
}
+ TestWallpaperObserver(const TestWallpaperObserver&) = delete;
+ TestWallpaperObserver& operator=(const TestWallpaperObserver&) = delete;
+
~TestWallpaperObserver() override {
WallpaperControllerClientImpl::Get()->RemoveObserver(this);
}
@@ -145,8 +148,6 @@
private:
bool finished_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(TestWallpaperObserver);
};
} // namespace
@@ -155,6 +156,12 @@
: public InProcessBrowserTest {
public:
CustomizationWallpaperDownloaderBrowserTest() {}
+
+ CustomizationWallpaperDownloaderBrowserTest(
+ const CustomizationWallpaperDownloaderBrowserTest&) = delete;
+ CustomizationWallpaperDownloaderBrowserTest& operator=(
+ const CustomizationWallpaperDownloaderBrowserTest&) = delete;
+
~CustomizationWallpaperDownloaderBrowserTest() override {}
// InProcessBrowserTest overrides:
@@ -227,8 +234,6 @@
// Number of retries required.
size_t required_retries_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(CustomizationWallpaperDownloaderBrowserTest);
};
IN_PROC_BROWSER_TEST_F(CustomizationWallpaperDownloaderBrowserTest,
diff --git a/chrome/browser/ash/dbus/chrome_features_service_provider.h b/chrome/browser/ash/dbus/chrome_features_service_provider.h
index 14bfd2b..ddc984f 100644
--- a/chrome/browser/ash/dbus/chrome_features_service_provider.h
+++ b/chrome/browser/ash/dbus/chrome_features_service_provider.h
@@ -48,6 +48,11 @@
: public CrosDBusService::ServiceProviderInterface {
public:
ChromeFeaturesServiceProvider();
+
+ ChromeFeaturesServiceProvider(const ChromeFeaturesServiceProvider&) = delete;
+ ChromeFeaturesServiceProvider& operator=(
+ const ChromeFeaturesServiceProvider&) = delete;
+
~ChromeFeaturesServiceProvider() override;
// CrosDBusService::ServiceProviderInterface overrides:
@@ -88,8 +93,6 @@
// Keep this last so that all weak pointers will be invalidated at the
// beginning of destruction.
base::WeakPtrFactory<ChromeFeaturesServiceProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeFeaturesServiceProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/dbus/component_updater_service_provider.h b/chrome/browser/ash/dbus/component_updater_service_provider.h
index 3e2c63b..18b68005 100644
--- a/chrome/browser/ash/dbus/component_updater_service_provider.h
+++ b/chrome/browser/ash/dbus/component_updater_service_provider.h
@@ -53,6 +53,10 @@
using LoadCallback = base::OnceCallback<void(const base::FilePath&)>;
Delegate() {}
+
+ Delegate(const Delegate&) = delete;
+ Delegate& operator=(const Delegate&) = delete;
+
virtual ~Delegate() {}
virtual void LoadComponent(const std::string& name,
@@ -60,13 +64,16 @@
LoadCallback load_callback) = 0;
virtual bool UnloadComponent(const std::string& name) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Delegate);
};
explicit ComponentUpdaterServiceProvider(
component_updater::CrOSComponentManager* cros_component_manager);
+
+ ComponentUpdaterServiceProvider(const ComponentUpdaterServiceProvider&) =
+ delete;
+ ComponentUpdaterServiceProvider& operator=(
+ const ComponentUpdaterServiceProvider&) = delete;
+
~ComponentUpdaterServiceProvider() override;
// CrosDBusService::ServiceProviderInterface overrides:
@@ -108,8 +115,6 @@
// Keep this last so that all weak pointers will be invalidated at the
// beginning of destruction.
base::WeakPtrFactory<ComponentUpdaterServiceProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ComponentUpdaterServiceProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/dbus/cryptohome_key_delegate_service_provider.h b/chrome/browser/ash/dbus/cryptohome_key_delegate_service_provider.h
index 885b95d..3d28e59 100644
--- a/chrome/browser/ash/dbus/cryptohome_key_delegate_service_provider.h
+++ b/chrome/browser/ash/dbus/cryptohome_key_delegate_service_provider.h
@@ -28,6 +28,12 @@
: public CrosDBusService::ServiceProviderInterface {
public:
CryptohomeKeyDelegateServiceProvider();
+
+ CryptohomeKeyDelegateServiceProvider(
+ const CryptohomeKeyDelegateServiceProvider&) = delete;
+ CryptohomeKeyDelegateServiceProvider& operator=(
+ const CryptohomeKeyDelegateServiceProvider&) = delete;
+
~CryptohomeKeyDelegateServiceProvider() override;
// CrosDBusService::ServiceProviderInterface overrides:
@@ -41,8 +47,6 @@
// Must be the last member.
base::WeakPtrFactory<CryptohomeKeyDelegateServiceProvider> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(CryptohomeKeyDelegateServiceProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/dbus/drive_file_stream_service_provider.h b/chrome/browser/ash/dbus/drive_file_stream_service_provider.h
index e22dd37..05b3139 100644
--- a/chrome/browser/ash/dbus/drive_file_stream_service_provider.h
+++ b/chrome/browser/ash/dbus/drive_file_stream_service_provider.h
@@ -30,6 +30,12 @@
: public CrosDBusService::ServiceProviderInterface {
public:
DriveFileStreamServiceProvider();
+
+ DriveFileStreamServiceProvider(const DriveFileStreamServiceProvider&) =
+ delete;
+ DriveFileStreamServiceProvider& operator=(
+ const DriveFileStreamServiceProvider&) = delete;
+
~DriveFileStreamServiceProvider() override;
// CrosDBusService::ServiceProviderInterface overrides:
@@ -44,8 +50,6 @@
// Keep this last so that all weak pointers will be invalidated at the
// beginning of destruction.
base::WeakPtrFactory<DriveFileStreamServiceProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DriveFileStreamServiceProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/dbus/kiosk_info_service_provider.h b/chrome/browser/ash/dbus/kiosk_info_service_provider.h
index 1e8db0c..b491723c 100644
--- a/chrome/browser/ash/dbus/kiosk_info_service_provider.h
+++ b/chrome/browser/ash/dbus/kiosk_info_service_provider.h
@@ -24,6 +24,10 @@
class KioskInfoService : public CrosDBusService::ServiceProviderInterface {
public:
KioskInfoService();
+
+ KioskInfoService(const KioskInfoService&) = delete;
+ KioskInfoService& operator=(const KioskInfoService&) = delete;
+
~KioskInfoService() override;
// CrosDBusService::ServiceProviderInterface
@@ -42,8 +46,6 @@
dbus::ExportedObject::ResponseSender response_sender);
base::WeakPtrFactory<KioskInfoService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(KioskInfoService);
};
} // namespace ash
diff --git a/chrome/browser/ash/dbus/libvda_service_provider.h b/chrome/browser/ash/dbus/libvda_service_provider.h
index 6d29d6c9..b525d21e 100644
--- a/chrome/browser/ash/dbus/libvda_service_provider.h
+++ b/chrome/browser/ash/dbus/libvda_service_provider.h
@@ -26,6 +26,10 @@
class LibvdaServiceProvider : public CrosDBusService::ServiceProviderInterface {
public:
LibvdaServiceProvider();
+
+ LibvdaServiceProvider(const LibvdaServiceProvider&) = delete;
+ LibvdaServiceProvider& operator=(const LibvdaServiceProvider&) = delete;
+
~LibvdaServiceProvider() override;
// CrosDBusService::ServiceProviderInterface overrides:
@@ -52,8 +56,6 @@
// Keep this last so that all weak pointers will be invalidated at the
// beginning of destruction.
base::WeakPtrFactory<LibvdaServiceProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LibvdaServiceProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/dbus/lock_to_single_user_service_provider.h b/chrome/browser/ash/dbus/lock_to_single_user_service_provider.h
index 2557d6c..837e210 100644
--- a/chrome/browser/ash/dbus/lock_to_single_user_service_provider.h
+++ b/chrome/browser/ash/dbus/lock_to_single_user_service_provider.h
@@ -35,6 +35,12 @@
: public CrosDBusService::ServiceProviderInterface {
public:
LockToSingleUserServiceProvider();
+
+ LockToSingleUserServiceProvider(const LockToSingleUserServiceProvider&) =
+ delete;
+ LockToSingleUserServiceProvider& operator=(
+ const LockToSingleUserServiceProvider&) = delete;
+
~LockToSingleUserServiceProvider() override;
void Start(scoped_refptr<dbus::ExportedObject> exported_object) override;
@@ -46,8 +52,6 @@
void NotifyVmStarting(dbus::MethodCall* method_call,
dbus::ExportedObject::ResponseSender response_sender);
base::WeakPtrFactory<LockToSingleUserServiceProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LockToSingleUserServiceProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/dbus/machine_learning_decision_service_provider.h b/chrome/browser/ash/dbus/machine_learning_decision_service_provider.h
index cfd68c5..4345da8 100644
--- a/chrome/browser/ash/dbus/machine_learning_decision_service_provider.h
+++ b/chrome/browser/ash/dbus/machine_learning_decision_service_provider.h
@@ -42,6 +42,12 @@
: public CrosDBusService::ServiceProviderInterface {
public:
MachineLearningDecisionServiceProvider();
+
+ MachineLearningDecisionServiceProvider(
+ const MachineLearningDecisionServiceProvider&) = delete;
+ MachineLearningDecisionServiceProvider& operator=(
+ const MachineLearningDecisionServiceProvider&) = delete;
+
~MachineLearningDecisionServiceProvider() override;
// CrosDBusService::ServiceProviderInterface overrides:
@@ -73,8 +79,6 @@
// beginning of destruction.
base::WeakPtrFactory<MachineLearningDecisionServiceProvider>
weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MachineLearningDecisionServiceProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/dbus/metrics_event_service_provider.h b/chrome/browser/ash/dbus/metrics_event_service_provider.h
index 219e6802..5ca24e6 100644
--- a/chrome/browser/ash/dbus/metrics_event_service_provider.h
+++ b/chrome/browser/ash/dbus/metrics_event_service_provider.h
@@ -22,6 +22,11 @@
public resource_coordinator::TabLifecycleObserver {
public:
MetricsEventServiceProvider();
+
+ MetricsEventServiceProvider(const MetricsEventServiceProvider&) = delete;
+ MetricsEventServiceProvider& operator=(const MetricsEventServiceProvider&) =
+ delete;
+
~MetricsEventServiceProvider() override;
// CrosDBusService::ServiceProviderInterface overrides:
@@ -38,8 +43,6 @@
// A reference on ExportedObject for sending signals.
scoped_refptr<dbus::ExportedObject> exported_object_;
-
- DISALLOW_COPY_AND_ASSIGN(MetricsEventServiceProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/dbus/plugin_vm_service_provider.h b/chrome/browser/ash/dbus/plugin_vm_service_provider.h
index 8bc5ac5..f2a643a 100644
--- a/chrome/browser/ash/dbus/plugin_vm_service_provider.h
+++ b/chrome/browser/ash/dbus/plugin_vm_service_provider.h
@@ -65,6 +65,10 @@
: public CrosDBusService::ServiceProviderInterface {
public:
PluginVmServiceProvider();
+
+ PluginVmServiceProvider(const PluginVmServiceProvider&) = delete;
+ PluginVmServiceProvider& operator=(const PluginVmServiceProvider&) = delete;
+
~PluginVmServiceProvider() override;
// CrosDBusService::ServiceProviderInterface overrides:
@@ -102,8 +106,6 @@
// Keep this last so that all weak pointers will be invalidated at the
// beginning of destruction.
base::WeakPtrFactory<PluginVmServiceProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PluginVmServiceProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/dbus/printers_service_provider.h b/chrome/browser/ash/dbus/printers_service_provider.h
index a3cde3a..ccb2105 100644
--- a/chrome/browser/ash/dbus/printers_service_provider.h
+++ b/chrome/browser/ash/dbus/printers_service_provider.h
@@ -23,6 +23,10 @@
public chromeos::CupsPrintersManager::Observer {
public:
PrintersServiceProvider();
+
+ PrintersServiceProvider(const PrintersServiceProvider&) = delete;
+ PrintersServiceProvider& operator=(const PrintersServiceProvider&) = delete;
+
~PrintersServiceProvider() override;
// CrosDBusService::ServiceProviderInterface overrides:
@@ -43,8 +47,6 @@
base::ScopedObservation<chromeos::CupsPrintersManagerProxy,
chromeos::CupsPrintersManager::Observer>
printers_manager_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PrintersServiceProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/dbus/proxy_resolution_service_provider.cc b/chrome/browser/ash/dbus/proxy_resolution_service_provider.cc
index cdd9397..fef896f 100644
--- a/chrome/browser/ash/dbus/proxy_resolution_service_provider.cc
+++ b/chrome/browser/ash/dbus/proxy_resolution_service_provider.cc
@@ -64,6 +64,9 @@
std::move(proxy_lookup_client));
}
+ ProxyLookupRequest(const ProxyLookupRequest&) = delete;
+ ProxyLookupRequest& operator=(const ProxyLookupRequest&) = delete;
+
~ProxyLookupRequest() override = default;
void OnProxyLookupComplete(
@@ -115,7 +118,6 @@
mojo::Receiver<network::mojom::ProxyLookupClient> receiver_{this};
ProxyResolutionServiceProvider::NotifyCallback notify_callback_;
chromeos::SystemProxyOverride system_proxy_override_;
- DISALLOW_COPY_AND_ASSIGN(ProxyLookupRequest);
};
} // namespace
diff --git a/chrome/browser/ash/dbus/proxy_resolution_service_provider.h b/chrome/browser/ash/dbus/proxy_resolution_service_provider.h
index e9d6402..905e600 100644
--- a/chrome/browser/ash/dbus/proxy_resolution_service_provider.h
+++ b/chrome/browser/ash/dbus/proxy_resolution_service_provider.h
@@ -67,6 +67,12 @@
const std::string& pac_string)>;
ProxyResolutionServiceProvider();
+
+ ProxyResolutionServiceProvider(const ProxyResolutionServiceProvider&) =
+ delete;
+ ProxyResolutionServiceProvider& operator=(
+ const ProxyResolutionServiceProvider&) = delete;
+
~ProxyResolutionServiceProvider() override;
void set_network_context_for_test(
@@ -125,8 +131,6 @@
const net::NetworkIsolationKey network_isolation_key_;
base::WeakPtrFactory<ProxyResolutionServiceProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ProxyResolutionServiceProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/dbus/proxy_resolution_service_provider_browsertest.cc b/chrome/browser/ash/dbus/proxy_resolution_service_provider_browsertest.cc
index 946c513..f816829 100644
--- a/chrome/browser/ash/dbus/proxy_resolution_service_provider_browsertest.cc
+++ b/chrome/browser/ash/dbus/proxy_resolution_service_provider_browsertest.cc
@@ -37,6 +37,11 @@
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
}
+ ProxyResolutionServiceProviderTestWrapper(
+ const ProxyResolutionServiceProviderTestWrapper&) = delete;
+ ProxyResolutionServiceProviderTestWrapper& operator=(
+ const ProxyResolutionServiceProviderTestWrapper&) = delete;
+
~ProxyResolutionServiceProviderTestWrapper() {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
}
@@ -77,8 +82,6 @@
}
ProxyResolutionServiceProvider impl_;
-
- DISALLOW_COPY_AND_ASSIGN(ProxyResolutionServiceProviderTestWrapper);
};
// Base test fixture that exposes a way to invoke ProxyResolutionServiceProvider
diff --git a/chrome/browser/ash/dbus/proxy_resolution_service_provider_unittest.cc b/chrome/browser/ash/dbus/proxy_resolution_service_provider_unittest.cc
index c913966..1bb6f5fdbb 100644
--- a/chrome/browser/ash/dbus/proxy_resolution_service_provider_unittest.cc
+++ b/chrome/browser/ash/dbus/proxy_resolution_service_provider_unittest.cc
@@ -50,6 +50,10 @@
class MockNetworkContext : public network::TestNetworkContext {
public:
MockNetworkContext() {}
+
+ MockNetworkContext(const MockNetworkContext&) = delete;
+ MockNetworkContext& operator=(const MockNetworkContext&) = delete;
+
~MockNetworkContext() override {}
// network::mojom::NetworkContext implementation:
@@ -91,8 +95,6 @@
chromeos::ScopedStubInstallAttributes test_install_attributes_{
chromeos::StubInstallAttributes::CreateCloudManaged("fake-domain",
"fake-id")};
-
- DISALLOW_COPY_AND_ASSIGN(MockNetworkContext);
};
} // namespace
@@ -110,6 +112,11 @@
service_provider_.get());
}
+ ProxyResolutionServiceProviderTest(
+ const ProxyResolutionServiceProviderTest&) = delete;
+ ProxyResolutionServiceProviderTest& operator=(
+ const ProxyResolutionServiceProviderTest&) = delete;
+
~ProxyResolutionServiceProviderTest() override {
test_helper_.TearDown();
}
@@ -141,8 +148,6 @@
std::unique_ptr<ProxyResolutionServiceProvider> service_provider_;
ServiceProviderTestHelper test_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(ProxyResolutionServiceProviderTest);
};
// Tests the normal success case. The proxy resolver returns a single proxy.
diff --git a/chrome/browser/ash/dbus/screen_lock_service_provider.h b/chrome/browser/ash/dbus/screen_lock_service_provider.h
index 51ebfe0a..586f1b8 100644
--- a/chrome/browser/ash/dbus/screen_lock_service_provider.h
+++ b/chrome/browser/ash/dbus/screen_lock_service_provider.h
@@ -26,6 +26,11 @@
: public CrosDBusService::ServiceProviderInterface {
public:
ScreenLockServiceProvider();
+
+ ScreenLockServiceProvider(const ScreenLockServiceProvider&) = delete;
+ ScreenLockServiceProvider& operator=(const ScreenLockServiceProvider&) =
+ delete;
+
~ScreenLockServiceProvider() override;
// CrosDBusService::ServiceProviderInterface overrides:
@@ -45,8 +50,6 @@
// Keep this last so that all weak pointers will be invalidated at the
// beginning of destruction.
base::WeakPtrFactory<ScreenLockServiceProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ScreenLockServiceProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/dbus/smb_fs_service_provider.h b/chrome/browser/ash/dbus/smb_fs_service_provider.h
index 2a77f9e4..58306d4 100644
--- a/chrome/browser/ash/dbus/smb_fs_service_provider.h
+++ b/chrome/browser/ash/dbus/smb_fs_service_provider.h
@@ -24,6 +24,10 @@
class SmbFsServiceProvider : public CrosDBusService::ServiceProviderInterface {
public:
SmbFsServiceProvider();
+
+ SmbFsServiceProvider(const SmbFsServiceProvider&) = delete;
+ SmbFsServiceProvider& operator=(const SmbFsServiceProvider&) = delete;
+
~SmbFsServiceProvider() override;
// CrosDBusService::ServiceProviderInterface overrides:
@@ -36,8 +40,6 @@
dbus::ExportedObject::ResponseSender response_sender);
base::WeakPtrFactory<SmbFsServiceProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SmbFsServiceProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/dbus/virtual_file_request_service_provider.h b/chrome/browser/ash/dbus/virtual_file_request_service_provider.h
index c15d058..b8dbad2 100644
--- a/chrome/browser/ash/dbus/virtual_file_request_service_provider.h
+++ b/chrome/browser/ash/dbus/virtual_file_request_service_provider.h
@@ -23,6 +23,12 @@
: public CrosDBusService::ServiceProviderInterface {
public:
VirtualFileRequestServiceProvider();
+
+ VirtualFileRequestServiceProvider(const VirtualFileRequestServiceProvider&) =
+ delete;
+ VirtualFileRequestServiceProvider& operator=(
+ const VirtualFileRequestServiceProvider&) = delete;
+
~VirtualFileRequestServiceProvider() override;
// CrosDBusService::ServiceProviderInterface overrides:
@@ -39,8 +45,6 @@
// beginning of destruction.
base::WeakPtrFactory<VirtualFileRequestServiceProvider> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(VirtualFileRequestServiceProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/dbus/vm/vm_permission_service_provider.h b/chrome/browser/ash/dbus/vm/vm_permission_service_provider.h
index 32a619b..846a707 100644
--- a/chrome/browser/ash/dbus/vm/vm_permission_service_provider.h
+++ b/chrome/browser/ash/dbus/vm/vm_permission_service_provider.h
@@ -97,6 +97,11 @@
: public CrosDBusService::ServiceProviderInterface {
public:
VmPermissionServiceProvider();
+
+ VmPermissionServiceProvider(const VmPermissionServiceProvider&) = delete;
+ VmPermissionServiceProvider& operator=(const VmPermissionServiceProvider&) =
+ delete;
+
~VmPermissionServiceProvider() override;
// CrosDBusService::ServiceProviderInterface overrides:
@@ -153,8 +158,6 @@
// Keep this last so that all weak pointers will be invalidated at the
// beginning of destruction.
base::WeakPtrFactory<VmPermissionServiceProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(VmPermissionServiceProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/dbus/vm_applications_service_provider.h b/chrome/browser/ash/dbus/vm_applications_service_provider.h
index 8642740..5cdbbd1 100644
--- a/chrome/browser/ash/dbus/vm_applications_service_provider.h
+++ b/chrome/browser/ash/dbus/vm_applications_service_provider.h
@@ -26,6 +26,11 @@
public ui::SelectFileDialog::Listener {
public:
VmApplicationsServiceProvider();
+
+ VmApplicationsServiceProvider(const VmApplicationsServiceProvider&) = delete;
+ VmApplicationsServiceProvider& operator=(
+ const VmApplicationsServiceProvider&) = delete;
+
~VmApplicationsServiceProvider() override;
// CrosDBusService::ServiceProviderInterface overrides:
@@ -66,8 +71,6 @@
void FileSelectionCanceled(void* params) override;
base::WeakPtrFactory<VmApplicationsServiceProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(VmApplicationsServiceProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/display/display_prefs_browsertest.cc b/chrome/browser/ash/display/display_prefs_browsertest.cc
index ce3d490..f22d3dc0 100644
--- a/chrome/browser/ash/display/display_prefs_browsertest.cc
+++ b/chrome/browser/ash/display/display_prefs_browsertest.cc
@@ -16,6 +16,10 @@
class DisplayPrefsBrowserTest : public InProcessBrowserTest {
public:
DisplayPrefsBrowserTest() = default;
+
+ DisplayPrefsBrowserTest(const DisplayPrefsBrowserTest&) = delete;
+ DisplayPrefsBrowserTest& operator=(const DisplayPrefsBrowserTest&) = delete;
+
~DisplayPrefsBrowserTest() override = default;
void SetUpOnMainThread() override {
@@ -47,9 +51,6 @@
}
PrefService* local_state_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DisplayPrefsBrowserTest);
};
// Test that display prefs are registered in the browser local_state
diff --git a/chrome/browser/ash/drive/drive_integration_service.cc b/chrome/browser/ash/drive/drive_integration_service.cc
index 78eeb90..e3c1066 100644
--- a/chrome/browser/ash/drive/drive_integration_service.cc
+++ b/chrome/browser/ash/drive/drive_integration_service.cc
@@ -342,6 +342,9 @@
weak_ptr_factory_.GetWeakPtr()));
}
+ PreferenceWatcher(const PreferenceWatcher&) = delete;
+ PreferenceWatcher& operator=(const PreferenceWatcher&) = delete;
+
~PreferenceWatcher() override {
if (integration_service_) {
content::GetNetworkConnectionTracker()->RemoveNetworkConnectionObserver(
@@ -435,7 +438,6 @@
chromeos::NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN;
base::WeakPtrFactory<PreferenceWatcher> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(PreferenceWatcher);
};
class DriveIntegrationService::DriveFsHolder
diff --git a/chrome/browser/ash/drive/drive_integration_service.h b/chrome/browser/ash/drive/drive_integration_service.h
index 65c6188a..b80fd8a 100644
--- a/chrome/browser/ash/drive/drive_integration_service.h
+++ b/chrome/browser/ash/drive/drive_integration_service.h
@@ -109,6 +109,10 @@
const std::string& test_mount_point_name,
const base::FilePath& test_cache_root,
DriveFsMojoListenerFactory test_drivefs_mojo_listener_factory = {});
+
+ DriveIntegrationService(const DriveIntegrationService&) = delete;
+ DriveIntegrationService& operator=(const DriveIntegrationService&) = delete;
+
~DriveIntegrationService() override;
// KeyedService override:
@@ -318,7 +322,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate its weak pointers before any other members are destroyed.
base::WeakPtrFactory<DriveIntegrationService> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(DriveIntegrationService);
};
// Singleton that owns all instances of DriveIntegrationService and
diff --git a/chrome/browser/ash/drive/drivefs_native_message_host.cc b/chrome/browser/ash/drive/drivefs_native_message_host.cc
index 65bd7dcc..0546a25 100644
--- a/chrome/browser/ash/drive/drivefs_native_message_host.cc
+++ b/chrome/browser/ash/drive/drivefs_native_message_host.cc
@@ -58,6 +58,9 @@
drivefs::mojom::DriveFs* drivefs_for_testing)
: drivefs_for_testing_(drivefs_for_testing) {}
+ DriveFsNativeMessageHost(const DriveFsNativeMessageHost&) = delete;
+ DriveFsNativeMessageHost& operator=(const DriveFsNativeMessageHost&) = delete;
+
~DriveFsNativeMessageHost() override = default;
void OnMessage(const std::string& message) override {
@@ -148,8 +151,6 @@
base::ThreadTaskRunnerHandle::Get();
base::WeakPtrFactory<DriveFsNativeMessageHost> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DriveFsNativeMessageHost);
};
std::unique_ptr<extensions::NativeMessageHost> CreateDriveFsNativeMessageHost(
diff --git a/chrome/browser/ash/drive/drivefs_test_support.h b/chrome/browser/ash/drive/drivefs_test_support.h
index 16ec10af..3da4859 100644
--- a/chrome/browser/ash/drive/drivefs_test_support.h
+++ b/chrome/browser/ash/drive/drivefs_test_support.h
@@ -23,6 +23,10 @@
static const char kPredefinedProfileSalt[];
FakeDriveFsHelper(Profile* profile, const base::FilePath& mount_path);
+
+ FakeDriveFsHelper(const FakeDriveFsHelper&) = delete;
+ FakeDriveFsHelper& operator=(const FakeDriveFsHelper&) = delete;
+
~FakeDriveFsHelper();
base::RepeatingCallback<std::unique_ptr<drivefs::DriveFsBootstrapListener>()>
@@ -34,8 +38,6 @@
private:
const base::FilePath mount_path_;
drivefs::FakeDriveFs fake_drivefs_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeDriveFsHelper);
};
} // namespace drive
diff --git a/chrome/browser/ash/drive/fileapi/drivefs_async_file_util.cc b/chrome/browser/ash/drive/fileapi/drivefs_async_file_util.cc
index 140e2c2..d5ec914c 100644
--- a/chrome/browser/ash/drive/fileapi/drivefs_async_file_util.cc
+++ b/chrome/browser/ash/drive/fileapi/drivefs_async_file_util.cc
@@ -29,6 +29,10 @@
class DriveFsFileUtil : public storage::LocalFileUtil {
public:
DriveFsFileUtil() = default;
+
+ DriveFsFileUtil(const DriveFsFileUtil&) = delete;
+ DriveFsFileUtil& operator=(const DriveFsFileUtil&) = delete;
+
~DriveFsFileUtil() override = default;
protected:
@@ -36,9 +40,6 @@
// DriveFS is a trusted filesystem, allow symlinks.
return false;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DriveFsFileUtil);
};
class CopyOperation {
diff --git a/chrome/browser/ash/drive/fileapi/drivefs_async_file_util.h b/chrome/browser/ash/drive/fileapi/drivefs_async_file_util.h
index 5ccd867a..1c75720 100644
--- a/chrome/browser/ash/drive/fileapi/drivefs_async_file_util.h
+++ b/chrome/browser/ash/drive/fileapi/drivefs_async_file_util.h
@@ -21,6 +21,10 @@
class DriveFsAsyncFileUtil : public storage::AsyncFileUtilAdapter {
public:
explicit DriveFsAsyncFileUtil(Profile* profile);
+
+ DriveFsAsyncFileUtil(const DriveFsAsyncFileUtil&) = delete;
+ DriveFsAsyncFileUtil& operator=(const DriveFsAsyncFileUtil&) = delete;
+
~DriveFsAsyncFileUtil() override;
// AsyncFileUtil overrides:
@@ -40,8 +44,6 @@
Profile* const profile_;
base::WeakPtrFactory<DriveFsAsyncFileUtil> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DriveFsAsyncFileUtil);
};
} // namespace internal
diff --git a/chrome/browser/ash/drive/fileapi/drivefs_file_system_backend_delegate.h b/chrome/browser/ash/drive/fileapi/drivefs_file_system_backend_delegate.h
index ab97f3f..a2e8b04 100644
--- a/chrome/browser/ash/drive/fileapi/drivefs_file_system_backend_delegate.h
+++ b/chrome/browser/ash/drive/fileapi/drivefs_file_system_backend_delegate.h
@@ -31,6 +31,12 @@
: public chromeos::FileSystemBackendDelegate {
public:
explicit DriveFsFileSystemBackendDelegate(Profile* profile);
+
+ DriveFsFileSystemBackendDelegate(const DriveFsFileSystemBackendDelegate&) =
+ delete;
+ DriveFsFileSystemBackendDelegate& operator=(
+ const DriveFsFileSystemBackendDelegate&) = delete;
+
~DriveFsFileSystemBackendDelegate() override;
// FileSystemBackend::Delegate overrides.
@@ -53,8 +59,6 @@
private:
std::unique_ptr<storage::AsyncFileUtil> async_file_util_;
-
- DISALLOW_COPY_AND_ASSIGN(DriveFsFileSystemBackendDelegate);
};
} // namespace drive
diff --git a/chrome/browser/ash/events/event_rewriter_delegate_impl.h b/chrome/browser/ash/events/event_rewriter_delegate_impl.h
index a33a434..df7b6c4 100644
--- a/chrome/browser/ash/events/event_rewriter_delegate_impl.h
+++ b/chrome/browser/ash/events/event_rewriter_delegate_impl.h
@@ -21,6 +21,11 @@
EventRewriterDelegateImpl(wm::ActivationClient* activation_client,
std::unique_ptr<DeprecationNotificationController>
deprecation_controller);
+
+ EventRewriterDelegateImpl(const EventRewriterDelegateImpl&) = delete;
+ EventRewriterDelegateImpl& operator=(const EventRewriterDelegateImpl&) =
+ delete;
+
~EventRewriterDelegateImpl() override;
void set_pref_service_for_testing(const PrefService* pref_service) {
@@ -48,8 +53,6 @@
// Handles showing notifications when deprecated event rewrites occur.
std::unique_ptr<DeprecationNotificationController> deprecation_controller_;
-
- DISALLOW_COPY_AND_ASSIGN(EventRewriterDelegateImpl);
};
} // namespace ash
diff --git a/chrome/browser/ash/events/event_rewriter_unittest.cc b/chrome/browser/ash/events/event_rewriter_unittest.cc
index cdcf3bce..bdfef84 100644
--- a/chrome/browser/ash/events/event_rewriter_unittest.cc
+++ b/chrome/browser/ash/events/event_rewriter_unittest.cc
@@ -3724,6 +3724,10 @@
class EventBuffer : public ui::test::TestEventProcessor {
public:
EventBuffer() {}
+
+ EventBuffer(const EventBuffer&) = delete;
+ EventBuffer& operator=(const EventBuffer&) = delete;
+
~EventBuffer() override {}
void PopEvents(std::vector<std::unique_ptr<ui::Event>>* events) {
@@ -3739,8 +3743,6 @@
}
std::vector<std::unique_ptr<ui::Event>> events_;
-
- DISALLOW_COPY_AND_ASSIGN(EventBuffer);
};
// Trivial EventSource that does nothing but send events.
@@ -3764,6 +3766,10 @@
: source_(&buffer_),
fake_user_manager_(new FakeChromeUserManager),
user_manager_enabler_(base::WrapUnique(fake_user_manager_)) {}
+
+ EventRewriterAshTest(const EventRewriterAshTest&) = delete;
+ EventRewriterAshTest& operator=(const EventRewriterAshTest&) = delete;
+
~EventRewriterAshTest() override {}
ui::EventDispatchDetails Send(ui::Event* event) {
@@ -3839,8 +3845,6 @@
FakeChromeUserManager* fake_user_manager_; // Not owned.
user_manager::ScopedUserManager user_manager_enabler_;
sync_preferences::TestingPrefServiceSyncable prefs_;
-
- DISALLOW_COPY_AND_ASSIGN(EventRewriterAshTest);
};
TEST_F(EventRewriterAshTest, TopRowKeysAreFunctionKeys) {
diff --git a/chrome/browser/ash/file_manager/documents_provider_root_manager.h b/chrome/browser/ash/file_manager/documents_provider_root_manager.h
index 771befb5..7f20d5c1 100644
--- a/chrome/browser/ash/file_manager/documents_provider_root_manager.h
+++ b/chrome/browser/ash/file_manager/documents_provider_root_manager.h
@@ -70,6 +70,11 @@
};
DocumentsProviderRootManager(Profile* profile,
arc::ArcFileSystemOperationRunner* runner);
+
+ DocumentsProviderRootManager(const DocumentsProviderRootManager&) = delete;
+ DocumentsProviderRootManager& operator=(const DocumentsProviderRootManager&) =
+ delete;
+
~DocumentsProviderRootManager() override;
void AddObserver(Observer* observer);
@@ -128,8 +133,6 @@
std::vector<RootInfo> current_roots_;
base::WeakPtrFactory<DocumentsProviderRootManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DocumentsProviderRootManager);
};
} // namespace file_manager
diff --git a/chrome/browser/ash/file_manager/documents_provider_root_manager_unittest.cc b/chrome/browser/ash/file_manager/documents_provider_root_manager_unittest.cc
index 3be816f..607a1b9 100644
--- a/chrome/browser/ash/file_manager/documents_provider_root_manager_unittest.cc
+++ b/chrome/browser/ash/file_manager/documents_provider_root_manager_unittest.cc
@@ -61,6 +61,12 @@
class DocumentsProviderRootManagerTest : public testing::Test {
public:
DocumentsProviderRootManagerTest() = default;
+
+ DocumentsProviderRootManagerTest(const DocumentsProviderRootManagerTest&) =
+ delete;
+ DocumentsProviderRootManagerTest& operator=(
+ const DocumentsProviderRootManagerTest&) = delete;
+
~DocumentsProviderRootManagerTest() override = default;
void SetUp() override {
@@ -111,8 +117,6 @@
std::unique_ptr<TestingProfile> profile_;
std::unique_ptr<arc::ArcFileSystemOperationRunner> runner_;
TestObserver observer_;
-
- DISALLOW_COPY_AND_ASSIGN(DocumentsProviderRootManagerTest);
};
TEST_F(DocumentsProviderRootManagerTest, AddMultipleRoots) {
diff --git a/chrome/browser/ash/file_manager/external_filesystem_apitest.cc b/chrome/browser/ash/file_manager/external_filesystem_apitest.cc
index 37e610f..318a07e6 100644
--- a/chrome/browser/ash/file_manager/external_filesystem_apitest.cc
+++ b/chrome/browser/ash/file_manager/external_filesystem_apitest.cc
@@ -290,6 +290,12 @@
};
FileSystemExtensionApiTestBase() = default;
+
+ FileSystemExtensionApiTestBase(const FileSystemExtensionApiTestBase&) =
+ delete;
+ FileSystemExtensionApiTestBase& operator=(
+ const FileSystemExtensionApiTestBase&) = delete;
+
~FileSystemExtensionApiTestBase() override = default;
virtual std::vector<TestDirConfig> GetTestDirContents() {
@@ -405,8 +411,6 @@
private:
std::unique_ptr<media_router::MockMediaRouter> media_router_;
-
- DISALLOW_COPY_AND_ASSIGN(FileSystemExtensionApiTestBase);
};
// Tests for a native local file system.
diff --git a/chrome/browser/ash/file_manager/fake_disk_mount_manager.h b/chrome/browser/ash/file_manager/fake_disk_mount_manager.h
index 1ab3e38..c6699677 100644
--- a/chrome/browser/ash/file_manager/fake_disk_mount_manager.h
+++ b/chrome/browser/ash/file_manager/fake_disk_mount_manager.h
@@ -46,6 +46,10 @@
};
FakeDiskMountManager();
+
+ FakeDiskMountManager(const FakeDiskMountManager&) = delete;
+ FakeDiskMountManager& operator=(const FakeDiskMountManager&) = delete;
+
~FakeDiskMountManager() override;
const std::vector<MountRequest>& mount_requests() const {
@@ -118,8 +122,6 @@
std::vector<std::string> unmount_requests_;
std::vector<RemountAllRequest> remount_all_requests_;
std::map<std::string, chromeos::MountError> unmount_errors_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeDiskMountManager);
};
} // namespace file_manager
diff --git a/chrome/browser/ash/file_manager/file_manager_browsertest_base.cc b/chrome/browser/ash/file_manager/file_manager_browsertest_base.cc
index 1762d4ff..2c3878b 100644
--- a/chrome/browser/ash/file_manager/file_manager_browsertest_base.cc
+++ b/chrome/browser/ash/file_manager/file_manager_browsertest_base.cc
@@ -530,6 +530,11 @@
extensions::TestApiObserverRegistry::GetInstance());
}
+ FileManagerTestMessageListener(const FileManagerTestMessageListener&) =
+ delete;
+ FileManagerTestMessageListener& operator=(
+ const FileManagerTestMessageListener&) = delete;
+
~FileManagerTestMessageListener() override = default;
Message GetNextMessage() {
@@ -579,8 +584,6 @@
base::ScopedObservation<extensions::TestApiObserverRegistry,
extensions::TestApiObserver>
test_api_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FileManagerTestMessageListener);
};
// Test volume.
@@ -813,6 +816,10 @@
class LocalTestVolume : public TestVolume {
public:
explicit LocalTestVolume(const std::string& name) : TestVolume(name) {}
+
+ LocalTestVolume(const LocalTestVolume&) = delete;
+ LocalTestVolume& operator=(const LocalTestVolume&) = delete;
+
~LocalTestVolume() override = default;
// Adds this local volume. Returns true on success.
@@ -888,14 +895,16 @@
}
std::map<base::FilePath, const AddEntriesMessage::TestEntryInfo> entries_;
-
- DISALLOW_COPY_AND_ASSIGN(LocalTestVolume);
};
// DownloadsTestVolume: local test volume for the "Downloads" directory.
class DownloadsTestVolume : public LocalTestVolume {
public:
DownloadsTestVolume() : LocalTestVolume("MyFiles") {}
+
+ DownloadsTestVolume(const DownloadsTestVolume&) = delete;
+ DownloadsTestVolume& operator=(const DownloadsTestVolume&) = delete;
+
~DownloadsTestVolume() override = default;
void EnsureDownloadsFolderExists() {
@@ -933,14 +942,15 @@
auto* volume = VolumeManager::Get(profile);
volume->RemoveDownloadsDirectoryForTesting();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DownloadsTestVolume);
};
class AndroidFilesTestVolume : public LocalTestVolume {
public:
AndroidFilesTestVolume() : LocalTestVolume("AndroidFiles") {}
+
+ AndroidFilesTestVolume(const AndroidFilesTestVolume&) = delete;
+ AndroidFilesTestVolume& operator=(const AndroidFilesTestVolume&) = delete;
+
~AndroidFilesTestVolume() override = default;
bool Mount(Profile* profile) override {
@@ -955,15 +965,16 @@
VolumeManager::Get(profile)->RemoveAndroidFilesDirectoryForTesting(
root_path());
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AndroidFilesTestVolume);
};
// CrostiniTestVolume: local test volume for the "Linux files" directory.
class CrostiniTestVolume : public LocalTestVolume {
public:
CrostiniTestVolume() : LocalTestVolume("Crostini") {}
+
+ CrostiniTestVolume(const CrostiniTestVolume&) = delete;
+ CrostiniTestVolume& operator=(const CrostiniTestVolume&) = delete;
+
~CrostiniTestVolume() override = default;
// Create root dir so entries can be created, but volume is not mounted.
@@ -976,9 +987,6 @@
}
const base::FilePath& mount_path() const { return root_path(); }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CrostiniTestVolume);
};
// FakeTestVolume: local test volume with a given volume and device type.
@@ -990,6 +998,10 @@
: LocalTestVolume(name),
volume_type_(volume_type),
device_type_(device_type) {}
+
+ FakeTestVolume(const FakeTestVolume&) = delete;
+ FakeTestVolume& operator=(const FakeTestVolume&) = delete;
+
~FakeTestVolume() override = default;
// Add the fake test volume entries.
@@ -1066,9 +1078,6 @@
const VolumeType volume_type_;
const chromeos::DeviceType device_type_;
const bool read_only_ = false;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FakeTestVolume);
};
// Removable TestVolume: local test volume for external media devices.
@@ -1084,6 +1093,10 @@
device_path_(device_path),
drive_label_(drive_label),
file_system_type_(file_system_type) {}
+
+ RemovableTestVolume(const RemovableTestVolume&) = delete;
+ RemovableTestVolume& operator=(const RemovableTestVolume&) = delete;
+
~RemovableTestVolume() override = default;
bool Mount(Profile* profile) override {
@@ -1108,8 +1121,6 @@
const base::FilePath device_path_;
const std::string drive_label_;
const std::string file_system_type_;
-
- DISALLOW_COPY_AND_ASSIGN(RemovableTestVolume);
};
// DriveFsTestVolume: test volume for Google Drive using DriveFS.
@@ -1117,6 +1128,10 @@
public:
explicit DriveFsTestVolume(Profile* original_profile)
: TestVolume("drive"), original_profile_(original_profile) {}
+
+ DriveFsTestVolume(const DriveFsTestVolume&) = delete;
+ DriveFsTestVolume& operator=(const DriveFsTestVolume&) = delete;
+
~DriveFsTestVolume() override = default;
drive::DriveIntegrationService* CreateDriveIntegrationService(
@@ -1324,8 +1339,6 @@
Profile* const original_profile_;
std::map<base::FilePath, const AddEntriesMessage::TestEntryInfo> entries_;
std::unique_ptr<drive::FakeDriveFsHelper> fake_drivefs_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(DriveFsTestVolume);
};
// DocumentsProviderTestVolume: test volume for Android DocumentsProvider.
@@ -1352,6 +1365,11 @@
authority,
root_document_id,
read_only) {}
+
+ DocumentsProviderTestVolume(const DocumentsProviderTestVolume&) = delete;
+ DocumentsProviderTestVolume& operator=(const DocumentsProviderTestVolume&) =
+ delete;
+
~DocumentsProviderTestVolume() override = default;
virtual void CreateEntry(const AddEntriesMessage::TestEntryInfo& entry) {
@@ -1433,8 +1451,6 @@
url::EncodeURIComponent(component.c_str(), component.size(), &encoded);
return {encoded.data(), static_cast<size_t>(encoded.length())};
}
-
- DISALLOW_COPY_AND_ASSIGN(DocumentsProviderTestVolume);
};
// MediaViewTestVolume: Test volume for the "media views": Audio, Images and
@@ -1450,6 +1466,9 @@
root_document_id,
true /* read_only */) {}
+ MediaViewTestVolume(const MediaViewTestVolume&) = delete;
+ MediaViewTestVolume& operator=(const MediaViewTestVolume&) = delete;
+
~MediaViewTestVolume() override = default;
bool Mount(Profile* profile) override {
@@ -1457,9 +1476,6 @@
return VolumeManager::Get(profile)->RegisterMediaViewForTesting(
root_document_id_);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MediaViewTestVolume);
};
class MockSmbFsMounter : public smbfs::SmbFsMounter {
@@ -1493,6 +1509,10 @@
class SmbfsTestVolume : public LocalTestVolume {
public:
SmbfsTestVolume() : LocalTestVolume("smbfs") {}
+
+ SmbfsTestVolume(const SmbfsTestVolume&) = delete;
+ SmbfsTestVolume& operator=(const SmbfsTestVolume&) = delete;
+
~SmbfsTestVolume() override = default;
// Create root dir so entries can be created, but volume is not mounted.
@@ -1580,8 +1600,6 @@
std::unique_ptr<MockSmbFsImpl> mock_smbfs_;
mojo::Remote<smbfs::mojom::SmbFsDelegate> delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(SmbfsTestVolume);
};
FileManagerBrowserTestBase::FileManagerBrowserTestBase() = default;
diff --git a/chrome/browser/ash/file_manager/file_manager_jstest_base.cc b/chrome/browser/ash/file_manager/file_manager_jstest_base.cc
index b4aa105..2a947b1 100644
--- a/chrome/browser/ash/file_manager/file_manager_jstest_base.cc
+++ b/chrome/browser/ash/file_manager/file_manager_jstest_base.cc
@@ -40,6 +40,10 @@
class TestFilesDataSource : public content::URLDataSource {
public:
TestFilesDataSource() {}
+
+ TestFilesDataSource(const TestFilesDataSource&) = delete;
+ TestFilesDataSource& operator=(const TestFilesDataSource&) = delete;
+
~TestFilesDataSource() override {}
private:
@@ -156,8 +160,6 @@
// Root of repository source, where files are served directly from.
base::FilePath source_root_;
base::FilePath gen_root_;
-
- DISALLOW_COPY_AND_ASSIGN(TestFilesDataSource);
};
// WebUIProvider to attach the URLDataSource for the test URL during tests.
@@ -167,6 +169,10 @@
: public TestChromeWebUIControllerFactory::WebUIProvider {
public:
TestWebUIProvider() = default;
+
+ TestWebUIProvider(const TestWebUIProvider&) = delete;
+ TestWebUIProvider& operator=(const TestWebUIProvider&) = delete;
+
~TestWebUIProvider() override = default;
std::unique_ptr<content::WebUIController> NewWebUI(content::WebUI* web_ui,
@@ -179,9 +185,6 @@
return std::make_unique<content::WebUIController>(web_ui);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestWebUIProvider);
};
base::LazyInstance<TestWebUIProvider>::DestructorAtExit test_webui_provider_ =
diff --git a/chrome/browser/ash/file_manager/file_tasks_notifier.h b/chrome/browser/ash/file_manager/file_tasks_notifier.h
index d73c397..a5b79d0a 100644
--- a/chrome/browser/ash/file_manager/file_tasks_notifier.h
+++ b/chrome/browser/ash/file_manager/file_tasks_notifier.h
@@ -51,6 +51,10 @@
};
explicit FileTasksNotifier(Profile* profile);
+
+ FileTasksNotifier(const FileTasksNotifier&) = delete;
+ FileTasksNotifier& operator=(const FileTasksNotifier&) = delete;
+
~FileTasksNotifier() override;
static FileTasksNotifier* GetForProfile(Profile* profile);
@@ -94,8 +98,6 @@
Profile* const profile_;
download::AllDownloadItemNotifier download_notifier_;
base::ObserverList<FileTasksObserver> observers_;
-
- DISALLOW_COPY_AND_ASSIGN(FileTasksNotifier);
};
} // namespace file_tasks
diff --git a/chrome/browser/ash/file_manager/path_util_unittest.cc b/chrome/browser/ash/file_manager/path_util_unittest.cc
index f2b3c5b..38daf33 100644
--- a/chrome/browser/ash/file_manager/path_util_unittest.cc
+++ b/chrome/browser/ash/file_manager/path_util_unittest.cc
@@ -55,6 +55,10 @@
class FileManagerPathUtilTest : public testing::Test {
public:
FileManagerPathUtilTest() = default;
+
+ FileManagerPathUtilTest(const FileManagerPathUtilTest&) = delete;
+ FileManagerPathUtilTest& operator=(const FileManagerPathUtilTest&) = delete;
+
~FileManagerPathUtilTest() override = default;
void SetUp() override {
@@ -70,9 +74,6 @@
protected:
content::BrowserTaskEnvironment task_environment_;
std::unique_ptr<TestingProfile> profile_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FileManagerPathUtilTest);
};
TEST_F(FileManagerPathUtilTest, GetDownloadsFolderForProfile) {
@@ -604,6 +605,12 @@
class FileManagerPathUtilConvertUrlTest : public testing::Test {
public:
FileManagerPathUtilConvertUrlTest() = default;
+
+ FileManagerPathUtilConvertUrlTest(const FileManagerPathUtilConvertUrlTest&) =
+ delete;
+ FileManagerPathUtilConvertUrlTest& operator=(
+ const FileManagerPathUtilConvertUrlTest&) = delete;
+
~FileManagerPathUtilConvertUrlTest() override = default;
void SetUp() override {
@@ -702,9 +709,6 @@
std::unique_ptr<arc::ArcServiceManager> arc_service_manager_;
base::FilePath drive_mount_point_;
base::FilePath crostini_mount_point_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FileManagerPathUtilConvertUrlTest);
};
FileSystemURL CreateExternalURL(const base::FilePath& path) {
diff --git a/chrome/browser/ash/file_manager/snapshot_manager.h b/chrome/browser/ash/file_manager/snapshot_manager.h
index 5340c17..aa32a2e 100644
--- a/chrome/browser/ash/file_manager/snapshot_manager.h
+++ b/chrome/browser/ash/file_manager/snapshot_manager.h
@@ -34,6 +34,10 @@
typedef base::OnceCallback<void(const base::FilePath&)> LocalPathCallback;
explicit SnapshotManager(Profile* profile);
+
+ SnapshotManager(const SnapshotManager&) = delete;
+ SnapshotManager& operator=(const SnapshotManager&) = delete;
+
~SnapshotManager();
// Creates a snapshot file copy of a file system file |absolute_file_path| and
@@ -56,7 +60,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate the weak pointers before any other members are destroyed.
base::WeakPtrFactory<SnapshotManager> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(SnapshotManager);
};
} // namespace file_manager
diff --git a/chrome/browser/ash/file_manager/volume_manager.h b/chrome/browser/ash/file_manager/volume_manager.h
index f218374..4ece0ad2 100644
--- a/chrome/browser/ash/file_manager/volume_manager.h
+++ b/chrome/browser/ash/file_manager/volume_manager.h
@@ -88,6 +88,9 @@
// valid as long as the volume is mounted.
class Volume : public base::SupportsWeakPtr<Volume> {
public:
+ Volume(const Volume&) = delete;
+ Volume& operator=(const Volume&) = delete;
+
~Volume();
// Factory static methods for different volume types.
@@ -261,8 +264,6 @@
// Device label of a physical removable device. Removable partitions
// belonging to the same device share the same device label.
std::string drive_label_;
-
- DISALLOW_COPY_AND_ASSIGN(Volume);
};
// Manages Volumes for file manager. Example of Volumes:
@@ -298,6 +299,10 @@
chromeos::disks::DiskMountManager* disk_mount_manager,
ash::file_system_provider::Service* file_system_provider_service,
GetMtpStorageInfoCallback get_mtp_storage_info_callback);
+
+ VolumeManager(const VolumeManager&) = delete;
+ VolumeManager& operator=(const VolumeManager&) = delete;
+
~VolumeManager() override;
// Returns the instance corresponding to the |context|.
@@ -488,7 +493,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate its weak pointers before any other members are destroyed.
base::WeakPtrFactory<VolumeManager> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(VolumeManager);
};
} // namespace file_manager
diff --git a/chrome/browser/ash/file_manager/volume_manager_unittest.cc b/chrome/browser/ash/file_manager/volume_manager_unittest.cc
index 83ae8a4..54a7572 100644
--- a/chrome/browser/ash/file_manager/volume_manager_unittest.cc
+++ b/chrome/browser/ash/file_manager/volume_manager_unittest.cc
@@ -83,6 +83,10 @@
};
LoggingObserver() = default;
+
+ LoggingObserver(const LoggingObserver&) = delete;
+ LoggingObserver& operator=(const LoggingObserver&) = delete;
+
~LoggingObserver() override = default;
const std::vector<Event>& events() const { return events_; }
@@ -203,8 +207,6 @@
private:
std::vector<Event> events_;
-
- DISALLOW_COPY_AND_ASSIGN(LoggingObserver);
};
class FakeUser : public user_manager::User {
diff --git a/chrome/browser/ash/file_system_provider/fake_provided_file_system.h b/chrome/browser/ash/file_system_provider/fake_provided_file_system.h
index ada3dbf..1b194db 100644
--- a/chrome/browser/ash/file_system_provider/fake_provided_file_system.h
+++ b/chrome/browser/ash/file_system_provider/fake_provided_file_system.h
@@ -64,6 +64,10 @@
public:
explicit FakeProvidedFileSystem(
const ProvidedFileSystemInfo& file_system_info);
+
+ FakeProvidedFileSystem(const FakeProvidedFileSystem&) = delete;
+ FakeProvidedFileSystem& operator=(const FakeProvidedFileSystem&) = delete;
+
~FakeProvidedFileSystem() override;
// Adds a fake entry to the fake file system.
@@ -187,7 +191,6 @@
Watchers watchers_;
base::WeakPtrFactory<FakeProvidedFileSystem> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(FakeProvidedFileSystem);
};
} // namespace file_system_provider
diff --git a/chrome/browser/ash/file_system_provider/fake_registry.h b/chrome/browser/ash/file_system_provider/fake_registry.h
index ff5ec88..84df4a5 100644
--- a/chrome/browser/ash/file_system_provider/fake_registry.h
+++ b/chrome/browser/ash/file_system_provider/fake_registry.h
@@ -20,6 +20,10 @@
class FakeRegistry : public RegistryInterface {
public:
FakeRegistry();
+
+ FakeRegistry(const FakeRegistry&) = delete;
+ FakeRegistry& operator=(const FakeRegistry&) = delete;
+
~FakeRegistry() override;
void RememberFileSystem(const ProvidedFileSystemInfo& file_system_info,
const Watchers& watchers) override;
@@ -35,8 +39,6 @@
private:
std::unique_ptr<ProvidedFileSystemInfo> file_system_info_;
std::unique_ptr<Watchers> watchers_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeRegistry);
};
} // namespace file_system_provider
diff --git a/chrome/browser/ash/file_system_provider/fileapi/backend_delegate.h b/chrome/browser/ash/file_system_provider/fileapi/backend_delegate.h
index c0dfa58e..1f46077 100644
--- a/chrome/browser/ash/file_system_provider/fileapi/backend_delegate.h
+++ b/chrome/browser/ash/file_system_provider/fileapi/backend_delegate.h
@@ -30,6 +30,10 @@
class BackendDelegate : public chromeos::FileSystemBackendDelegate {
public:
BackendDelegate();
+
+ BackendDelegate(const BackendDelegate&) = delete;
+ BackendDelegate& operator=(const BackendDelegate&) = delete;
+
~BackendDelegate() override;
// FileSystemBackend::Delegate overrides.
@@ -53,8 +57,6 @@
private:
std::unique_ptr<storage::AsyncFileUtil> async_file_util_;
std::unique_ptr<storage::WatcherManager> watcher_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(BackendDelegate);
};
} // namespace file_system_provider
diff --git a/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_reader.h b/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_reader.h
index ab17c13..ecf94870 100644
--- a/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_reader.h
+++ b/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_reader.h
@@ -37,6 +37,10 @@
int preloading_buffer_length,
int64_t max_bytes_to_read);
+ BufferingFileStreamReader(const BufferingFileStreamReader&) = delete;
+ BufferingFileStreamReader& operator=(const BufferingFileStreamReader&) =
+ delete;
+
~BufferingFileStreamReader() override;
// storage::FileStreamReader overrides.
@@ -72,7 +76,6 @@
int preloaded_bytes_;
base::WeakPtrFactory<BufferingFileStreamReader> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(BufferingFileStreamReader);
};
} // namespace file_system_provider
diff --git a/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc b/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc
index 4a177c5..732428b 100644
--- a/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc
+++ b/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc
@@ -46,6 +46,10 @@
public:
FakeFileStreamReader(std::vector<int>* log, net::Error return_error)
: log_(log), return_error_(return_error) {}
+
+ FakeFileStreamReader(const FakeFileStreamReader&) = delete;
+ FakeFileStreamReader& operator=(const FakeFileStreamReader&) = delete;
+
~FakeFileStreamReader() override {}
// storage::FileStreamReader overrides.
@@ -79,7 +83,6 @@
private:
std::vector<int>* log_; // Not owned.
net::Error return_error_;
- DISALLOW_COPY_AND_ASSIGN(FakeFileStreamReader);
};
} // namespace
diff --git a/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_writer.h b/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_writer.h
index e2a63ab..8c712f4 100644
--- a/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_writer.h
+++ b/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_writer.h
@@ -34,6 +34,10 @@
std::unique_ptr<storage::FileStreamWriter> file_stream_writer,
int intermediate_buffer_length);
+ BufferingFileStreamWriter(const BufferingFileStreamWriter&) = delete;
+ BufferingFileStreamWriter& operator=(const BufferingFileStreamWriter&) =
+ delete;
+
~BufferingFileStreamWriter() override;
// storage::FileStreamWriter overrides.
@@ -90,7 +94,6 @@
int buffered_bytes_;
base::WeakPtrFactory<BufferingFileStreamWriter> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(BufferingFileStreamWriter);
};
} // namespace file_system_provider
diff --git a/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc b/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc
index b285196..c90d356 100644
--- a/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc
+++ b/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc
@@ -53,6 +53,10 @@
flush_log_(flush_log),
cancel_counter_(cancel_counter),
write_error_(write_error) {}
+
+ FakeFileStreamWriter(const FakeFileStreamWriter&) = delete;
+ FakeFileStreamWriter& operator=(const FakeFileStreamWriter&) = delete;
+
~FakeFileStreamWriter() override {}
// storage::FileStreamWriter overrides.
@@ -93,7 +97,6 @@
std::vector<int>* flush_log_; // Not owned.
int* cancel_counter_; // Not owned.
net::Error write_error_;
- DISALLOW_COPY_AND_ASSIGN(FakeFileStreamWriter);
};
} // namespace
diff --git a/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader.h b/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader.h
index 16372f2..d74b12e 100644
--- a/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader.h
+++ b/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader.h
@@ -35,6 +35,9 @@
int64_t initial_offset,
const base::Time& expected_modification_time);
+ FileStreamReader(const FileStreamReader&) = delete;
+ FileStreamReader& operator=(const FileStreamReader&) = delete;
+
~FileStreamReader() override;
// storage::FileStreamReader overrides.
@@ -109,7 +112,6 @@
State state_;
base::WeakPtrFactory<FileStreamReader> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(FileStreamReader);
};
} // namespace file_system_provider
diff --git a/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader_unittest.cc b/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader_unittest.cc
index 80b962a..da478ba1 100644
--- a/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader_unittest.cc
+++ b/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader_unittest.cc
@@ -49,6 +49,10 @@
class EventLogger {
public:
EventLogger() {}
+
+ EventLogger(const EventLogger&) = delete;
+ EventLogger& operator=(const EventLogger&) = delete;
+
virtual ~EventLogger() {}
void OnRead(int result) { results_.push_back(result); }
@@ -63,8 +67,6 @@
private:
std::vector<int64_t> results_;
base::WeakPtrFactory<EventLogger> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EventLogger);
};
// Creates a cracked FileSystemURL for tests.
diff --git a/chrome/browser/ash/file_system_provider/fileapi/file_stream_writer.h b/chrome/browser/ash/file_system_provider/fileapi/file_stream_writer.h
index 034b137f..3363dfc 100644
--- a/chrome/browser/ash/file_system_provider/fileapi/file_stream_writer.h
+++ b/chrome/browser/ash/file_system_provider/fileapi/file_stream_writer.h
@@ -24,6 +24,9 @@
public:
FileStreamWriter(const storage::FileSystemURL& url, int64_t initial_offset);
+ FileStreamWriter(const FileStreamWriter&) = delete;
+ FileStreamWriter& operator=(const FileStreamWriter&) = delete;
+
~FileStreamWriter() override;
// storage::FileStreamWriter overrides.
@@ -80,7 +83,6 @@
State state_;
base::WeakPtrFactory<FileStreamWriter> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(FileStreamWriter);
};
} // namespace file_system_provider
diff --git a/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.h b/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.h
index fc0bf84..3683c16 100644
--- a/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.h
+++ b/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.h
@@ -32,6 +32,10 @@
class ProviderAsyncFileUtil : public storage::AsyncFileUtil {
public:
ProviderAsyncFileUtil();
+
+ ProviderAsyncFileUtil(const ProviderAsyncFileUtil&) = delete;
+ ProviderAsyncFileUtil& operator=(const ProviderAsyncFileUtil&) = delete;
+
~ProviderAsyncFileUtil() override;
// storage::AsyncFileUtil overrides.
@@ -100,9 +104,6 @@
std::unique_ptr<storage::FileSystemOperationContext> context,
const storage::FileSystemURL& url,
CreateSnapshotFileCallback callback) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ProviderAsyncFileUtil);
};
} // namespace internal
diff --git a/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util_unittest.cc b/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util_unittest.cc
index 0ebcf58..1bbc687a 100644
--- a/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util_unittest.cc
+++ b/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util_unittest.cc
@@ -51,6 +51,10 @@
class EventLogger {
public:
EventLogger() {}
+
+ EventLogger(const EventLogger&) = delete;
+ EventLogger& operator=(const EventLogger&) = delete;
+
virtual ~EventLogger() {}
void OnStatus(base::File::Error error) {
@@ -99,7 +103,6 @@
private:
std::unique_ptr<base::File::Error> result_;
storage::AsyncFileUtil::EntryList read_directory_list_;
- DISALLOW_COPY_AND_ASSIGN(EventLogger);
};
// Creates a cracked FileSystemURL for tests.
diff --git a/chrome/browser/ash/file_system_provider/mount_path_util.h b/chrome/browser/ash/file_system_provider/mount_path_util.h
index f3d53b0..6e27eb38 100644
--- a/chrome/browser/ash/file_system_provider/mount_path_util.h
+++ b/chrome/browser/ash/file_system_provider/mount_path_util.h
@@ -35,6 +35,10 @@
class FileSystemURLParser {
public:
explicit FileSystemURLParser(const storage::FileSystemURL& url);
+
+ FileSystemURLParser(const FileSystemURLParser&) = delete;
+ FileSystemURLParser& operator=(const FileSystemURLParser&) = delete;
+
virtual ~FileSystemURLParser();
// Parses the |url| passed to the constructor. If parsing succeeds, then
@@ -48,8 +52,6 @@
storage::FileSystemURL url_;
ProvidedFileSystemInterface* file_system_;
base::FilePath file_path_;
-
- DISALLOW_COPY_AND_ASSIGN(FileSystemURLParser);
};
// Finds a file system, which is responsible for handling the specified
@@ -58,6 +60,10 @@
class LocalPathParser {
public:
LocalPathParser(Profile* profile, const base::FilePath& local_path);
+
+ LocalPathParser(const LocalPathParser&) = delete;
+ LocalPathParser& operator=(const LocalPathParser&) = delete;
+
virtual ~LocalPathParser();
// Parses the |local_path| passed to the constructor. If parsing succeeds,
@@ -72,8 +78,6 @@
base::FilePath local_path_;
ProvidedFileSystemInterface* file_system_;
base::FilePath file_path_;
-
- DISALLOW_COPY_AND_ASSIGN(LocalPathParser);
};
} // namespace util
diff --git a/chrome/browser/ash/file_system_provider/notification_manager.h b/chrome/browser/ash/file_system_provider/notification_manager.h
index a2a43b5..730f1c33 100644
--- a/chrome/browser/ash/file_system_provider/notification_manager.h
+++ b/chrome/browser/ash/file_system_provider/notification_manager.h
@@ -37,6 +37,10 @@
public:
NotificationManager(Profile* profile,
const ProvidedFileSystemInfo& file_system_info);
+
+ NotificationManager(const NotificationManager&) = delete;
+ NotificationManager& operator=(const NotificationManager&) = delete;
+
~NotificationManager() override;
// NotificationManagerInterface overrides:
@@ -73,8 +77,6 @@
std::unique_ptr<AppIconLoader> icon_loader_;
gfx::Image extension_icon_;
base::WeakPtrFactory<NotificationManager> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NotificationManager);
};
} // namespace file_system_provider
diff --git a/chrome/browser/ash/file_system_provider/notification_manager_interface.h b/chrome/browser/ash/file_system_provider/notification_manager_interface.h
index 6fb7103..90f2c48 100644
--- a/chrome/browser/ash/file_system_provider/notification_manager_interface.h
+++ b/chrome/browser/ash/file_system_provider/notification_manager_interface.h
@@ -21,6 +21,11 @@
typedef base::OnceCallback<void(NotificationResult)> NotificationCallback;
NotificationManagerInterface() {}
+
+ NotificationManagerInterface(const NotificationManagerInterface&) = delete;
+ NotificationManagerInterface& operator=(const NotificationManagerInterface&) =
+ delete;
+
virtual ~NotificationManagerInterface() {}
// Shows a notification about the request being unresponsive. The |callback|
@@ -30,9 +35,6 @@
// Hides a notification previously shown with |id|.
virtual void HideUnresponsiveNotification(int id) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NotificationManagerInterface);
};
} // namespace file_system_provider
diff --git a/chrome/browser/ash/file_system_provider/operations/abort.h b/chrome/browser/ash/file_system_provider/operations/abort.h
index 78a86d5..d65375e 100644
--- a/chrome/browser/ash/file_system_provider/operations/abort.h
+++ b/chrome/browser/ash/file_system_provider/operations/abort.h
@@ -30,6 +30,10 @@
const ProvidedFileSystemInfo& file_system_info,
int operation_request_id,
storage::AsyncFileUtil::StatusCallback callback);
+
+ Abort(const Abort&) = delete;
+ Abort& operator=(const Abort&) = delete;
+
~Abort() override;
// Operation overrides.
@@ -44,8 +48,6 @@
private:
int operation_request_id_;
storage::AsyncFileUtil::StatusCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(Abort);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/add_watcher.h b/chrome/browser/ash/file_system_provider/operations/add_watcher.h
index d41fcb8..7ff7ef43 100644
--- a/chrome/browser/ash/file_system_provider/operations/add_watcher.h
+++ b/chrome/browser/ash/file_system_provider/operations/add_watcher.h
@@ -37,6 +37,10 @@
const base::FilePath& entry_path,
bool recursive,
storage::AsyncFileUtil::StatusCallback callback);
+
+ AddWatcher(const AddWatcher&) = delete;
+ AddWatcher& operator=(const AddWatcher&) = delete;
+
~AddWatcher() override;
// Operation overrides.
@@ -52,8 +56,6 @@
const base::FilePath entry_path_;
const bool recursive_;
storage::AsyncFileUtil::StatusCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(AddWatcher);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/close_file.h b/chrome/browser/ash/file_system_provider/operations/close_file.h
index 8bc0497..4254021 100644
--- a/chrome/browser/ash/file_system_provider/operations/close_file.h
+++ b/chrome/browser/ash/file_system_provider/operations/close_file.h
@@ -32,6 +32,10 @@
const ProvidedFileSystemInfo& file_system_info,
int open_request_id,
storage::AsyncFileUtil::StatusCallback callback);
+
+ CloseFile(const CloseFile&) = delete;
+ CloseFile& operator=(const CloseFile&) = delete;
+
~CloseFile() override;
// Operation overrides.
@@ -46,8 +50,6 @@
private:
int open_request_id_;
storage::AsyncFileUtil::StatusCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(CloseFile);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/configure.h b/chrome/browser/ash/file_system_provider/operations/configure.h
index dc5bd40..01fd8b0c 100644
--- a/chrome/browser/ash/file_system_provider/operations/configure.h
+++ b/chrome/browser/ash/file_system_provider/operations/configure.h
@@ -30,6 +30,10 @@
Configure(extensions::EventRouter* event_router,
const ProvidedFileSystemInfo& file_system_info,
storage::AsyncFileUtil::StatusCallback callback);
+
+ Configure(const Configure&) = delete;
+ Configure& operator=(const Configure&) = delete;
+
~Configure() override;
// Operation overrides.
@@ -43,8 +47,6 @@
private:
storage::AsyncFileUtil::StatusCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(Configure);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/copy_entry.h b/chrome/browser/ash/file_system_provider/operations/copy_entry.h
index 7e3b3129..8b3da39 100644
--- a/chrome/browser/ash/file_system_provider/operations/copy_entry.h
+++ b/chrome/browser/ash/file_system_provider/operations/copy_entry.h
@@ -35,6 +35,10 @@
const base::FilePath& source_path,
const base::FilePath& target_path,
storage::AsyncFileUtil::StatusCallback callback);
+
+ CopyEntry(const CopyEntry&) = delete;
+ CopyEntry& operator=(const CopyEntry&) = delete;
+
~CopyEntry() override;
// Operation overrides.
@@ -50,8 +54,6 @@
base::FilePath source_path_;
base::FilePath target_path_;
storage::AsyncFileUtil::StatusCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(CopyEntry);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/create_directory.h b/chrome/browser/ash/file_system_provider/operations/create_directory.h
index 6929673..fe45bf79 100644
--- a/chrome/browser/ash/file_system_provider/operations/create_directory.h
+++ b/chrome/browser/ash/file_system_provider/operations/create_directory.h
@@ -36,6 +36,10 @@
const base::FilePath& directory_path,
bool recursive,
storage::AsyncFileUtil::StatusCallback callback);
+
+ CreateDirectory(const CreateDirectory&) = delete;
+ CreateDirectory& operator=(const CreateDirectory&) = delete;
+
~CreateDirectory() override;
// Operation overrides.
@@ -51,8 +55,6 @@
base::FilePath directory_path_;
bool recursive_;
storage::AsyncFileUtil::StatusCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(CreateDirectory);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/create_file.h b/chrome/browser/ash/file_system_provider/operations/create_file.h
index 7b64485..0d1aceb5 100644
--- a/chrome/browser/ash/file_system_provider/operations/create_file.h
+++ b/chrome/browser/ash/file_system_provider/operations/create_file.h
@@ -35,6 +35,10 @@
const ProvidedFileSystemInfo& file_system_info,
const base::FilePath& file_path,
storage::AsyncFileUtil::StatusCallback callback);
+
+ CreateFile(const CreateFile&) = delete;
+ CreateFile& operator=(const CreateFile&) = delete;
+
~CreateFile() override;
// Operation overrides.
@@ -49,8 +53,6 @@
private:
base::FilePath file_path_;
storage::AsyncFileUtil::StatusCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(CreateFile);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/delete_entry.h b/chrome/browser/ash/file_system_provider/operations/delete_entry.h
index 9664a4d..8da5471 100644
--- a/chrome/browser/ash/file_system_provider/operations/delete_entry.h
+++ b/chrome/browser/ash/file_system_provider/operations/delete_entry.h
@@ -35,6 +35,10 @@
const base::FilePath& entry_path,
bool recursive,
storage::AsyncFileUtil::StatusCallback callback);
+
+ DeleteEntry(const DeleteEntry&) = delete;
+ DeleteEntry& operator=(const DeleteEntry&) = delete;
+
~DeleteEntry() override;
// Operation overrides.
@@ -50,8 +54,6 @@
base::FilePath entry_path_;
bool recursive_;
storage::AsyncFileUtil::StatusCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(DeleteEntry);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/execute_action.h b/chrome/browser/ash/file_system_provider/operations/execute_action.h
index 9dbc287..f8c89d0 100644
--- a/chrome/browser/ash/file_system_provider/operations/execute_action.h
+++ b/chrome/browser/ash/file_system_provider/operations/execute_action.h
@@ -40,6 +40,10 @@
const std::vector<base::FilePath>& entry_path,
const std::string& action_id,
storage::AsyncFileUtil::StatusCallback callback);
+
+ ExecuteAction(const ExecuteAction&) = delete;
+ ExecuteAction& operator=(const ExecuteAction&) = delete;
+
~ExecuteAction() override;
// Operation overrides.
@@ -55,8 +59,6 @@
const std::vector<base::FilePath> entry_paths_;
const std::string action_id_;
storage::AsyncFileUtil::StatusCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ExecuteAction);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/get_actions.h b/chrome/browser/ash/file_system_provider/operations/get_actions.h
index a269851..43d47b5 100644
--- a/chrome/browser/ash/file_system_provider/operations/get_actions.h
+++ b/chrome/browser/ash/file_system_provider/operations/get_actions.h
@@ -36,6 +36,10 @@
const ProvidedFileSystemInfo& file_system_info,
const std::vector<base::FilePath>& entry_paths,
ProvidedFileSystemInterface::GetActionsCallback callback);
+
+ GetActions(const GetActions&) = delete;
+ GetActions& operator=(const GetActions&) = delete;
+
~GetActions() override;
// Operation overrides.
@@ -50,8 +54,6 @@
private:
const std::vector<base::FilePath> entry_paths_;
ProvidedFileSystemInterface::GetActionsCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(GetActions);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/get_actions_unittest.cc b/chrome/browser/ash/file_system_provider/operations/get_actions_unittest.cc
index 7e2625b..c715569 100644
--- a/chrome/browser/ash/file_system_provider/operations/get_actions_unittest.cc
+++ b/chrome/browser/ash/file_system_provider/operations/get_actions_unittest.cc
@@ -44,6 +44,10 @@
public:
Event(const Actions& actions, base::File::Error result)
: actions_(actions), result_(result) {}
+
+ Event(const Event&) = delete;
+ Event& operator=(const Event&) = delete;
+
virtual ~Event() {}
const Actions& actions() const { return actions_; }
@@ -52,8 +56,6 @@
private:
Actions actions_;
base::File::Error result_;
-
- DISALLOW_COPY_AND_ASSIGN(Event);
};
CallbackLogger() {}
diff --git a/chrome/browser/ash/file_system_provider/operations/get_metadata.h b/chrome/browser/ash/file_system_provider/operations/get_metadata.h
index 35a4c22..0784211 100644
--- a/chrome/browser/ash/file_system_provider/operations/get_metadata.h
+++ b/chrome/browser/ash/file_system_provider/operations/get_metadata.h
@@ -47,6 +47,10 @@
const base::FilePath& entry_path,
ProvidedFileSystemInterface::MetadataFieldMask fields,
ProvidedFileSystemInterface::GetMetadataCallback callback);
+
+ GetMetadata(const GetMetadata&) = delete;
+ GetMetadata& operator=(const GetMetadata&) = delete;
+
~GetMetadata() override;
// Operation overrides.
@@ -62,8 +66,6 @@
base::FilePath entry_path_;
ProvidedFileSystemInterface::MetadataFieldMask fields_;
ProvidedFileSystemInterface::GetMetadataCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(GetMetadata);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/get_metadata_unittest.cc b/chrome/browser/ash/file_system_provider/operations/get_metadata_unittest.cc
index 1264030..aea386b 100644
--- a/chrome/browser/ash/file_system_provider/operations/get_metadata_unittest.cc
+++ b/chrome/browser/ash/file_system_provider/operations/get_metadata_unittest.cc
@@ -63,6 +63,10 @@
public:
Event(std::unique_ptr<EntryMetadata> metadata, base::File::Error result)
: metadata_(std::move(metadata)), result_(result) {}
+
+ Event(const Event&) = delete;
+ Event& operator=(const Event&) = delete;
+
virtual ~Event() {}
const EntryMetadata* metadata() const { return metadata_.get(); }
@@ -71,8 +75,6 @@
private:
std::unique_ptr<EntryMetadata> metadata_;
base::File::Error result_;
-
- DISALLOW_COPY_AND_ASSIGN(Event);
};
CallbackLogger() {}
diff --git a/chrome/browser/ash/file_system_provider/operations/move_entry.h b/chrome/browser/ash/file_system_provider/operations/move_entry.h
index 93cbbfa..8c29e01 100644
--- a/chrome/browser/ash/file_system_provider/operations/move_entry.h
+++ b/chrome/browser/ash/file_system_provider/operations/move_entry.h
@@ -35,6 +35,10 @@
const base::FilePath& source_path,
const base::FilePath& target_path,
storage::AsyncFileUtil::StatusCallback callback);
+
+ MoveEntry(const MoveEntry&) = delete;
+ MoveEntry& operator=(const MoveEntry&) = delete;
+
~MoveEntry() override;
// Operation overrides.
@@ -50,8 +54,6 @@
base::FilePath source_path_;
base::FilePath target_path_;
storage::AsyncFileUtil::StatusCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(MoveEntry);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/open_file.h b/chrome/browser/ash/file_system_provider/operations/open_file.h
index 8cf986e..75940e7 100644
--- a/chrome/browser/ash/file_system_provider/operations/open_file.h
+++ b/chrome/browser/ash/file_system_provider/operations/open_file.h
@@ -36,6 +36,10 @@
const base::FilePath& file_path,
OpenFileMode mode,
ProvidedFileSystemInterface::OpenFileCallback callback);
+
+ OpenFile(const OpenFile&) = delete;
+ OpenFile& operator=(const OpenFile&) = delete;
+
~OpenFile() override;
// Operation overrides.
@@ -51,8 +55,6 @@
base::FilePath file_path_;
OpenFileMode mode_;
ProvidedFileSystemInterface::OpenFileCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(OpenFile);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/open_file_unittest.cc b/chrome/browser/ash/file_system_provider/operations/open_file_unittest.cc
index 2d2c1b6..ef180fc 100644
--- a/chrome/browser/ash/file_system_provider/operations/open_file_unittest.cc
+++ b/chrome/browser/ash/file_system_provider/operations/open_file_unittest.cc
@@ -40,6 +40,10 @@
public:
Event(int file_handle, base::File::Error result)
: file_handle_(file_handle), result_(result) {}
+
+ Event(const Event&) = delete;
+ Event& operator=(const Event&) = delete;
+
virtual ~Event() {}
int file_handle() { return file_handle_; }
@@ -48,8 +52,6 @@
private:
int file_handle_;
base::File::Error result_;
-
- DISALLOW_COPY_AND_ASSIGN(Event);
};
CallbackLogger() {}
diff --git a/chrome/browser/ash/file_system_provider/operations/operation.h b/chrome/browser/ash/file_system_provider/operations/operation.h
index e673b8c..f757c5eb 100644
--- a/chrome/browser/ash/file_system_provider/operations/operation.h
+++ b/chrome/browser/ash/file_system_provider/operations/operation.h
@@ -34,6 +34,10 @@
Operation(extensions::EventRouter* event_router,
const ProvidedFileSystemInfo& file_system_info);
+
+ Operation(const Operation&) = delete;
+ Operation& operator=(const Operation&) = delete;
+
~Operation() override;
// RequestManager::HandlerInterface overrides.
@@ -61,7 +65,6 @@
private:
DispatchEventImplCallback dispatch_event_impl_;
- DISALLOW_COPY_AND_ASSIGN(Operation);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/read_directory.h b/chrome/browser/ash/file_system_provider/operations/read_directory.h
index a809d5f..a778e62 100644
--- a/chrome/browser/ash/file_system_provider/operations/read_directory.h
+++ b/chrome/browser/ash/file_system_provider/operations/read_directory.h
@@ -34,6 +34,10 @@
const ProvidedFileSystemInfo& file_system_info,
const base::FilePath& directory_path,
storage::AsyncFileUtil::ReadDirectoryCallback callback);
+
+ ReadDirectory(const ReadDirectory&) = delete;
+ ReadDirectory& operator=(const ReadDirectory&) = delete;
+
~ReadDirectory() override;
// Operation overrides.
@@ -48,8 +52,6 @@
private:
base::FilePath directory_path_;
const storage::AsyncFileUtil::ReadDirectoryCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ReadDirectory);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/read_directory_unittest.cc b/chrome/browser/ash/file_system_provider/operations/read_directory_unittest.cc
index c65432f..5c7860c 100644
--- a/chrome/browser/ash/file_system_provider/operations/read_directory_unittest.cc
+++ b/chrome/browser/ash/file_system_provider/operations/read_directory_unittest.cc
@@ -48,6 +48,10 @@
: result_(result),
entry_list_(std::move(entry_list)),
has_more_(has_more) {}
+
+ Event(const Event&) = delete;
+ Event& operator=(const Event&) = delete;
+
virtual ~Event() {}
base::File::Error result() { return result_; }
@@ -60,8 +64,6 @@
base::File::Error result_;
storage::AsyncFileUtil::EntryList entry_list_;
bool has_more_;
-
- DISALLOW_COPY_AND_ASSIGN(Event);
};
CallbackLogger() {}
diff --git a/chrome/browser/ash/file_system_provider/operations/read_file.h b/chrome/browser/ash/file_system_provider/operations/read_file.h
index ca708ac..177c7f857 100644
--- a/chrome/browser/ash/file_system_provider/operations/read_file.h
+++ b/chrome/browser/ash/file_system_provider/operations/read_file.h
@@ -38,6 +38,10 @@
int64_t offset,
int length,
ProvidedFileSystemInterface::ReadChunkReceivedCallback callback);
+
+ ReadFile(const ReadFile&) = delete;
+ ReadFile& operator=(const ReadFile&) = delete;
+
~ReadFile() override;
// Operation overrides.
@@ -56,8 +60,6 @@
int length_;
int64_t current_offset_;
ProvidedFileSystemInterface::ReadChunkReceivedCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ReadFile);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/read_file_unittest.cc b/chrome/browser/ash/file_system_provider/operations/read_file_unittest.cc
index 14c181a2..c2dd4c7 100644
--- a/chrome/browser/ash/file_system_provider/operations/read_file_unittest.cc
+++ b/chrome/browser/ash/file_system_provider/operations/read_file_unittest.cc
@@ -45,6 +45,10 @@
public:
Event(int chunk_length, bool has_more, base::File::Error result)
: chunk_length_(chunk_length), has_more_(has_more), result_(result) {}
+
+ Event(const Event&) = delete;
+ Event& operator=(const Event&) = delete;
+
virtual ~Event() {}
int chunk_length() const { return chunk_length_; }
@@ -55,8 +59,6 @@
int chunk_length_;
bool has_more_;
base::File::Error result_;
-
- DISALLOW_COPY_AND_ASSIGN(Event);
};
CallbackLogger() {}
diff --git a/chrome/browser/ash/file_system_provider/operations/remove_watcher.h b/chrome/browser/ash/file_system_provider/operations/remove_watcher.h
index 9e9712e..35b5c54 100644
--- a/chrome/browser/ash/file_system_provider/operations/remove_watcher.h
+++ b/chrome/browser/ash/file_system_provider/operations/remove_watcher.h
@@ -35,6 +35,10 @@
const base::FilePath& entry_path,
bool recursive,
storage::AsyncFileUtil::StatusCallback callback);
+
+ RemoveWatcher(const RemoveWatcher&) = delete;
+ RemoveWatcher& operator=(const RemoveWatcher&) = delete;
+
~RemoveWatcher() override;
// Operation overrides.
@@ -50,8 +54,6 @@
const base::FilePath entry_path_;
bool recursive_;
storage::AsyncFileUtil::StatusCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(RemoveWatcher);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/test_util.h b/chrome/browser/ash/file_system_provider/operations/test_util.h
index bf8c721..66f6679 100644
--- a/chrome/browser/ash/file_system_provider/operations/test_util.h
+++ b/chrome/browser/ash/file_system_provider/operations/test_util.h
@@ -25,6 +25,10 @@
class LoggingDispatchEventImpl {
public:
explicit LoggingDispatchEventImpl(bool dispatch_reply);
+
+ LoggingDispatchEventImpl(const LoggingDispatchEventImpl&) = delete;
+ LoggingDispatchEventImpl& operator=(const LoggingDispatchEventImpl&) = delete;
+
virtual ~LoggingDispatchEventImpl();
// Handles sending an event to a providing extension.
@@ -36,8 +40,6 @@
private:
std::vector<std::unique_ptr<extensions::Event>> events_;
bool dispatch_reply_;
-
- DISALLOW_COPY_AND_ASSIGN(LoggingDispatchEventImpl);
};
// Container for remembering operations' callback invocations.
diff --git a/chrome/browser/ash/file_system_provider/operations/truncate.h b/chrome/browser/ash/file_system_provider/operations/truncate.h
index d39184b..861d247 100644
--- a/chrome/browser/ash/file_system_provider/operations/truncate.h
+++ b/chrome/browser/ash/file_system_provider/operations/truncate.h
@@ -38,6 +38,10 @@
const base::FilePath& file_path,
int64_t length,
storage::AsyncFileUtil::StatusCallback callback);
+
+ Truncate(const Truncate&) = delete;
+ Truncate& operator=(const Truncate&) = delete;
+
~Truncate() override;
// Operation overrides.
@@ -53,8 +57,6 @@
base::FilePath file_path_;
int64_t length_;
storage::AsyncFileUtil::StatusCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(Truncate);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/unmount.h b/chrome/browser/ash/file_system_provider/operations/unmount.h
index 6e53025..a580703 100644
--- a/chrome/browser/ash/file_system_provider/operations/unmount.h
+++ b/chrome/browser/ash/file_system_provider/operations/unmount.h
@@ -30,6 +30,10 @@
Unmount(extensions::EventRouter* event_router,
const ProvidedFileSystemInfo& file_system_info,
storage::AsyncFileUtil::StatusCallback callback);
+
+ Unmount(const Unmount&) = delete;
+ Unmount& operator=(const Unmount&) = delete;
+
~Unmount() override;
// Operation overrides.
@@ -43,8 +47,6 @@
private:
storage::AsyncFileUtil::StatusCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(Unmount);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/operations/write_file.h b/chrome/browser/ash/file_system_provider/operations/write_file.h
index 9624e2db..4bd09f8 100644
--- a/chrome/browser/ash/file_system_provider/operations/write_file.h
+++ b/chrome/browser/ash/file_system_provider/operations/write_file.h
@@ -39,6 +39,10 @@
int64_t offset,
int length,
storage::AsyncFileUtil::StatusCallback callback);
+
+ WriteFile(const WriteFile&) = delete;
+ WriteFile& operator=(const WriteFile&) = delete;
+
~WriteFile() override;
// Operation overrides.
@@ -56,8 +60,6 @@
int64_t offset_;
int length_;
storage::AsyncFileUtil::StatusCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(WriteFile);
};
} // namespace operations
diff --git a/chrome/browser/ash/file_system_provider/provided_file_system.h b/chrome/browser/ash/file_system_provider/provided_file_system.h
index 3665976..f7a6a57 100644
--- a/chrome/browser/ash/file_system_provider/provided_file_system.h
+++ b/chrome/browser/ash/file_system_provider/provided_file_system.h
@@ -81,6 +81,10 @@
public:
ProvidedFileSystem(Profile* profile,
const ProvidedFileSystemInfo& file_system_info);
+
+ ProvidedFileSystem(const ProvidedFileSystem&) = delete;
+ ProvidedFileSystem& operator=(const ProvidedFileSystem&) = delete;
+
~ProvidedFileSystem() override;
// Sets a custom event router. Used in unit tests to mock out the real
@@ -252,7 +256,6 @@
base::ObserverList<ProvidedFileSystemObserver>::Unchecked observers_;
base::WeakPtrFactory<ProvidedFileSystem> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(ProvidedFileSystem);
};
} // namespace file_system_provider
diff --git a/chrome/browser/ash/file_system_provider/provided_file_system_unittest.cc b/chrome/browser/ash/file_system_provider/provided_file_system_unittest.cc
index 0639e83f..af4d19b 100644
--- a/chrome/browser/ash/file_system_provider/provided_file_system_unittest.cc
+++ b/chrome/browser/ash/file_system_provider/provided_file_system_unittest.cc
@@ -60,6 +60,10 @@
: EventRouter(profile, NULL),
file_system_(file_system),
reply_result_(base::File::FILE_OK) {}
+
+ FakeEventRouter(const FakeEventRouter&) = delete;
+ FakeEventRouter& operator=(const FakeEventRouter&) = delete;
+
~FakeEventRouter() override {}
// Handles an event which would normally be routed to an extension. Instead
@@ -110,7 +114,6 @@
private:
ProvidedFileSystemInterface* const file_system_; // Not owned.
base::File::Error reply_result_;
- DISALLOW_COPY_AND_ASSIGN(FakeEventRouter);
};
// Observes the tested file system.
@@ -121,6 +124,10 @@
ChangeEvent(storage::WatcherManager::ChangeType change_type,
const ProvidedFileSystemObserver::Changes& changes)
: change_type_(change_type), changes_(changes) {}
+
+ ChangeEvent(const ChangeEvent&) = delete;
+ ChangeEvent& operator=(const ChangeEvent&) = delete;
+
virtual ~ChangeEvent() {}
storage::WatcherManager::ChangeType change_type() const {
@@ -133,8 +140,6 @@
private:
const storage::WatcherManager::ChangeType change_type_;
const ProvidedFileSystemObserver::Changes changes_;
-
- DISALLOW_COPY_AND_ASSIGN(ChangeEvent);
};
Observer() : list_changed_counter_(0), tag_updated_counter_(0) {}
@@ -189,15 +194,16 @@
class StubNotificationManager : public NotificationManagerInterface {
public:
StubNotificationManager() {}
+
+ StubNotificationManager(const StubNotificationManager&) = delete;
+ StubNotificationManager& operator=(const StubNotificationManager&) = delete;
+
~StubNotificationManager() override {}
// NotificationManagerInterface overrides.
void ShowUnresponsiveNotification(int id,
NotificationCallback callback) override {}
void HideUnresponsiveNotification(int id) override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(StubNotificationManager);
};
typedef std::vector<base::File::Error> Log;
diff --git a/chrome/browser/ash/file_system_provider/queue.h b/chrome/browser/ash/file_system_provider/queue.h
index 536d221..d08fbba3 100644
--- a/chrome/browser/ash/file_system_provider/queue.h
+++ b/chrome/browser/ash/file_system_provider/queue.h
@@ -42,6 +42,9 @@
// Creates a queue with a maximum number of tasks running in parallel.
explicit Queue(size_t max_in_parallel);
+ Queue(const Queue&) = delete;
+ Queue& operator=(const Queue&) = delete;
+
virtual ~Queue();
// Creates a token for enqueuing (and later aborting) tasks.
@@ -88,7 +91,6 @@
std::map<int, Task> executed_;
base::WeakPtrFactory<Queue> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(Queue);
};
} // namespace file_system_provider
diff --git a/chrome/browser/ash/file_system_provider/registry.h b/chrome/browser/ash/file_system_provider/registry.h
index a1dea71..95e007b 100644
--- a/chrome/browser/ash/file_system_provider/registry.h
+++ b/chrome/browser/ash/file_system_provider/registry.h
@@ -42,6 +42,10 @@
class Registry : public RegistryInterface {
public:
explicit Registry(Profile* profile);
+
+ Registry(const Registry&) = delete;
+ Registry& operator=(const Registry&) = delete;
+
~Registry() override;
// RegistryInterface overrides.
@@ -56,7 +60,6 @@
private:
Profile* profile_; // Not owned.
- DISALLOW_COPY_AND_ASSIGN(Registry);
};
} // namespace file_system_provider
diff --git a/chrome/browser/ash/file_system_provider/request_manager.h b/chrome/browser/ash/file_system_provider/request_manager.h
index 4380ff4..084c83f 100644
--- a/chrome/browser/ash/file_system_provider/request_manager.h
+++ b/chrome/browser/ash/file_system_provider/request_manager.h
@@ -111,6 +111,10 @@
RequestManager(Profile* profile,
const std::string& provider_id,
NotificationManagerInterface* notification_manager);
+
+ RequestManager(const RequestManager&) = delete;
+ RequestManager& operator=(const RequestManager&) = delete;
+
virtual ~RequestManager();
// Creates a request and returns its request id (greater than 0). Returns 0 in
@@ -187,8 +191,6 @@
base::TimeDelta timeout_;
base::ObserverList<Observer>::Unchecked observers_;
base::WeakPtrFactory<RequestManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(RequestManager);
};
} // namespace file_system_provider
diff --git a/chrome/browser/ash/file_system_provider/request_manager_unittest.cc b/chrome/browser/ash/file_system_provider/request_manager_unittest.cc
index 6df9179..ef3eafae 100644
--- a/chrome/browser/ash/file_system_provider/request_manager_unittest.cc
+++ b/chrome/browser/ash/file_system_provider/request_manager_unittest.cc
@@ -35,6 +35,10 @@
class FakeNotificationManager : public NotificationManagerInterface {
public:
FakeNotificationManager() {}
+
+ FakeNotificationManager(const FakeNotificationManager&) = delete;
+ FakeNotificationManager& operator=(const FakeNotificationManager&) = delete;
+
~FakeNotificationManager() override {}
// NotificationManagerInterface overrides:
@@ -70,8 +74,6 @@
}
CallbackMap callbacks_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeNotificationManager);
};
// Logs calls of the success and error callbacks on requests.
@@ -203,12 +205,14 @@
logger_->OnError(request_id, std::move(result), error);
}
+ FakeHandler(const FakeHandler&) = delete;
+ FakeHandler& operator=(const FakeHandler&) = delete;
+
~FakeHandler() override {}
private:
base::WeakPtr<EventLogger> logger_;
bool execute_reply_;
- DISALLOW_COPY_AND_ASSIGN(FakeHandler);
};
// Observer the request manager for request events.
diff --git a/chrome/browser/ash/file_system_provider/request_value.h b/chrome/browser/ash/file_system_provider/request_value.h
index 347ea0c..a68c3c5 100644
--- a/chrome/browser/ash/file_system_provider/request_value.h
+++ b/chrome/browser/ash/file_system_provider/request_value.h
@@ -23,6 +23,9 @@
// proper content.
RequestValue();
+ RequestValue(const RequestValue&) = delete;
+ RequestValue& operator=(const RequestValue&) = delete;
+
virtual ~RequestValue();
static std::unique_ptr<RequestValue> CreateForUnmountSuccess(
@@ -123,8 +126,6 @@
OperationRequestedError::Params>
operation_error_params_;
std::unique_ptr<std::string> testing_params_;
-
- DISALLOW_COPY_AND_ASSIGN(RequestValue);
};
} // namespace file_system_provider
diff --git a/chrome/browser/ash/file_system_provider/service.h b/chrome/browser/ash/file_system_provider/service.h
index 68f5dbe..09aac26 100644
--- a/chrome/browser/ash/file_system_provider/service.h
+++ b/chrome/browser/ash/file_system_provider/service.h
@@ -67,6 +67,10 @@
enum UnmountReason { UNMOUNT_REASON_USER, UNMOUNT_REASON_SHUTDOWN };
Service(Profile* profile, extensions::ExtensionRegistry* extension_registry);
+
+ Service(const Service&) = delete;
+ Service& operator=(const Service&) = delete;
+
~Service() override;
// Gets the singleton instance for the |context|.
@@ -209,7 +213,6 @@
ProviderMap provider_map_;
base::WeakPtrFactory<Service> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(Service);
};
} // namespace file_system_provider
diff --git a/chrome/browser/ash/file_system_provider/throttled_file_system.h b/chrome/browser/ash/file_system_provider/throttled_file_system.h
index da0fc236..9b3112f 100644
--- a/chrome/browser/ash/file_system_provider/throttled_file_system.h
+++ b/chrome/browser/ash/file_system_provider/throttled_file_system.h
@@ -42,6 +42,10 @@
public:
explicit ThrottledFileSystem(
std::unique_ptr<ProvidedFileSystemInterface> file_system);
+
+ ThrottledFileSystem(const ThrottledFileSystem&) = delete;
+ ThrottledFileSystem& operator=(const ThrottledFileSystem&) = delete;
+
~ThrottledFileSystem() override;
// ProvidedFileSystemInterface overrides.
@@ -147,7 +151,6 @@
std::map<int, int> opened_files_;
base::WeakPtrFactory<ThrottledFileSystem> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(ThrottledFileSystem);
};
} // namespace file_system_provider
diff --git a/chrome/browser/ash/first_run/drive_first_run_controller.cc b/chrome/browser/ash/first_run/drive_first_run_controller.cc
index 6f6c933..9c81c21 100644
--- a/chrome/browser/ash/first_run/drive_first_run_controller.cc
+++ b/chrome/browser/ash/first_run/drive_first_run_controller.cc
@@ -92,6 +92,10 @@
const std::string& app_id,
const std::string& endpoint_url,
CompletionCallback completion_callback);
+
+ DriveWebContentsManager(const DriveWebContentsManager&) = delete;
+ DriveWebContentsManager& operator=(const DriveWebContentsManager&) = delete;
+
~DriveWebContentsManager() override;
// Start loading the WebContents for the endpoint in the context of the Drive
@@ -147,8 +151,6 @@
bool started_ = false;
CompletionCallback completion_callback_;
base::WeakPtrFactory<DriveWebContentsManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DriveWebContentsManager);
};
DriveWebContentsManager::DriveWebContentsManager(
diff --git a/chrome/browser/ash/guest_os/guest_os_registry_service.h b/chrome/browser/ash/guest_os/guest_os_registry_service.h
index 95abb09..8bb6856 100644
--- a/chrome/browser/ash/guest_os/guest_os_registry_service.h
+++ b/chrome/browser/ash/guest_os/guest_os_registry_service.h
@@ -76,6 +76,10 @@
Registration(const std::string app_id, const base::Value pref);
Registration(Registration&& registration) = default;
Registration& operator=(Registration&& registration) = default;
+
+ Registration(const Registration&) = delete;
+ Registration& operator=(const Registration&) = delete;
+
~Registration();
std::string app_id() const { return app_id_; }
@@ -108,8 +112,6 @@
std::string app_id_;
base::Value pref_;
-
- DISALLOW_COPY_AND_ASSIGN(Registration);
};
class Observer {
diff --git a/chrome/browser/ash/guest_os/guest_os_share_path.h b/chrome/browser/ash/guest_os/guest_os_share_path.h
index b074a0e..d85d60f9d 100644
--- a/chrome/browser/ash/guest_os/guest_os_share_path.h
+++ b/chrome/browser/ash/guest_os/guest_os_share_path.h
@@ -64,6 +64,10 @@
static GuestOsSharePath* GetForProfile(Profile* profile);
explicit GuestOsSharePath(Profile* profile);
+
+ GuestOsSharePath(const GuestOsSharePath&) = delete;
+ GuestOsSharePath& operator=(const GuestOsSharePath&) = delete;
+
~GuestOsSharePath() override;
// KeyedService:
@@ -178,8 +182,6 @@
std::map<base::FilePath, SharedPathInfo> shared_paths_;
base::WeakPtrFactory<GuestOsSharePath> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(GuestOsSharePath);
}; // class
} // namespace guest_os
diff --git a/chrome/browser/ash/guest_os/guest_os_share_path_unittest.cc b/chrome/browser/ash/guest_os/guest_os_share_path_unittest.cc
index 0d9ce0f..5d96c25 100644
--- a/chrome/browser/ash/guest_os/guest_os_share_path_unittest.cc
+++ b/chrome/browser/ash/guest_os/guest_os_share_path_unittest.cc
@@ -224,6 +224,9 @@
fake_seneschal_client_ = chromeos::FakeSeneschalClient::Get();
}
+ GuestOsSharePathTest(const GuestOsSharePathTest&) = delete;
+ GuestOsSharePathTest& operator=(const GuestOsSharePathTest&) = delete;
+
~GuestOsSharePathTest() override {
chromeos::SeneschalClient::Shutdown();
chromeos::ConciergeClient::Shutdown();
@@ -341,8 +344,6 @@
std::unique_ptr<ScopedTestingLocalState> local_state_;
scoped_refptr<component_updater::FakeCrOSComponentManager> component_manager_;
BrowserProcessPlatformPartTestApi browser_part_;
-
- DISALLOW_COPY_AND_ASSIGN(GuestOsSharePathTest);
};
TEST_F(GuestOsSharePathTest, SuccessMyFilesRoot) {
diff --git a/chrome/browser/ash/hats/hats_dialog.h b/chrome/browser/ash/hats/hats_dialog.h
index ea71c23..a90acff 100644
--- a/chrome/browser/ash/hats/hats_dialog.h
+++ b/chrome/browser/ash/hats/hats_dialog.h
@@ -31,6 +31,9 @@
const base::flat_map<std::string, std::string>& product_specific_data =
base::flat_map<std::string, std::string>());
+ HatsDialog(const HatsDialog&) = delete;
+ HatsDialog& operator=(const HatsDialog&) = delete;
+
~HatsDialog() override;
private:
@@ -82,8 +85,6 @@
std::string url_;
Profile* user_profile_;
const std::string histogram_name_;
-
- DISALLOW_COPY_AND_ASSIGN(HatsDialog);
};
} // namespace ash
diff --git a/chrome/browser/ash/hats/hats_notification_controller_unittest.cc b/chrome/browser/ash/hats/hats_notification_controller_unittest.cc
index 08b8467b..b9f3593 100644
--- a/chrome/browser/ash/hats/hats_notification_controller_unittest.cc
+++ b/chrome/browser/ash/hats/hats_notification_controller_unittest.cc
@@ -37,6 +37,12 @@
class HatsNotificationControllerTest : public BrowserWithTestWindowTest {
public:
HatsNotificationControllerTest() {}
+
+ HatsNotificationControllerTest(const HatsNotificationControllerTest&) =
+ delete;
+ HatsNotificationControllerTest& operator=(
+ const HatsNotificationControllerTest&) = delete;
+
~HatsNotificationControllerTest() override {}
void SetUp() override {
@@ -82,9 +88,6 @@
NiceMock<MockNetworkPortalDetector> mock_network_portal_detector_;
std::unique_ptr<NotificationDisplayServiceTester> display_service_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(HatsNotificationControllerTest);
};
TEST_F(HatsNotificationControllerTest, NewDevice_ShouldNotShowNotification) {
diff --git a/chrome/browser/ash/input_method/assistive_window_controller.h b/chrome/browser/ash/input_method/assistive_window_controller.h
index db23577..550ec54 100644
--- a/chrome/browser/ash/input_method/assistive_window_controller.h
+++ b/chrome/browser/ash/input_method/assistive_window_controller.h
@@ -37,6 +37,11 @@
AssistiveWindowControllerDelegate* delegate,
Profile* profile,
ui::ime::AssistiveAccessibilityView* accessibility_view = nullptr);
+
+ AssistiveWindowController(const AssistiveWindowController&) = delete;
+ AssistiveWindowController& operator=(const AssistiveWindowController&) =
+ delete;
+
~AssistiveWindowController() override;
ui::ime::SuggestionWindowView* GetSuggestionWindowViewForTesting();
@@ -77,8 +82,6 @@
size_t confirmed_length_ = 0;
Bounds bounds_;
bool tracking_last_suggestion_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(AssistiveWindowController);
};
} // namespace input_method
diff --git a/chrome/browser/ash/input_method/candidate_window_controller_impl.h b/chrome/browser/ash/input_method/candidate_window_controller_impl.h
index 13fdbb2..c5d9862 100644
--- a/chrome/browser/ash/input_method/candidate_window_controller_impl.h
+++ b/chrome/browser/ash/input_method/candidate_window_controller_impl.h
@@ -39,6 +39,11 @@
public IMECandidateWindowHandlerInterface {
public:
CandidateWindowControllerImpl();
+
+ CandidateWindowControllerImpl(const CandidateWindowControllerImpl&) = delete;
+ CandidateWindowControllerImpl& operator=(
+ const CandidateWindowControllerImpl&) = delete;
+
~CandidateWindowControllerImpl() override;
// CandidateWindowController overrides:
@@ -88,8 +93,6 @@
std::vector<ui::InfolistEntry> latest_infolist_entries_;
base::ObserverList<CandidateWindowController::Observer>::Unchecked observers_;
-
- DISALLOW_COPY_AND_ASSIGN(CandidateWindowControllerImpl);
};
} // namespace input_method
diff --git a/chrome/browser/ash/input_method/component_extension_ime_manager_delegate_impl.h b/chrome/browser/ash/input_method/component_extension_ime_manager_delegate_impl.h
index 5b33b59..3a20713 100644
--- a/chrome/browser/ash/input_method/component_extension_ime_manager_delegate_impl.h
+++ b/chrome/browser/ash/input_method/component_extension_ime_manager_delegate_impl.h
@@ -27,6 +27,12 @@
: public ComponentExtensionIMEManagerDelegate {
public:
ComponentExtensionIMEManagerDelegateImpl();
+
+ ComponentExtensionIMEManagerDelegateImpl(
+ const ComponentExtensionIMEManagerDelegateImpl&) = delete;
+ ComponentExtensionIMEManagerDelegateImpl& operator=(
+ const ComponentExtensionIMEManagerDelegateImpl&) = delete;
+
~ComponentExtensionIMEManagerDelegateImpl() override;
// ComponentExtensionIMEManagerDelegate overrides:
@@ -67,8 +73,6 @@
std::vector<ComponentExtensionIME> component_extension_list_;
std::set<std::string> login_layout_set_;
-
- DISALLOW_COPY_AND_ASSIGN(ComponentExtensionIMEManagerDelegateImpl);
};
} // namespace input_method
diff --git a/chrome/browser/ash/input_method/ime_service_connector.h b/chrome/browser/ash/input_method/ime_service_connector.h
index 3cb5908..9458122 100644
--- a/chrome/browser/ash/input_method/ime_service_connector.h
+++ b/chrome/browser/ash/input_method/ime_service_connector.h
@@ -27,6 +27,10 @@
: public chromeos::ime::mojom::PlatformAccessProvider {
public:
explicit ImeServiceConnector(Profile* profile);
+
+ ImeServiceConnector(const ImeServiceConnector&) = delete;
+ ImeServiceConnector& operator=(const ImeServiceConnector&) = delete;
+
~ImeServiceConnector() override;
// chromeos::ime::mojom::PlatformAccessProvider overrides:
@@ -53,8 +57,6 @@
mojo::Remote<chromeos::ime::mojom::ImeService> remote_service_;
mojo::Receiver<chromeos::ime::mojom::PlatformAccessProvider>
platform_access_receiver_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ImeServiceConnector);
};
} // namespace input_method
diff --git a/chrome/browser/ash/input_method/input_method_delegate_impl.h b/chrome/browser/ash/input_method/input_method_delegate_impl.h
index 225f376..37c0656 100644
--- a/chrome/browser/ash/input_method/input_method_delegate_impl.h
+++ b/chrome/browser/ash/input_method/input_method_delegate_impl.h
@@ -19,6 +19,10 @@
class InputMethodDelegateImpl : public InputMethodDelegate {
public:
InputMethodDelegateImpl();
+
+ InputMethodDelegateImpl(const InputMethodDelegateImpl&) = delete;
+ InputMethodDelegateImpl& operator=(const InputMethodDelegateImpl&) = delete;
+
~InputMethodDelegateImpl() override;
// InputMethodDelegate implementation.
@@ -27,9 +31,6 @@
std::u16string GetDisplayLanguageName(
const std::string& language_code) const override;
void SetHardwareKeyboardLayoutForTesting(const std::string& layout) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(InputMethodDelegateImpl);
};
} // namespace input_method
diff --git a/chrome/browser/ash/input_method/input_method_engine.h b/chrome/browser/ash/input_method/input_method_engine.h
index aa373783..7e1a0e90 100644
--- a/chrome/browser/ash/input_method/input_method_engine.h
+++ b/chrome/browser/ash/input_method/input_method_engine.h
@@ -86,6 +86,9 @@
InputMethodEngine();
+ InputMethodEngine(const InputMethodEngine&) = delete;
+ InputMethodEngine& operator=(const InputMethodEngine&) = delete;
+
~InputMethodEngine() override;
// InputMethodEngineBase overrides.
@@ -224,8 +227,6 @@
// Whether the desktop is being casted.
bool is_casting_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(InputMethodEngine);
};
} // namespace input_method
diff --git a/chrome/browser/ash/input_method/input_method_engine_browsertests.cc b/chrome/browser/ash/input_method/input_method_engine_browsertests.cc
index 6dc6b198..777fdcb 100644
--- a/chrome/browser/ash/input_method/input_method_engine_browsertests.cc
+++ b/chrome/browser/ash/input_method/input_method_engine_browsertests.cc
@@ -67,6 +67,11 @@
public ::testing::WithParamInterface<TestType> {
public:
InputMethodEngineBrowserTest() = default;
+
+ InputMethodEngineBrowserTest(const InputMethodEngineBrowserTest&) = delete;
+ InputMethodEngineBrowserTest& operator=(const InputMethodEngineBrowserTest&) =
+ delete;
+
virtual ~InputMethodEngineBrowserTest() = default;
void TearDownInProcessBrowserTestFixture() override { extension_ = NULL; }
@@ -127,15 +132,16 @@
}
const extensions::Extension* extension_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(InputMethodEngineBrowserTest);
};
class KeyEventDoneCallback {
public:
explicit KeyEventDoneCallback(bool expected_argument)
: expected_argument_(expected_argument) {}
+
+ KeyEventDoneCallback(const KeyEventDoneCallback&) = delete;
+ KeyEventDoneCallback& operator=(const KeyEventDoneCallback&) = delete;
+
~KeyEventDoneCallback() = default;
void Run(bool consumed) {
@@ -148,14 +154,16 @@
private:
bool expected_argument_;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(KeyEventDoneCallback);
};
class TestTextInputClient : public ui::DummyTextInputClient {
public:
explicit TestTextInputClient(ui::TextInputType type)
: ui::DummyTextInputClient(type) {}
+
+ TestTextInputClient(const TestTextInputClient&) = delete;
+ TestTextInputClient& operator=(const TestTextInputClient&) = delete;
+
~TestTextInputClient() override = default;
void WaitUntilCalled() { run_loop_.Run(); }
@@ -173,8 +181,6 @@
std::u16string inserted_text_;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(TestTextInputClient);
};
INSTANTIATE_TEST_SUITE_P(InputMethodEngineBrowserTest,
diff --git a/chrome/browser/ash/input_method/input_method_engine_unittest.cc b/chrome/browser/ash/input_method/input_method_engine_unittest.cc
index 8b9af40..181d265 100644
--- a/chrome/browser/ash/input_method/input_method_engine_unittest.cc
+++ b/chrome/browser/ash/input_method/input_method_engine_unittest.cc
@@ -82,6 +82,10 @@
class TestObserver : public InputMethodEngineBase::Observer {
public:
TestObserver() : calls_bitmap_(NONE) {}
+
+ TestObserver(const TestObserver&) = delete;
+ TestObserver& operator=(const TestObserver&) = delete;
+
~TestObserver() override = default;
void OnActivate(const std::string& engine_id) override {
@@ -148,8 +152,6 @@
private:
unsigned char calls_bitmap_;
std::string engine_id_;
-
- DISALLOW_COPY_AND_ASSIGN(TestObserver);
};
class InputMethodEngineTest : public testing::Test {
@@ -167,6 +169,10 @@
chrome_keyboard_controller_client_test_helper_ =
ChromeKeyboardControllerClientTestHelper::InitializeWithFake();
}
+
+ InputMethodEngineTest(const InputMethodEngineTest&) = delete;
+ InputMethodEngineTest& operator=(const InputMethodEngineTest&) = delete;
+
~InputMethodEngineTest() override {
ui::IMEBridge::Get()->SetInputContextHandler(nullptr);
engine_.reset();
@@ -206,9 +212,6 @@
mock_ime_input_context_handler_;
std::unique_ptr<ChromeKeyboardControllerClientTestHelper>
chrome_keyboard_controller_client_test_helper_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(InputMethodEngineTest);
};
} // namespace
diff --git a/chrome/browser/ash/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/ash/input_method/input_method_manager_impl_unittest.cc
index 9296dce..ad831fad 100644
--- a/chrome/browser/ash/input_method/input_method_manager_impl_unittest.cc
+++ b/chrome/browser/ash/input_method/input_method_manager_impl_unittest.cc
@@ -74,6 +74,10 @@
input_method_extension_removed_count_(0),
input_method_menu_item_changed_count_(0),
last_show_message_(false) {}
+
+ TestObserver(const TestObserver&) = delete;
+ TestObserver& operator=(const TestObserver&) = delete;
+
~TestObserver() override = default;
void InputMethodChanged(InputMethodManager* manager,
@@ -101,9 +105,6 @@
int input_method_extension_removed_count_;
int input_method_menu_item_changed_count_;
bool last_show_message_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestObserver);
};
class TestCandidateWindowObserver
@@ -114,6 +115,10 @@
candidate_window_closed_count_(0) {
}
+ TestCandidateWindowObserver(const TestCandidateWindowObserver&) = delete;
+ TestCandidateWindowObserver& operator=(const TestCandidateWindowObserver&) =
+ delete;
+
~TestCandidateWindowObserver() override = default;
void CandidateWindowOpened(InputMethodManager* manager) override {
@@ -125,15 +130,17 @@
int candidate_window_opened_count_;
int candidate_window_closed_count_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestCandidateWindowObserver);
};
} // namespace
class InputMethodManagerImplTest : public BrowserWithTestWindowTest {
public:
InputMethodManagerImplTest() = default;
+
+ InputMethodManagerImplTest(const InputMethodManagerImplTest&) = delete;
+ InputMethodManagerImplTest& operator=(const InputMethodManagerImplTest&) =
+ delete;
+
~InputMethodManagerImplTest() override = default;
void SetUp() override {
@@ -375,9 +382,6 @@
std::unique_ptr<MockInputMethodEngine> mock_engine_handler_;
FakeImeKeyboard* keyboard_ = nullptr;
ui::ime::InputMethodMenuManager* menu_manager_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImplTest);
};
TEST_F(InputMethodManagerImplTest, TestGetImeKeyboard) {
diff --git a/chrome/browser/ash/input_method/input_method_persistence.h b/chrome/browser/ash/input_method/input_method_persistence.h
index 102438f..b7a3eeb 100644
--- a/chrome/browser/ash/input_method/input_method_persistence.h
+++ b/chrome/browser/ash/input_method/input_method_persistence.h
@@ -25,6 +25,10 @@
// OnSessionStateChange whenever the InputMethodManager::UISessionState
// changes.
explicit InputMethodPersistence(InputMethodManager* input_method_manager);
+
+ InputMethodPersistence(const InputMethodPersistence&) = delete;
+ InputMethodPersistence& operator=(const InputMethodPersistence&) = delete;
+
~InputMethodPersistence() override;
// InputMethodManager::Observer overrides.
@@ -40,7 +44,6 @@
private:
InputMethodManager* input_method_manager_;
- DISALLOW_COPY_AND_ASSIGN(InputMethodPersistence);
};
void SetUserLastInputMethodPreferenceForTesting(
diff --git a/chrome/browser/ash/input_method/mock_candidate_window_controller.h b/chrome/browser/ash/input_method/mock_candidate_window_controller.h
index 05186f8..29b0331 100644
--- a/chrome/browser/ash/input_method/mock_candidate_window_controller.h
+++ b/chrome/browser/ash/input_method/mock_candidate_window_controller.h
@@ -16,6 +16,11 @@
class MockCandidateWindowController : public CandidateWindowController {
public:
MockCandidateWindowController();
+
+ MockCandidateWindowController(const MockCandidateWindowController&) = delete;
+ MockCandidateWindowController& operator=(
+ const MockCandidateWindowController&) = delete;
+
~MockCandidateWindowController() override;
// CandidateWindowController overrides:
@@ -33,8 +38,6 @@
private:
base::ObserverList<CandidateWindowController::Observer>::Unchecked observers_;
-
- DISALLOW_COPY_AND_ASSIGN(MockCandidateWindowController);
};
} // namespace input_method
diff --git a/chrome/browser/ash/input_method/textinput_test_helper.h b/chrome/browser/ash/input_method/textinput_test_helper.h
index 93075c2d..1ed5e9f 100644
--- a/chrome/browser/ash/input_method/textinput_test_helper.h
+++ b/chrome/browser/ash/input_method/textinput_test_helper.h
@@ -25,20 +25,26 @@
class TextInputTestBase : public InProcessBrowserTest {
public:
TextInputTestBase();
+
+ TextInputTestBase(const TextInputTestBase&) = delete;
+ TextInputTestBase& operator=(const TextInputTestBase&) = delete;
+
~TextInputTestBase() override;
ui::InputMethod* GetInputMethod() const;
private:
ui::ScopedTestInputMethodFactory scoped_test_input_method_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(TextInputTestBase);
};
// Provides text input test utilities.
class TextInputTestHelper : public ui::InputMethodObserver {
public:
explicit TextInputTestHelper(ui::InputMethod* input_method);
+
+ TextInputTestHelper(const TextInputTestHelper&) = delete;
+ TextInputTestHelper& operator=(const TextInputTestHelper&) = delete;
+
~TextInputTestHelper() override;
// Returns the latest status notified to ui::InputMethod
@@ -98,8 +104,6 @@
bool focus_state_;
ui::TextInputType latest_text_input_type_;
ui::InputMethod* input_method_;
-
- DISALLOW_COPY_AND_ASSIGN(TextInputTestHelper);
};
} // namespace input_method
diff --git a/chrome/browser/ash/input_method/ui/candidate_view_unittest.cc b/chrome/browser/ash/input_method/ui/candidate_view_unittest.cc
index bdfd778..c53ae39 100644
--- a/chrome/browser/ash/input_method/ui/candidate_view_unittest.cc
+++ b/chrome/browser/ash/input_method/ui/candidate_view_unittest.cc
@@ -36,6 +36,10 @@
class CandidateViewTest : public views::ViewsTestBase {
public:
CandidateViewTest() = default;
+
+ CandidateViewTest(const CandidateViewTest&) = delete;
+ CandidateViewTest& operator=(const CandidateViewTest&) = delete;
+
~CandidateViewTest() override = default;
void SetUp() override {
@@ -99,8 +103,6 @@
views::Widget* widget_ = nullptr;
views::View* container_ = nullptr;
std::unique_ptr<ui::test::EventGenerator> event_generator_;
-
- DISALLOW_COPY_AND_ASSIGN(CandidateViewTest);
};
TEST_F(CandidateViewTest, MouseHovers) {
diff --git a/chrome/browser/ash/input_method/ui/candidate_window_view_unittest.cc b/chrome/browser/ash/input_method/ui/candidate_window_view_unittest.cc
index 7a3251c..706113c 100644
--- a/chrome/browser/ash/input_method/ui/candidate_window_view_unittest.cc
+++ b/chrome/browser/ash/input_method/ui/candidate_window_view_unittest.cc
@@ -61,6 +61,10 @@
class CandidateWindowViewTest : public views::ViewsTestBase {
public:
CandidateWindowViewTest() {}
+
+ CandidateWindowViewTest(const CandidateWindowViewTest&) = delete;
+ CandidateWindowViewTest& operator=(const CandidateWindowViewTest&) = delete;
+
~CandidateWindowViewTest() override {}
protected:
@@ -111,8 +115,6 @@
private:
CandidateWindowView* candidate_window_view_; // Owned by its Widget.
-
- DISALLOW_COPY_AND_ASSIGN(CandidateWindowViewTest);
};
TEST_F(CandidateWindowViewTest, UpdateCandidatesTest_CursorVisibility) {
diff --git a/chrome/browser/ash/input_method/ui/infolist_window.cc b/chrome/browser/ash/input_method/ui/infolist_window.cc
index 7cabe70..943ac0f7 100644
--- a/chrome/browser/ash/input_method/ui/infolist_window.cc
+++ b/chrome/browser/ash/input_method/ui/infolist_window.cc
@@ -45,15 +45,16 @@
class InfolistBorder : public views::BubbleBorder {
public:
InfolistBorder();
+
+ InfolistBorder(const InfolistBorder&) = delete;
+ InfolistBorder& operator=(const InfolistBorder&) = delete;
+
~InfolistBorder() override;
// views::BubbleBorder implementation.
gfx::Rect GetBounds(const gfx::Rect& anchor_rect,
const gfx::Size& contents_size) const override;
gfx::Insets GetInsets() const override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(InfolistBorder);
};
InfolistBorder::InfolistBorder()
diff --git a/chrome/browser/ash/input_method/ui/input_method_menu_manager.h b/chrome/browser/ash/input_method/ui/input_method_menu_manager.h
index 0d807b97..d8b888b1 100644
--- a/chrome/browser/ash/input_method/ui/input_method_menu_manager.h
+++ b/chrome/browser/ash/input_method/ui/input_method_menu_manager.h
@@ -29,6 +29,9 @@
InputMethodMenuManager* manager) = 0;
};
+ InputMethodMenuManager(const InputMethodMenuManager&) = delete;
+ InputMethodMenuManager& operator=(const InputMethodMenuManager&) = delete;
+
~InputMethodMenuManager();
void AddObserver(Observer* observer);
@@ -58,8 +61,6 @@
// Observers who will be notified when menu changes.
base::ObserverList<Observer>::Unchecked observers_;
-
- DISALLOW_COPY_AND_ASSIGN(InputMethodMenuManager);
};
} // namespace ime
diff --git a/chrome/browser/ash/input_method/ui/suggestion_window_view_unittest.cc b/chrome/browser/ash/input_method/ui/suggestion_window_view_unittest.cc
index 5545355..4675872b 100644
--- a/chrome/browser/ash/input_method/ui/suggestion_window_view_unittest.cc
+++ b/chrome/browser/ash/input_method/ui/suggestion_window_view_unittest.cc
@@ -29,6 +29,10 @@
class SuggestionWindowViewTest : public ChromeViewsTestBase {
public:
SuggestionWindowViewTest() {}
+
+ SuggestionWindowViewTest(const SuggestionWindowViewTest&) = delete;
+ SuggestionWindowViewTest& operator=(const SuggestionWindowViewTest&) = delete;
+
~SuggestionWindowViewTest() override {}
protected:
@@ -83,8 +87,6 @@
AssistiveWindowButton candidate_button_;
AssistiveWindowButton setting_link_view_;
AssistiveWindowButton learn_more_button_;
-
- DISALLOW_COPY_AND_ASSIGN(SuggestionWindowViewTest);
};
TEST_F(SuggestionWindowViewTest, HighlightOneCandidateWhenIndexIsValid) {
diff --git a/chrome/browser/ash/input_method/ui/undo_window_unittest.cc b/chrome/browser/ash/input_method/ui/undo_window_unittest.cc
index 64768688..bdd6634 100644
--- a/chrome/browser/ash/input_method/ui/undo_window_unittest.cc
+++ b/chrome/browser/ash/input_method/ui/undo_window_unittest.cc
@@ -21,6 +21,10 @@
class UndoWindowTest : public ChromeViewsTestBase {
public:
UndoWindowTest() {}
+
+ UndoWindowTest(const UndoWindowTest&) = delete;
+ UndoWindowTest& operator=(const UndoWindowTest&) = delete;
+
~UndoWindowTest() override {}
protected:
@@ -41,8 +45,6 @@
std::unique_ptr<MockAssistiveDelegate> delegate_ =
std::make_unique<MockAssistiveDelegate>();
AssistiveWindowButton undo_button_;
-
- DISALLOW_COPY_AND_ASSIGN(UndoWindowTest);
};
TEST_F(UndoWindowTest, HighlightsUndoButtonWhenNotHighlighted) {
diff --git a/chrome/browser/ash/kerberos/kerberos_credentials_manager.h b/chrome/browser/ash/kerberos/kerberos_credentials_manager.h
index 5328ad7..8bdb81335 100644
--- a/chrome/browser/ash/kerberos/kerberos_credentials_manager.h
+++ b/chrome/browser/ash/kerberos/kerberos_credentials_manager.h
@@ -49,6 +49,10 @@
class Observer : public base::CheckedObserver {
public:
Observer();
+
+ Observer(const Observer&) = delete;
+ Observer& operator=(const Observer&) = delete;
+
~Observer() override;
// Called when the set of accounts was changed through Kerberos credentials
@@ -58,9 +62,6 @@
// Called when Kerberos enabled/disabled state changes. The new state is
// available via IsKerberosEnabled().
virtual void OnKerberosEnabledStateChanged() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Observer);
};
// Maximum number of managed accounts addition retries per prefs change.
@@ -68,6 +69,11 @@
KerberosCredentialsManager(PrefService* local_state,
Profile* primary_profile);
+
+ KerberosCredentialsManager(const KerberosCredentialsManager&) = delete;
+ KerberosCredentialsManager& operator=(const KerberosCredentialsManager&) =
+ delete;
+
~KerberosCredentialsManager() override;
// Registers prefs stored in local state.
@@ -301,7 +307,6 @@
add_managed_account_callback_for_testing_;
base::WeakPtrFactory<KerberosCredentialsManager> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(KerberosCredentialsManager);
};
} // namespace ash
diff --git a/chrome/browser/ash/kerberos/kerberos_credentials_manager_test.cc b/chrome/browser/ash/kerberos/kerberos_credentials_manager_test.cc
index 6d3d050..4ce6785 100644
--- a/chrome/browser/ash/kerberos/kerberos_credentials_manager_test.cc
+++ b/chrome/browser/ash/kerberos/kerberos_credentials_manager_test.cc
@@ -180,6 +180,11 @@
mgr_->AddObserver(&observer_);
}
+ KerberosCredentialsManagerTest(const KerberosCredentialsManagerTest&) =
+ delete;
+ KerberosCredentialsManagerTest& operator=(
+ const KerberosCredentialsManagerTest&) = delete;
+
~KerberosCredentialsManagerTest() override {
mgr_->RemoveObserver(&observer_);
mgr_.reset();
@@ -376,7 +381,6 @@
private:
base::WeakPtrFactory<KerberosCredentialsManagerTest> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(KerberosCredentialsManagerTest);
};
// The default config sets strong crypto and allows forwardable tickets.
diff --git a/chrome/browser/ash/lock_screen_apps/app_manager_impl.h b/chrome/browser/ash/lock_screen_apps/app_manager_impl.h
index 1a172c6..ee7a109 100644
--- a/chrome/browser/ash/lock_screen_apps/app_manager_impl.h
+++ b/chrome/browser/ash/lock_screen_apps/app_manager_impl.h
@@ -37,6 +37,10 @@
public extensions::ExtensionRegistryObserver {
public:
explicit AppManagerImpl(const base::TickClock* tick_clock);
+
+ AppManagerImpl(const AppManagerImpl&) = delete;
+ AppManagerImpl& operator=(const AppManagerImpl&) = delete;
+
~AppManagerImpl() override;
// AppManager implementation:
@@ -187,8 +191,6 @@
int available_lock_screen_app_reloads_ = 0;
base::WeakPtrFactory<AppManagerImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AppManagerImpl);
};
} // namespace lock_screen_apps
diff --git a/chrome/browser/ash/lock_screen_apps/app_manager_impl_unittest.cc b/chrome/browser/ash/lock_screen_apps/app_manager_impl_unittest.cc
index 61c8492..c7eb212 100644
--- a/chrome/browser/ash/lock_screen_apps/app_manager_impl_unittest.cc
+++ b/chrome/browser/ash/lock_screen_apps/app_manager_impl_unittest.cc
@@ -65,6 +65,10 @@
public:
explicit LockScreenEventRouter(content::BrowserContext* context)
: extensions::TestEventRouter(context) {}
+
+ LockScreenEventRouter(const LockScreenEventRouter&) = delete;
+ LockScreenEventRouter& operator=(const LockScreenEventRouter&) = delete;
+
~LockScreenEventRouter() override = default;
// extensions::EventRouter:
@@ -72,9 +76,6 @@
const std::string& event_name) const override {
return event_name == extensions::api::app_runtime::OnLaunched::kEventName;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LockScreenEventRouter);
};
class LockScreenEventObserver
@@ -82,6 +83,10 @@
public:
explicit LockScreenEventObserver(content::BrowserContext* context)
: context_(context) {}
+
+ LockScreenEventObserver(const LockScreenEventObserver&) = delete;
+ LockScreenEventObserver& operator=(const LockScreenEventObserver&) = delete;
+
~LockScreenEventObserver() override = default;
// extensions::TestEventRouter::EventObserver:
@@ -129,8 +134,6 @@
std::vector<std::string> launched_apps_;
content::BrowserContext* context_;
bool expect_restore_action_state_ = true;
-
- DISALLOW_COPY_AND_ASSIGN(LockScreenEventObserver);
};
enum class TestAppLocation { kUnpacked, kInternal };
@@ -141,6 +144,10 @@
LockScreenAppManagerImplTest()
: profile_manager_(TestingBrowserProcess::GetGlobal()) {}
+ LockScreenAppManagerImplTest(const LockScreenAppManagerImplTest&) = delete;
+ LockScreenAppManagerImplTest& operator=(const LockScreenAppManagerImplTest&) =
+ delete;
+
~LockScreenAppManagerImplTest() override = default;
void SetUp() override {
@@ -470,8 +477,6 @@
bool needs_lock_screen_event_router_ = false;
int note_taking_changed_count_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(LockScreenAppManagerImplTest);
};
} // namespace
diff --git a/chrome/browser/ash/lock_screen_apps/app_window_metrics_tracker.h b/chrome/browser/ash/lock_screen_apps/app_window_metrics_tracker.h
index 0030931..17119911 100644
--- a/chrome/browser/ash/lock_screen_apps/app_window_metrics_tracker.h
+++ b/chrome/browser/ash/lock_screen_apps/app_window_metrics_tracker.h
@@ -26,6 +26,10 @@
class AppWindowMetricsTracker : public content::WebContentsObserver {
public:
explicit AppWindowMetricsTracker(const base::TickClock* clock);
+
+ AppWindowMetricsTracker(const AppWindowMetricsTracker&) = delete;
+ AppWindowMetricsTracker& operator=(const AppWindowMetricsTracker&) = delete;
+
~AppWindowMetricsTracker() override;
// Register app launch request.
@@ -78,8 +82,6 @@
// the window contents is loaded.
// Should be either kForeground or kBackground.
absl::optional<State> state_after_window_contents_load_ = State::kForeground;
-
- DISALLOW_COPY_AND_ASSIGN(AppWindowMetricsTracker);
};
} // namespace lock_screen_apps
diff --git a/chrome/browser/ash/lock_screen_apps/fake_lock_screen_profile_creator.h b/chrome/browser/ash/lock_screen_apps/fake_lock_screen_profile_creator.h
index fb216fb..0984aadef 100644
--- a/chrome/browser/ash/lock_screen_apps/fake_lock_screen_profile_creator.h
+++ b/chrome/browser/ash/lock_screen_apps/fake_lock_screen_profile_creator.h
@@ -18,6 +18,11 @@
// |profile_manager| - Testing profile manager that can be used to create
// testing profiles.
explicit FakeLockScreenProfileCreator(TestingProfileManager* profile_manager);
+
+ FakeLockScreenProfileCreator(const FakeLockScreenProfileCreator&) = delete;
+ FakeLockScreenProfileCreator& operator=(const FakeLockScreenProfileCreator&) =
+ delete;
+
~FakeLockScreenProfileCreator() override;
// Simulate lock screen profile creation - this will create a TestingProfile
@@ -34,8 +39,6 @@
private:
TestingProfileManager* const profile_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeLockScreenProfileCreator);
};
} // namespace lock_screen_apps
diff --git a/chrome/browser/ash/lock_screen_apps/first_app_run_toast_manager.cc b/chrome/browser/ash/lock_screen_apps/first_app_run_toast_manager.cc
index 1833ceb..c51823d 100644
--- a/chrome/browser/ash/lock_screen_apps/first_app_run_toast_manager.cc
+++ b/chrome/browser/ash/lock_screen_apps/first_app_run_toast_manager.cc
@@ -39,6 +39,9 @@
widget_->AddObserver(this);
}
+ AppWidgetObserver(const AppWidgetObserver&) = delete;
+ AppWidgetObserver& operator=(const AppWidgetObserver&) = delete;
+
~AppWidgetObserver() override {
// This is a no-op of the observer was previously removed.
widget_->RemoveObserver(this);
@@ -58,8 +61,6 @@
private:
FirstAppRunToastManager* manager_;
views::Widget* widget_;
-
- DISALLOW_COPY_AND_ASSIGN(AppWidgetObserver);
};
FirstAppRunToastManager::FirstAppRunToastManager(Profile* profile)
diff --git a/chrome/browser/ash/lock_screen_apps/first_app_run_toast_manager.h b/chrome/browser/ash/lock_screen_apps/first_app_run_toast_manager.h
index 1a4a9240..886aa1c 100644
--- a/chrome/browser/ash/lock_screen_apps/first_app_run_toast_manager.h
+++ b/chrome/browser/ash/lock_screen_apps/first_app_run_toast_manager.h
@@ -27,6 +27,10 @@
public views::WidgetObserver {
public:
explicit FirstAppRunToastManager(Profile* profile);
+
+ FirstAppRunToastManager(const FirstAppRunToastManager&) = delete;
+ FirstAppRunToastManager& operator=(const FirstAppRunToastManager&) = delete;
+
~FirstAppRunToastManager() override;
// Runs the manager for an app window launch. It determines whether the first
@@ -83,8 +87,6 @@
std::unique_ptr<AppWidgetObserver> app_widget_observer_;
base::WeakPtrFactory<FirstAppRunToastManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FirstAppRunToastManager);
};
} // namespace lock_screen_apps
diff --git a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator.h b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator.h
index 3df9d7c..60d91991 100644
--- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator.h
+++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator.h
@@ -19,6 +19,10 @@
class LockScreenProfileCreator {
public:
LockScreenProfileCreator();
+
+ LockScreenProfileCreator(const LockScreenProfileCreator&) = delete;
+ LockScreenProfileCreator& operator=(const LockScreenProfileCreator&) = delete;
+
virtual ~LockScreenProfileCreator();
// Initializes the creator - it marks the object as initialized and calls
@@ -77,8 +81,6 @@
Profile* lock_screen_profile_ = nullptr;
std::list<base::OnceClosure> create_profile_callbacks_;
-
- DISALLOW_COPY_AND_ASSIGN(LockScreenProfileCreator);
};
} // namespace lock_screen_apps
diff --git a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.h b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.h
index 1e3fd25dd..b3230690 100644
--- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.h
+++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.h
@@ -31,6 +31,11 @@
// used to determine lock screen note taking availability.
LockScreenProfileCreatorImpl(Profile* primary_profile,
const base::TickClock* tick_clock);
+
+ LockScreenProfileCreatorImpl(const LockScreenProfileCreatorImpl&) = delete;
+ LockScreenProfileCreatorImpl& operator=(const LockScreenProfileCreatorImpl&) =
+ delete;
+
~LockScreenProfileCreatorImpl() override;
// chromeos::NoteTakingHelper::Observer:
@@ -65,8 +70,6 @@
note_taking_helper_observation_{this};
base::WeakPtrFactory<LockScreenProfileCreatorImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LockScreenProfileCreatorImpl);
};
} // namespace lock_screen_apps
diff --git a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
index cb2e91a..cc042a7 100644
--- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
+++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
@@ -76,6 +76,10 @@
class PendingProfileCreation : public Profile::Delegate {
public:
PendingProfileCreation() {}
+
+ PendingProfileCreation(const PendingProfileCreation&) = delete;
+ PendingProfileCreation& operator=(const PendingProfileCreation&) = delete;
+
~PendingProfileCreation() override {}
// Sets the pending profile creation to track a profile creation,
@@ -170,8 +174,6 @@
Profile* profile_ = nullptr;
bool success_ = false;
bool is_new_profile_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(PendingProfileCreation);
};
// Test profile manager implementation used to track async profile creation.
@@ -211,6 +213,12 @@
public:
LockScreenProfileCreatorImplTest()
: local_state_(TestingBrowserProcess::GetGlobal()) {}
+
+ LockScreenProfileCreatorImplTest(const LockScreenProfileCreatorImplTest&) =
+ delete;
+ LockScreenProfileCreatorImplTest& operator=(
+ const LockScreenProfileCreatorImplTest&) = delete;
+
~LockScreenProfileCreatorImplTest() override {}
void SetUp() override {
@@ -374,8 +382,6 @@
std::unique_ptr<arc::ArcSessionManager> arc_session_manager_;
std::unique_ptr<LockScreenProfileCreator> lock_screen_profile_creator_;
-
- DISALLOW_COPY_AND_ASSIGN(LockScreenProfileCreatorImplTest);
};
} // namespace
diff --git a/chrome/browser/ash/lock_screen_apps/note_taking_browsertest.cc b/chrome/browser/ash/lock_screen_apps/note_taking_browsertest.cc
index 82a0e963..63836d2 100644
--- a/chrome/browser/ash/lock_screen_apps/note_taking_browsertest.cc
+++ b/chrome/browser/ash/lock_screen_apps/note_taking_browsertest.cc
@@ -34,6 +34,11 @@
class LockScreenAppsEnabledWaiter : public lock_screen_apps::StateObserver {
public:
LockScreenAppsEnabledWaiter() = default;
+
+ LockScreenAppsEnabledWaiter(const LockScreenAppsEnabledWaiter&) = delete;
+ LockScreenAppsEnabledWaiter& operator=(const LockScreenAppsEnabledWaiter&) =
+ delete;
+
~LockScreenAppsEnabledWaiter() override {}
// Runs loop until lock_screen_apps::StateController enters |target_state|.
@@ -68,13 +73,15 @@
lock_screen_apps_state_observation_{this};
base::OnceClosure state_change_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(LockScreenAppsEnabledWaiter);
};
class LockScreenNoteTakingTest : public extensions::ExtensionBrowserTest {
public:
LockScreenNoteTakingTest() { set_chromeos_user_ = true; }
+
+ LockScreenNoteTakingTest(const LockScreenNoteTakingTest&) = delete;
+ LockScreenNoteTakingTest& operator=(const LockScreenNoteTakingTest&) = delete;
+
~LockScreenNoteTakingTest() override = default;
void SetUpCommandLine(base::CommandLine* cmd_line) override {
@@ -182,8 +189,6 @@
private:
std::unique_ptr<extensions::ResultCatcher> result_catcher_;
-
- DISALLOW_COPY_AND_ASSIGN(LockScreenNoteTakingTest);
};
} // namespace
diff --git a/chrome/browser/ash/lock_screen_apps/state_controller.h b/chrome/browser/ash/lock_screen_apps/state_controller.h
index dba78172..c40a473 100644
--- a/chrome/browser/ash/lock_screen_apps/state_controller.h
+++ b/chrome/browser/ash/lock_screen_apps/state_controller.h
@@ -75,6 +75,10 @@
// StateController will set global instance ptr that can be accessed using
// |Get|. This pointer will be reset when the StateController is destroyed.
StateController();
+
+ StateController(const StateController&) = delete;
+ StateController& operator=(const StateController&) = delete;
+
~StateController() override;
// Sets the tray action that should be used by |StateController|.
@@ -268,8 +272,6 @@
const base::TickClock* tick_clock_ = nullptr;
base::WeakPtrFactory<StateController> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(StateController);
};
} // namespace lock_screen_apps
diff --git a/chrome/browser/ash/lock_screen_apps/state_controller_unittest.cc b/chrome/browser/ash/lock_screen_apps/state_controller_unittest.cc
index f86bea09..3dd1d992 100644
--- a/chrome/browser/ash/lock_screen_apps/state_controller_unittest.cc
+++ b/chrome/browser/ash/lock_screen_apps/state_controller_unittest.cc
@@ -116,6 +116,10 @@
class TestFocusCyclerDelegate : public lock_screen_apps::FocusCyclerDelegate {
public:
TestFocusCyclerDelegate() = default;
+
+ TestFocusCyclerDelegate(const TestFocusCyclerDelegate&) = delete;
+ TestFocusCyclerDelegate& operator=(const TestFocusCyclerDelegate&) = delete;
+
~TestFocusCyclerDelegate() override = default;
void RegisterLockScreenAppFocusHandler(
@@ -147,8 +151,6 @@
private:
bool lock_screen_app_focused_ = false;
LockScreenAppFocusCallback focus_handler_;
-
- DISALLOW_COPY_AND_ASSIGN(TestFocusCyclerDelegate);
};
class TestAppManager : public lock_screen_apps::AppManager {
@@ -165,6 +167,9 @@
: expected_primary_profile_(expected_primary_profile),
lock_screen_profile_creator_(lock_screen_profile_creator) {}
+ TestAppManager(const TestAppManager&) = delete;
+ TestAppManager& operator=(const TestAppManager&) = delete;
+
~TestAppManager() override = default;
void Initialize(Profile* primary_profile,
@@ -244,13 +249,15 @@
std::string app_id_;
// Whether app launch should succeed.
bool app_launchable_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(TestAppManager);
};
class TestStateObserver : public lock_screen_apps::StateObserver {
public:
TestStateObserver() = default;
+
+ TestStateObserver(const TestStateObserver&) = delete;
+ TestStateObserver& operator=(const TestStateObserver&) = delete;
+
~TestStateObserver() override = default;
void OnLockScreenNoteStateChanged(TrayActionState state) override {
@@ -265,14 +272,15 @@
private:
std::vector<TrayActionState> observed_states_;
-
- DISALLOW_COPY_AND_ASSIGN(TestStateObserver);
};
class TestTrayAction : public ash::mojom::TrayAction {
public:
TestTrayAction() = default;
+ TestTrayAction(const TestTrayAction&) = delete;
+ TestTrayAction& operator=(const TestTrayAction&) = delete;
+
~TestTrayAction() override = default;
mojo::PendingRemote<ash::mojom::TrayAction> CreateRemoteAndBind() {
@@ -307,8 +315,6 @@
mojo::Remote<ash::mojom::TrayActionClient> client_;
std::vector<TrayActionState> observed_states_;
-
- DISALLOW_COPY_AND_ASSIGN(TestTrayAction);
};
// Wrapper around AppWindow used to manage the app window lifetime, and provide
@@ -321,6 +327,9 @@
nullptr)),
window_(window) {}
+ TestAppWindow(const TestAppWindow&) = delete;
+ TestAppWindow& operator=(const TestAppWindow&) = delete;
+
~TestAppWindow() override {
// Make sure the window is initialized, so |window_| does not get leaked.
if (!initialized_ && window_)
@@ -371,8 +380,6 @@
extensions::AppWindow* window_;
bool closed_ = false;
bool initialized_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(TestAppWindow);
};
class LockScreenAppStateTest : public BrowserWithTestWindowTest {
@@ -381,6 +388,9 @@
: fake_user_manager_(new ash::FakeChromeUserManager),
user_manager_enabler_(base::WrapUnique(fake_user_manager_)) {}
+ LockScreenAppStateTest(const LockScreenAppStateTest&) = delete;
+ LockScreenAppStateTest& operator=(const LockScreenAppStateTest&) = delete;
+
~LockScreenAppStateTest() override = default;
void SetUp() override {
@@ -697,33 +707,37 @@
scoped_refptr<const extensions::Extension> app_;
base::SimpleTestTickClock tick_clock_;
-
- DISALLOW_COPY_AND_ASSIGN(LockScreenAppStateTest);
};
class LockScreenAppStateKioskUserTest : public LockScreenAppStateTest {
public:
LockScreenAppStateKioskUserTest() {}
+
+ LockScreenAppStateKioskUserTest(const LockScreenAppStateKioskUserTest&) =
+ delete;
+ LockScreenAppStateKioskUserTest& operator=(
+ const LockScreenAppStateKioskUserTest&) = delete;
+
~LockScreenAppStateKioskUserTest() override {}
void AddTestUser(const AccountId& account_id) override {
fake_user_manager()->AddKioskAppUser(account_id);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LockScreenAppStateKioskUserTest);
};
// Tests that initially do not have stylus tools set as enabled.
class LockScreenAppStateNoStylusInputTest : public LockScreenAppStateTest {
public:
LockScreenAppStateNoStylusInputTest() = default;
+
+ LockScreenAppStateNoStylusInputTest(
+ const LockScreenAppStateNoStylusInputTest&) = delete;
+ LockScreenAppStateNoStylusInputTest& operator=(
+ const LockScreenAppStateNoStylusInputTest&) = delete;
+
~LockScreenAppStateNoStylusInputTest() override = default;
void SetUpStylusAvailability() override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LockScreenAppStateNoStylusInputTest);
};
} // namespace
diff --git a/chrome/browser/ash/login/active_directory_login_browsertest.cc b/chrome/browser/ash/login/active_directory_login_browsertest.cc
index f406597..e3d40a0 100644
--- a/chrome/browser/ash/login/active_directory_login_browsertest.cc
+++ b/chrome/browser/ash/login/active_directory_login_browsertest.cc
@@ -62,6 +62,9 @@
test_realm_(user_manager::kSupervisedUserDomain),
test_user_(kTestActiveDirectoryUser + ("@" + test_realm_)) {}
+ ActiveDirectoryLoginTest(const ActiveDirectoryLoginTest&) = delete;
+ ActiveDirectoryLoginTest& operator=(const ActiveDirectoryLoginTest&) = delete;
+
~ActiveDirectoryLoginTest() override = default;
protected:
@@ -75,9 +78,6 @@
&mixin_host_,
DeviceStateMixin::State::OOBE_COMPLETED_ACTIVE_DIRECTORY_ENROLLED};
ActiveDirectoryLoginMixin ad_login_{&mixin_host_};
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ActiveDirectoryLoginTest);
};
class ActiveDirectoryLoginAutocompleteTest : public ActiveDirectoryLoginTest {
diff --git a/chrome/browser/ash/login/app_mode/auto_launched_kiosk_browsertest.cc b/chrome/browser/ash/login/app_mode/auto_launched_kiosk_browsertest.cc
index ad57528..7cf8a8b 100644
--- a/chrome/browser/ash/login/app_mode/auto_launched_kiosk_browsertest.cc
+++ b/chrome/browser/ash/login/app_mode/auto_launched_kiosk_browsertest.cc
@@ -89,6 +89,10 @@
registrar_.Add(this, chrome::NOTIFICATION_APP_TERMINATING,
content::NotificationService::AllSources());
}
+
+ TerminationObserver(const TerminationObserver&) = delete;
+ TerminationObserver& operator=(const TerminationObserver&) = delete;
+
~TerminationObserver() override = default;
// Whether app has been terminated - i.e. whether app termination notification
@@ -105,8 +109,6 @@
bool notification_seen_ = false;
content::NotificationRegistrar registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(TerminationObserver);
};
} // namespace
@@ -118,6 +120,9 @@
device_state_.set_domain("domain.com");
}
+ AutoLaunchedKioskTest(const AutoLaunchedKioskTest&) = delete;
+ AutoLaunchedKioskTest& operator=(const AutoLaunchedKioskTest&) = delete;
+
~AutoLaunchedKioskTest() override = default;
virtual std::string GetTestAppId() const {
@@ -264,8 +269,6 @@
std::unique_ptr<base::AutoReset<bool>> skip_splash_wait_override_;
LoginManagerMixin login_manager_{&mixin_host_, {}};
-
- DISALLOW_COPY_AND_ASSIGN(AutoLaunchedKioskTest);
};
IN_PROC_BROWSER_TEST_F(AutoLaunchedKioskTest, PRE_CrashRestore) {
@@ -348,12 +351,15 @@
class AutoLaunchedNonKioskEnabledAppTest : public AutoLaunchedKioskTest {
public:
AutoLaunchedNonKioskEnabledAppTest() {}
+
+ AutoLaunchedNonKioskEnabledAppTest(
+ const AutoLaunchedNonKioskEnabledAppTest&) = delete;
+ AutoLaunchedNonKioskEnabledAppTest& operator=(
+ const AutoLaunchedNonKioskEnabledAppTest&) = delete;
+
~AutoLaunchedNonKioskEnabledAppTest() override = default;
std::string GetTestAppId() const override { return kTestNonKioskEnabledApp; }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AutoLaunchedNonKioskEnabledAppTest);
};
IN_PROC_BROWSER_TEST_F(AutoLaunchedNonKioskEnabledAppTest, NotLaunched) {
@@ -381,6 +387,10 @@
class ManagementApiKioskTest : public AutoLaunchedKioskTest {
public:
ManagementApiKioskTest() {}
+
+ ManagementApiKioskTest(const ManagementApiKioskTest&) = delete;
+ ManagementApiKioskTest& operator=(const ManagementApiKioskTest&) = delete;
+
~ManagementApiKioskTest() override = default;
// AutoLaunchedKioskTest:
@@ -390,9 +400,6 @@
std::vector<std::string> GetTestSecondaryAppIds() const override {
return {kTestManagementApiSecondaryApp};
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ManagementApiKioskTest);
};
IN_PROC_BROWSER_TEST_F(ManagementApiKioskTest, ManagementApi) {
diff --git a/chrome/browser/ash/login/app_mode/kiosk_browsertest.cc b/chrome/browser/ash/login/app_mode/kiosk_browsertest.cc
index b385d14..d848c6c 100644
--- a/chrome/browser/ash/login/app_mode/kiosk_browsertest.cc
+++ b/chrome/browser/ash/login/app_mode/kiosk_browsertest.cc
@@ -296,6 +296,10 @@
public:
KioskFakeDiskMountManager() {}
+ KioskFakeDiskMountManager(const KioskFakeDiskMountManager&) = delete;
+ KioskFakeDiskMountManager& operator=(const KioskFakeDiskMountManager&) =
+ delete;
+
~KioskFakeDiskMountManager() override {}
void set_usb_mount_path(const std::string& usb_mount_path) {
@@ -316,8 +320,6 @@
private:
std::string usb_mount_path_;
-
- DISALLOW_COPY_AND_ASSIGN(KioskFakeDiskMountManager);
};
class AppDataLoadWaiter : public KioskAppManagerObserver {
@@ -335,6 +337,9 @@
manager_->AddObserver(this);
}
+ AppDataLoadWaiter(const AppDataLoadWaiter&) = delete;
+ AppDataLoadWaiter& operator=(const AppDataLoadWaiter&) = delete;
+
~AppDataLoadWaiter() override { manager_->RemoveObserver(this); }
void Wait() {
@@ -422,8 +427,6 @@
bool quit_;
std::string app_id_;
std::string version_;
-
- DISALLOW_COPY_AND_ASSIGN(AppDataLoadWaiter);
};
// Replaces settings urls for KioskSettingsNavigationThrottle.
@@ -491,6 +494,9 @@
KioskAppData::SetIgnoreKioskAppDataLoadFailuresForTesting(true);
}
+ KioskTest(const KioskTest&) = delete;
+ KioskTest& operator=(const KioskTest&) = delete;
+
~KioskTest() override = default;
protected:
@@ -837,8 +843,6 @@
std::unique_ptr<base::AutoReset<bool>> skip_splash_wait_override_;
std::unique_ptr<base::AutoReset<base::TimeDelta>> network_wait_override_;
std::unique_ptr<base::AutoReset<bool>> block_app_launch_override_;
-
- DISALLOW_COPY_AND_ASSIGN(KioskTest);
};
class KioskDeviceOwnedTest : public KioskTest {
@@ -1676,6 +1680,10 @@
class KioskUpdateTest : public KioskTest {
public:
KioskUpdateTest() {}
+
+ KioskUpdateTest(const KioskUpdateTest&) = delete;
+ KioskUpdateTest& operator=(const KioskUpdateTest&) = delete;
+
~KioskUpdateTest() override {}
struct TestAppInfo {
@@ -1912,6 +1920,10 @@
manager_->AddObserver(this);
}
+ KioskAppExternalUpdateWaiter(const KioskAppExternalUpdateWaiter&) = delete;
+ KioskAppExternalUpdateWaiter& operator=(
+ const KioskAppExternalUpdateWaiter&) = delete;
+
~KioskAppExternalUpdateWaiter() override { manager_->RemoveObserver(this); }
void Wait() {
@@ -1946,14 +1958,10 @@
bool quit_;
bool update_success_;
bool app_update_notified_;
-
- DISALLOW_COPY_AND_ASSIGN(KioskAppExternalUpdateWaiter);
};
// Owned by DiskMountManager.
KioskFakeDiskMountManager* fake_disk_mount_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(KioskUpdateTest);
};
IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_LaunchOfflineEnabledAppNoNetwork) {
@@ -2703,6 +2711,9 @@
audio::FakeSystemInfo::OverrideGlobalBinderForAudioService(this);
}
+ KioskVirtualKeyboardTest(const KioskVirtualKeyboardTest&) = delete;
+ KioskVirtualKeyboardTest& operator=(const KioskVirtualKeyboardTest&) = delete;
+
~KioskVirtualKeyboardTest() override {
audio::FakeSystemInfo::ClearGlobalBinderForAudioService();
}
@@ -2727,9 +2738,6 @@
void HasInputDevices(HasInputDevicesCallback callback) override {
std::move(callback).Run(true);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(KioskVirtualKeyboardTest);
};
// Flaky. crbug.com/1094809
diff --git a/chrome/browser/ash/login/arc_terms_of_service_browsertest.cc b/chrome/browser/ash/login/arc_terms_of_service_browsertest.cc
index cb3d317..7c173e4e4 100644
--- a/chrome/browser/ash/login/arc_terms_of_service_browsertest.cc
+++ b/chrome/browser/ash/login/arc_terms_of_service_browsertest.cc
@@ -144,6 +144,11 @@
class ArcTermsOfServiceScreenTest : public OobeBaseTest {
public:
ArcTermsOfServiceScreenTest() = default;
+
+ ArcTermsOfServiceScreenTest(const ArcTermsOfServiceScreenTest&) = delete;
+ ArcTermsOfServiceScreenTest& operator=(const ArcTermsOfServiceScreenTest&) =
+ delete;
+
~ArcTermsOfServiceScreenTest() override = default;
void RegisterAdditionalRequestHandlers() override {
@@ -294,8 +299,6 @@
base::OnceClosure on_screen_exit_called_ = base::DoNothing();
LoginManagerMixin login_manager_mixin_{&mixin_host_};
-
- DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceScreenTest);
};
// Tests that screen fetches the terms of service from the specified URL
@@ -520,6 +523,12 @@
public testing::WithParamInterface<std::tuple<bool, bool>> {
public:
ParameterizedArcTermsOfServiceScreenTest() = default;
+
+ ParameterizedArcTermsOfServiceScreenTest(
+ const ParameterizedArcTermsOfServiceScreenTest&) = delete;
+ ParameterizedArcTermsOfServiceScreenTest& operator=(
+ const ParameterizedArcTermsOfServiceScreenTest&) = delete;
+
~ParameterizedArcTermsOfServiceScreenTest() = default;
void SetUp() override {
@@ -576,8 +585,6 @@
protected:
bool accept_backup_restore_;
bool accept_location_service_;
-
- DISALLOW_COPY_AND_ASSIGN(ParameterizedArcTermsOfServiceScreenTest);
};
// Tests that clicking on "Accept" button records the expected consents.
@@ -615,6 +622,12 @@
: public ArcTermsOfServiceScreenTest {
public:
PublicAccountArcTermsOfServiceScreenTest() = default;
+
+ PublicAccountArcTermsOfServiceScreenTest(
+ const PublicAccountArcTermsOfServiceScreenTest&) = delete;
+ PublicAccountArcTermsOfServiceScreenTest& operator=(
+ const PublicAccountArcTermsOfServiceScreenTest&) = delete;
+
~PublicAccountArcTermsOfServiceScreenTest() override = default;
void SetUpInProcessBrowserTestFixture() override {
@@ -704,7 +717,6 @@
LocalPolicyTestServerMixin local_policy_mixin_{&mixin_host_};
DeviceStateMixin device_state_{
&mixin_host_, DeviceStateMixin::State::OOBE_COMPLETED_CLOUD_ENROLLED};
- DISALLOW_COPY_AND_ASSIGN(PublicAccountArcTermsOfServiceScreenTest);
};
IN_PROC_BROWSER_TEST_F(PublicAccountArcTermsOfServiceScreenTest,
diff --git a/chrome/browser/ash/login/auth/chrome_login_performer.h b/chrome/browser/ash/login/auth/chrome_login_performer.h
index 8d76b5f8..26df5e3 100644
--- a/chrome/browser/ash/login/auth/chrome_login_performer.h
+++ b/chrome/browser/ash/login/auth/chrome_login_performer.h
@@ -35,6 +35,10 @@
class ChromeLoginPerformer : public LoginPerformer {
public:
explicit ChromeLoginPerformer(Delegate* delegate);
+
+ ChromeLoginPerformer(const ChromeLoginPerformer&) = delete;
+ ChromeLoginPerformer& operator=(const ChromeLoginPerformer&) = delete;
+
~ChromeLoginPerformer() override;
// LoginPerformer:
@@ -72,8 +76,6 @@
// Used to verify logins that matched wildcard on the login allowlist.
std::unique_ptr<policy::WildcardLoginChecker> wildcard_login_checker_;
base::WeakPtrFactory<ChromeLoginPerformer> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeLoginPerformer);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/auth/cryptohome_authenticator_unittest.cc b/chrome/browser/ash/login/auth/cryptohome_authenticator_unittest.cc
index 2479c37c..d88de16 100644
--- a/chrome/browser/ash/login/auth/cryptohome_authenticator_unittest.cc
+++ b/chrome/browser/ash/login/auth/cryptohome_authenticator_unittest.cc
@@ -128,6 +128,10 @@
class TestUserDataAuthClient : public ::chromeos::FakeUserDataAuthClient {
public:
TestUserDataAuthClient() = default;
+
+ TestUserDataAuthClient(const TestUserDataAuthClient&) = delete;
+ TestUserDataAuthClient& operator=(const TestUserDataAuthClient&) = delete;
+
~TestUserDataAuthClient() override = default;
void set_expected_id(const cryptohome::AccountIdentifier& id) {
@@ -248,8 +252,6 @@
bool mount_guest_should_succeed_ = false;
bool remove_should_succeed_ = false;
bool unmount_should_succeed_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(TestUserDataAuthClient);
};
} // namespace
diff --git a/chrome/browser/ash/login/chrome_restart_request.cc b/chrome/browser/ash/login/chrome_restart_request.cc
index 1f23413d..7056aae 100644
--- a/chrome/browser/ash/login/chrome_restart_request.cc
+++ b/chrome/browser/ash/login/chrome_restart_request.cc
@@ -285,6 +285,10 @@
public:
explicit ChromeRestartRequest(const std::vector<std::string>& argv,
RestartChromeReason reson);
+
+ ChromeRestartRequest(const ChromeRestartRequest&) = delete;
+ ChromeRestartRequest& operator=(const ChromeRestartRequest&) = delete;
+
~ChromeRestartRequest();
// Starts the request.
@@ -301,8 +305,6 @@
const RestartChromeReason reason_;
base::OneShotTimer timer_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeRestartRequest);
};
ChromeRestartRequest::ChromeRestartRequest(const std::vector<std::string>& argv,
diff --git a/chrome/browser/ash/login/configuration_based_oobe_browsertest.cc b/chrome/browser/ash/login/configuration_based_oobe_browsertest.cc
index 5f7018d..179b1e6 100644
--- a/chrome/browser/ash/login/configuration_based_oobe_browsertest.cc
+++ b/chrome/browser/ash/login/configuration_based_oobe_browsertest.cc
@@ -142,6 +142,12 @@
class OobeConfigurationEnrollmentTest : public OobeConfigurationTest {
public:
OobeConfigurationEnrollmentTest() = default;
+
+ OobeConfigurationEnrollmentTest(const OobeConfigurationEnrollmentTest&) =
+ delete;
+ OobeConfigurationEnrollmentTest& operator=(
+ const OobeConfigurationEnrollmentTest&) = delete;
+
~OobeConfigurationEnrollmentTest() override = default;
protected:
@@ -149,9 +155,6 @@
// We need fake gaia to fetch device local account tokens.
FakeGaiaMixin fake_gaia_{&mixin_host_};
test::EnrollmentUIMixin enrollment_ui_{&mixin_host_};
-
- private:
- DISALLOW_COPY_AND_ASSIGN(OobeConfigurationEnrollmentTest);
};
// Check that configuration lets correctly pass Welcome screen.
diff --git a/chrome/browser/ash/login/crash_restore_browsertest.cc b/chrome/browser/ash/login/crash_restore_browsertest.cc
index a066c407..d25f9d2 100644
--- a/chrome/browser/ash/login/crash_restore_browsertest.cc
+++ b/chrome/browser/ash/login/crash_restore_browsertest.cc
@@ -109,6 +109,11 @@
if (!user_sessions_restored_)
UserSessionManager::GetInstance()->AddSessionStateObserver(this);
}
+
+ UserSessionRestoreObserver(const UserSessionRestoreObserver&) = delete;
+ UserSessionRestoreObserver& operator=(const UserSessionRestoreObserver&) =
+ delete;
+
~UserSessionRestoreObserver() override {}
void PendingUserSessionsRestoreFinished() override {
@@ -137,8 +142,6 @@
bool running_loop_;
bool user_sessions_restored_;
scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(UserSessionRestoreObserver);
};
class CrashRestoreComplexTest : public CrashRestoreSimpleTest {
diff --git a/chrome/browser/ash/login/demo_mode/demo_extensions_external_loader_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_extensions_external_loader_unittest.cc
index 48af32e..51dd7bc1 100644
--- a/chrome/browser/ash/login/demo_mode/demo_extensions_external_loader_unittest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_extensions_external_loader_unittest.cc
@@ -64,6 +64,11 @@
: public extensions::ExternalProviderInterface::VisitorInterface {
public:
TestExternalProviderVisitor() = default;
+
+ TestExternalProviderVisitor(const TestExternalProviderVisitor&) = delete;
+ TestExternalProviderVisitor& operator=(const TestExternalProviderVisitor&) =
+ delete;
+
~TestExternalProviderVisitor() override = default;
const std::map<std::string, TestCrxInfo>& loaded_crx_files() const {
@@ -133,8 +138,6 @@
std::unique_ptr<base::RunLoop> ready_waiter_;
std::unique_ptr<base::RunLoop> file_waiter_;
-
- DISALLOW_COPY_AND_ASSIGN(TestExternalProviderVisitor);
};
class DemoExtensionsExternalLoaderTest : public testing::Test {
@@ -145,6 +148,11 @@
&test_url_loader_factory_)),
scoped_user_manager_(std::make_unique<FakeChromeUserManager>()) {}
+ DemoExtensionsExternalLoaderTest(const DemoExtensionsExternalLoaderTest&) =
+ delete;
+ DemoExtensionsExternalLoaderTest& operator=(
+ const DemoExtensionsExternalLoaderTest&) = delete;
+
~DemoExtensionsExternalLoaderTest() override = default;
void SetUp() override {
@@ -225,8 +233,6 @@
content::InProcessUtilityThreadHelper in_process_utility_thread_helper_;
user_manager::ScopedUserManager scoped_user_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(DemoExtensionsExternalLoaderTest);
};
TEST_F(DemoExtensionsExternalLoaderTest, NoDemoExtensionsConfig) {
@@ -519,6 +525,11 @@
std::move(fake_user_manager));
}
+ ShouldCreateDemoExtensionsExternalLoaderTest(
+ const ShouldCreateDemoExtensionsExternalLoaderTest&) = delete;
+ ShouldCreateDemoExtensionsExternalLoaderTest& operator=(
+ const ShouldCreateDemoExtensionsExternalLoaderTest&) = delete;
+
~ShouldCreateDemoExtensionsExternalLoaderTest() override = default;
void SetUp() override {
@@ -548,8 +559,6 @@
content::BrowserTaskEnvironment task_environment_;
std::unique_ptr<user_manager::ScopedUserManager> scoped_user_manager_;
std::unique_ptr<DemoModeTestHelper> demo_mode_test_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(ShouldCreateDemoExtensionsExternalLoaderTest);
};
TEST_F(ShouldCreateDemoExtensionsExternalLoaderTest, PrimaryDemoProfile) {
diff --git a/chrome/browser/ash/login/demo_mode/demo_mode_detector.h b/chrome/browser/ash/login/demo_mode/demo_mode_detector.h
index 8841838..8016d9a 100644
--- a/chrome/browser/ash/login/demo_mode/demo_mode_detector.h
+++ b/chrome/browser/ash/login/demo_mode/demo_mode_detector.h
@@ -30,6 +30,10 @@
};
DemoModeDetector(const base::TickClock* clock, Observer* observer);
+
+ DemoModeDetector(const DemoModeDetector&) = delete;
+ DemoModeDetector& operator=(const DemoModeDetector&) = delete;
+
virtual ~DemoModeDetector();
// Registers the preference for derelict state.
@@ -71,8 +75,6 @@
const base::TickClock* tick_clock_;
base::WeakPtrFactory<DemoModeDetector> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DemoModeDetector);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h b/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h
index 952ea07..a2119c5 100644
--- a/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h
+++ b/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h
@@ -133,6 +133,9 @@
// disabled.
static bool IsLegacyDemoRetailModeDomain(const std::string& domain);
+ DemoModeResourcesRemover(const DemoModeResourcesRemover&) = delete;
+ DemoModeResourcesRemover& operator=(const DemoModeResourcesRemover&) = delete;
+
~DemoModeResourcesRemover() override;
// UserDataAuthClient::Observer:
@@ -195,8 +198,6 @@
user_activity_observation_{this};
base::WeakPtrFactory<DemoModeResourcesRemover> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DemoModeResourcesRemover);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover_unittest.cc
index ad7b730..dc7820e 100644
--- a/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover_unittest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover_unittest.cc
@@ -49,6 +49,11 @@
class DemoModeResourcesRemoverTest : public testing::Test {
public:
DemoModeResourcesRemoverTest() = default;
+
+ DemoModeResourcesRemoverTest(const DemoModeResourcesRemoverTest&) = delete;
+ DemoModeResourcesRemoverTest& operator=(const DemoModeResourcesRemoverTest&) =
+ delete;
+
~DemoModeResourcesRemoverTest() override = default;
void SetUp() override {
@@ -173,38 +178,42 @@
base::FilePath demo_resources_path_;
std::unique_ptr<user_manager::ScopedUserManager> scoped_user_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(DemoModeResourcesRemoverTest);
};
class ManagedDemoModeResourcesRemoverTest
: public DemoModeResourcesRemoverTest {
public:
ManagedDemoModeResourcesRemoverTest() = default;
+
+ ManagedDemoModeResourcesRemoverTest(
+ const ManagedDemoModeResourcesRemoverTest&) = delete;
+ ManagedDemoModeResourcesRemoverTest& operator=(
+ const ManagedDemoModeResourcesRemoverTest&) = delete;
+
~ManagedDemoModeResourcesRemoverTest() override = default;
std::unique_ptr<StubInstallAttributes> CreateInstallAttributes() override {
return StubInstallAttributes::CreateCloudManaged("test-domain",
"FAKE_DEVICE_ID");
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ManagedDemoModeResourcesRemoverTest);
};
class DemoModeResourcesRemoverInLegacyDemoRetailModeTest
: public DemoModeResourcesRemoverTest {
public:
DemoModeResourcesRemoverInLegacyDemoRetailModeTest() = default;
+
+ DemoModeResourcesRemoverInLegacyDemoRetailModeTest(
+ const DemoModeResourcesRemoverInLegacyDemoRetailModeTest&) = delete;
+ DemoModeResourcesRemoverInLegacyDemoRetailModeTest& operator=(
+ const DemoModeResourcesRemoverInLegacyDemoRetailModeTest&) = delete;
+
~DemoModeResourcesRemoverInLegacyDemoRetailModeTest() override = default;
std::unique_ptr<StubInstallAttributes> CreateInstallAttributes() override {
return StubInstallAttributes::CreateCloudManaged("us-retailmode.com",
"FAKE_DEVICE_ID");
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DemoModeResourcesRemoverInLegacyDemoRetailModeTest);
};
TEST(LegacyDemoRetailModeDomainMatching, Matching) {
diff --git a/chrome/browser/ash/login/demo_mode/demo_mode_test_helper.h b/chrome/browser/ash/login/demo_mode/demo_mode_test_helper.h
index 1bd3ac6d..5cbaed9 100644
--- a/chrome/browser/ash/login/demo_mode/demo_mode_test_helper.h
+++ b/chrome/browser/ash/login/demo_mode/demo_mode_test_helper.h
@@ -28,6 +28,10 @@
class DemoModeTestHelper {
public:
DemoModeTestHelper();
+
+ DemoModeTestHelper(const DemoModeTestHelper&) = delete;
+ DemoModeTestHelper& operator=(const DemoModeTestHelper&) = delete;
+
~DemoModeTestHelper();
// Starts a Demo Mode session and loads a fake Demo Mode resources component.
@@ -69,8 +73,6 @@
// True if this class initialized the DBusThreadManager.
bool dbus_thread_manager_initialized_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(DemoModeTestHelper);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/demo_mode/demo_resources.h b/chrome/browser/ash/login/demo_mode/demo_resources.h
index 2ac859f..59dae14 100644
--- a/chrome/browser/ash/login/demo_mode/demo_resources.h
+++ b/chrome/browser/ash/login/demo_mode/demo_resources.h
@@ -34,6 +34,10 @@
static base::FilePath GetPreInstalledPath();
explicit DemoResources(DemoSession::DemoModeConfig config);
+
+ DemoResources(const DemoResources&) = delete;
+ DemoResources& operator=(const DemoResources&) = delete;
+
~DemoResources();
// Converts a relative path to an absolute path under the demo
@@ -110,8 +114,6 @@
std::list<base::OnceClosure> load_callbacks_;
base::WeakPtrFactory<DemoResources> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DemoResources);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/demo_mode/demo_resources_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_resources_unittest.cc
index 0ed0f20..8691cb3 100644
--- a/chrome/browser/ash/login/demo_mode/demo_resources_unittest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_resources_unittest.cc
@@ -40,6 +40,10 @@
DemoResourcesTest()
: browser_process_platform_part_test_api_(
g_browser_process->platform_part()) {}
+
+ DemoResourcesTest(const DemoResourcesTest&) = delete;
+ DemoResourcesTest& operator=(const DemoResourcesTest&) = delete;
+
~DemoResourcesTest() override = default;
void SetUp() override {
@@ -85,8 +89,6 @@
private:
BrowserProcessPlatformPartTestApi browser_process_platform_part_test_api_;
-
- DISALLOW_COPY_AND_ASSIGN(DemoResourcesTest);
};
TEST_F(DemoResourcesTest, GetPaths) {
diff --git a/chrome/browser/ash/login/demo_mode/demo_session_browsertest.cc b/chrome/browser/ash/login/demo_mode/demo_session_browsertest.cc
index c3ce7f8..986ae6ab 100644
--- a/chrome/browser/ash/login/demo_mode/demo_session_browsertest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_session_browsertest.cc
@@ -104,13 +104,17 @@
class DemoSessionNonDemoEnrolledDeviceTest : public OobeBaseTest {
public:
DemoSessionNonDemoEnrolledDeviceTest() = default;
+
+ DemoSessionNonDemoEnrolledDeviceTest(
+ const DemoSessionNonDemoEnrolledDeviceTest&) = delete;
+ DemoSessionNonDemoEnrolledDeviceTest& operator=(
+ const DemoSessionNonDemoEnrolledDeviceTest&) = delete;
+
~DemoSessionNonDemoEnrolledDeviceTest() override = default;
private:
DeviceStateMixin device_state_{
&mixin_host_, DeviceStateMixin::State::OOBE_COMPLETED_CLOUD_ENROLLED};
-
- DISALLOW_COPY_AND_ASSIGN(DemoSessionNonDemoEnrolledDeviceTest);
};
IN_PROC_BROWSER_TEST_F(DemoSessionNonDemoEnrolledDeviceTest, NotDemoMode) {
@@ -120,13 +124,16 @@
class DemoSessionConsumerDeviceTest : public OobeBaseTest {
public:
DemoSessionConsumerDeviceTest() = default;
+
+ DemoSessionConsumerDeviceTest(const DemoSessionConsumerDeviceTest&) = delete;
+ DemoSessionConsumerDeviceTest& operator=(
+ const DemoSessionConsumerDeviceTest&) = delete;
+
~DemoSessionConsumerDeviceTest() override = default;
private:
DeviceStateMixin device_state_{
&mixin_host_, DeviceStateMixin::State::OOBE_COMPLETED_CONSUMER_OWNED};
-
- DISALLOW_COPY_AND_ASSIGN(DemoSessionConsumerDeviceTest);
};
IN_PROC_BROWSER_TEST_F(DemoSessionConsumerDeviceTest, NotDemoMode) {
@@ -136,13 +143,16 @@
class DemoSessionUnownedDeviceTest : public OobeBaseTest {
public:
DemoSessionUnownedDeviceTest() = default;
+
+ DemoSessionUnownedDeviceTest(const DemoSessionUnownedDeviceTest&) = delete;
+ DemoSessionUnownedDeviceTest& operator=(const DemoSessionUnownedDeviceTest&) =
+ delete;
+
~DemoSessionUnownedDeviceTest() override = default;
private:
DeviceStateMixin device_state_{
&mixin_host_, DeviceStateMixin::State::OOBE_COMPLETED_UNOWNED};
-
- DISALLOW_COPY_AND_ASSIGN(DemoSessionUnownedDeviceTest);
};
IN_PROC_BROWSER_TEST_F(DemoSessionUnownedDeviceTest, NotDemoMode) {
@@ -152,14 +162,18 @@
class DemoSessionActiveDirectoryDeviceTest : public OobeBaseTest {
public:
DemoSessionActiveDirectoryDeviceTest() = default;
+
+ DemoSessionActiveDirectoryDeviceTest(
+ const DemoSessionActiveDirectoryDeviceTest&) = delete;
+ DemoSessionActiveDirectoryDeviceTest& operator=(
+ const DemoSessionActiveDirectoryDeviceTest&) = delete;
+
~DemoSessionActiveDirectoryDeviceTest() override = default;
private:
DeviceStateMixin device_state_{
&mixin_host_,
DeviceStateMixin::State::OOBE_COMPLETED_ACTIVE_DIRECTORY_ENROLLED};
-
- DISALLOW_COPY_AND_ASSIGN(DemoSessionActiveDirectoryDeviceTest);
};
IN_PROC_BROWSER_TEST_F(DemoSessionActiveDirectoryDeviceTest, NotDemoMode) {
diff --git a/chrome/browser/ash/login/demo_mode/demo_session_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_session_unittest.cc
index 47ea58c..df72300 100644
--- a/chrome/browser/ash/login/demo_mode/demo_session_unittest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_session_unittest.cc
@@ -65,6 +65,9 @@
g_browser_process->platform_part()),
scoped_user_manager_(std::make_unique<FakeChromeUserManager>()) {}
+ DemoSessionTest(const DemoSessionTest&) = delete;
+ DemoSessionTest& operator=(const DemoSessionTest&) = delete;
+
~DemoSessionTest() override = default;
void SetUp() override {
@@ -151,8 +154,6 @@
BrowserProcessPlatformPartTestApi browser_process_platform_part_test_api_;
user_manager::ScopedUserManager scoped_user_manager_;
chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(DemoSessionTest);
};
TEST_F(DemoSessionTest, StartForDeviceInDemoMode) {
diff --git a/chrome/browser/ash/login/demo_mode/demo_setup_browsertest.cc b/chrome/browser/ash/login/demo_mode/demo_setup_browsertest.cc
index 6d6451d..38609c5 100644
--- a/chrome/browser/ash/login/demo_mode/demo_setup_browsertest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_setup_browsertest.cc
@@ -107,6 +107,10 @@
class DemoSetupTestBase : public OobeBaseTest {
public:
DemoSetupTestBase() = default;
+
+ DemoSetupTestBase(const DemoSetupTestBase&) = delete;
+ DemoSetupTestBase& operator=(const DemoSetupTestBase&) = delete;
+
~DemoSetupTestBase() override = default;
void SetUpOnMainThread() override {
@@ -302,8 +306,6 @@
base::ScopedTempDir fake_demo_resources_dir_;
policy::MockCloudPolicyStore mock_policy_store_;
std::unique_ptr<base::AutoReset<bool>> branded_build_override_;
-
- DISALLOW_COPY_AND_ASSIGN(DemoSetupTestBase);
};
class DemoSetupArcSupportedTest : public DemoSetupTestBase {
@@ -999,6 +1001,11 @@
class DemoSetupProgressStepsTest : public DemoSetupArcSupportedTest {
public:
DemoSetupProgressStepsTest() = default;
+
+ DemoSetupProgressStepsTest(const DemoSetupProgressStepsTest&) = delete;
+ DemoSetupProgressStepsTest& operator=(const DemoSetupProgressStepsTest&) =
+ delete;
+
~DemoSetupProgressStepsTest() override = default;
// Checks how many steps have been rendered in the demo setup screen.
@@ -1021,7 +1028,6 @@
private:
base::test::ScopedFeatureList scoped_feature_list_;
- DISALLOW_COPY_AND_ASSIGN(DemoSetupProgressStepsTest);
};
IN_PROC_BROWSER_TEST_F(DemoSetupProgressStepsTest,
@@ -1055,6 +1061,11 @@
class DemoSetupArcUnsupportedTest : public DemoSetupTestBase {
public:
DemoSetupArcUnsupportedTest() = default;
+
+ DemoSetupArcUnsupportedTest(const DemoSetupArcUnsupportedTest&) = delete;
+ DemoSetupArcUnsupportedTest& operator=(const DemoSetupArcUnsupportedTest&) =
+ delete;
+
~DemoSetupArcUnsupportedTest() override = default;
// DemoSetupTestBase:
@@ -1063,9 +1074,6 @@
command_line->AppendSwitchASCII(switches::kArcAvailability, "none");
ASSERT_FALSE(arc::IsArcAvailable());
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DemoSetupArcUnsupportedTest);
};
// TODO(crbug.com/1150349): Flaky on ChromeOS ASAN.
diff --git a/chrome/browser/ash/login/demo_mode/demo_setup_controller_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_setup_controller_unittest.cc
index b129181..d89a3dd 100644
--- a/chrome/browser/ash/login/demo_mode/demo_setup_controller_unittest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_setup_controller_unittest.cc
@@ -48,6 +48,11 @@
public:
DemoSetupControllerTestHelper()
: run_loop_(std::make_unique<base::RunLoop>()) {}
+
+ DemoSetupControllerTestHelper(const DemoSetupControllerTestHelper&) = delete;
+ DemoSetupControllerTestHelper& operator=(
+ const DemoSetupControllerTestHelper&) = delete;
+
virtual ~DemoSetupControllerTestHelper() = default;
void OnSetupError(const DemoSetupController::DemoSetupError& error) {
@@ -101,8 +106,6 @@
absl::optional<DemoSetupController::DemoSetupStep> setup_step_;
absl::optional<DemoSetupController::DemoSetupError> error_;
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(DemoSetupControllerTestHelper);
};
class DemoSetupControllerTest : public testing::Test {
diff --git a/chrome/browser/ash/login/easy_unlock/chrome_proximity_auth_client.h b/chrome/browser/ash/login/easy_unlock/chrome_proximity_auth_client.h
index 9cad86a..2b7138fd9 100644
--- a/chrome/browser/ash/login/easy_unlock/chrome_proximity_auth_client.h
+++ b/chrome/browser/ash/login/easy_unlock/chrome_proximity_auth_client.h
@@ -17,6 +17,11 @@
class ChromeProximityAuthClient : public proximity_auth::ProximityAuthClient {
public:
explicit ChromeProximityAuthClient(Profile* profile);
+
+ ChromeProximityAuthClient(const ChromeProximityAuthClient&) = delete;
+ ChromeProximityAuthClient& operator=(const ChromeProximityAuthClient&) =
+ delete;
+
~ChromeProximityAuthClient() override;
// proximity_auth::ProximityAuthClient:
@@ -32,8 +37,6 @@
private:
Profile* const profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeProximityAuthClient);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.h
index 960eca03..1200a056 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.h
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.h
@@ -26,6 +26,10 @@
enum Type { TYPE_UNLOCK, TYPE_SIGNIN };
EasyUnlockAuthAttempt(const AccountId& account_id, Type type);
+
+ EasyUnlockAuthAttempt(const EasyUnlockAuthAttempt&) = delete;
+ EasyUnlockAuthAttempt& operator=(const EasyUnlockAuthAttempt&) = delete;
+
~EasyUnlockAuthAttempt();
// Ensures the device is currently locked and the unlock process is being
@@ -56,8 +60,6 @@
State state_;
const AccountId account_id_;
Type type_;
-
- DISALLOW_COPY_AND_ASSIGN(EasyUnlockAuthAttempt);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt_unittest.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt_unittest.cc
index a0d2f3c..9b0064b1 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt_unittest.cc
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt_unittest.cc
@@ -69,6 +69,9 @@
auth_type_(proximity_auth::mojom::AuthType::USER_CLICK),
account_id_(account_id) {}
+ TestLockHandler(const TestLockHandler&) = delete;
+ TestLockHandler& operator=(const TestLockHandler&) = delete;
+
~TestLockHandler() override {}
void set_state(AuthState value) { state_ = value; }
@@ -152,13 +155,17 @@
proximity_auth::mojom::AuthType auth_type_;
const AccountId account_id_;
std::string expected_secret_;
-
- DISALLOW_COPY_AND_ASSIGN(TestLockHandler);
};
class EasyUnlockAuthAttemptUnlockTest : public testing::Test {
public:
EasyUnlockAuthAttemptUnlockTest() {}
+
+ EasyUnlockAuthAttemptUnlockTest(const EasyUnlockAuthAttemptUnlockTest&) =
+ delete;
+ EasyUnlockAuthAttemptUnlockTest& operator=(
+ const EasyUnlockAuthAttemptUnlockTest&) = delete;
+
~EasyUnlockAuthAttemptUnlockTest() override {}
void SetUp() override {
@@ -184,9 +191,6 @@
const AccountId test_account_id1_ = AccountId::FromUserEmail(kTestUser1);
const AccountId test_account_id2_ = AccountId::FromUserEmail(kTestUser2);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(EasyUnlockAuthAttemptUnlockTest);
};
TEST_F(EasyUnlockAuthAttemptUnlockTest, StartWhenNotLocked) {
@@ -291,6 +295,12 @@
class EasyUnlockAuthAttemptSigninTest : public testing::Test {
public:
EasyUnlockAuthAttemptSigninTest() {}
+
+ EasyUnlockAuthAttemptSigninTest(const EasyUnlockAuthAttemptSigninTest&) =
+ delete;
+ EasyUnlockAuthAttemptSigninTest& operator=(
+ const EasyUnlockAuthAttemptSigninTest&) = delete;
+
~EasyUnlockAuthAttemptSigninTest() override {}
void SetUp() override {
@@ -316,9 +326,6 @@
const AccountId test_account_id1_ = AccountId::FromUserEmail(kTestUser1);
const AccountId test_account_id2_ = AccountId::FromUserEmail(kTestUser2);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(EasyUnlockAuthAttemptSigninTest);
};
TEST_F(EasyUnlockAuthAttemptSigninTest, StartWhenNotLocked) {
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper.h
index 9a1327b..75e86256 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper.h
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper.h
@@ -31,6 +31,11 @@
const std::string& channel_binding_data,
const AccountId& account_id,
EasyUnlockTpmKeyManager* key_manager);
+
+ EasyUnlockChallengeWrapper(const EasyUnlockChallengeWrapper&) = delete;
+ EasyUnlockChallengeWrapper& operator=(const EasyUnlockChallengeWrapper&) =
+ delete;
+
virtual ~EasyUnlockChallengeWrapper();
// Wraps the challenge and invokes `callback` with the `wrapped_challenge`
@@ -68,8 +73,6 @@
WrappedChallengeCallback callback_;
base::WeakPtrFactory<EasyUnlockChallengeWrapper> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EasyUnlockChallengeWrapper);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper_unittest.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper_unittest.cc
index 94b9c435..5637500 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper_unittest.cc
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper_unittest.cc
@@ -32,6 +32,12 @@
kChannelBindingData,
AccountId::FromUserEmail(kUserId),
nullptr) {}
+
+ TestableEasyUnlockChallengeWrapper(
+ const TestableEasyUnlockChallengeWrapper&) = delete;
+ TestableEasyUnlockChallengeWrapper& operator=(
+ const TestableEasyUnlockChallengeWrapper&) = delete;
+
~TestableEasyUnlockChallengeWrapper() override {}
private:
@@ -56,8 +62,6 @@
std::move(callback).Run(kSignature);
}
-
- DISALLOW_COPY_AND_ASSIGN(TestableEasyUnlockChallengeWrapper);
};
TEST(EasyUnlockChallengeWrapperTest, TestWrapChallenge) {
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.cc
index afaca46..0bb301c 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.cc
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.cc
@@ -53,6 +53,10 @@
const std::string& tpm_pub_key,
EasyUnlockDeviceKeyData* device,
ChallengeCreatedCallback callback);
+
+ ChallengeCreator(const ChallengeCreator&) = delete;
+ ChallengeCreator& operator=(const ChallengeCreator&) = delete;
+
~ChallengeCreator();
void Start();
@@ -86,8 +90,6 @@
EasyUnlockClient* easy_unlock_client_;
base::WeakPtrFactory<ChallengeCreator> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChallengeCreator);
};
EasyUnlockCreateKeysOperation::ChallengeCreator::ChallengeCreator(
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.h
index 7ea0f0a..b821f84f 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.h
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.h
@@ -29,6 +29,11 @@
const std::string& tpm_public_key,
const EasyUnlockDeviceKeyDataList& devices,
CreateKeysCallback callback);
+
+ EasyUnlockCreateKeysOperation(const EasyUnlockCreateKeysOperation&) = delete;
+ EasyUnlockCreateKeysOperation& operator=(
+ const EasyUnlockCreateKeysOperation&) = delete;
+
~EasyUnlockCreateKeysOperation();
void Start();
@@ -58,8 +63,6 @@
std::unique_ptr<ChallengeCreator> challenge_creator_;
base::WeakPtrFactory<EasyUnlockCreateKeysOperation> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EasyUnlockCreateKeysOperation);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_get_keys_operation.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_get_keys_operation.h
index 9d2053f..0c9f879 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_get_keys_operation.h
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_get_keys_operation.h
@@ -26,6 +26,11 @@
const EasyUnlockDeviceKeyDataList& data_list)>;
EasyUnlockGetKeysOperation(const UserContext& user_context,
GetKeysCallback callback);
+
+ EasyUnlockGetKeysOperation(const EasyUnlockGetKeysOperation&) = delete;
+ EasyUnlockGetKeysOperation& operator=(const EasyUnlockGetKeysOperation&) =
+ delete;
+
~EasyUnlockGetKeysOperation();
// Starts the operation. If the cryptohome service is not yet available, the
@@ -50,8 +55,6 @@
EasyUnlockDeviceKeyDataList devices_;
base::WeakPtrFactory<EasyUnlockGetKeysOperation> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EasyUnlockGetKeysOperation);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.h
index ef5727e..a7c0d7f 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.h
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.h
@@ -38,6 +38,10 @@
using GetDeviceDataListCallback = EasyUnlockGetKeysOperation::GetKeysCallback;
EasyUnlockKeyManager();
+
+ EasyUnlockKeyManager(const EasyUnlockKeyManager&) = delete;
+ EasyUnlockKeyManager& operator=(const EasyUnlockKeyManager&) = delete;
+
~EasyUnlockKeyManager();
// Clears existing Easy unlock keys and creates new ones for the given
@@ -110,8 +114,6 @@
std::unique_ptr<EasyUnlockGetKeysOperation> pending_read_operation_;
base::WeakPtrFactory<EasyUnlockKeyManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EasyUnlockKeyManager);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller.h
index ad1979e..69f5048 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller.h
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller.h
@@ -21,6 +21,12 @@
class EasyUnlockNotificationController {
public:
explicit EasyUnlockNotificationController(Profile* profile);
+
+ EasyUnlockNotificationController(const EasyUnlockNotificationController&) =
+ delete;
+ EasyUnlockNotificationController& operator=(
+ const EasyUnlockNotificationController&) = delete;
+
virtual ~EasyUnlockNotificationController();
// Shows the notification when EasyUnlock is synced to a new Chromebook.
@@ -69,8 +75,6 @@
base::WeakPtrFactory<EasyUnlockNotificationController> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(EasyUnlockNotificationController);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller_chromeos_unittest.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller_chromeos_unittest.cc
index ca4bed6..30526c4 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller_chromeos_unittest.cc
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller_chromeos_unittest.cc
@@ -22,14 +22,16 @@
explicit TestableNotificationController(Profile* profile)
: EasyUnlockNotificationController(profile) {}
+ TestableNotificationController(const TestableNotificationController&) =
+ delete;
+ TestableNotificationController& operator=(
+ const TestableNotificationController&) = delete;
+
~TestableNotificationController() override {}
// EasyUnlockNotificationController:
MOCK_METHOD0(LaunchEasyUnlockSettings, void());
MOCK_METHOD0(LockScreen, void());
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestableNotificationController);
};
class EasyUnlockNotificationControllerTest : public BrowserWithTestWindowTest {
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_refresh_keys_operation.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_refresh_keys_operation.h
index 07107c1..3306c99 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_refresh_keys_operation.h
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_refresh_keys_operation.h
@@ -27,6 +27,12 @@
const std::string& tpm_public_key,
const EasyUnlockDeviceKeyDataList& devices,
RefreshKeysCallback callback);
+
+ EasyUnlockRefreshKeysOperation(const EasyUnlockRefreshKeysOperation&) =
+ delete;
+ EasyUnlockRefreshKeysOperation& operator=(
+ const EasyUnlockRefreshKeysOperation&) = delete;
+
~EasyUnlockRefreshKeysOperation();
void Start();
@@ -45,8 +51,6 @@
std::unique_ptr<EasyUnlockRemoveKeysOperation> remove_keys_operation_;
base::WeakPtrFactory<EasyUnlockRefreshKeysOperation> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EasyUnlockRefreshKeysOperation);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.h
index c8ff50e9..a932d323 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.h
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.h
@@ -25,6 +25,11 @@
EasyUnlockRemoveKeysOperation(const UserContext& user_context,
size_t start_index,
RemoveKeysCallback callback);
+
+ EasyUnlockRemoveKeysOperation(const EasyUnlockRemoveKeysOperation&) = delete;
+ EasyUnlockRemoveKeysOperation& operator=(
+ const EasyUnlockRemoveKeysOperation&) = delete;
+
~EasyUnlockRemoveKeysOperation();
void Start();
@@ -39,8 +44,6 @@
RemoveKeysCallback callback_;
size_t key_index_;
base::WeakPtrFactory<EasyUnlockRemoveKeysOperation> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EasyUnlockRemoveKeysOperation);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_service.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_service.cc
index 00393fc..0495f22 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_service.cc
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_service.cc
@@ -89,6 +89,9 @@
PowerManagerClient::Get()->AddObserver(this);
}
+ PowerMonitor(const PowerMonitor&) = delete;
+ PowerMonitor& operator=(const PowerMonitor&) = delete;
+
~PowerMonitor() override { PowerManagerClient::Get()->RemoveObserver(this); }
private:
@@ -112,8 +115,6 @@
EasyUnlockService* service_;
base::WeakPtrFactory<PowerMonitor> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PowerMonitor);
};
EasyUnlockService::EasyUnlockService(
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.h
index a7bcd7a..2661f75 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.h
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.h
@@ -57,6 +57,9 @@
device_sync::DeviceSyncClient* device_sync_client,
multidevice_setup::MultiDeviceSetupClient* multidevice_setup_client);
+ EasyUnlockServiceRegular(const EasyUnlockServiceRegular&) = delete;
+ EasyUnlockServiceRegular& operator=(const EasyUnlockServiceRegular&) = delete;
+
~EasyUnlockServiceRegular() override;
private:
@@ -158,8 +161,6 @@
PrefChangeRegistrar registrar_;
base::WeakPtrFactory<EasyUnlockServiceRegular> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EasyUnlockServiceRegular);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular_unittest.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular_unittest.cc
index 3f96b05d..ebd6fca 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular_unittest.cc
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular_unittest.cc
@@ -63,15 +63,18 @@
public:
MockEasyUnlockNotificationController()
: EasyUnlockNotificationController(nullptr) {}
+
+ MockEasyUnlockNotificationController(
+ const MockEasyUnlockNotificationController&) = delete;
+ MockEasyUnlockNotificationController& operator=(
+ const MockEasyUnlockNotificationController&) = delete;
+
~MockEasyUnlockNotificationController() override {}
// EasyUnlockNotificationController:
MOCK_METHOD0(ShowChromebookAddedNotification, void());
MOCK_METHOD0(ShowPairingChangeNotification, void());
MOCK_METHOD1(ShowPairingChangeAppliedNotification, void(const std::string&));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockEasyUnlockNotificationController);
};
// Define a stub MultiDeviceSetupDialog because the base class has a protected
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_signin_chromeos.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_signin_chromeos.h
index 4106ff8f..baa9eea 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_signin_chromeos.h
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_signin_chromeos.h
@@ -36,6 +36,10 @@
EasyUnlockServiceSignin(
Profile* profile,
secure_channel::SecureChannelClient* secure_channel_client);
+
+ EasyUnlockServiceSignin(const EasyUnlockServiceSignin&) = delete;
+ EasyUnlockServiceSignin& operator=(const EasyUnlockServiceSignin&) = delete;
+
~EasyUnlockServiceSignin() override;
// Wraps the challenge for the remote device identified by `account_id` and
@@ -152,8 +156,6 @@
pref_manager_;
base::WeakPtrFactory<EasyUnlockServiceSignin> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EasyUnlockServiceSignin);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager.h
index 25139931..c3cd24e 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager.h
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager.h
@@ -40,6 +40,10 @@
EasyUnlockTpmKeyManager(const AccountId& account_id,
const std::string& username_hash,
PrefService* local_state);
+
+ EasyUnlockTpmKeyManager(const EasyUnlockTpmKeyManager&) = delete;
+ EasyUnlockTpmKeyManager& operator=(const EasyUnlockTpmKeyManager&) = delete;
+
~EasyUnlockTpmKeyManager() override;
// Checks if the RSA public key is set in the local state. If not, creates
@@ -147,8 +151,6 @@
base::WeakPtrFactory<EasyUnlockTpmKeyManager> get_tpm_slot_weak_ptr_factory_{
this};
base::WeakPtrFactory<EasyUnlockTpmKeyManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EasyUnlockTpmKeyManager);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc
index da83e2e6..a9d3146 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc
@@ -201,6 +201,11 @@
user_manager_(new FakeChromeUserManager()),
user_manager_enabler_(base::WrapUnique(user_manager_)),
profile_manager_(TestingBrowserProcess::GetGlobal()) {}
+
+ EasyUnlockTpmKeyManagerTest(const EasyUnlockTpmKeyManagerTest&) = delete;
+ EasyUnlockTpmKeyManagerTest& operator=(const EasyUnlockTpmKeyManagerTest&) =
+ delete;
+
~EasyUnlockTpmKeyManagerTest() override {}
void SetUp() override {
@@ -358,8 +363,6 @@
// The test user's username hash.
std::string username_hash_;
-
- DISALLOW_COPY_AND_ASSIGN(EasyUnlockTpmKeyManagerTest);
};
TEST_F(EasyUnlockTpmKeyManagerTest, CreateKeyPair) {
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_user_login_flow.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_user_login_flow.h
index 5d9d8f33..a17db3ad 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_user_login_flow.h
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_user_login_flow.h
@@ -20,14 +20,16 @@
class EasyUnlockUserLoginFlow : public ExtendedUserFlow {
public:
explicit EasyUnlockUserLoginFlow(const AccountId& account_id);
+
+ EasyUnlockUserLoginFlow(const EasyUnlockUserLoginFlow&) = delete;
+ EasyUnlockUserLoginFlow& operator=(const EasyUnlockUserLoginFlow&) = delete;
+
~EasyUnlockUserLoginFlow() override;
private:
// ExtendedUserFlow implementation.
bool HandleLoginFailure(const AuthFailure& failure) override;
void HandleLoginSuccess(const UserContext& context) override;
-
- DISALLOW_COPY_AND_ASSIGN(EasyUnlockUserLoginFlow);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/easy_unlock/smartlock_state_handler.h b/chrome/browser/ash/login/easy_unlock/smartlock_state_handler.h
index 7d828cf..ad96603 100644
--- a/chrome/browser/ash/login/easy_unlock/smartlock_state_handler.h
+++ b/chrome/browser/ash/login/easy_unlock/smartlock_state_handler.h
@@ -49,6 +49,10 @@
HardlockState initial_hardlock_state,
proximity_auth::ScreenlockBridge* screenlock_bridge,
proximity_auth::ProximityAuthPrefManager* pref_manager);
+
+ SmartLockStateHandler(const SmartLockStateHandler&) = delete;
+ SmartLockStateHandler& operator=(const SmartLockStateHandler&) = delete;
+
~SmartLockStateHandler() override;
// Returns true if handler is not in INACTIVE state.
@@ -107,8 +111,6 @@
// Whether the user's phone was ever locked while on the current lock screen.
bool did_see_locked_phone_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(SmartLockStateHandler);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/easy_unlock/smartlock_state_handler_unittest.cc b/chrome/browser/ash/login/easy_unlock/smartlock_state_handler_unittest.cc
index 17a84f82..dc4ec17 100644
--- a/chrome/browser/ash/login/easy_unlock/smartlock_state_handler_unittest.cc
+++ b/chrome/browser/ash/login/easy_unlock/smartlock_state_handler_unittest.cc
@@ -39,6 +39,11 @@
: public proximity_auth::ProximityAuthPrefManager {
public:
FakeProximityAuthPrefManager() = default;
+
+ FakeProximityAuthPrefManager(const FakeProximityAuthPrefManager&) = delete;
+ FakeProximityAuthPrefManager& operator=(const FakeProximityAuthPrefManager&) =
+ delete;
+
~FakeProximityAuthPrefManager() override = default;
// proximity_auth::ProximityAuthPrefManager:
@@ -70,8 +75,6 @@
private:
bool has_shown_login_disabled_message_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(FakeProximityAuthPrefManager);
};
// Checks if `input` string has any unreplaced placeholders.
@@ -92,6 +95,10 @@
: account_id_(account_id),
show_icon_count_(0u),
auth_type_(proximity_auth::mojom::AuthType::OFFLINE_PASSWORD) {}
+
+ TestLockHandler(const TestLockHandler&) = delete;
+ TestLockHandler& operator=(const TestLockHandler&) = delete;
+
~TestLockHandler() override {}
// proximity_auth::ScreenlockBridge::LockHandler implementation:
@@ -244,8 +251,6 @@
// Auth type and value set using `SetAuthType`.
proximity_auth::mojom::AuthType auth_type_;
std::u16string auth_value_;
-
- DISALLOW_COPY_AND_ASSIGN(TestLockHandler);
};
class SmartLockStateHandlerTest : public testing::Test {
diff --git a/chrome/browser/ash/login/enable_debugging_browsertest.cc b/chrome/browser/ash/login/enable_debugging_browsertest.cc
index 9d5217d..6421e2c 100644
--- a/chrome/browser/ash/login/enable_debugging_browsertest.cc
+++ b/chrome/browser/ash/login/enable_debugging_browsertest.cc
@@ -174,6 +174,10 @@
class EnableDebuggingTestBase : public OobeBaseTest {
public:
EnableDebuggingTestBase() = default;
+
+ EnableDebuggingTestBase(const EnableDebuggingTestBase&) = delete;
+ EnableDebuggingTestBase& operator=(const EnableDebuggingTestBase&) = delete;
+
~EnableDebuggingTestBase() override = default;
// OobeBaseTest:
@@ -231,9 +235,6 @@
}
TestDebugDaemonClient* debug_daemon_client_ = nullptr;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(EnableDebuggingTestBase);
};
class EnableDebuggingDevTest : public EnableDebuggingTestBase {
diff --git a/chrome/browser/ash/login/enrollment/auto_enrollment_check_screen.h b/chrome/browser/ash/login/enrollment/auto_enrollment_check_screen.h
index 8e89123..af63e4b 100644
--- a/chrome/browser/ash/login/enrollment/auto_enrollment_check_screen.h
+++ b/chrome/browser/ash/login/enrollment/auto_enrollment_check_screen.h
@@ -37,6 +37,11 @@
AutoEnrollmentCheckScreen(AutoEnrollmentCheckScreenView* view,
ErrorScreen* error_screen,
const base::RepeatingClosure& exit_callback);
+
+ AutoEnrollmentCheckScreen(const AutoEnrollmentCheckScreen&) = delete;
+ AutoEnrollmentCheckScreen& operator=(const AutoEnrollmentCheckScreen&) =
+ delete;
+
~AutoEnrollmentCheckScreen() override;
// Clears the cached state causing the forced enrollment check to be retried.
@@ -125,8 +130,6 @@
base::CallbackListSubscription connect_request_subscription_;
base::WeakPtrFactory<AutoEnrollmentCheckScreen> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AutoEnrollmentCheckScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/enrollment/auto_enrollment_controller.h b/chrome/browser/ash/login/enrollment/auto_enrollment_controller.h
index 0b950081..f35bfaf6 100644
--- a/chrome/browser/ash/login/enrollment/auto_enrollment_controller.h
+++ b/chrome/browser/ash/login/enrollment/auto_enrollment_controller.h
@@ -123,6 +123,10 @@
}
AutoEnrollmentController();
+
+ AutoEnrollmentController(const AutoEnrollmentController&) = delete;
+ AutoEnrollmentController& operator=(const AutoEnrollmentController&) = delete;
+
~AutoEnrollmentController();
// Starts the auto-enrollment check. Safe to call multiple times: aborts in
@@ -295,8 +299,6 @@
base::WeakPtrFactory<AutoEnrollmentController> client_start_weak_factory_{
this};
base::WeakPtrFactory<AutoEnrollmentController> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AutoEnrollmentController);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/enrollment/enrollment_local_policy_server_browsertest.cc b/chrome/browser/ash/login/enrollment/enrollment_local_policy_server_browsertest.cc
index 7019900..bbfd699 100644
--- a/chrome/browser/ash/login/enrollment/enrollment_local_policy_server_browsertest.cc
+++ b/chrome/browser/ash/login/enrollment/enrollment_local_policy_server_browsertest.cc
@@ -223,6 +223,10 @@
system::kSerialNumberKeyForTest, test::kTestSerialNumber);
}
+ AutoEnrollmentWithStatistics(const AutoEnrollmentWithStatistics&) = delete;
+ AutoEnrollmentWithStatistics& operator=(const AutoEnrollmentWithStatistics&) =
+ delete;
+
~AutoEnrollmentWithStatistics() override = default;
protected:
@@ -243,12 +247,16 @@
private:
system::ScopedFakeStatisticsProvider fake_statistics_provider_;
- DISALLOW_COPY_AND_ASSIGN(AutoEnrollmentWithStatistics);
};
class AutoEnrollmentNoStateKeys : public AutoEnrollmentWithStatistics {
public:
AutoEnrollmentNoStateKeys() = default;
+
+ AutoEnrollmentNoStateKeys(const AutoEnrollmentNoStateKeys&) = delete;
+ AutoEnrollmentNoStateKeys& operator=(const AutoEnrollmentNoStateKeys&) =
+ delete;
+
~AutoEnrollmentNoStateKeys() override = default;
// AutoEnrollmentWithStatistics:
@@ -257,9 +265,6 @@
// Session manager client is initialized by DeviceStateMixin.
FakeSessionManagerClient::Get()->set_force_state_keys_missing(true);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AutoEnrollmentNoStateKeys);
};
class InitialEnrollmentTest : public EnrollmentLocalPolicyServerBase {
@@ -837,6 +842,9 @@
DeviceStateMixin::State::OOBE_COMPLETED_CLOUD_ENROLLED);
}
+ EnrollmentRecoveryTest(const EnrollmentRecoveryTest&) = delete;
+ EnrollmentRecoveryTest& operator=(const EnrollmentRecoveryTest&) = delete;
+
~EnrollmentRecoveryTest() override = default;
protected:
@@ -846,9 +854,6 @@
// This triggers recovery enrollment.
device_state_.RequestDevicePolicyUpdate()->policy_data()->Clear();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(EnrollmentRecoveryTest);
};
IN_PROC_BROWSER_TEST_F(EnrollmentRecoveryTest, Success) {
diff --git a/chrome/browser/ash/login/enrollment/enrollment_screen.h b/chrome/browser/ash/login/enrollment/enrollment_screen.h
index 18845e6..96f47e6 100644
--- a/chrome/browser/ash/login/enrollment/enrollment_screen.h
+++ b/chrome/browser/ash/login/enrollment/enrollment_screen.h
@@ -52,6 +52,10 @@
using ScreenExitCallback = base::RepeatingCallback<void(Result result)>;
EnrollmentScreen(EnrollmentScreenView* view,
const ScreenExitCallback& exit_callback);
+
+ EnrollmentScreen(const EnrollmentScreen&) = delete;
+ EnrollmentScreen& operator=(const EnrollmentScreen&) = delete;
+
~EnrollmentScreen() override;
static EnrollmentScreen* Get(ScreenManager* manager);
@@ -220,7 +224,6 @@
std::unique_ptr<AuthPolicyHelper> authpolicy_login_helper_;
base::WeakPtrFactory<EnrollmentScreen> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(EnrollmentScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/enrollment/enrollment_screen_browsertest.cc b/chrome/browser/ash/login/enrollment/enrollment_screen_browsertest.cc
index f670e4f..fd1f89c 100644
--- a/chrome/browser/ash/login/enrollment/enrollment_screen_browsertest.cc
+++ b/chrome/browser/ash/login/enrollment/enrollment_screen_browsertest.cc
@@ -35,6 +35,10 @@
class EnrollmentScreenTest : public OobeBaseTest {
public:
EnrollmentScreenTest() = default;
+
+ EnrollmentScreenTest(const EnrollmentScreenTest&) = delete;
+ EnrollmentScreenTest& operator=(const EnrollmentScreenTest&) = delete;
+
~EnrollmentScreenTest() override = default;
// OobeBaseTest:
@@ -54,9 +58,6 @@
}
test::EnrollmentUIMixin enrollment_ui_{&mixin_host_};
-
- private:
- DISALLOW_COPY_AND_ASSIGN(EnrollmentScreenTest);
};
IN_PROC_BROWSER_TEST_F(EnrollmentScreenTest, TestCancel) {
@@ -79,6 +80,12 @@
class AttestationAuthEnrollmentScreenTest : public EnrollmentScreenTest {
public:
AttestationAuthEnrollmentScreenTest() = default;
+
+ AttestationAuthEnrollmentScreenTest(
+ const AttestationAuthEnrollmentScreenTest&) = delete;
+ AttestationAuthEnrollmentScreenTest& operator=(
+ const AttestationAuthEnrollmentScreenTest&) = delete;
+
~AttestationAuthEnrollmentScreenTest() override = default;
private:
@@ -87,8 +94,6 @@
EnrollmentScreenTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kEnterpriseEnableZeroTouchEnrollment);
}
-
- DISALLOW_COPY_AND_ASSIGN(AttestationAuthEnrollmentScreenTest);
};
IN_PROC_BROWSER_TEST_F(AttestationAuthEnrollmentScreenTest, TestCancel) {
@@ -118,6 +123,12 @@
class ForcedAttestationAuthEnrollmentScreenTest : public EnrollmentScreenTest {
public:
ForcedAttestationAuthEnrollmentScreenTest() = default;
+
+ ForcedAttestationAuthEnrollmentScreenTest(
+ const ForcedAttestationAuthEnrollmentScreenTest&) = delete;
+ ForcedAttestationAuthEnrollmentScreenTest& operator=(
+ const ForcedAttestationAuthEnrollmentScreenTest&) = delete;
+
~ForcedAttestationAuthEnrollmentScreenTest() override = default;
private:
@@ -127,8 +138,6 @@
command_line->AppendSwitchASCII(
switches::kEnterpriseEnableZeroTouchEnrollment, "forced");
}
-
- DISALLOW_COPY_AND_ASSIGN(ForcedAttestationAuthEnrollmentScreenTest);
};
IN_PROC_BROWSER_TEST_F(ForcedAttestationAuthEnrollmentScreenTest, TestCancel) {
@@ -142,6 +151,11 @@
class MultiAuthEnrollmentScreenTest : public EnrollmentScreenTest {
public:
MultiAuthEnrollmentScreenTest() = default;
+
+ MultiAuthEnrollmentScreenTest(const MultiAuthEnrollmentScreenTest&) = delete;
+ MultiAuthEnrollmentScreenTest& operator=(
+ const MultiAuthEnrollmentScreenTest&) = delete;
+
~MultiAuthEnrollmentScreenTest() override = default;
private:
@@ -157,8 +171,6 @@
switches::kAppOemManifestFile,
test_data_dir.AppendASCII("kiosk_manifest.json"));
}
-
- DISALLOW_COPY_AND_ASSIGN(MultiAuthEnrollmentScreenTest);
};
IN_PROC_BROWSER_TEST_F(MultiAuthEnrollmentScreenTest, TestCancel) {
@@ -172,6 +184,12 @@
class ProvisionedEnrollmentScreenTest : public EnrollmentScreenTest {
public:
ProvisionedEnrollmentScreenTest() = default;
+
+ ProvisionedEnrollmentScreenTest(const ProvisionedEnrollmentScreenTest&) =
+ delete;
+ ProvisionedEnrollmentScreenTest& operator=(
+ const ProvisionedEnrollmentScreenTest&) = delete;
+
~ProvisionedEnrollmentScreenTest() override = default;
private:
@@ -185,8 +203,6 @@
switches::kAppOemManifestFile,
test_data_dir.AppendASCII("kiosk_manifest.json"));
}
-
- DISALLOW_COPY_AND_ASSIGN(ProvisionedEnrollmentScreenTest);
};
IN_PROC_BROWSER_TEST_F(ProvisionedEnrollmentScreenTest, TestBackButton) {
diff --git a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h
index de87e49..a23fc13 100644
--- a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h
+++ b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h
@@ -75,6 +75,10 @@
static void SetEnrollmentHelperMock(
std::unique_ptr<EnterpriseEnrollmentHelper> mock);
+ EnterpriseEnrollmentHelper(const EnterpriseEnrollmentHelper&) = delete;
+ EnterpriseEnrollmentHelper& operator=(const EnterpriseEnrollmentHelper&) =
+ delete;
+
virtual ~EnterpriseEnrollmentHelper();
// Starts enterprise enrollment using `auth_code`. First tries to exchange the
@@ -140,8 +144,6 @@
// If this is not nullptr, then it will be used to as next enrollment helper.
static EnterpriseEnrollmentHelper* mock_enrollment_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(EnterpriseEnrollmentHelper);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.cc b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.cc
index 75be261..4c89df75 100644
--- a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.cc
+++ b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.cc
@@ -52,6 +52,10 @@
class TokenRevoker : public GaiaAuthConsumer {
public:
TokenRevoker();
+
+ TokenRevoker(const TokenRevoker&) = delete;
+ TokenRevoker& operator=(const TokenRevoker&) = delete;
+
~TokenRevoker() override;
void Start(const std::string& token);
@@ -62,8 +66,6 @@
private:
GaiaAuthFetcher gaia_fetcher_;
-
- DISALLOW_COPY_AND_ASSIGN(TokenRevoker);
};
TokenRevoker::TokenRevoker()
diff --git a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.h b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.h
index d75df32..a082ce9 100644
--- a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.h
+++ b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.h
@@ -28,6 +28,12 @@
class EnterpriseEnrollmentHelperImpl : public EnterpriseEnrollmentHelper {
public:
EnterpriseEnrollmentHelperImpl();
+
+ EnterpriseEnrollmentHelperImpl(const EnterpriseEnrollmentHelperImpl&) =
+ delete;
+ EnterpriseEnrollmentHelperImpl& operator=(
+ const EnterpriseEnrollmentHelperImpl&) = delete;
+
~EnterpriseEnrollmentHelperImpl() override;
// EnterpriseEnrollmentHelper:
@@ -96,8 +102,6 @@
std::unique_ptr<policy::EnrollmentHandler> enrollment_handler_;
base::WeakPtrFactory<EnterpriseEnrollmentHelperImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EnterpriseEnrollmentHelperImpl);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/enterprise_user_session_metrics_unittest.cc b/chrome/browser/ash/login/enterprise_user_session_metrics_unittest.cc
index 31e96cdc..b4f29f9 100644
--- a/chrome/browser/ash/login/enterprise_user_session_metrics_unittest.cc
+++ b/chrome/browser/ash/login/enterprise_user_session_metrics_unittest.cc
@@ -36,15 +36,18 @@
install_attributes_(std::make_unique<ScopedStubInstallAttributes>(
StubInstallAttributes::CreateCloudManaged("test-domain",
"FAKE_DEVICE_ID"))) {}
+
+ EnterpriseUserSessionMetricsTest(const EnterpriseUserSessionMetricsTest&) =
+ delete;
+ EnterpriseUserSessionMetricsTest& operator=(
+ const EnterpriseUserSessionMetricsTest&) = delete;
+
~EnterpriseUserSessionMetricsTest() override = default;
protected:
content::BrowserTaskEnvironment task_environment_;
ScopedTestingLocalState local_state_;
std::unique_ptr<ScopedStubInstallAttributes> install_attributes_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(EnterpriseUserSessionMetricsTest);
};
// Tests recording a sign-in event with a sign-in event type.
diff --git a/chrome/browser/ash/login/error_screen_browsertest.cc b/chrome/browser/ash/login/error_screen_browsertest.cc
index 39eb703..2d62d37 100644
--- a/chrome/browser/ash/login/error_screen_browsertest.cc
+++ b/chrome/browser/ash/login/error_screen_browsertest.cc
@@ -57,6 +57,10 @@
class NetworkErrorScreenTest : public InProcessBrowserTest {
public:
NetworkErrorScreenTest() = default;
+
+ NetworkErrorScreenTest(const NetworkErrorScreenTest&) = delete;
+ NetworkErrorScreenTest& operator=(const NetworkErrorScreenTest&) = delete;
+
~NetworkErrorScreenTest() override = default;
void SetUpOnMainThread() override {
@@ -132,8 +136,6 @@
private:
std::unique_ptr<NetworkStateTestHelper> network_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkErrorScreenTest);
};
// Test that the network list contains the fake wifi network.
@@ -208,6 +210,10 @@
class GuestErrorScreenTest : public MixinBasedInProcessBrowserTest {
public:
GuestErrorScreenTest() { login_manager_.set_session_restore_enabled(); }
+
+ GuestErrorScreenTest(const GuestErrorScreenTest&) = delete;
+ GuestErrorScreenTest& operator=(const GuestErrorScreenTest&) = delete;
+
~GuestErrorScreenTest() override = default;
void SetUpInProcessBrowserTestFixture() override {
@@ -220,9 +226,6 @@
protected:
std::unique_ptr<WizardContext> wizard_context_;
LoginManagerMixin login_manager_{&mixin_host_};
-
- private:
- DISALLOW_COPY_AND_ASSIGN(GuestErrorScreenTest);
};
// Test that guest signin option is shown when enabled and that clicking on it
@@ -252,6 +255,10 @@
class KioskErrorScreenTest : public MixinBasedInProcessBrowserTest {
public:
KioskErrorScreenTest() = default;
+
+ KioskErrorScreenTest(const KioskErrorScreenTest&) = delete;
+ KioskErrorScreenTest& operator=(const KioskErrorScreenTest&) = delete;
+
~KioskErrorScreenTest() override = default;
void SetUpInProcessBrowserTestFixture() override {
@@ -307,8 +314,6 @@
KioskAppsMixin kiosk_apps_{&mixin_host_, embedded_test_server()};
LoginManagerMixin login_manager_{&mixin_host_, {}};
-
- DISALLOW_COPY_AND_ASSIGN(KioskErrorScreenTest);
};
// Verify that certificate manager dialog opens.
diff --git a/chrome/browser/ash/login/eula_browsertest.cc b/chrome/browser/ash/login/eula_browsertest.cc
index 515365a..d3863d10 100644
--- a/chrome/browser/ash/login/eula_browsertest.cc
+++ b/chrome/browser/ash/login/eula_browsertest.cc
@@ -66,6 +66,11 @@
public:
explicit WebContentsLoadFinishedWaiter(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents) {}
+
+ WebContentsLoadFinishedWaiter(const WebContentsLoadFinishedWaiter&) = delete;
+ WebContentsLoadFinishedWaiter& operator=(
+ const WebContentsLoadFinishedWaiter&) = delete;
+
~WebContentsLoadFinishedWaiter() override = default;
void Wait() {
@@ -86,8 +91,6 @@
}
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(WebContentsLoadFinishedWaiter);
};
// Helper invoked by GuestViewManager::ForEachGuest to collect WebContents of
@@ -104,6 +107,10 @@
class EulaTest : public OobeBaseTest {
public:
EulaTest() = default;
+
+ EulaTest(const EulaTest&) = delete;
+ EulaTest& operator=(const EulaTest&) = delete;
+
~EulaTest() override = default;
void ShowEulaScreen() {
@@ -189,9 +196,6 @@
}
FakeEulaMixin fake_eula_{&mixin_host_, embedded_test_server()};
-
- private:
- DISALLOW_COPY_AND_ASSIGN(EulaTest);
};
// When testing the offline fallback mechanism, the requests reaching the
diff --git a/chrome/browser/ash/login/existing_user_controller.h b/chrome/browser/ash/login/existing_user_controller.h
index ded239c..2cb2c0a 100644
--- a/chrome/browser/ash/login/existing_user_controller.h
+++ b/chrome/browser/ash/login/existing_user_controller.h
@@ -67,6 +67,10 @@
// All UI initialization is deferred till Init() call.
ExistingUserController();
+
+ ExistingUserController(const ExistingUserController&) = delete;
+ ExistingUserController& operator=(const ExistingUserController&) = delete;
+
~ExistingUserController() override;
// Creates and shows login UI for known users.
@@ -392,8 +396,6 @@
// Factory of callbacks.
base::WeakPtrFactory<ExistingUserController> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExistingUserController);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/helper.h b/chrome/browser/ash/login/helper.h
index ff992d70..b02a240 100644
--- a/chrome/browser/ash/login/helper.h
+++ b/chrome/browser/ash/login/helper.h
@@ -61,6 +61,10 @@
class NetworkStateHelper {
public:
NetworkStateHelper();
+
+ NetworkStateHelper(const NetworkStateHelper&) = delete;
+ NetworkStateHelper& operator=(const NetworkStateHelper&) = delete;
+
virtual ~NetworkStateHelper();
// Returns name of the currently connected network.
@@ -81,8 +85,6 @@
network_handler::ErrorCallback error_callback,
const std::string& service_path,
const std::string& guid) const;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkStateHelper);
};
//
diff --git a/chrome/browser/ash/login/lock/fingerprint_unlock_browsertest.cc b/chrome/browser/ash/login/lock/fingerprint_unlock_browsertest.cc
index b2294649..208bb93 100644
--- a/chrome/browser/ash/login/lock/fingerprint_unlock_browsertest.cc
+++ b/chrome/browser/ash/login/lock/fingerprint_unlock_browsertest.cc
@@ -40,6 +40,10 @@
class FingerprintUnlockTest : public InProcessBrowserTest {
public:
FingerprintUnlockTest() = default;
+
+ FingerprintUnlockTest(const FingerprintUnlockTest&) = delete;
+ FingerprintUnlockTest& operator=(const FingerprintUnlockTest&) = delete;
+
~FingerprintUnlockTest() override = default;
void SetUp() override {
@@ -210,8 +214,6 @@
QuickUnlockStorage* quick_unlock_storage_;
std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
-
- DISALLOW_COPY_AND_ASSIGN(FingerprintUnlockTest);
};
IN_PROC_BROWSER_TEST_F(FingerprintUnlockTest, FingerprintNotTimedOutTest) {
diff --git a/chrome/browser/ash/login/lock/screen_locker.cc b/chrome/browser/ash/login/lock/screen_locker.cc
index b5cd26b..1e60026 100644
--- a/chrome/browser/ash/login/lock/screen_locker.cc
+++ b/chrome/browser/ash/login/lock/screen_locker.cc
@@ -97,6 +97,9 @@
SessionManagerClient::Get()->SetStubDelegate(this);
}
+ ScreenLockObserver(const ScreenLockObserver&) = delete;
+ ScreenLockObserver& operator=(const ScreenLockObserver&) = delete;
+
~ScreenLockObserver() override {
session_manager::SessionManager::Get()->RemoveObserver(this);
if (SessionManagerClient::Get())
@@ -142,8 +145,6 @@
private:
bool session_started_;
-
- DISALLOW_COPY_AND_ASSIGN(ScreenLockObserver);
};
ScreenLockObserver* g_screen_lock_observer = nullptr;
diff --git a/chrome/browser/ash/login/lock/screen_locker.h b/chrome/browser/ash/login/lock/screen_locker.h
index 211987d..bb8c3d8 100644
--- a/chrome/browser/ash/login/lock/screen_locker.h
+++ b/chrome/browser/ash/login/lock/screen_locker.h
@@ -52,6 +52,10 @@
class Delegate {
public:
Delegate();
+
+ Delegate(const Delegate&) = delete;
+ Delegate& operator=(const Delegate&) = delete;
+
virtual ~Delegate();
// Show the given error message.
@@ -63,9 +67,6 @@
// Called by ScreenLocker to notify that ash lock animation finishes.
virtual void OnAshLockAnimationFinished() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Delegate);
};
using AuthenticateCallback = base::OnceCallback<void(bool auth_success)>;
diff --git a/chrome/browser/ash/login/lock/screen_locker_browsertest.cc b/chrome/browser/ash/login/lock/screen_locker_browsertest.cc
index 32e121f..5e27392 100644
--- a/chrome/browser/ash/login/lock/screen_locker_browsertest.cc
+++ b/chrome/browser/ash/login/lock/screen_locker_browsertest.cc
@@ -40,6 +40,10 @@
class ScreenLockerTest : public InProcessBrowserTest {
public:
ScreenLockerTest() = default;
+
+ ScreenLockerTest(const ScreenLockerTest&) = delete;
+ ScreenLockerTest& operator=(const ScreenLockerTest&) = delete;
+
~ScreenLockerTest() override = default;
FakeSessionManagerClient* session_manager_client() {
@@ -83,8 +87,6 @@
void OnStartSession(const dbus::ObjectPath& path) {}
std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
-
- DISALLOW_COPY_AND_ASSIGN(ScreenLockerTest);
};
IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestBadThenGoodPassword) {
diff --git a/chrome/browser/ash/login/lock/screen_locker_tester.cc b/chrome/browser/ash/login/lock/screen_locker_tester.cc
index 12305787..19db216a 100644
--- a/chrome/browser/ash/login/lock/screen_locker_tester.cc
+++ b/chrome/browser/ash/login/lock/screen_locker_tester.cc
@@ -43,6 +43,10 @@
LoginAttemptObserver() : AuthStatusConsumer() {
ScreenLocker::default_screen_locker()->SetLoginStatusConsumer(this);
}
+
+ LoginAttemptObserver(const LoginAttemptObserver&) = delete;
+ LoginAttemptObserver& operator=(const LoginAttemptObserver&) = delete;
+
~LoginAttemptObserver() override {
if (ScreenLocker::default_screen_locker())
ScreenLocker::default_screen_locker()->SetLoginStatusConsumer(nullptr);
@@ -72,8 +76,6 @@
bool login_attempted_ = false;
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(LoginAttemptObserver);
};
} // namespace
diff --git a/chrome/browser/ash/login/lock/screen_locker_tester.h b/chrome/browser/ash/login/lock/screen_locker_tester.h
index 81e6f90..1e12a78 100644
--- a/chrome/browser/ash/login/lock/screen_locker_tester.h
+++ b/chrome/browser/ash/login/lock/screen_locker_tester.h
@@ -22,6 +22,10 @@
class ScreenLockerTester : public session_manager::SessionManagerObserver {
public:
ScreenLockerTester();
+
+ ScreenLockerTester(const ScreenLockerTester&) = delete;
+ ScreenLockerTester& operator=(const ScreenLockerTester&) = delete;
+
~ScreenLockerTester() override;
// Synchronously lock the device.
@@ -60,8 +64,6 @@
base::OnceClosure on_lock_callback_;
base::OnceClosure on_unlock_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ScreenLockerTester);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/lock/screen_locker_unittest.cc b/chrome/browser/ash/login/lock/screen_locker_unittest.cc
index 5e83d8a8..855b7f2 100644
--- a/chrome/browser/ash/login/lock/screen_locker_unittest.cc
+++ b/chrome/browser/ash/login/lock/screen_locker_unittest.cc
@@ -67,6 +67,10 @@
class ScreenLockerUnitTest : public testing::Test {
public:
ScreenLockerUnitTest() = default;
+
+ ScreenLockerUnitTest(const ScreenLockerUnitTest&) = delete;
+ ScreenLockerUnitTest& operator=(const ScreenLockerUnitTest&) = delete;
+
~ScreenLockerUnitTest() override = default;
void SetUp() override {
@@ -180,7 +184,6 @@
chromeos::SessionTerminationManager session_termination_manager_;
std::unique_ptr<audio::TestObserver> observer_;
- DISALLOW_COPY_AND_ASSIGN(ScreenLockerUnitTest);
};
// Chrome notifies Ash when screen is locked. Ash is responsible for suspending
diff --git a/chrome/browser/ash/login/lock/views_screen_locker.h b/chrome/browser/ash/login/lock/views_screen_locker.h
index e211d4b5..a61b9d01 100644
--- a/chrome/browser/ash/login/lock/views_screen_locker.h
+++ b/chrome/browser/ash/login/lock/views_screen_locker.h
@@ -31,6 +31,10 @@
public lock_screen_apps::FocusCyclerDelegate {
public:
explicit ViewsScreenLocker(ScreenLocker* screen_locker);
+
+ ViewsScreenLocker(const ViewsScreenLocker&) = delete;
+ ViewsScreenLocker& operator=(const ViewsScreenLocker&) = delete;
+
~ViewsScreenLocker() override;
void Init();
@@ -92,8 +96,6 @@
std::unique_ptr<MojoSystemInfoDispatcher> system_info_updater_;
base::WeakPtrFactory<ViewsScreenLocker> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ViewsScreenLocker);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/login_auth_recorder.h b/chrome/browser/ash/login/login_auth_recorder.h
index 7a026828..e9a7a97 100644
--- a/chrome/browser/ash/login/login_auth_recorder.h
+++ b/chrome/browser/ash/login/login_auth_recorder.h
@@ -67,6 +67,10 @@
};
LoginAuthRecorder();
+
+ LoginAuthRecorder(const LoginAuthRecorder&) = delete;
+ LoginAuthRecorder& operator=(const LoginAuthRecorder&) = delete;
+
~LoginAuthRecorder() override;
// Called when user attempts authentication using AuthMethod `type`.
@@ -77,8 +81,6 @@
private:
AuthMethod last_auth_method_ = AuthMethod::kNothing;
-
- DISALLOW_COPY_AND_ASSIGN(LoginAuthRecorder);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/login_auth_recorder_browsertest.cc b/chrome/browser/ash/login/login_auth_recorder_browsertest.cc
index 4076831..41ab3602 100644
--- a/chrome/browser/ash/login/login_auth_recorder_browsertest.cc
+++ b/chrome/browser/ash/login/login_auth_recorder_browsertest.cc
@@ -27,6 +27,10 @@
class LoginAuthRecorderTest : public InProcessBrowserTest {
public:
LoginAuthRecorderTest() = default;
+
+ LoginAuthRecorderTest(const LoginAuthRecorderTest&) = delete;
+ LoginAuthRecorderTest& operator=(const LoginAuthRecorderTest&) = delete;
+
~LoginAuthRecorderTest() override = default;
protected:
@@ -63,9 +67,6 @@
// Used to verify recorded data.
std::unique_ptr<base::HistogramTester> histogram_tester_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LoginAuthRecorderTest);
};
// Verifies that auth method usage is recorded correctly.
diff --git a/chrome/browser/ash/login/login_client_cert_usage_observer.h b/chrome/browser/ash/login/login_client_cert_usage_observer.h
index 9988c25..d46e4ee6 100644
--- a/chrome/browser/ash/login/login_client_cert_usage_observer.h
+++ b/chrome/browser/ash/login/login_client_cert_usage_observer.h
@@ -22,6 +22,11 @@
: public CertificateProviderService::Observer {
public:
LoginClientCertUsageObserver();
+
+ LoginClientCertUsageObserver(const LoginClientCertUsageObserver&) = delete;
+ LoginClientCertUsageObserver& operator=(const LoginClientCertUsageObserver&) =
+ delete;
+
~LoginClientCertUsageObserver() override;
// Returns whether at least one certificate was used.
@@ -48,8 +53,6 @@
scoped_refptr<net::X509Certificate> used_cert_;
// The extension that signed `used_cert_`.
std::string used_extension_id_;
-
- DISALLOW_COPY_AND_ASSIGN(LoginClientCertUsageObserver);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/login_manager_test.h b/chrome/browser/ash/login/login_manager_test.h
index 74e9ba8..4c5110e 100644
--- a/chrome/browser/ash/login/login_manager_test.h
+++ b/chrome/browser/ash/login/login_manager_test.h
@@ -24,6 +24,10 @@
class LoginManagerTest : public MixinBasedInProcessBrowserTest {
public:
LoginManagerTest();
+
+ LoginManagerTest(const LoginManagerTest&) = delete;
+ LoginManagerTest& operator=(const LoginManagerTest&) = delete;
+
~LoginManagerTest() override;
void SetUpCommandLine(base::CommandLine* command_line) override;
@@ -65,7 +69,6 @@
bool should_launch_browser_ = false;
EmbeddedTestServerSetupMixin embedded_test_server_{&mixin_host_,
embedded_test_server()};
- DISALLOW_COPY_AND_ASSIGN(LoginManagerTest);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/login_ui_shelf_visibility_browsertest.cc b/chrome/browser/ash/login/login_ui_shelf_visibility_browsertest.cc
index 85fe5b9..8b770f7 100644
--- a/chrome/browser/ash/login/login_ui_shelf_visibility_browsertest.cc
+++ b/chrome/browser/ash/login/login_ui_shelf_visibility_browsertest.cc
@@ -34,6 +34,11 @@
class LoginUIShelfVisibilityTest : public MixinBasedInProcessBrowserTest {
public:
LoginUIShelfVisibilityTest() = default;
+
+ LoginUIShelfVisibilityTest(const LoginUIShelfVisibilityTest&) = delete;
+ LoginUIShelfVisibilityTest& operator=(const LoginUIShelfVisibilityTest&) =
+ delete;
+
~LoginUIShelfVisibilityTest() override = default;
void SetUpOnMainThread() override {
@@ -64,8 +69,6 @@
EmbeddedTestServerSetupMixin test_server_mixin_{&mixin_host_,
embedded_test_server()};
FakeGaiaMixin fake_gaia_mixin_{&mixin_host_};
-
- DISALLOW_COPY_AND_ASSIGN(LoginUIShelfVisibilityTest);
};
class OsInstallVisibilityTest : public LoginUIShelfVisibilityTest {
diff --git a/chrome/browser/ash/login/login_utils_browsertest.cc b/chrome/browser/ash/login/login_utils_browsertest.cc
index fc92ced..483b5641 100644
--- a/chrome/browser/ash/login/login_utils_browsertest.cc
+++ b/chrome/browser/ash/login/login_utils_browsertest.cc
@@ -45,6 +45,10 @@
scoped_fake_statistics_provider_.SetMachineStatistic(
system::kRlzBrandCodeKey, kTestBrand);
}
+
+ LoginUtilsTest(const LoginUtilsTest&) = delete;
+ LoginUtilsTest& operator=(const LoginUtilsTest&) = delete;
+
~LoginUtilsTest() override = default;
PrefService* local_state() { return g_browser_process->local_state(); }
@@ -53,8 +57,6 @@
private:
system::ScopedFakeStatisticsProvider scoped_fake_statistics_provider_;
-
- DISALLOW_COPY_AND_ASSIGN(LoginUtilsTest);
};
#if BUILDFLAG(ENABLE_RLZ)
diff --git a/chrome/browser/ash/login/mojo_system_info_dispatcher.h b/chrome/browser/ash/login/mojo_system_info_dispatcher.h
index 54f90177..aceba4c 100644
--- a/chrome/browser/ash/login/mojo_system_info_dispatcher.h
+++ b/chrome/browser/ash/login/mojo_system_info_dispatcher.h
@@ -13,6 +13,10 @@
class MojoSystemInfoDispatcher : public VersionInfoUpdater::Delegate {
public:
MojoSystemInfoDispatcher();
+
+ MojoSystemInfoDispatcher(const MojoSystemInfoDispatcher&) = delete;
+ MojoSystemInfoDispatcher& operator=(const MojoSystemInfoDispatcher&) = delete;
+
~MojoSystemInfoDispatcher() override;
// Request the system info.
@@ -39,8 +43,6 @@
std::string enterprise_info_;
std::string bluetooth_name_;
bool adb_sideloading_enabled_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(MojoSystemInfoDispatcher);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/oobe_browsertest.cc b/chrome/browser/ash/login/oobe_browsertest.cc
index de16d2d5..eebf678 100644
--- a/chrome/browser/ash/login/oobe_browsertest.cc
+++ b/chrome/browser/ash/login/oobe_browsertest.cc
@@ -55,6 +55,10 @@
class OobeTest : public OobeBaseTest {
public:
OobeTest() = default;
+
+ OobeTest(const OobeTest&) = delete;
+ OobeTest& operator=(const OobeTest&) = delete;
+
~OobeTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -85,8 +89,6 @@
private:
FakeGaiaMixin fake_gaia_{&mixin_host_};
-
- DISALLOW_COPY_AND_ASSIGN(OobeTest);
};
IN_PROC_BROWSER_TEST_F(OobeTest, NewUser) {
diff --git a/chrome/browser/ash/login/oobe_interactive_ui_test.cc b/chrome/browser/ash/login/oobe_interactive_ui_test.cc
index 679bda1..c0d5fd9 100644
--- a/chrome/browser/ash/login/oobe_interactive_ui_test.cc
+++ b/chrome/browser/ash/login/oobe_interactive_ui_test.cc
@@ -425,6 +425,12 @@
class NativeWindowVisibilityObserver : public aura::WindowObserver {
public:
NativeWindowVisibilityObserver() = default;
+
+ NativeWindowVisibilityObserver(const NativeWindowVisibilityObserver&) =
+ delete;
+ NativeWindowVisibilityObserver& operator=(
+ const NativeWindowVisibilityObserver&) = delete;
+
// aura::Window will remove observers on destruction.
~NativeWindowVisibilityObserver() override = default;
@@ -445,8 +451,6 @@
bool was_visible_ = false;
aura::Window* window_;
-
- DISALLOW_COPY_AND_ASSIGN(NativeWindowVisibilityObserver);
};
// Sets the `NativeWindowVisibilityObserver` to observe the
@@ -459,6 +463,12 @@
explicit NativeWindowVisibilityBrowserMainExtraParts(
NativeWindowVisibilityObserver* observer)
: observer_(observer) {}
+
+ NativeWindowVisibilityBrowserMainExtraParts(
+ const NativeWindowVisibilityBrowserMainExtraParts&) = delete;
+ NativeWindowVisibilityBrowserMainExtraParts& operator=(
+ const NativeWindowVisibilityBrowserMainExtraParts&) = delete;
+
~NativeWindowVisibilityBrowserMainExtraParts() override = default;
// ChromeBrowserMainExtraParts:
@@ -471,8 +481,6 @@
private:
NativeWindowVisibilityObserver* observer_;
-
- DISALLOW_COPY_AND_ASSIGN(NativeWindowVisibilityBrowserMainExtraParts);
};
class OobeEndToEndTestSetupMixin : public InProcessBrowserTestMixin {
@@ -509,6 +517,11 @@
{}, {features::kHideShelfControlsInTabletMode});
}
}
+
+ OobeEndToEndTestSetupMixin(const OobeEndToEndTestSetupMixin&) = delete;
+ OobeEndToEndTestSetupMixin& operator=(const OobeEndToEndTestSetupMixin&) =
+ delete;
+
~OobeEndToEndTestSetupMixin() override = default;
// InProcessBrowserTestMixin:
@@ -600,8 +613,6 @@
std::unique_ptr<ScopedTestRecommendAppsFetcherFactory>
recommend_apps_fetcher_factory_;
net::EmbeddedTestServer* arc_tos_server_;
-
- DISALLOW_COPY_AND_ASSIGN(OobeEndToEndTestSetupMixin);
};
} // namespace
@@ -614,6 +625,10 @@
branded_build_override_ =
WizardController::ForceBrandedBuildForTesting(true);
}
+
+ OobeInteractiveUITest(const OobeInteractiveUITest&) = delete;
+ OobeInteractiveUITest& operator=(const OobeInteractiveUITest&) = delete;
+
~OobeInteractiveUITest() override = default;
// OobeBaseTest:
@@ -655,7 +670,6 @@
EmbeddedTestServerSetupMixin arc_tos_server_setup_{&mixin_host_,
&arc_tos_server_};
OobeEndToEndTestSetupMixin setup_{&mixin_host_, &arc_tos_server_, GetParam()};
- DISALLOW_COPY_AND_ASSIGN(OobeInteractiveUITest);
};
void OobeInteractiveUITest::PerformStepsBeforeEnrollmentCheck() {
@@ -755,6 +769,12 @@
class OobeZeroTouchInteractiveUITest : public OobeInteractiveUITest {
public:
OobeZeroTouchInteractiveUITest() = default;
+
+ OobeZeroTouchInteractiveUITest(const OobeZeroTouchInteractiveUITest&) =
+ delete;
+ OobeZeroTouchInteractiveUITest& operator=(
+ const OobeZeroTouchInteractiveUITest&) = delete;
+
~OobeZeroTouchInteractiveUITest() override = default;
void SetUpOnMainThread() override {
@@ -789,8 +809,6 @@
LocalPolicyTestServerMixin policy_server_{&mixin_host_};
test::EnrollmentUIMixin enrollment_ui_{&mixin_host_};
system::ScopedFakeStatisticsProvider fake_statistics_provider_;
-
- DISALLOW_COPY_AND_ASSIGN(OobeZeroTouchInteractiveUITest);
};
void OobeZeroTouchInteractiveUITest::ZeroTouchEndToEnd() {
diff --git a/chrome/browser/ash/login/proxy_auth_dialog_browsertest.cc b/chrome/browser/ash/login/proxy_auth_dialog_browsertest.cc
index 5c9f5042..7a4563b 100644
--- a/chrome/browser/ash/login/proxy_auth_dialog_browsertest.cc
+++ b/chrome/browser/ash/login/proxy_auth_dialog_browsertest.cc
@@ -32,6 +32,9 @@
base::Unretained(this))),
login_handler_(nullptr) {}
+ ProxyAuthDialogWaiter(const ProxyAuthDialogWaiter&) = delete;
+ ProxyAuthDialogWaiter& operator=(const ProxyAuthDialogWaiter&) = delete;
+
~ProxyAuthDialogWaiter() override {}
LoginHandler* login_handler() const { return login_handler_; }
@@ -45,8 +48,6 @@
}
LoginHandler* login_handler_;
-
- DISALLOW_COPY_AND_ASSIGN(ProxyAuthDialogWaiter);
};
} // namespace
@@ -61,6 +62,11 @@
login_manager_mixin_.AppendRegularUsers(1);
}
+ ProxyAuthOnUserBoardScreenTest(const ProxyAuthOnUserBoardScreenTest&) =
+ delete;
+ ProxyAuthOnUserBoardScreenTest& operator=(
+ const ProxyAuthOnUserBoardScreenTest&) = delete;
+
~ProxyAuthOnUserBoardScreenTest() override {}
void SetUp() override {
@@ -77,8 +83,6 @@
private:
net::SpawnedTestServer proxy_server_;
LoginManagerMixin login_manager_mixin_{&mixin_host_};
-
- DISALLOW_COPY_AND_ASSIGN(ProxyAuthOnUserBoardScreenTest);
};
IN_PROC_BROWSER_TEST_F(ProxyAuthOnUserBoardScreenTest,
diff --git a/chrome/browser/ash/login/quick_unlock/auth_token.h b/chrome/browser/ash/login/quick_unlock/auth_token.h
index 119d5dd..a8415c54 100644
--- a/chrome/browser/ash/login/quick_unlock/auth_token.h
+++ b/chrome/browser/ash/login/quick_unlock/auth_token.h
@@ -30,6 +30,10 @@
static const int kTokenExpirationSeconds;
explicit AuthToken(const chromeos::UserContext& user_context);
+
+ AuthToken(const AuthToken&) = delete;
+ AuthToken& operator=(const AuthToken&) = delete;
+
~AuthToken();
// An unguessable identifier that can be passed to webui to verify the token
@@ -56,8 +60,6 @@
std::unique_ptr<chromeos::UserContext> user_context_;
base::WeakPtrFactory<AuthToken> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AuthToken);
};
} // namespace quick_unlock
diff --git a/chrome/browser/ash/login/quick_unlock/fingerprint_storage.h b/chrome/browser/ash/login/quick_unlock/fingerprint_storage.h
index 469c3c9..1f026943 100644
--- a/chrome/browser/ash/login/quick_unlock/fingerprint_storage.h
+++ b/chrome/browser/ash/login/quick_unlock/fingerprint_storage.h
@@ -41,6 +41,10 @@
static void RegisterProfilePrefs(PrefRegistrySimple* registry);
explicit FingerprintStorage(Profile* profile);
+
+ FingerprintStorage(const FingerprintStorage&) = delete;
+ FingerprintStorage& operator=(const FingerprintStorage&) = delete;
+
~FingerprintStorage() override;
// feature_usage::FeatureUsageMetrics::Delegate:
@@ -87,8 +91,6 @@
feature_usage_metrics_service_;
base::WeakPtrFactory<FingerprintStorage> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FingerprintStorage);
};
} // namespace quick_unlock
diff --git a/chrome/browser/ash/login/quick_unlock/pin_backend.h b/chrome/browser/ash/login/quick_unlock/pin_backend.h
index 3aeb80b..6342344 100644
--- a/chrome/browser/ash/login/quick_unlock/pin_backend.h
+++ b/chrome/browser/ash/login/quick_unlock/pin_backend.h
@@ -38,6 +38,10 @@
// Use GetInstance().
PinBackend();
+
+ PinBackend(const PinBackend&) = delete;
+ PinBackend& operator=(const PinBackend&) = delete;
+
~PinBackend();
// Check to see if the PinBackend supports login. This is true when the
@@ -170,8 +174,6 @@
// Blocks chrome from restarting while migrating from prefs to cryptohome PIN.
std::unique_ptr<ScopedKeepAlive> scoped_keep_alive_;
-
- DISALLOW_COPY_AND_ASSIGN(PinBackend);
};
} // namespace quick_unlock
diff --git a/chrome/browser/ash/login/quick_unlock/pin_migration_browsertest.cc b/chrome/browser/ash/login/quick_unlock/pin_migration_browsertest.cc
index e3f3686..6a8475f4 100644
--- a/chrome/browser/ash/login/quick_unlock/pin_migration_browsertest.cc
+++ b/chrome/browser/ash/login/quick_unlock/pin_migration_browsertest.cc
@@ -26,6 +26,10 @@
class PinMigrationTest : public LoginManagerTest {
public:
PinMigrationTest() = default;
+
+ PinMigrationTest(const PinMigrationTest&) = delete;
+ PinMigrationTest& operator=(const PinMigrationTest&) = delete;
+
~PinMigrationTest() override = default;
void SetUp() override {
@@ -36,9 +40,6 @@
LoginManagerTest::SetUp();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PinMigrationTest);
};
// Step 1/3: Register a new user.
diff --git a/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.h b/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.h
index ca05e48..88e4b31 100644
--- a/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.h
+++ b/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.h
@@ -31,6 +31,10 @@
const Key& key);
PinStorageCryptohome();
+
+ PinStorageCryptohome(const PinStorageCryptohome&) = delete;
+ PinStorageCryptohome& operator=(const PinStorageCryptohome&) = delete;
+
~PinStorageCryptohome();
void IsPinSetInCryptohome(const AccountId& account_id,
@@ -55,8 +59,6 @@
std::vector<base::OnceClosure> system_salt_callbacks_;
base::WeakPtrFactory<PinStorageCryptohome> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PinStorageCryptohome);
};
} // namespace quick_unlock
diff --git a/chrome/browser/ash/login/quick_unlock/pin_storage_prefs.h b/chrome/browser/ash/login/quick_unlock/pin_storage_prefs.h
index 9978fd9..abf2372 100644
--- a/chrome/browser/ash/login/quick_unlock/pin_storage_prefs.h
+++ b/chrome/browser/ash/login/quick_unlock/pin_storage_prefs.h
@@ -27,6 +27,10 @@
static void RegisterProfilePrefs(PrefRegistrySimple* registry);
explicit PinStoragePrefs(PrefService* pref_service);
+
+ PinStoragePrefs(const PinStoragePrefs&) = delete;
+ PinStoragePrefs& operator=(const PinStoragePrefs&) = delete;
+
~PinStoragePrefs();
// Add a PIN unlock attempt count.
@@ -57,8 +61,6 @@
private:
PrefService* pref_service_;
int unlock_attempt_count_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(PinStoragePrefs);
};
} // namespace quick_unlock
diff --git a/chrome/browser/ash/login/quick_unlock/quick_unlock_storage.h b/chrome/browser/ash/login/quick_unlock/quick_unlock_storage.h
index 3b15f6b..765a98a6 100644
--- a/chrome/browser/ash/login/quick_unlock/quick_unlock_storage.h
+++ b/chrome/browser/ash/login/quick_unlock/quick_unlock_storage.h
@@ -24,6 +24,10 @@
class QuickUnlockStorage : public KeyedService {
public:
explicit QuickUnlockStorage(Profile* profile);
+
+ QuickUnlockStorage(const QuickUnlockStorage&) = delete;
+ QuickUnlockStorage& operator=(const QuickUnlockStorage&) = delete;
+
~QuickUnlockStorage() override;
// Replaces default clock with a test clock for testing.
@@ -88,8 +92,6 @@
base::Clock* clock_;
std::unique_ptr<FingerprintStorage> fingerprint_storage_;
std::unique_ptr<PinStoragePrefs> pin_storage_prefs_;
-
- DISALLOW_COPY_AND_ASSIGN(QuickUnlockStorage);
};
} // namespace quick_unlock
diff --git a/chrome/browser/ash/login/reset_browsertest.cc b/chrome/browser/ash/login/reset_browsertest.cc
index 1f75ea8..1e900a1 100644
--- a/chrome/browser/ash/login/reset_browsertest.cc
+++ b/chrome/browser/ash/login/reset_browsertest.cc
@@ -117,6 +117,10 @@
class ResetTest : public OobeBaseTest, public LocalStateMixin::Delegate {
public:
ResetTest() = default;
+
+ ResetTest(const ResetTest&) = delete;
+ ResetTest& operator=(const ResetTest&) = delete;
+
~ResetTest() override = default;
// Simulates reset screen request from views based login.
@@ -139,13 +143,15 @@
LoginManagerMixin::TestUserInfo test_user_{
AccountId::FromUserEmailGaiaId(kTestUser1, kTestUser1GaiaId)};
LoginManagerMixin login_manager_mixin_{&mixin_host_, {test_user_}};
-
- DISALLOW_COPY_AND_ASSIGN(ResetTest);
};
class ResetOobeTest : public OobeBaseTest {
public:
ResetOobeTest() = default;
+
+ ResetOobeTest(const ResetOobeTest&) = delete;
+ ResetOobeTest& operator=(const ResetOobeTest&) = delete;
+
~ResetOobeTest() override = default;
// OobeBaseTest:
@@ -161,9 +167,6 @@
EXPECT_FALSE(LoginScreenTestApi::IsGuestButtonShown());
ExpectConfirmationDialogClosed();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ResetOobeTest);
};
class ResetFirstAfterBootTest : public ResetTest {
diff --git a/chrome/browser/ash/login/saml/in_session_password_change_manager.h b/chrome/browser/ash/login/saml/in_session_password_change_manager.h
index bc1585b..05ca76c5 100644
--- a/chrome/browser/ash/login/saml/in_session_password_change_manager.h
+++ b/chrome/browser/ash/login/saml/in_session_password_change_manager.h
@@ -105,6 +105,12 @@
static InSessionPasswordChangeManager* Get();
explicit InSessionPasswordChangeManager(Profile* primary_profile);
+
+ InSessionPasswordChangeManager(const InSessionPasswordChangeManager&) =
+ delete;
+ InSessionPasswordChangeManager& operator=(
+ const InSessionPasswordChangeManager&) = delete;
+
~InSessionPasswordChangeManager() override;
// Sets the given instance as the singleton for testing.
@@ -191,8 +197,6 @@
std::unique_ptr<PasswordSyncTokenFetcher> password_sync_token_fetcher_;
friend class InSessionPasswordChangeManagerTest;
-
- DISALLOW_COPY_AND_ASSIGN(InSessionPasswordChangeManager);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/saml/public_saml_url_fetcher.h b/chrome/browser/ash/login/saml/public_saml_url_fetcher.h
index d838bbae67..d49376c1 100644
--- a/chrome/browser/ash/login/saml/public_saml_url_fetcher.h
+++ b/chrome/browser/ash/login/saml/public_saml_url_fetcher.h
@@ -26,6 +26,10 @@
class PublicSamlUrlFetcher {
public:
explicit PublicSamlUrlFetcher(AccountId account_id);
+
+ PublicSamlUrlFetcher(const PublicSamlUrlFetcher&) = delete;
+ PublicSamlUrlFetcher& operator=(const PublicSamlUrlFetcher&) = delete;
+
~PublicSamlUrlFetcher();
// Sends request to the DM server, gets and checks the response and
@@ -58,8 +62,6 @@
// Called at the end of Fetch().
base::OnceClosure callback_;
base::WeakPtrFactory<PublicSamlUrlFetcher> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PublicSamlUrlFetcher);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/saml/saml_browsertest.cc b/chrome/browser/ash/login/saml/saml_browsertest.cc
index b1f95d4..c4b98f8 100644
--- a/chrome/browser/ash/login/saml/saml_browsertest.cc
+++ b/chrome/browser/ash/login/saml/saml_browsertest.cc
@@ -204,6 +204,10 @@
SamlTest() {
fake_gaia_.set_initialize_fake_merge_session(false);
}
+
+ SamlTest(const SamlTest&) = delete;
+ SamlTest& operator=(const SamlTest&) = delete;
+
~SamlTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -329,8 +333,6 @@
FakeSamlIdpMixin fake_saml_idp_mixin_{&mixin_host_, &fake_gaia_};
base::test::ScopedFeatureList feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(SamlTest);
};
// Tests that signin frame should display the SAML notice and the 'back' button
@@ -815,6 +817,10 @@
class SAMLEnrollmentTest : public SamlTest {
public:
SAMLEnrollmentTest();
+
+ SAMLEnrollmentTest(const SAMLEnrollmentTest&) = delete;
+ SAMLEnrollmentTest& operator=(const SAMLEnrollmentTest&) = delete;
+
~SAMLEnrollmentTest() override;
// SamlTest:
@@ -824,9 +830,6 @@
protected:
LocalPolicyTestServerMixin local_policy_mixin_{&mixin_host_};
test::EnrollmentUIMixin enrollment_ui_{&mixin_host_};
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SAMLEnrollmentTest);
};
SAMLEnrollmentTest::SAMLEnrollmentTest() {
@@ -890,6 +893,10 @@
class SAMLPolicyTest : public SamlTest {
public:
SAMLPolicyTest();
+
+ SAMLPolicyTest(const SAMLPolicyTest&) = delete;
+ SAMLPolicyTest& operator=(const SAMLPolicyTest&) = delete;
+
~SAMLPolicyTest() override;
// SamlTest:
@@ -927,9 +934,6 @@
&mixin_host_,
{LoginManagerMixin::TestUserInfo(
AccountId::FromUserEmailGaiaId("[email protected]", "1111"))}};
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SAMLPolicyTest);
};
SAMLPolicyTest::SAMLPolicyTest()
diff --git a/chrome/browser/ash/login/screen_manager.h b/chrome/browser/ash/login/screen_manager.h
index ac3d9467..4b11ecc9 100644
--- a/chrome/browser/ash/login/screen_manager.h
+++ b/chrome/browser/ash/login/screen_manager.h
@@ -19,6 +19,10 @@
class ScreenManager {
public:
ScreenManager();
+
+ ScreenManager(const ScreenManager&) = delete;
+ ScreenManager& operator=(const ScreenManager&) = delete;
+
~ScreenManager();
// Initialize all screen instances.
@@ -35,8 +39,6 @@
private:
// Created screens.
std::map<OobeScreenId, std::unique_ptr<BaseScreen>> screens_;
-
- DISALLOW_COPY_AND_ASSIGN(ScreenManager);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/app_downloading_screen.h b/chrome/browser/ash/login/screens/app_downloading_screen.h
index 351e2bc..a6d6e83 100644
--- a/chrome/browser/ash/login/screens/app_downloading_screen.h
+++ b/chrome/browser/ash/login/screens/app_downloading_screen.h
@@ -23,6 +23,10 @@
AppDownloadingScreen(AppDownloadingScreenView* view,
const base::RepeatingClosure& exit_callback);
+
+ AppDownloadingScreen(const AppDownloadingScreen&) = delete;
+ AppDownloadingScreen& operator=(const AppDownloadingScreen&) = delete;
+
~AppDownloadingScreen() override;
void set_exit_callback_for_testing(base::RepeatingClosure exit_callback) {
@@ -38,8 +42,6 @@
private:
AppDownloadingScreenView* const view_;
base::RepeatingClosure exit_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(AppDownloadingScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/arc_terms_of_service_screen.h b/chrome/browser/ash/login/screens/arc_terms_of_service_screen.h
index 05661aa8..bbc8795 100644
--- a/chrome/browser/ash/login/screens/arc_terms_of_service_screen.h
+++ b/chrome/browser/ash/login/screens/arc_terms_of_service_screen.h
@@ -47,6 +47,10 @@
using ScreenExitCallback = base::RepeatingCallback<void(Result result)>;
ArcTermsOfServiceScreen(ArcTermsOfServiceScreenView* view,
const ScreenExitCallback& exit_callback);
+
+ ArcTermsOfServiceScreen(const ArcTermsOfServiceScreen&) = delete;
+ ArcTermsOfServiceScreen& operator=(const ArcTermsOfServiceScreen&) = delete;
+
~ArcTermsOfServiceScreen() override;
void set_exit_callback_for_testing(const ScreenExitCallback& exit_callback) {
@@ -73,8 +77,6 @@
private:
ArcTermsOfServiceScreenView* view_;
ScreenExitCallback exit_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/assistant_optin_flow_screen.h b/chrome/browser/ash/login/screens/assistant_optin_flow_screen.h
index b2b3204..e76240ff 100644
--- a/chrome/browser/ash/login/screens/assistant_optin_flow_screen.h
+++ b/chrome/browser/ash/login/screens/assistant_optin_flow_screen.h
@@ -29,6 +29,10 @@
AssistantOptInFlowScreen(AssistantOptInFlowScreenView* view,
const ScreenExitCallback& exit_callback);
+
+ AssistantOptInFlowScreen(const AssistantOptInFlowScreen&) = delete;
+ AssistantOptInFlowScreen& operator=(const AssistantOptInFlowScreen&) = delete;
+
~AssistantOptInFlowScreen() override;
// Called when view is destroyed so there's no dead reference to it.
@@ -55,8 +59,6 @@
private:
AssistantOptInFlowScreenView* view_;
ScreenExitCallback exit_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(AssistantOptInFlowScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/assistant_optin_flow_screen_browsertest.cc b/chrome/browser/ash/login/screens/assistant_optin_flow_screen_browsertest.cc
index a241e5a..ed0d071 100644
--- a/chrome/browser/ash/login/screens/assistant_optin_flow_screen_browsertest.cc
+++ b/chrome/browser/ash/login/screens/assistant_optin_flow_screen_browsertest.cc
@@ -134,6 +134,9 @@
ScopedAssistantSettings() = default;
+ ScopedAssistantSettings(const ScopedAssistantSettings&) = delete;
+ ScopedAssistantSettings& operator=(const ScopedAssistantSettings&) = delete;
+
~ScopedAssistantSettings() override = default;
void set_consent_ui_flags(int flags) { consent_ui_flags_ = flags; }
@@ -331,8 +334,6 @@
int setting_zippy_size_ = 1;
bool is_minor_user_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedAssistantSettings);
};
class AssistantOptInFlowTest : public OobeBaseTest {
diff --git a/chrome/browser/ash/login/screens/base_screen.h b/chrome/browser/ash/login/screens/base_screen.h
index 7f5da781..c829fbe 100644
--- a/chrome/browser/ash/login/screens/base_screen.h
+++ b/chrome/browser/ash/login/screens/base_screen.h
@@ -30,6 +30,10 @@
constexpr static const char kNotApplicable[] = "NotApplicable";
BaseScreen(OobeScreenId screen_id, OobeScreenPriority screen_priority);
+
+ BaseScreen(const BaseScreen&) = delete;
+ BaseScreen& operator=(const BaseScreen&) = delete;
+
virtual ~BaseScreen();
// Makes wizard screen visible.
@@ -77,8 +81,6 @@
const OobeScreenId screen_id_;
const OobeScreenPriority screen_priority_;
-
- DISALLOW_COPY_AND_ASSIGN(BaseScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/chrome_user_selection_screen.h b/chrome/browser/ash/login/screens/chrome_user_selection_screen.h
index 44cbebf..053a42f 100644
--- a/chrome/browser/ash/login/screens/chrome_user_selection_screen.h
+++ b/chrome/browser/ash/login/screens/chrome_user_selection_screen.h
@@ -24,6 +24,11 @@
public policy::DeviceLocalAccountPolicyService::Observer {
public:
explicit ChromeUserSelectionScreen(DisplayedScreen display_type);
+
+ ChromeUserSelectionScreen(const ChromeUserSelectionScreen&) = delete;
+ ChromeUserSelectionScreen& operator=(const ChromeUserSelectionScreen&) =
+ delete;
+
~ChromeUserSelectionScreen() override;
// UserSelectionScreen:
@@ -71,8 +76,6 @@
DisplayNamesMap public_session_display_names_;
base::WeakPtrFactory<ChromeUserSelectionScreen> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeUserSelectionScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/demo_preferences_screen.h b/chrome/browser/ash/login/screens/demo_preferences_screen.h
index 3d4415c..e1704cf 100644
--- a/chrome/browser/ash/login/screens/demo_preferences_screen.h
+++ b/chrome/browser/ash/login/screens/demo_preferences_screen.h
@@ -30,6 +30,10 @@
using ScreenExitCallback = base::RepeatingCallback<void(Result result)>;
DemoPreferencesScreen(DemoPreferencesScreenView* view,
const ScreenExitCallback& exit_callback);
+
+ DemoPreferencesScreen(const DemoPreferencesScreen&) = delete;
+ DemoPreferencesScreen& operator=(const DemoPreferencesScreen&) = delete;
+
~DemoPreferencesScreen() override;
void SetLocale(const std::string& locale);
@@ -71,8 +75,6 @@
DemoPreferencesScreenView* view_;
ScreenExitCallback exit_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(DemoPreferencesScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/demo_setup_screen.h b/chrome/browser/ash/login/screens/demo_setup_screen.h
index de3a7534..a5b5a9b 100644
--- a/chrome/browser/ash/login/screens/demo_setup_screen.h
+++ b/chrome/browser/ash/login/screens/demo_setup_screen.h
@@ -28,6 +28,10 @@
using ScreenExitCallback = base::RepeatingCallback<void(Result result)>;
DemoSetupScreen(DemoSetupScreenView* view,
const ScreenExitCallback& exit_callback);
+
+ DemoSetupScreen(const DemoSetupScreen&) = delete;
+ DemoSetupScreen& operator=(const DemoSetupScreen&) = delete;
+
~DemoSetupScreen() override;
// Called when view is being destroyed. If Screen is destroyed earlier
@@ -63,8 +67,6 @@
ScreenExitCallback exit_callback_;
base::WeakPtrFactory<DemoSetupScreen> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DemoSetupScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/device_disabled_screen.h b/chrome/browser/ash/login/screens/device_disabled_screen.h
index 54ea442..986dab0b 100644
--- a/chrome/browser/ash/login/screens/device_disabled_screen.h
+++ b/chrome/browser/ash/login/screens/device_disabled_screen.h
@@ -18,6 +18,10 @@
public system::DeviceDisablingManager::Observer {
public:
explicit DeviceDisabledScreen(DeviceDisabledScreenView* view);
+
+ DeviceDisabledScreen(const DeviceDisabledScreen&) = delete;
+ DeviceDisabledScreen& operator=(const DeviceDisabledScreen&) = delete;
+
~DeviceDisabledScreen() override;
// Called when the view is being destroyed. Note that if the Delegate is
@@ -33,8 +37,6 @@
void HideImpl() override;
DeviceDisabledScreenView* view_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceDisabledScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/enable_adb_sideloading_screen.h b/chrome/browser/ash/login/screens/enable_adb_sideloading_screen.h
index 60c945a0..56dc8af 100644
--- a/chrome/browser/ash/login/screens/enable_adb_sideloading_screen.h
+++ b/chrome/browser/ash/login/screens/enable_adb_sideloading_screen.h
@@ -26,6 +26,11 @@
public:
EnableAdbSideloadingScreen(EnableAdbSideloadingScreenView* view,
const base::RepeatingClosure& exit_callback);
+
+ EnableAdbSideloadingScreen(const EnableAdbSideloadingScreen&) = delete;
+ EnableAdbSideloadingScreen& operator=(const EnableAdbSideloadingScreen&) =
+ delete;
+
~EnableAdbSideloadingScreen() override;
// Called by EnableAdbSideloadingHandler.
@@ -59,8 +64,6 @@
EnableAdbSideloadingScreenView* view_;
base::RepeatingClosure exit_callback_;
base::WeakPtrFactory<EnableAdbSideloadingScreen> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EnableAdbSideloadingScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/enable_debugging_screen.h b/chrome/browser/ash/login/screens/enable_debugging_screen.h
index 5cd7b32..205b771f 100644
--- a/chrome/browser/ash/login/screens/enable_debugging_screen.h
+++ b/chrome/browser/ash/login/screens/enable_debugging_screen.h
@@ -21,6 +21,10 @@
public:
EnableDebuggingScreen(EnableDebuggingScreenView* view,
const base::RepeatingClosure& exit_callback);
+
+ EnableDebuggingScreen(const EnableDebuggingScreen&) = delete;
+ EnableDebuggingScreen& operator=(const EnableDebuggingScreen&) = delete;
+
~EnableDebuggingScreen() override;
// Called by EnableDebuggingScreenHandler.
@@ -64,8 +68,6 @@
base::RepeatingClosure exit_callback_;
base::WeakPtrFactory<EnableDebuggingScreen> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EnableDebuggingScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/encryption_migration_screen.h b/chrome/browser/ash/login/screens/encryption_migration_screen.h
index aeec938d..e55c6b29 100644
--- a/chrome/browser/ash/login/screens/encryption_migration_screen.h
+++ b/chrome/browser/ash/login/screens/encryption_migration_screen.h
@@ -45,6 +45,11 @@
};
explicit EncryptionMigrationScreen(EncryptionMigrationScreenView* view);
+
+ EncryptionMigrationScreen(const EncryptionMigrationScreen&) = delete;
+ EncryptionMigrationScreen& operator=(const EncryptionMigrationScreen&) =
+ delete;
+
~EncryptionMigrationScreen() override;
// This method is called, when view is being destroyed. Note, if Delegate is
@@ -165,8 +170,6 @@
power_manager_observation_{this};
base::WeakPtrFactory<EncryptionMigrationScreen> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EncryptionMigrationScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/error_screen.h b/chrome/browser/ash/login/screens/error_screen.h
index 702d870..27d18f1 100644
--- a/chrome/browser/ash/login/screens/error_screen.h
+++ b/chrome/browser/ash/login/screens/error_screen.h
@@ -44,6 +44,10 @@
static const char kUserActionCancel[];
explicit ErrorScreen(ErrorScreenView* view);
+
+ ErrorScreen(const ErrorScreen&) = delete;
+ ErrorScreen& operator=(const ErrorScreen&) = delete;
+
~ErrorScreen() override;
CaptivePortalWindowProxy* captive_portal_window_proxy() {
@@ -197,8 +201,6 @@
base::RepeatingCallbackList<void()> connect_request_callbacks_;
base::WeakPtrFactory<ErrorScreen> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ErrorScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/eula_screen.h b/chrome/browser/ash/login/screens/eula_screen.h
index 342e999..9d72815 100644
--- a/chrome/browser/ash/login/screens/eula_screen.h
+++ b/chrome/browser/ash/login/screens/eula_screen.h
@@ -51,6 +51,10 @@
using ScreenExitCallback = base::RepeatingCallback<void(Result result)>;
EulaScreen(EulaView* view, const ScreenExitCallback& exit_callback);
+
+ EulaScreen(const EulaScreen&) = delete;
+ EulaScreen& operator=(const EulaScreen&) = delete;
+
~EulaScreen() override;
// Returns URL of the OEM EULA page that should be displayed using current
@@ -95,8 +99,6 @@
EulaView* view_;
ScreenExitCallback exit_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(EulaScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/fingerprint_setup_screen.h b/chrome/browser/ash/login/screens/fingerprint_setup_screen.h
index 43b2a06..77a7015 100644
--- a/chrome/browser/ash/login/screens/fingerprint_setup_screen.h
+++ b/chrome/browser/ash/login/screens/fingerprint_setup_screen.h
@@ -48,6 +48,10 @@
FingerprintSetupScreen(FingerprintSetupScreenView* view,
const ScreenExitCallback& exit_callback);
+
+ FingerprintSetupScreen(const FingerprintSetupScreen&) = delete;
+ FingerprintSetupScreen& operator=(const FingerprintSetupScreen&) = delete;
+
~FingerprintSetupScreen() override;
void set_exit_callback_for_testing(const ScreenExitCallback& exit_callback) {
@@ -91,8 +95,6 @@
ScreenExitCallback exit_callback_;
base::WeakPtrFactory<FingerprintSetupScreen> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FingerprintSetupScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/gaia_screen.h b/chrome/browser/ash/login/screens/gaia_screen.h
index 4ceba1a..a0c9f86 100644
--- a/chrome/browser/ash/login/screens/gaia_screen.h
+++ b/chrome/browser/ash/login/screens/gaia_screen.h
@@ -34,6 +34,10 @@
using ScreenExitCallback = base::RepeatingCallback<void(Result result)>;
explicit GaiaScreen(const ScreenExitCallback& exit_callback);
+
+ GaiaScreen(const GaiaScreen&) = delete;
+ GaiaScreen& operator=(const GaiaScreen&) = delete;
+
~GaiaScreen() override;
void SetView(GaiaView* view);
@@ -54,8 +58,6 @@
GaiaView* view_ = nullptr;
ScreenExitCallback exit_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(GaiaScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/hid_detection_screen.h b/chrome/browser/ash/login/screens/hid_detection_screen.h
index ed04616..2a5ac92 100644
--- a/chrome/browser/ash/login/screens/hid_detection_screen.h
+++ b/chrome/browser/ash/login/screens/hid_detection_screen.h
@@ -51,6 +51,10 @@
HIDDetectionScreen(HIDDetectionView* view,
const ScreenExitCallback& exit_callback);
+
+ HIDDetectionScreen(const HIDDetectionScreen&) = delete;
+ HIDDetectionScreen& operator=(const HIDDetectionScreen&) = delete;
+
~HIDDetectionScreen() override;
static std::string GetResultString(Result result);
@@ -257,8 +261,6 @@
bool devices_enumerated_ = false;
base::WeakPtrFactory<HIDDetectionScreen> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(HIDDetectionScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/hid_detection_screen_browsertest.cc b/chrome/browser/ash/login/screens/hid_detection_screen_browsertest.cc
index a3faa0b..c99feaf 100644
--- a/chrome/browser/ash/login/screens/hid_detection_screen_browsertest.cc
+++ b/chrome/browser/ash/login/screens/hid_detection_screen_browsertest.cc
@@ -46,6 +46,12 @@
class HIDDetectionScreenChromeboxTest : public OobeBaseTest {
public:
HIDDetectionScreenChromeboxTest() = default;
+
+ HIDDetectionScreenChromeboxTest(const HIDDetectionScreenChromeboxTest&) =
+ delete;
+ HIDDetectionScreenChromeboxTest& operator=(
+ const HIDDetectionScreenChromeboxTest&) = delete;
+
~HIDDetectionScreenChromeboxTest() override = default;
void SetUpOnMainThread() override {
@@ -90,8 +96,6 @@
// Chromeboxes.
base::test::ScopedChromeOSVersionInfo version_{"DEVICETYPE=CHROMEBOX",
base::Time::Now()};
-
- DISALLOW_COPY_AND_ASSIGN(HIDDetectionScreenChromeboxTest);
};
IN_PROC_BROWSER_TEST_F(HIDDetectionScreenChromeboxTest, NoDevicesConnected) {
diff --git a/chrome/browser/ash/login/screens/kiosk_autolaunch_screen.h b/chrome/browser/ash/login/screens/kiosk_autolaunch_screen.h
index e2d0148..33d607b 100644
--- a/chrome/browser/ash/login/screens/kiosk_autolaunch_screen.h
+++ b/chrome/browser/ash/login/screens/kiosk_autolaunch_screen.h
@@ -27,6 +27,10 @@
using ScreenExitCallback = base::RepeatingCallback<void(Result result)>;
KioskAutolaunchScreen(KioskAutolaunchScreenView* view,
const ScreenExitCallback& exit_callback);
+
+ KioskAutolaunchScreen(const KioskAutolaunchScreen&) = delete;
+ KioskAutolaunchScreen& operator=(const KioskAutolaunchScreen&) = delete;
+
~KioskAutolaunchScreen() override;
// Called when screen is exited.
@@ -44,8 +48,6 @@
private:
KioskAutolaunchScreenView* view_;
ScreenExitCallback exit_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(KioskAutolaunchScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/kiosk_enable_screen.h b/chrome/browser/ash/login/screens/kiosk_enable_screen.h
index 55696dc..275ee0e 100644
--- a/chrome/browser/ash/login/screens/kiosk_enable_screen.h
+++ b/chrome/browser/ash/login/screens/kiosk_enable_screen.h
@@ -23,6 +23,10 @@
public:
KioskEnableScreen(KioskEnableScreenView* view,
const base::RepeatingClosure& exit_callback);
+
+ KioskEnableScreen(const KioskEnableScreen&) = delete;
+ KioskEnableScreen& operator=(const KioskEnableScreen&) = delete;
+
~KioskEnableScreen() override;
// This method is called, when view is being destroyed. Note, if Screen
@@ -52,8 +56,6 @@
bool is_configurable_ = false;
base::WeakPtrFactory<KioskEnableScreen> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(KioskEnableScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/management_transition_screen.h b/chrome/browser/ash/login/screens/management_transition_screen.h
index 4649e11..f777c05 100644
--- a/chrome/browser/ash/login/screens/management_transition_screen.h
+++ b/chrome/browser/ash/login/screens/management_transition_screen.h
@@ -17,6 +17,11 @@
public:
ManagementTransitionScreen(ManagementTransitionScreenView* view,
const base::RepeatingClosure& exit_callback);
+
+ ManagementTransitionScreen(const ManagementTransitionScreen&) = delete;
+ ManagementTransitionScreen& operator=(const ManagementTransitionScreen&) =
+ delete;
+
~ManagementTransitionScreen() override;
// Called when view is destroyed so there's no dead reference to it.
@@ -35,8 +40,6 @@
private:
ManagementTransitionScreenView* view_;
base::RepeatingClosure exit_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ManagementTransitionScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/marketing_opt_in_screen.h b/chrome/browser/ash/login/screens/marketing_opt_in_screen.h
index 1383dd32..54bbbae 100644
--- a/chrome/browser/ash/login/screens/marketing_opt_in_screen.h
+++ b/chrome/browser/ash/login/screens/marketing_opt_in_screen.h
@@ -54,6 +54,10 @@
MarketingOptInScreen(MarketingOptInScreenView* view,
const ScreenExitCallback& exit_callback);
+
+ MarketingOptInScreen(const MarketingOptInScreen&) = delete;
+ MarketingOptInScreen& operator=(const MarketingOptInScreen&) = delete;
+
~MarketingOptInScreen() override;
// On "Get Started" button pressed.
@@ -138,7 +142,6 @@
const base::flat_set<base::StringPiece> countries_with_legal_footer{"ca"};
base::WeakPtrFactory<MarketingOptInScreen> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(MarketingOptInScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/mock_demo_preferences_screen.h b/chrome/browser/ash/login/screens/mock_demo_preferences_screen.h
index 5e2ddd6a..53a823b 100644
--- a/chrome/browser/ash/login/screens/mock_demo_preferences_screen.h
+++ b/chrome/browser/ash/login/screens/mock_demo_preferences_screen.h
@@ -18,20 +18,27 @@
public:
MockDemoPreferencesScreen(DemoPreferencesScreenView* view,
const ScreenExitCallback& exit_callback);
+
+ MockDemoPreferencesScreen(const MockDemoPreferencesScreen&) = delete;
+ MockDemoPreferencesScreen& operator=(const MockDemoPreferencesScreen&) =
+ delete;
+
~MockDemoPreferencesScreen() override;
MOCK_METHOD(void, ShowImpl, ());
MOCK_METHOD(void, HideImpl, ());
void ExitScreen(Result result);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockDemoPreferencesScreen);
};
class MockDemoPreferencesScreenView : public DemoPreferencesScreenView {
public:
MockDemoPreferencesScreenView();
+
+ MockDemoPreferencesScreenView(const MockDemoPreferencesScreenView&) = delete;
+ MockDemoPreferencesScreenView& operator=(
+ const MockDemoPreferencesScreenView&) = delete;
+
~MockDemoPreferencesScreenView() override;
MOCK_METHOD(void, Show, ());
@@ -43,8 +50,6 @@
private:
DemoPreferencesScreen* screen_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(MockDemoPreferencesScreenView);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/mock_network_screen.h b/chrome/browser/ash/login/screens/mock_network_screen.h
index aaeef3e0..425af6b9 100644
--- a/chrome/browser/ash/login/screens/mock_network_screen.h
+++ b/chrome/browser/ash/login/screens/mock_network_screen.h
@@ -16,20 +16,25 @@
public:
MockNetworkScreen(NetworkScreenView* view,
const ScreenExitCallback& exit_callback);
+
+ MockNetworkScreen(const MockNetworkScreen&) = delete;
+ MockNetworkScreen& operator=(const MockNetworkScreen&) = delete;
+
~MockNetworkScreen() override;
MOCK_METHOD(void, ShowImpl, ());
MOCK_METHOD(void, HideImpl, ());
void ExitScreen(NetworkScreen::Result result);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockNetworkScreen);
};
class MockNetworkScreenView : public NetworkScreenView {
public:
MockNetworkScreenView();
+
+ MockNetworkScreenView(const MockNetworkScreenView&) = delete;
+ MockNetworkScreenView& operator=(const MockNetworkScreenView&) = delete;
+
~MockNetworkScreenView() override;
void Bind(NetworkScreen* screen) override;
@@ -45,8 +50,6 @@
private:
NetworkScreen* screen_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(MockNetworkScreenView);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/mock_welcome_screen.h b/chrome/browser/ash/login/screens/mock_welcome_screen.h
index f818e07..0d771bf 100644
--- a/chrome/browser/ash/login/screens/mock_welcome_screen.h
+++ b/chrome/browser/ash/login/screens/mock_welcome_screen.h
@@ -18,20 +18,25 @@
public:
MockWelcomeScreen(WelcomeView* view,
const WelcomeScreen::ScreenExitCallback& exit_callback);
+
+ MockWelcomeScreen(const MockWelcomeScreen&) = delete;
+ MockWelcomeScreen& operator=(const MockWelcomeScreen&) = delete;
+
~MockWelcomeScreen() override;
MOCK_METHOD(void, ShowImpl, ());
MOCK_METHOD(void, HideImpl, ());
void ExitScreen(Result result);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockWelcomeScreen);
};
class MockWelcomeView : public WelcomeView {
public:
MockWelcomeView();
+
+ MockWelcomeView(const MockWelcomeView&) = delete;
+ MockWelcomeView& operator=(const MockWelcomeView&) = delete;
+
~MockWelcomeView() override;
void Bind(WelcomeScreen* screen) override;
@@ -52,8 +57,6 @@
private:
WelcomeScreen* screen_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(MockWelcomeView);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/multidevice_setup_screen.h b/chrome/browser/ash/login/screens/multidevice_setup_screen.h
index ba05ede..17b7e383 100644
--- a/chrome/browser/ash/login/screens/multidevice_setup_screen.h
+++ b/chrome/browser/ash/login/screens/multidevice_setup_screen.h
@@ -27,6 +27,10 @@
using ScreenExitCallback = base::RepeatingCallback<void(Result result)>;
MultiDeviceSetupScreen(MultiDeviceSetupScreenView* view,
const ScreenExitCallback& exit_callback);
+
+ MultiDeviceSetupScreen(const MultiDeviceSetupScreen&) = delete;
+ MultiDeviceSetupScreen& operator=(const MultiDeviceSetupScreen&) = delete;
+
~MultiDeviceSetupScreen() override;
void AddExitCallbackForTesting(const ScreenExitCallback& testing_callback) {
@@ -74,8 +78,6 @@
MultiDeviceSetupScreenView* view_;
ScreenExitCallback exit_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(MultiDeviceSetupScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/network_screen.h b/chrome/browser/ash/login/screens/network_screen.h
index b01e63e3..0a32be1 100644
--- a/chrome/browser/ash/login/screens/network_screen.h
+++ b/chrome/browser/ash/login/screens/network_screen.h
@@ -35,6 +35,10 @@
NetworkScreen(NetworkScreenView* view,
const ScreenExitCallback& exit_callback);
+
+ NetworkScreen(const NetworkScreen&) = delete;
+ NetworkScreen& operator=(const NetworkScreen&) = delete;
+
~NetworkScreen() override;
// Called when `view` has been destroyed. If this instance is destroyed before
@@ -133,8 +137,6 @@
std::unique_ptr<login::NetworkStateHelper> network_state_helper_;
base::WeakPtrFactory<NetworkScreen> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NetworkScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/network_screen_browsertest.cc b/chrome/browser/ash/login/screens/network_screen_browsertest.cc
index 26ed910..a73905b 100644
--- a/chrome/browser/ash/login/screens/network_screen_browsertest.cc
+++ b/chrome/browser/ash/login/screens/network_screen_browsertest.cc
@@ -41,6 +41,10 @@
class NetworkScreenTest : public InProcessBrowserTest {
public:
NetworkScreenTest() = default;
+
+ NetworkScreenTest(const NetworkScreenTest&) = delete;
+ NetworkScreenTest& operator=(const NetworkScreenTest&) = delete;
+
~NetworkScreenTest() override = default;
// InProcessBrowserTest:
@@ -103,8 +107,6 @@
login::MockNetworkStateHelper* mock_network_state_helper_;
NetworkScreen* network_screen_;
absl::optional<NetworkScreen::Result> last_screen_result_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkScreenTest);
};
IN_PROC_BROWSER_TEST_F(NetworkScreenTest, CanConnect) {
diff --git a/chrome/browser/ash/login/screens/network_screen_unittest.cc b/chrome/browser/ash/login/screens/network_screen_unittest.cc
index cc093e6..4ababc5 100644
--- a/chrome/browser/ash/login/screens/network_screen_unittest.cc
+++ b/chrome/browser/ash/login/screens/network_screen_unittest.cc
@@ -28,6 +28,10 @@
class NetworkScreenUnitTest : public testing::Test {
public:
NetworkScreenUnitTest() = default;
+
+ NetworkScreenUnitTest(const NetworkScreenUnitTest&) = delete;
+ NetworkScreenUnitTest& operator=(const NetworkScreenUnitTest&) = delete;
+
~NetworkScreenUnitTest() override = default;
// testing::Test:
@@ -72,8 +76,6 @@
// More accessory objects needed by NetworkScreen.
MockNetworkScreenView mock_view_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkScreenUnitTest);
};
TEST_F(NetworkScreenUnitTest, ContinuesAutomatically) {
diff --git a/chrome/browser/ash/login/screens/pin_setup_screen.h b/chrome/browser/ash/login/screens/pin_setup_screen.h
index daf093d6..8e78cb9 100644
--- a/chrome/browser/ash/login/screens/pin_setup_screen.h
+++ b/chrome/browser/ash/login/screens/pin_setup_screen.h
@@ -50,6 +50,10 @@
using ScreenExitCallback = base::RepeatingCallback<void(Result result)>;
PinSetupScreen(PinSetupScreenView* view,
const ScreenExitCallback& exit_callback);
+
+ PinSetupScreen(const PinSetupScreen&) = delete;
+ PinSetupScreen& operator=(const PinSetupScreen&) = delete;
+
~PinSetupScreen() override;
void set_exit_callback_for_testing(const ScreenExitCallback& exit_callback) {
@@ -84,8 +88,6 @@
void OnTokenTimedOut();
base::WeakPtrFactory<PinSetupScreen> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PinSetupScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.h b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.h
index 6bbf5cbe..4aa7218 100644
--- a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.h
+++ b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.h
@@ -62,6 +62,10 @@
RecommendAppsFetcherDelegate* delegate,
mojo::PendingRemote<mojom::CrosDisplayConfigController> display_config,
network::mojom::URLLoaderFactory* url_loader_factory);
+
+ RecommendAppsFetcherImpl(const RecommendAppsFetcherImpl&) = delete;
+ RecommendAppsFetcherImpl& operator=(const RecommendAppsFetcherImpl&) = delete;
+
~RecommendAppsFetcherImpl() override;
// Provide a retry method to download the app list again.
@@ -154,8 +158,6 @@
mojo::Remote<mojom::CrosDisplayConfigController> cros_display_config_;
base::WeakPtrFactory<RecommendAppsFetcherImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(RecommendAppsFetcherImpl);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl_unittest.cc b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl_unittest.cc
index 14802cdf..1aa62099 100644
--- a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl_unittest.cc
+++ b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl_unittest.cc
@@ -68,6 +68,10 @@
explicit TestCrosDisplayConfig(
mojo::PendingReceiver<mojom::CrosDisplayConfigController> receiver)
: receiver_(this, std::move(receiver)) {}
+
+ TestCrosDisplayConfig(const TestCrosDisplayConfig&) = delete;
+ TestCrosDisplayConfig& operator=(const TestCrosDisplayConfig&) = delete;
+
~TestCrosDisplayConfig() override = default;
void Flush() {
@@ -117,8 +121,6 @@
mojo::Receiver<mojom::CrosDisplayConfigController> receiver_;
GetDisplayUnitInfoListCallback get_display_unit_info_list_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(TestCrosDisplayConfig);
};
// Helper class to extract relevant information from the app list request
diff --git a/chrome/browser/ash/login/screens/recommend_apps_screen.h b/chrome/browser/ash/login/screens/recommend_apps_screen.h
index 4e3915f8..6c9820e0 100644
--- a/chrome/browser/ash/login/screens/recommend_apps_screen.h
+++ b/chrome/browser/ash/login/screens/recommend_apps_screen.h
@@ -37,6 +37,10 @@
RecommendAppsScreen(RecommendAppsScreenView* view,
const ScreenExitCallback& exit_callback);
+
+ RecommendAppsScreen(const RecommendAppsScreen&) = delete;
+ RecommendAppsScreen& operator=(const RecommendAppsScreen&) = delete;
+
~RecommendAppsScreen() override;
// Called when the user skips the Recommend Apps screen.
@@ -77,8 +81,6 @@
// Skip the screen for testing if set to true.
bool skip_for_testing_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(RecommendAppsScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/reset_screen.h b/chrome/browser/ash/login/screens/reset_screen.h
index f28c8411..a046e5c 100644
--- a/chrome/browser/ash/login/screens/reset_screen.h
+++ b/chrome/browser/ash/login/screens/reset_screen.h
@@ -36,6 +36,10 @@
ResetScreen(ResetView* view,
ErrorScreen* error_screen,
const base::RepeatingClosure& exit_callback);
+
+ ResetScreen(const ResetScreen&) = delete;
+ ResetScreen& operator=(const ResetScreen&) = delete;
+
~ResetScreen() override;
// Called when view is destroyed so there's no dead reference to it.
@@ -97,8 +101,6 @@
std::unique_ptr<ScopedGuestButtonBlocker> scoped_guest_button_blocker_;
base::WeakPtrFactory<ResetScreen> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ResetScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/sync_consent_browsertest.cc b/chrome/browser/ash/login/screens/sync_consent_browsertest.cc
index 5b84dde..5244587d 100644
--- a/chrome/browser/ash/login/screens/sync_consent_browsertest.cc
+++ b/chrome/browser/ash/login/screens/sync_consent_browsertest.cc
@@ -143,6 +143,10 @@
WizardController::ForceBrandedBuildForTesting(true)) {
login_manager_mixin_.set_session_restore_enabled();
}
+
+ SyncConsentTest(const SyncConsentTest&) = delete;
+ SyncConsentTest& operator=(const SyncConsentTest&) = delete;
+
~SyncConsentTest() override = default;
void SetUpOnMainThread() override {
@@ -311,7 +315,6 @@
LoginManagerMixin login_manager_mixin_{&mixin_host_};
std::unique_ptr<base::AutoReset<bool>> force_branded_build_;
- DISALLOW_COPY_AND_ASSIGN(SyncConsentTest);
};
IN_PROC_BROWSER_TEST_F(SyncConsentTest, SkippedNotBrandedBuild) {
@@ -417,10 +420,12 @@
public ::testing::WithParamInterface<std::string> {
public:
SyncConsentTestWithParams() = default;
- ~SyncConsentTestWithParams() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(SyncConsentTestWithParams);
+ SyncConsentTestWithParams(const SyncConsentTestWithParams&) = delete;
+ SyncConsentTestWithParams& operator=(const SyncConsentTestWithParams&) =
+ delete;
+
+ ~SyncConsentTestWithParams() override = default;
};
IN_PROC_BROWSER_TEST_P(SyncConsentTestWithParams, SyncConsentTestWithLocale) {
diff --git a/chrome/browser/ash/login/screens/sync_consent_screen.h b/chrome/browser/ash/login/screens/sync_consent_screen.h
index 3f71367..7be86b9 100644
--- a/chrome/browser/ash/login/screens/sync_consent_screen.h
+++ b/chrome/browser/ash/login/screens/sync_consent_screen.h
@@ -88,6 +88,10 @@
SyncConsentScreen(SyncConsentScreenView* view,
const ScreenExitCallback& exit_callback);
+
+ SyncConsentScreen(const SyncConsentScreen&) = delete;
+ SyncConsentScreen& operator=(const SyncConsentScreen&) = delete;
+
~SyncConsentScreen() override;
// Inits `user_`, its `profile_` and `behavior_` before using the screen.
@@ -193,8 +197,6 @@
SyncConsentScreenTestDelegate* test_delegate_ = nullptr;
base::WeakPtrFactory<SyncConsentScreen> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SyncConsentScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/terms_of_service_screen.h b/chrome/browser/ash/login/screens/terms_of_service_screen.h
index f1bcfcc..b54eb95 100644
--- a/chrome/browser/ash/login/screens/terms_of_service_screen.h
+++ b/chrome/browser/ash/login/screens/terms_of_service_screen.h
@@ -40,6 +40,10 @@
using ScreenExitCallback = base::RepeatingCallback<void(Result result)>;
TermsOfServiceScreen(TermsOfServiceScreenView* view,
const ScreenExitCallback& exit_callback);
+
+ TermsOfServiceScreen(const TermsOfServiceScreen&) = delete;
+ TermsOfServiceScreen& operator=(const TermsOfServiceScreen&) = delete;
+
~TermsOfServiceScreen() override;
// Called when the user declines the Terms of Service.
@@ -102,8 +106,6 @@
base::OneShotTimer download_timer_;
base::WeakPtrFactory<TermsOfServiceScreen> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TermsOfServiceScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/update_required_screen.h b/chrome/browser/ash/login/screens/update_required_screen.h
index 3157b0a..54de02a 100644
--- a/chrome/browser/ash/login/screens/update_required_screen.h
+++ b/chrome/browser/ash/login/screens/update_required_screen.h
@@ -39,6 +39,10 @@
UpdateRequiredScreen(UpdateRequiredView* view,
ErrorScreen* error_screen,
base::RepeatingClosure exit_callback);
+
+ UpdateRequiredScreen(const UpdateRequiredScreen&) = delete;
+ UpdateRequiredScreen& operator=(const UpdateRequiredScreen&) = delete;
+
~UpdateRequiredScreen() override;
// Called when the being destroyed. This should call Unbind() on the
@@ -149,8 +153,6 @@
base::CallbackListSubscription connect_request_subscription_;
base::WeakPtrFactory<UpdateRequiredScreen> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UpdateRequiredScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/update_screen.h b/chrome/browser/ash/login/screens/update_screen.h
index d299c83..a9c5a4fe 100644
--- a/chrome/browser/ash/login/screens/update_screen.h
+++ b/chrome/browser/ash/login/screens/update_screen.h
@@ -72,6 +72,10 @@
UpdateScreen(UpdateView* view,
ErrorScreen* error_screen,
const ScreenExitCallback& exit_callback);
+
+ UpdateScreen(const UpdateScreen&) = delete;
+ UpdateScreen& operator=(const UpdateScreen&) = delete;
+
~UpdateScreen() override;
// Called when the being destroyed. This should call Unbind() on the
@@ -227,8 +231,6 @@
power_manager_subscription_{this};
base::WeakPtrFactory<UpdateScreen> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UpdateScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/update_screen_browsertest.cc b/chrome/browser/ash/login/screens/update_screen_browsertest.cc
index 4550a2e..33c7e4b 100644
--- a/chrome/browser/ash/login/screens/update_screen_browsertest.cc
+++ b/chrome/browser/ash/login/screens/update_screen_browsertest.cc
@@ -107,6 +107,10 @@
class UpdateScreenTest : public OobeBaseTest {
public:
UpdateScreenTest() {}
+
+ UpdateScreenTest(const UpdateScreenTest&) = delete;
+ UpdateScreenTest& operator=(const UpdateScreenTest&) = delete;
+
~UpdateScreenTest() override = default;
void CheckUpdatingDialogComponents(
@@ -172,8 +176,6 @@
base::OnceClosure screen_result_callback_;
base::test::ScopedFeatureList feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(UpdateScreenTest);
};
class BetterUpdateScreenTest : public UpdateScreenTest {
diff --git a/chrome/browser/ash/login/screens/user_selection_screen.cc b/chrome/browser/ash/login/screens/user_selection_screen.cc
index f827355..f3e3b26b 100644
--- a/chrome/browser/ash/login/screens/user_selection_screen.cc
+++ b/chrome/browser/ash/login/screens/user_selection_screen.cc
@@ -236,6 +236,11 @@
public:
explicit DircryptoMigrationChecker(UserSelectionScreen* owner)
: owner_(owner) {}
+
+ DircryptoMigrationChecker(const DircryptoMigrationChecker&) = delete;
+ DircryptoMigrationChecker& operator=(const DircryptoMigrationChecker&) =
+ delete;
+
~DircryptoMigrationChecker() = default;
// Start to check whether the given user needs dircrypto migration.
@@ -326,8 +331,6 @@
std::map<AccountId, bool> needs_dircrypto_migration_cache_;
base::WeakPtrFactory<DircryptoMigrationChecker> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DircryptoMigrationChecker);
};
// Helper class to check whether tpm is locked and update UI with time left to
diff --git a/chrome/browser/ash/login/screens/user_selection_screen.h b/chrome/browser/ash/login/screens/user_selection_screen.h
index eb053d9..cf38b5a 100644
--- a/chrome/browser/ash/login/screens/user_selection_screen.h
+++ b/chrome/browser/ash/login/screens/user_selection_screen.h
@@ -46,6 +46,10 @@
public UserOnlineSigninNotifier::Observer {
public:
explicit UserSelectionScreen(DisplayedScreen display_type);
+
+ UserSelectionScreen(const UserSelectionScreen&) = delete;
+ UserSelectionScreen& operator=(const UserSelectionScreen&) = delete;
+
~UserSelectionScreen() override;
void SetView(UserBoardView* view);
@@ -181,8 +185,6 @@
scoped_observation_{this};
base::WeakPtrFactory<UserSelectionScreen> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/welcome_screen.h b/chrome/browser/ash/login/screens/welcome_screen.h
index 6a4fe74fc..8814974 100644
--- a/chrome/browser/ash/login/screens/welcome_screen.h
+++ b/chrome/browser/ash/login/screens/welcome_screen.h
@@ -71,6 +71,10 @@
using ScreenExitCallback = base::RepeatingCallback<void(Result result)>;
WelcomeScreen(WelcomeView* view, const ScreenExitCallback& exit_callback);
+
+ WelcomeScreen(const WelcomeScreen&) = delete;
+ WelcomeScreen& operator=(const WelcomeScreen&) = delete;
+
~WelcomeScreen() override;
static std::string GetResultString(Result result);
@@ -186,8 +190,6 @@
base::ObserverList<Observer>::Unchecked observers_;
base::WeakPtrFactory<WelcomeScreen> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WelcomeScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/screens/wrong_hwid_screen.h b/chrome/browser/ash/login/screens/wrong_hwid_screen.h
index aff745a..53bbe521 100644
--- a/chrome/browser/ash/login/screens/wrong_hwid_screen.h
+++ b/chrome/browser/ash/login/screens/wrong_hwid_screen.h
@@ -22,6 +22,10 @@
public:
WrongHWIDScreen(WrongHWIDScreenView* view,
const base::RepeatingClosure& exit_callback);
+
+ WrongHWIDScreen(const WrongHWIDScreen&) = delete;
+ WrongHWIDScreen& operator=(const WrongHWIDScreen&) = delete;
+
~WrongHWIDScreen() override;
// This method is called, when view is being destroyed. Note, if Delegate
@@ -47,8 +51,6 @@
WrongHWIDScreenView* view_;
base::RepeatingClosure exit_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(WrongHWIDScreen);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/session/chrome_session_manager.h b/chrome/browser/ash/login/session/chrome_session_manager.h
index c917301..bafd6b6a 100644
--- a/chrome/browser/ash/login/session/chrome_session_manager.h
+++ b/chrome/browser/ash/login/session/chrome_session_manager.h
@@ -23,6 +23,10 @@
class ChromeSessionManager : public session_manager::SessionManager {
public:
ChromeSessionManager();
+
+ ChromeSessionManager(const ChromeSessionManager&) = delete;
+ ChromeSessionManager& operator=(const ChromeSessionManager&) = delete;
+
~ChromeSessionManager() override;
// Initialize session manager on browser starts up. Runs different code
@@ -45,8 +49,6 @@
private:
std::unique_ptr<OobeConfiguration> oobe_configuration_;
std::unique_ptr<UserSessionInitializer> user_session_initializer_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeSessionManager);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/session/chrome_session_manager_browsertest.cc b/chrome/browser/ash/login/session/chrome_session_manager_browsertest.cc
index ce2c36b..395c901 100644
--- a/chrome/browser/ash/login/session/chrome_session_manager_browsertest.cc
+++ b/chrome/browser/ash/login/session/chrome_session_manager_browsertest.cc
@@ -56,6 +56,10 @@
class UserAddingScreenWaiter : public UserAddingScreen::Observer {
public:
UserAddingScreenWaiter() { UserAddingScreen::Get()->AddObserver(this); }
+
+ UserAddingScreenWaiter(const UserAddingScreenWaiter&) = delete;
+ UserAddingScreenWaiter& operator=(const UserAddingScreenWaiter&) = delete;
+
~UserAddingScreenWaiter() override {
UserAddingScreen::Get()->RemoveObserver(this);
}
@@ -75,8 +79,6 @@
private:
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(UserAddingScreenWaiter);
};
} // anonymous namespace
@@ -84,6 +86,10 @@
class ChromeSessionManagerTest : public LoginManagerTest {
public:
ChromeSessionManagerTest() = default;
+
+ ChromeSessionManagerTest(const ChromeSessionManagerTest&) = delete;
+ ChromeSessionManagerTest& operator=(const ChromeSessionManagerTest&) = delete;
+
~ChromeSessionManagerTest() override {}
// LoginManagerTest:
@@ -97,9 +103,6 @@
FakeGaiaMixin fake_gaia_{&mixin_host_};
DeviceStateMixin device_state_{
&mixin_host_, DeviceStateMixin::State::OOBE_COMPLETED_UNOWNED};
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeSessionManagerTest);
};
IN_PROC_BROWSER_TEST_F(ChromeSessionManagerTest, OobeNewUser) {
diff --git a/chrome/browser/ash/login/session/user_session_manager_test.cc b/chrome/browser/ash/login/session/user_session_manager_test.cc
index 8de4b3f..a7a7f2e 100644
--- a/chrome/browser/ash/login/session/user_session_manager_test.cc
+++ b/chrome/browser/ash/login/session/user_session_manager_test.cc
@@ -56,6 +56,9 @@
void SetUp() override { ASSERT_TRUE(profile_manager_->SetUp()); }
+ UserSessionManagerTest(const UserSessionManagerTest&) = delete;
+ UserSessionManagerTest& operator=(const UserSessionManagerTest&) = delete;
+
~UserSessionManagerTest() override {
profile_manager_->DeleteAllTestingProfiles();
user_session_manager_.reset();
@@ -112,9 +115,6 @@
std::unique_ptr<TestingProfileManager> profile_manager_;
user_manager::User* test_user_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(UserSessionManagerTest);
};
// Calling VoteForSavingLoginPassword() with `save_password` set to false for
diff --git a/chrome/browser/ash/login/signin/auth_error_observer.h b/chrome/browser/ash/login/signin/auth_error_observer.h
index d45359bb..ca7c004 100644
--- a/chrome/browser/ash/login/signin/auth_error_observer.h
+++ b/chrome/browser/ash/login/signin/auth_error_observer.h
@@ -26,6 +26,10 @@
static bool ShouldObserve(Profile* profile);
explicit AuthErrorObserver(Profile* profile);
+
+ AuthErrorObserver(const AuthErrorObserver&) = delete;
+ AuthErrorObserver& operator=(const AuthErrorObserver&) = delete;
+
~AuthErrorObserver() override;
// Starts to observe SyncService and SigninErrorController.
@@ -50,8 +54,6 @@
void HandleAuthError(const GoogleServiceAuthError& auth_error);
Profile* const profile_;
-
- DISALLOW_COPY_AND_ASSIGN(AuthErrorObserver);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/signin/merge_session_navigation_throttle.h b/chrome/browser/ash/login/signin/merge_session_navigation_throttle.h
index 97e5f0c6a..77625b6 100644
--- a/chrome/browser/ash/login/signin/merge_session_navigation_throttle.h
+++ b/chrome/browser/ash/login/signin/merge_session_navigation_throttle.h
@@ -29,6 +29,12 @@
public:
static std::unique_ptr<content::NavigationThrottle> Create(
content::NavigationHandle* handle);
+
+ MergeSessionNavigationThrottle(const MergeSessionNavigationThrottle&) =
+ delete;
+ MergeSessionNavigationThrottle& operator=(
+ const MergeSessionNavigationThrottle&) = delete;
+
~MergeSessionNavigationThrottle() override;
private:
@@ -58,8 +64,6 @@
login_manager_observation_{this};
base::OneShotTimer proceed_timer_;
-
- DISALLOW_COPY_AND_ASSIGN(MergeSessionNavigationThrottle);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/signin/merge_session_throttling_utils.cc b/chrome/browser/ash/login/signin/merge_session_throttling_utils.cc
index 199617f..47b233d 100644
--- a/chrome/browser/ash/login/signin/merge_session_throttling_utils.cc
+++ b/chrome/browser/ash/login/signin/merge_session_throttling_utils.cc
@@ -37,6 +37,9 @@
public:
ProfileSet() {}
+ ProfileSet(const ProfileSet&) = delete;
+ ProfileSet& operator=(const ProfileSet&) = delete;
+
virtual ~ProfileSet() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); }
static ProfileSet* Get();
@@ -45,8 +48,6 @@
friend struct ::base::LazyInstanceTraitsBase<ProfileSet>;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(ProfileSet);
};
// Set of all of profiles for which restore session is in progress.
diff --git a/chrome/browser/ash/login/signin/oauth2_browsertest.cc b/chrome/browser/ash/login/signin/oauth2_browsertest.cc
index 0a972a96..30e7b5e 100644
--- a/chrome/browser/ash/login/signin/oauth2_browsertest.cc
+++ b/chrome/browser/ash/login/signin/oauth2_browsertest.cc
@@ -179,6 +179,10 @@
FROM_HERE,
base::BindOnce(&BlockThreadOnThread, base::Owned(unblock_event_)));
}
+
+ ThreadBlocker(const ThreadBlocker&) = delete;
+ ThreadBlocker& operator=(const ThreadBlocker&) = delete;
+
~ThreadBlocker() { unblock_event_->Signal(); }
private:
@@ -187,8 +191,6 @@
// `unblock_event_` is deleted after BlockThreadOnThread returns.
base::WaitableEvent* const unblock_event_;
-
- DISALLOW_COPY_AND_ASSIGN(ThreadBlocker);
};
// Helper class that is added as a RequestMonitor of embedded test server to
@@ -480,6 +482,10 @@
class CookieReader {
public:
CookieReader() = default;
+
+ CookieReader(const CookieReader&) = delete;
+ CookieReader& operator=(const CookieReader&) = delete;
+
~CookieReader() = default;
void ReadCookies(Profile* profile) {
@@ -509,8 +515,6 @@
}
net::CookieList cookie_list_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieReader);
};
// PRE_MergeSession is testing merge session for a new profile.
@@ -786,6 +790,9 @@
merge_session_event_(base::WaitableEvent::ResetPolicy::MANUAL,
base::WaitableEvent::InitialState::NOT_SIGNALED) {}
+ FakeGoogle(const FakeGoogle&) = delete;
+ FakeGoogle& operator=(const FakeGoogle&) = delete;
+
~FakeGoogle() {}
std::unique_ptr<HttpResponse> HandleRequest(const HttpRequest& request) {
@@ -862,8 +869,6 @@
std::unique_ptr<base::RunLoop> run_loop_;
std::unique_ptr<base::RunLoop> merge_session_run_loop_;
bool hang_merge_session_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(FakeGoogle);
};
class MergeSessionTest : public OAuth2Test,
diff --git a/chrome/browser/ash/login/signin/oauth2_login_manager.h b/chrome/browser/ash/login/signin/oauth2_login_manager.h
index 9625255..e69a915f 100644
--- a/chrome/browser/ash/login/signin/oauth2_login_manager.h
+++ b/chrome/browser/ash/login/signin/oauth2_login_manager.h
@@ -59,6 +59,10 @@
};
explicit OAuth2LoginManager(Profile* user_profile);
+
+ OAuth2LoginManager(const OAuth2LoginManager&) = delete;
+ OAuth2LoginManager& operator=(const OAuth2LoginManager&) = delete;
+
~OAuth2LoginManager() override;
void AddObserver(OAuth2LoginManager::Observer* observer);
@@ -188,8 +192,6 @@
// TODO(zelidrag|gspencer): Figure out how to get rid of ProfileHelper so we
// can change the line below to base::ObserverList<Observer, true>.
base::ObserverList<Observer, false>::Unchecked observer_list_;
-
- DISALLOW_COPY_AND_ASSIGN(OAuth2LoginManager);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/signin/oauth2_login_verifier.h b/chrome/browser/ash/login/signin/oauth2_login_verifier.h
index 48fe9aab..8ffc81a 100644
--- a/chrome/browser/ash/login/signin/oauth2_login_verifier.h
+++ b/chrome/browser/ash/login/signin/oauth2_login_verifier.h
@@ -43,6 +43,10 @@
signin::IdentityManager* identity_manager,
const CoreAccountId& primary_account_id,
const std::string& oauthlogin_access_token);
+
+ OAuth2LoginVerifier(const OAuth2LoginVerifier&) = delete;
+ OAuth2LoginVerifier& operator=(const OAuth2LoginVerifier&) = delete;
+
~OAuth2LoginVerifier() override;
// Initiates verification of GAIA cookies in the cookie jar.
@@ -67,8 +71,6 @@
const std::string access_token_;
base::WeakPtrFactory<OAuth2LoginVerifier> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(OAuth2LoginVerifier);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/signin/oauth2_token_fetcher.h b/chrome/browser/ash/login/signin/oauth2_token_fetcher.h
index d0680ba6..fdc77c98 100644
--- a/chrome/browser/ash/login/signin/oauth2_token_fetcher.h
+++ b/chrome/browser/ash/login/signin/oauth2_token_fetcher.h
@@ -38,6 +38,10 @@
OAuth2TokenFetcher(
OAuth2TokenFetcher::Delegate* delegate,
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory);
+
+ OAuth2TokenFetcher(const OAuth2TokenFetcher&) = delete;
+ OAuth2TokenFetcher& operator=(const OAuth2TokenFetcher&) = delete;
+
~OAuth2TokenFetcher() override;
void StartExchangeFromAuthCode(const std::string& auth_code,
@@ -65,8 +69,6 @@
std::string session_index_;
std::string signin_scoped_device_id_;
std::string auth_code_;
-
- DISALLOW_COPY_AND_ASSIGN(OAuth2TokenFetcher);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/signin/oauth2_token_initializer.h b/chrome/browser/ash/login/signin/oauth2_token_initializer.h
index 7b0097c0..03f9136 100644
--- a/chrome/browser/ash/login/signin/oauth2_token_initializer.h
+++ b/chrome/browser/ash/login/signin/oauth2_token_initializer.h
@@ -22,6 +22,10 @@
base::OnceCallback<void(bool success, const UserContext& user_context)>;
OAuth2TokenInitializer();
+
+ OAuth2TokenInitializer(const OAuth2TokenInitializer&) = delete;
+ OAuth2TokenInitializer& operator=(const OAuth2TokenInitializer&) = delete;
+
~OAuth2TokenInitializer() override;
// Fetch OAuth2 tokens.
@@ -36,8 +40,6 @@
UserContext user_context_;
FetchOAuth2TokensCallback callback_;
std::unique_ptr<OAuth2TokenFetcher> oauth2_token_fetcher_;
-
- DISALLOW_COPY_AND_ASSIGN(OAuth2TokenInitializer);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/signin/signin_error_notifier.h b/chrome/browser/ash/login/signin/signin_error_notifier.h
index 423ea0f7..22c32d3 100644
--- a/chrome/browser/ash/login/signin/signin_error_notifier.h
+++ b/chrome/browser/ash/login/signin/signin_error_notifier.h
@@ -33,6 +33,10 @@
public KeyedService {
public:
SigninErrorNotifier(SigninErrorController* controller, Profile* profile);
+
+ SigninErrorNotifier(const SigninErrorNotifier&) = delete;
+ SigninErrorNotifier& operator=(const SigninErrorNotifier&) = delete;
+
~SigninErrorNotifier() override;
static std::unique_ptr<base::AutoReset<bool>> IgnoreSyncErrorsForTesting();
@@ -91,7 +95,6 @@
std::string secondary_account_notification_id_;
base::WeakPtrFactory<SigninErrorNotifier> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(SigninErrorNotifier);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/signin/token_handle_fetcher.h b/chrome/browser/ash/login/signin/token_handle_fetcher.h
index abd844e..4e38ba1 100644
--- a/chrome/browser/ash/login/signin/token_handle_fetcher.h
+++ b/chrome/browser/ash/login/signin/token_handle_fetcher.h
@@ -32,6 +32,10 @@
class TokenHandleFetcher : public gaia::GaiaOAuthClient::Delegate {
public:
TokenHandleFetcher(TokenHandleUtil* util, const AccountId& account_id);
+
+ TokenHandleFetcher(const TokenHandleFetcher&) = delete;
+ TokenHandleFetcher& operator=(const TokenHandleFetcher&) = delete;
+
~TokenHandleFetcher() override;
using TokenFetchingCallback =
@@ -72,8 +76,6 @@
std::unique_ptr<signin::PrimaryAccountAccessTokenFetcher>
access_token_fetcher_;
base::CallbackListSubscription profile_shutdown_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(TokenHandleFetcher);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/signin/token_handle_util.h b/chrome/browser/ash/login/signin/token_handle_util.h
index 2d59f7ff..02fc6a70 100644
--- a/chrome/browser/ash/login/signin/token_handle_util.h
+++ b/chrome/browser/ash/login/signin/token_handle_util.h
@@ -30,6 +30,10 @@
class TokenHandleUtil {
public:
TokenHandleUtil();
+
+ TokenHandleUtil(const TokenHandleUtil&) = delete;
+ TokenHandleUtil& operator=(const TokenHandleUtil&) = delete;
+
~TokenHandleUtil();
enum TokenHandleStatus { VALID, INVALID, UNKNOWN };
@@ -75,6 +79,10 @@
const std::string& token,
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
TokenValidationCallback callback);
+
+ TokenDelegate(const TokenDelegate&) = delete;
+ TokenDelegate& operator=(const TokenDelegate&) = delete;
+
~TokenDelegate() override;
void OnOAuthError() override;
@@ -90,8 +98,6 @@
base::TimeTicks tokeninfo_response_start_time_;
TokenValidationCallback callback_;
gaia::GaiaOAuthClient gaia_client_;
-
- DISALLOW_COPY_AND_ASSIGN(TokenDelegate);
};
void OnValidationComplete(const std::string& token);
@@ -101,8 +107,6 @@
validation_delegates_;
base::WeakPtrFactory<TokenHandleUtil> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TokenHandleUtil);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/signin_partition_manager.h b/chrome/browser/ash/login/signin_partition_manager.h
index bb1600f..e802023 100644
--- a/chrome/browser/ash/login/signin_partition_manager.h
+++ b/chrome/browser/ash/login/signin_partition_manager.h
@@ -47,6 +47,10 @@
base::OnceCallback<void(const std::string& partition_name)>;
explicit SigninPartitionManager(content::BrowserContext* browser_context);
+
+ SigninPartitionManager(const SigninPartitionManager&) = delete;
+ SigninPartitionManager& operator=(const SigninPartitionManager&) = delete;
+
~SigninPartitionManager() override;
// Creates a new StoragePartition for a sign-in attempt. If a previous
@@ -129,8 +133,6 @@
// The StoragePartition identified by `storage_partition_domain_` and
// `current_storage_partition_name_`.
content::StoragePartition* current_storage_partition_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(SigninPartitionManager);
};
} // namespace login
diff --git a/chrome/browser/ash/login/test/active_directory_login_mixin.h b/chrome/browser/ash/login/test/active_directory_login_mixin.h
index b6f0c97..4834fda 100644
--- a/chrome/browser/ash/login/test/active_directory_login_mixin.h
+++ b/chrome/browser/ash/login/test/active_directory_login_mixin.h
@@ -23,6 +23,11 @@
class ActiveDirectoryLoginMixin : public InProcessBrowserTestMixin {
public:
explicit ActiveDirectoryLoginMixin(InProcessBrowserTestMixinHost* host);
+
+ ActiveDirectoryLoginMixin(const ActiveDirectoryLoginMixin&) = delete;
+ ActiveDirectoryLoginMixin& operator=(const ActiveDirectoryLoginMixin&) =
+ delete;
+
~ActiveDirectoryLoginMixin() override;
// InProcessBrowserTestMixin:
@@ -81,8 +86,6 @@
std::string autocomplete_realm_;
std::unique_ptr<content::DOMMessageQueue> message_queue_;
-
- DISALLOW_COPY_AND_ASSIGN(ActiveDirectoryLoginMixin);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/device_state_mixin.h b/chrome/browser/ash/login/test/device_state_mixin.h
index 5facc4b..8d2818d7 100644
--- a/chrome/browser/ash/login/test/device_state_mixin.h
+++ b/chrome/browser/ash/login/test/device_state_mixin.h
@@ -45,6 +45,10 @@
};
DeviceStateMixin(InProcessBrowserTestMixinHost* host, State initial_state);
+
+ DeviceStateMixin(const DeviceStateMixin&) = delete;
+ DeviceStateMixin& operator=(const DeviceStateMixin&) = delete;
+
~DeviceStateMixin() override;
// InProcessBrowserTestMixin:
@@ -120,8 +124,6 @@
LocalStateMixin local_state_mixin_;
base::WeakPtrFactory<DeviceStateMixin> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceStateMixin);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/dialog_window_waiter.h b/chrome/browser/ash/login/test/dialog_window_waiter.h
index 843f9000..0ab76e0d 100644
--- a/chrome/browser/ash/login/test/dialog_window_waiter.h
+++ b/chrome/browser/ash/login/test/dialog_window_waiter.h
@@ -30,6 +30,9 @@
// Starts listening for a dialog window to open with title `dialog_title`.
explicit DialogWindowWaiter(const std::u16string& dialog_title);
+ DialogWindowWaiter(const DialogWindowWaiter&) = delete;
+ DialogWindowWaiter& operator=(const DialogWindowWaiter&) = delete;
+
~DialogWindowWaiter() override;
// Blocks until a dialog with title `dialog_title` becomes visible. All calls
@@ -53,8 +56,6 @@
std::set<aura::Window*> dialog_windows_;
base::ScopedMultiSourceObservation<aura::Window, aura::WindowObserver>
window_observations_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DialogWindowWaiter);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/embedded_test_server_setup_mixin.h b/chrome/browser/ash/login/test/embedded_test_server_setup_mixin.h
index e2d2c56..a3fae74 100644
--- a/chrome/browser/ash/login/test/embedded_test_server_setup_mixin.h
+++ b/chrome/browser/ash/login/test/embedded_test_server_setup_mixin.h
@@ -16,6 +16,11 @@
public:
EmbeddedTestServerSetupMixin(InProcessBrowserTestMixinHost* host,
net::EmbeddedTestServer* server);
+
+ EmbeddedTestServerSetupMixin(const EmbeddedTestServerSetupMixin&) = delete;
+ EmbeddedTestServerSetupMixin& operator=(const EmbeddedTestServerSetupMixin&) =
+ delete;
+
~EmbeddedTestServerSetupMixin() override;
// InProcessBrowserTestMixin:
@@ -29,8 +34,6 @@
// Embedded test server owned by test that uses this mixin.
net::EmbeddedTestServer* embedded_test_server_;
-
- DISALLOW_COPY_AND_ASSIGN(EmbeddedTestServerSetupMixin);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/enrollment_helper_mixin.h b/chrome/browser/ash/login/test/enrollment_helper_mixin.h
index 65c7a17..f9ad79b 100644
--- a/chrome/browser/ash/login/test/enrollment_helper_mixin.h
+++ b/chrome/browser/ash/login/test/enrollment_helper_mixin.h
@@ -32,6 +32,10 @@
static const char kTestAuthCode[];
explicit EnrollmentHelperMixin(InProcessBrowserTestMixinHost* host);
+
+ EnrollmentHelperMixin(const EnrollmentHelperMixin&) = delete;
+ EnrollmentHelperMixin& operator=(const EnrollmentHelperMixin&) = delete;
+
~EnrollmentHelperMixin() override;
// Resets mock (to be used in tests that retry enrollment.
@@ -87,8 +91,6 @@
// Unowned reference to last created mock.
EnterpriseEnrollmentHelperMock* mock_ = nullptr;
base::WeakPtrFactory<EnrollmentHelperMixin> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EnrollmentHelperMixin);
};
} // namespace test
diff --git a/chrome/browser/ash/login/test/enrollment_ui_mixin.h b/chrome/browser/ash/login/test/enrollment_ui_mixin.h
index 5b93f6f..9934c3f 100644
--- a/chrome/browser/ash/login/test/enrollment_ui_mixin.h
+++ b/chrome/browser/ash/login/test/enrollment_ui_mixin.h
@@ -50,6 +50,10 @@
class EnrollmentUIMixin : public InProcessBrowserTestMixin {
public:
explicit EnrollmentUIMixin(InProcessBrowserTestMixinHost* host);
+
+ EnrollmentUIMixin(const EnrollmentUIMixin&) = delete;
+ EnrollmentUIMixin& operator=(const EnrollmentUIMixin&) = delete;
+
~EnrollmentUIMixin() override;
// Waits until specific enrollment step is displayed.
@@ -84,8 +88,6 @@
absl::optional<base::RunLoop> screen_exit_waiter_;
void HandleScreenExit(EnrollmentScreen::Result result);
-
- DISALLOW_COPY_AND_ASSIGN(EnrollmentUIMixin);
};
} // namespace test
diff --git a/chrome/browser/ash/login/test/fake_gaia_mixin.h b/chrome/browser/ash/login/test/fake_gaia_mixin.h
index cc4b69a..8819280 100644
--- a/chrome/browser/ash/login/test/fake_gaia_mixin.h
+++ b/chrome/browser/ash/login/test/fake_gaia_mixin.h
@@ -59,6 +59,10 @@
static const test::UIPath kPasswordPath;
explicit FakeGaiaMixin(InProcessBrowserTestMixinHost* host);
+
+ FakeGaiaMixin(const FakeGaiaMixin&) = delete;
+ FakeGaiaMixin& operator=(const FakeGaiaMixin&) = delete;
+
~FakeGaiaMixin() override;
// Sets up fake gaia for the login code:
@@ -114,8 +118,6 @@
std::unique_ptr<FakeGaia> fake_gaia_;
bool initialize_fake_merge_session_ = true;
bool initialize_child_id_token_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(FakeGaiaMixin);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/guest_session_mixin.h b/chrome/browser/ash/login/test/guest_session_mixin.h
index 0eba466..9ade9df 100644
--- a/chrome/browser/ash/login/test/guest_session_mixin.h
+++ b/chrome/browser/ash/login/test/guest_session_mixin.h
@@ -19,13 +19,14 @@
class GuestSessionMixin : public InProcessBrowserTestMixin {
public:
explicit GuestSessionMixin(InProcessBrowserTestMixinHost* mixin_host);
+
+ GuestSessionMixin(const GuestSessionMixin&) = delete;
+ GuestSessionMixin& operator=(const GuestSessionMixin&) = delete;
+
~GuestSessionMixin() override;
// InProcessBrowserTestMixin:
void SetUpCommandLine(base::CommandLine* command_line) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(GuestSessionMixin);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/hid_controller_mixin.h b/chrome/browser/ash/login/test/hid_controller_mixin.h
index aa974ac9..dbd3646 100644
--- a/chrome/browser/ash/login/test/hid_controller_mixin.h
+++ b/chrome/browser/ash/login/test/hid_controller_mixin.h
@@ -32,6 +32,10 @@
static const char kTouchscreenId[];
explicit HIDControllerMixin(InProcessBrowserTestMixinHost* host);
+
+ HIDControllerMixin(const HIDControllerMixin&) = delete;
+ HIDControllerMixin& operator=(const HIDControllerMixin&) = delete;
+
~HIDControllerMixin() override;
void AddMouse(device::mojom::InputDeviceType type);
@@ -56,8 +60,6 @@
std::unique_ptr<device::FakeInputServiceLinux> fake_input_service_manager_;
scoped_refptr<testing::NiceMock<device::MockBluetoothAdapter>> mock_adapter_;
base::WeakPtrFactory<HIDControllerMixin> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(HIDControllerMixin);
};
} // namespace test
diff --git a/chrome/browser/ash/login/test/https_forwarder.h b/chrome/browser/ash/login/test/https_forwarder.h
index 1ef7111..e9aae69 100644
--- a/chrome/browser/ash/login/test/https_forwarder.h
+++ b/chrome/browser/ash/login/test/https_forwarder.h
@@ -27,6 +27,10 @@
class HTTPSForwarder {
public:
HTTPSForwarder();
+
+ HTTPSForwarder(const HTTPSForwarder&) = delete;
+ HTTPSForwarder& operator=(const HTTPSForwarder&) = delete;
+
~HTTPSForwarder();
// Returns a URL that uses `ssl_host_` as the host.
@@ -42,8 +46,6 @@
std::unique_ptr<net::ScopedTestRoot> test_root_;
std::unique_ptr<ForwardingServer> forwarding_server_;
-
- DISALLOW_COPY_AND_ASSIGN(HTTPSForwarder);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/local_policy_test_server_mixin.h b/chrome/browser/ash/login/test/local_policy_test_server_mixin.h
index f65337c..0492772c 100644
--- a/chrome/browser/ash/login/test/local_policy_test_server_mixin.h
+++ b/chrome/browser/ash/login/test/local_policy_test_server_mixin.h
@@ -37,6 +37,11 @@
class LocalPolicyTestServerMixin : public InProcessBrowserTestMixin {
public:
explicit LocalPolicyTestServerMixin(InProcessBrowserTestMixinHost* host);
+
+ LocalPolicyTestServerMixin(const LocalPolicyTestServerMixin&) = delete;
+ LocalPolicyTestServerMixin& operator=(const LocalPolicyTestServerMixin&) =
+ delete;
+
~LocalPolicyTestServerMixin() override;
policy::LocalPolicyTestServer* server() { return policy_test_server_.get(); }
@@ -128,8 +133,6 @@
base::Value server_config_;
bool canned_signing_keys_enabled_ = false;
bool automatic_rotation_of_signing_keys_enabled_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(LocalPolicyTestServerMixin);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/login_manager_mixin.h b/chrome/browser/ash/login/test/login_manager_mixin.h
index 2877c8c1..c09baa6 100644
--- a/chrome/browser/ash/login/test/login_manager_mixin.h
+++ b/chrome/browser/ash/login/test/login_manager_mixin.h
@@ -78,6 +78,9 @@
const UserList& initial_users,
FakeGaiaMixin* gaia_mixin);
+ LoginManagerMixin(const LoginManagerMixin&) = delete;
+ LoginManagerMixin& operator=(const LoginManagerMixin&) = delete;
+
~LoginManagerMixin() override;
// Enables session restore between multi-step test run (not very useful unless
@@ -159,8 +162,6 @@
LocalStateMixin local_state_mixin_;
FakeGaiaMixin* fake_gaia_mixin_;
-
- DISALLOW_COPY_AND_ASSIGN(LoginManagerMixin);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/offline_login_test_mixin.h b/chrome/browser/ash/login/test/offline_login_test_mixin.h
index a48ca65..3adb5a16 100644
--- a/chrome/browser/ash/login/test/offline_login_test_mixin.h
+++ b/chrome/browser/ash/login/test/offline_login_test_mixin.h
@@ -20,6 +20,10 @@
class OfflineLoginTestMixin : public InProcessBrowserTestMixin {
public:
explicit OfflineLoginTestMixin(InProcessBrowserTestMixinHost* host);
+
+ OfflineLoginTestMixin(const OfflineLoginTestMixin&) = delete;
+ OfflineLoginTestMixin& operator=(const OfflineLoginTestMixin&) = delete;
+
~OfflineLoginTestMixin() override;
// InProcessBrowserTestMixin:
@@ -55,8 +59,6 @@
// This is ised to disable networking.
std::unique_ptr<chromeos::NetworkStateTestHelper> network_state_test_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(OfflineLoginTestMixin);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/oobe_base_test.h b/chrome/browser/ash/login/test/oobe_base_test.h
index de071e9..f47c456 100644
--- a/chrome/browser/ash/login/test/oobe_base_test.h
+++ b/chrome/browser/ash/login/test/oobe_base_test.h
@@ -29,6 +29,10 @@
class OobeBaseTest : public MixinBasedInProcessBrowserTest {
public:
OobeBaseTest();
+
+ OobeBaseTest(const OobeBaseTest&) = delete;
+ OobeBaseTest& operator=(const OobeBaseTest&) = delete;
+
~OobeBaseTest() override;
// Subclasses may register their own custom request handlers that will
@@ -85,8 +89,6 @@
std::unique_ptr<LoginOrLockScreenVisibleWaiter> login_screen_load_observer_;
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(OobeBaseTest);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/oobe_configuration_waiter.h b/chrome/browser/ash/login/test/oobe_configuration_waiter.h
index ed1d041f..56e23a85 100644
--- a/chrome/browser/ash/login/test/oobe_configuration_waiter.h
+++ b/chrome/browser/ash/login/test/oobe_configuration_waiter.h
@@ -17,6 +17,9 @@
public:
OOBEConfigurationWaiter();
+ OOBEConfigurationWaiter(const OOBEConfigurationWaiter&) = delete;
+ OOBEConfigurationWaiter& operator=(const OOBEConfigurationWaiter&) = delete;
+
~OOBEConfigurationWaiter() override;
// OobeConfiguration::Observer override:
@@ -27,8 +30,6 @@
private:
base::OnceClosure callback_;
-
- DISALLOW_COPY_AND_ASSIGN(OOBEConfigurationWaiter);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/oobe_screen_exit_waiter.h b/chrome/browser/ash/login/test/oobe_screen_exit_waiter.h
index 15248d1..7ceacf2 100644
--- a/chrome/browser/ash/login/test/oobe_screen_exit_waiter.h
+++ b/chrome/browser/ash/login/test/oobe_screen_exit_waiter.h
@@ -23,6 +23,10 @@
public test::TestConditionWaiter {
public:
explicit OobeScreenExitWaiter(OobeScreenId target_screen);
+
+ OobeScreenExitWaiter(const OobeScreenExitWaiter&) = delete;
+ OobeScreenExitWaiter& operator=(const OobeScreenExitWaiter&) = delete;
+
~OobeScreenExitWaiter() override;
// OobeUI::Observer implementation:
@@ -46,8 +50,6 @@
base::ScopedObservation<OobeUI, OobeUI::Observer> oobe_ui_observation_{this};
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(OobeScreenExitWaiter);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/oobe_screen_waiter.h b/chrome/browser/ash/login/test/oobe_screen_waiter.h
index 8af85eb..ef3494c 100644
--- a/chrome/browser/ash/login/test/oobe_screen_waiter.h
+++ b/chrome/browser/ash/login/test/oobe_screen_waiter.h
@@ -25,6 +25,10 @@
public aura::WindowObserver {
public:
explicit OobeScreenWaiter(OobeScreenId target_screen);
+
+ OobeScreenWaiter(const OobeScreenWaiter&) = delete;
+ OobeScreenWaiter& operator=(const OobeScreenWaiter&) = delete;
+
~OobeScreenWaiter() override;
void set_no_assert_last_screen() { assert_last_screen_ = false; }
@@ -82,8 +86,6 @@
native_window_observation_{this};
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(OobeScreenWaiter);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/oobe_window_visibility_waiter.h b/chrome/browser/ash/login/test/oobe_window_visibility_waiter.h
index cdc3462..4e45dba 100644
--- a/chrome/browser/ash/login/test/oobe_window_visibility_waiter.h
+++ b/chrome/browser/ash/login/test/oobe_window_visibility_waiter.h
@@ -20,6 +20,11 @@
class OobeWindowVisibilityWaiter : public aura::WindowObserver {
public:
explicit OobeWindowVisibilityWaiter(bool target_visibilty);
+
+ OobeWindowVisibilityWaiter(const OobeWindowVisibilityWaiter&) = delete;
+ OobeWindowVisibilityWaiter& operator=(const OobeWindowVisibilityWaiter&) =
+ delete;
+
~OobeWindowVisibilityWaiter() override;
void Wait();
@@ -35,8 +40,6 @@
base::OnceClosure wait_stop_closure_;
base::ScopedObservation<aura::Window, aura::WindowObserver>
window_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(OobeWindowVisibilityWaiter);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/scoped_help_app_for_test.h b/chrome/browser/ash/login/test/scoped_help_app_for_test.h
index be1c86a..c9058ff 100644
--- a/chrome/browser/ash/login/test/scoped_help_app_for_test.h
+++ b/chrome/browser/ash/login/test/scoped_help_app_for_test.h
@@ -16,9 +16,11 @@
class ScopedHelpAppForTest {
public:
ScopedHelpAppForTest();
- virtual ~ScopedHelpAppForTest();
- DISALLOW_COPY_AND_ASSIGN(ScopedHelpAppForTest);
+ ScopedHelpAppForTest(const ScopedHelpAppForTest&) = delete;
+ ScopedHelpAppForTest& operator=(const ScopedHelpAppForTest&) = delete;
+
+ virtual ~ScopedHelpAppForTest();
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/scoped_policy_update.h b/chrome/browser/ash/login/test/scoped_policy_update.h
index 1e3af82..937c99a 100644
--- a/chrome/browser/ash/login/test/scoped_policy_update.h
+++ b/chrome/browser/ash/login/test/scoped_policy_update.h
@@ -21,6 +21,10 @@
public:
explicit ScopedUserPolicyUpdate(policy::UserPolicyBuilder* policy_builder,
base::OnceClosure callback);
+
+ ScopedUserPolicyUpdate(const ScopedUserPolicyUpdate&) = delete;
+ ScopedUserPolicyUpdate& operator=(const ScopedUserPolicyUpdate&) = delete;
+
~ScopedUserPolicyUpdate();
// Policy payload proto - use this to set up desired policy values.
@@ -37,8 +41,6 @@
private:
policy::UserPolicyBuilder* const policy_builder_;
base::OnceClosure callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedUserPolicyUpdate);
};
// Helper that is used by mixins to provide means for setting up device policy
@@ -50,6 +52,10 @@
public:
explicit ScopedDevicePolicyUpdate(policy::DevicePolicyBuilder* policy_builder,
base::OnceClosure callback);
+
+ ScopedDevicePolicyUpdate(const ScopedDevicePolicyUpdate&) = delete;
+ ScopedDevicePolicyUpdate& operator=(const ScopedDevicePolicyUpdate&) = delete;
+
~ScopedDevicePolicyUpdate();
// Policy payload proto - use this to set up desired policy values.
@@ -65,8 +71,6 @@
private:
policy::DevicePolicyBuilder* const policy_builder_;
base::OnceClosure callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedDevicePolicyUpdate);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/session_flags_manager.h b/chrome/browser/ash/login/test/session_flags_manager.h
index 24d9430a..ba0ea463 100644
--- a/chrome/browser/ash/login/test/session_flags_manager.h
+++ b/chrome/browser/ash/login/test/session_flags_manager.h
@@ -36,6 +36,10 @@
using Switch = std::pair<std::string, std::string>;
SessionFlagsManager();
+
+ SessionFlagsManager(const SessionFlagsManager&) = delete;
+ SessionFlagsManager& operator=(const SessionFlagsManager&) = delete;
+
~SessionFlagsManager();
// Sets the manager up for session restore.It should be called early in
@@ -107,8 +111,6 @@
// If `session_restore_enabled_` is set, the path to the file where session
// state is saved.
base::FilePath backing_file_;
-
- DISALLOW_COPY_AND_ASSIGN(SessionFlagsManager);
};
} // namespace test
diff --git a/chrome/browser/ash/login/test/session_manager_state_waiter.h b/chrome/browser/ash/login/test/session_manager_state_waiter.h
index 884858b..d08b984f 100644
--- a/chrome/browser/ash/login/test/session_manager_state_waiter.h
+++ b/chrome/browser/ash/login/test/session_manager_state_waiter.h
@@ -28,6 +28,10 @@
// session starts.
explicit SessionStateWaiter(absl::optional<session_manager::SessionState>
target_state = absl::nullopt);
+
+ SessionStateWaiter(const SessionStateWaiter&) = delete;
+ SessionStateWaiter& operator=(const SessionStateWaiter&) = delete;
+
~SessionStateWaiter() override;
void Wait();
@@ -44,8 +48,6 @@
session_observation_{this};
bool done_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(SessionStateWaiter);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/test_condition_waiter.h b/chrome/browser/ash/login/test/test_condition_waiter.h
index ec0e6465..413fea1 100644
--- a/chrome/browser/ash/login/test/test_condition_waiter.h
+++ b/chrome/browser/ash/login/test/test_condition_waiter.h
@@ -13,13 +13,14 @@
// Generic class for conditions that can be awaited it test.
class TestConditionWaiter {
public:
+ TestConditionWaiter(const TestConditionWaiter&) = delete;
+ TestConditionWaiter& operator=(const TestConditionWaiter&) = delete;
+
virtual ~TestConditionWaiter() = default;
virtual void Wait() = 0;
protected:
TestConditionWaiter() = default;
-
- DISALLOW_COPY_AND_ASSIGN(TestConditionWaiter);
};
} // namespace test
diff --git a/chrome/browser/ash/login/test/test_predicate_waiter.h b/chrome/browser/ash/login/test/test_predicate_waiter.h
index 7e8db9f..eb03b0a 100644
--- a/chrome/browser/ash/login/test/test_predicate_waiter.h
+++ b/chrome/browser/ash/login/test/test_predicate_waiter.h
@@ -19,6 +19,10 @@
using PredicateCheck = base::RepeatingCallback<bool(void)>;
explicit TestPredicateWaiter(const PredicateCheck& is_fulfilled);
+
+ TestPredicateWaiter(const TestPredicateWaiter&) = delete;
+ TestPredicateWaiter& operator=(const TestPredicateWaiter&) = delete;
+
~TestPredicateWaiter() override;
void set_description(const std::string& description) {
@@ -36,8 +40,6 @@
base::RetainingOneShotTimer timer_;
base::RunLoop run_loop_;
std::string description_;
-
- DISALLOW_COPY_AND_ASSIGN(TestPredicateWaiter);
};
} // namespace test
diff --git a/chrome/browser/ash/login/test/user_policy_mixin.h b/chrome/browser/ash/login/test/user_policy_mixin.h
index 7bef7b03..fcace5a 100644
--- a/chrome/browser/ash/login/test/user_policy_mixin.h
+++ b/chrome/browser/ash/login/test/user_policy_mixin.h
@@ -29,6 +29,10 @@
UserPolicyMixin(InProcessBrowserTestMixinHost* mixin_host,
const AccountId& account_id,
LocalPolicyTestServerMixin* policy_server);
+
+ UserPolicyMixin(const UserPolicyMixin&) = delete;
+ UserPolicyMixin& operator=(const UserPolicyMixin&) = delete;
+
~UserPolicyMixin() override;
// InProcessBrowserTestMixin:
@@ -71,8 +75,6 @@
policy::UserPolicyBuilder user_policy_builder_;
base::WeakPtrFactory<UserPolicyMixin> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UserPolicyMixin);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/test/webview_content_extractor.cc b/chrome/browser/ash/login/test/webview_content_extractor.cc
index bf05de40..1738b17 100644
--- a/chrome/browser/ash/login/test/webview_content_extractor.cc
+++ b/chrome/browser/ash/login/test/webview_content_extractor.cc
@@ -25,6 +25,11 @@
public:
explicit WebContentsLoadFinishedWaiter(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents) {}
+
+ WebContentsLoadFinishedWaiter(const WebContentsLoadFinishedWaiter&) = delete;
+ WebContentsLoadFinishedWaiter& operator=(
+ const WebContentsLoadFinishedWaiter&) = delete;
+
~WebContentsLoadFinishedWaiter() override = default;
void Wait() {
@@ -43,8 +48,6 @@
}
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(WebContentsLoadFinishedWaiter);
};
// Helper invoked by GuestViewManager::ForEachGuest to collect WebContents of
diff --git a/chrome/browser/ash/login/ui/captive_portal_view.h b/chrome/browser/ash/login/ui/captive_portal_view.h
index 2e4a65c..cf03257e 100644
--- a/chrome/browser/ash/login/ui/captive_portal_view.h
+++ b/chrome/browser/ash/login/ui/captive_portal_view.h
@@ -14,6 +14,10 @@
class CaptivePortalView : public SimpleWebViewDialog {
public:
CaptivePortalView(Profile* profile, CaptivePortalWindowProxy* proxy);
+
+ CaptivePortalView(const CaptivePortalView&) = delete;
+ CaptivePortalView& operator=(const CaptivePortalView&) = delete;
+
~CaptivePortalView() override;
// Starts loading.
@@ -34,8 +38,6 @@
CaptivePortalWindowProxy* proxy_;
bool redirected_;
-
- DISALLOW_COPY_AND_ASSIGN(CaptivePortalView);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/ui/captive_portal_window_browsertest.cc b/chrome/browser/ash/login/ui/captive_portal_window_browsertest.cc
index 0c361e9..baeef7c 100644
--- a/chrome/browser/ash/login/ui/captive_portal_window_browsertest.cc
+++ b/chrome/browser/ash/login/ui/captive_portal_window_browsertest.cc
@@ -182,6 +182,12 @@
class CaptivePortalWindowCtorDtorTest : public LoginManagerTest {
public:
CaptivePortalWindowCtorDtorTest() = default;
+
+ CaptivePortalWindowCtorDtorTest(const CaptivePortalWindowCtorDtorTest&) =
+ delete;
+ CaptivePortalWindowCtorDtorTest& operator=(
+ const CaptivePortalWindowCtorDtorTest&) = delete;
+
~CaptivePortalWindowCtorDtorTest() override {}
void SetUpInProcessBrowserTestFixture() override {
@@ -213,8 +219,6 @@
// Use fake GAIA to avoid potential flakiness when real GAIA would not
// load and Error screen would be shown instead of Login screen.
FakeGaiaMixin fake_gaia_{&mixin_host_};
-
- DISALLOW_COPY_AND_ASSIGN(CaptivePortalWindowCtorDtorTest);
};
// Flaky on multiple builders, see crbug.com/1244162
diff --git a/chrome/browser/ash/login/ui/fake_login_display_host.cc b/chrome/browser/ash/login/ui/fake_login_display_host.cc
index 67c1e933..c9b6c08 100644
--- a/chrome/browser/ash/login/ui/fake_login_display_host.cc
+++ b/chrome/browser/ash/login/ui/fake_login_display_host.cc
@@ -15,14 +15,15 @@
explicit FakeBaseScreen(OobeScreenId screen_id)
: BaseScreen(screen_id, OobeScreenPriority::DEFAULT) {}
+ FakeBaseScreen(const FakeBaseScreen&) = delete;
+ FakeBaseScreen& operator=(const FakeBaseScreen&) = delete;
+
~FakeBaseScreen() override = default;
private:
// BaseScreen:
void ShowImpl() override {}
void HideImpl() override {}
-
- DISALLOW_COPY_AND_ASSIGN(FakeBaseScreen);
};
FakeLoginDisplayHost::FakeLoginDisplayHost()
diff --git a/chrome/browser/ash/login/ui/fake_login_display_host.h b/chrome/browser/ash/login/ui/fake_login_display_host.h
index dc35986..b5e2cbba 100644
--- a/chrome/browser/ash/login/ui/fake_login_display_host.h
+++ b/chrome/browser/ash/login/ui/fake_login_display_host.h
@@ -22,6 +22,10 @@
class FakeLoginDisplayHost : public LoginDisplayHost {
public:
FakeLoginDisplayHost();
+
+ FakeLoginDisplayHost(const FakeLoginDisplayHost&) = delete;
+ FakeLoginDisplayHost& operator=(const FakeLoginDisplayHost&) = delete;
+
~FakeLoginDisplayHost() override;
// LoginDisplayHost:
@@ -86,8 +90,6 @@
std::unique_ptr<FakeBaseScreen> fake_screen_;
std::unique_ptr<WizardContext> wizard_context_;
std::unique_ptr<WizardController> wizard_controller_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeLoginDisplayHost);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/ui/input_events_blocker.h b/chrome/browser/ash/login/ui/input_events_blocker.h
index 19cbc0b..8f3bade 100644
--- a/chrome/browser/ash/login/ui/input_events_blocker.h
+++ b/chrome/browser/ash/login/ui/input_events_blocker.h
@@ -17,15 +17,16 @@
class InputEventsBlocker : public ui::EventHandler {
public:
InputEventsBlocker();
+
+ InputEventsBlocker(const InputEventsBlocker&) = delete;
+ InputEventsBlocker& operator=(const InputEventsBlocker&) = delete;
+
~InputEventsBlocker() override;
void OnKeyEvent(ui::KeyEvent* event) override;
void OnMouseEvent(ui::MouseEvent* event) override;
void OnTouchEvent(ui::TouchEvent* event) override;
void OnGestureEvent(ui::GestureEvent* event) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(InputEventsBlocker);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/ui/kiosk_app_menu_controller.h b/chrome/browser/ash/login/ui/kiosk_app_menu_controller.h
index 8e32e5ee..7a12d3d 100644
--- a/chrome/browser/ash/login/ui/kiosk_app_menu_controller.h
+++ b/chrome/browser/ash/login/ui/kiosk_app_menu_controller.h
@@ -18,6 +18,10 @@
class KioskAppMenuController : public KioskAppManagerObserver {
public:
KioskAppMenuController();
+
+ KioskAppMenuController(const KioskAppMenuController&) = delete;
+ KioskAppMenuController& operator=(const KioskAppMenuController&) = delete;
+
~KioskAppMenuController() override;
// Manually dispatch kiosk app data to Ash.
@@ -37,8 +41,6 @@
kiosk_observations_{this};
base::WeakPtrFactory<KioskAppMenuController> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(KioskAppMenuController);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/ui/login_display_host_common.h b/chrome/browser/ash/login/ui/login_display_host_common.h
index 3e3826f0..f3b67a99 100644
--- a/chrome/browser/ash/login/ui/login_display_host_common.h
+++ b/chrome/browser/ash/login/ui/login_display_host_common.h
@@ -36,6 +36,10 @@
public SigninUI {
public:
LoginDisplayHostCommon();
+
+ LoginDisplayHostCommon(const LoginDisplayHostCommon&) = delete;
+ LoginDisplayHostCommon& operator=(const LoginDisplayHostCommon&) = delete;
+
~LoginDisplayHostCommon() override;
// LoginDisplayHost:
@@ -149,8 +153,6 @@
base::RepeatingClosure on_wizard_controller_created_for_tests_;
base::WeakPtrFactory<LoginDisplayHostCommon> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostCommon);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/ui/login_display_host_mojo.h b/chrome/browser/ash/login/ui/login_display_host_mojo.h
index 8414e789..f909575 100644
--- a/chrome/browser/ash/login/ui/login_display_host_mojo.h
+++ b/chrome/browser/ash/login/ui/login_display_host_mojo.h
@@ -48,6 +48,10 @@
public views::ViewObserver {
public:
explicit LoginDisplayHostMojo(DisplayedScreen displayed_screen);
+
+ LoginDisplayHostMojo(const LoginDisplayHostMojo&) = delete;
+ LoginDisplayHostMojo& operator=(const LoginDisplayHostMojo&) = delete;
+
~LoginDisplayHostMojo() override;
// Called when the gaia dialog is destroyed.
@@ -236,8 +240,6 @@
base::ObserverList<LoginDisplayHost::Observer> observers_;
base::WeakPtrFactory<LoginDisplayHostMojo> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostMojo);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/ui/login_display_host_webui.cc b/chrome/browser/ash/login/ui/login_display_host_webui.cc
index 52541fc..08ac16d6 100644
--- a/chrome/browser/ash/login/ui/login_display_host_webui.cc
+++ b/chrome/browser/ash/login/ui/login_display_host_webui.cc
@@ -158,6 +158,10 @@
public:
explicit AnimationObserver(base::OnceClosure callback)
: callback_(std::move(callback)) {}
+
+ AnimationObserver(const AnimationObserver&) = delete;
+ AnimationObserver& operator=(const AnimationObserver&) = delete;
+
~AnimationObserver() override {}
private:
@@ -168,8 +172,6 @@
}
base::OnceClosure callback_;
-
- DISALLOW_COPY_AND_ASSIGN(AnimationObserver);
};
// Even if oobe is complete we may still want to show it, for example, if there
@@ -379,6 +381,10 @@
widget->GetCompositor()->AddObserver(this);
widget_->AddObserver(this);
}
+
+ CloseAfterCommit(const CloseAfterCommit&) = delete;
+ CloseAfterCommit& operator=(const CloseAfterCommit&) = delete;
+
~CloseAfterCommit() override {
widget_->RemoveObserver(this);
widget_->GetCompositor()->RemoveObserver(this);
@@ -399,8 +405,6 @@
private:
views::Widget* const widget_;
-
- DISALLOW_COPY_AND_ASSIGN(CloseAfterCommit);
};
// Returns true if we have default audio device.
@@ -430,6 +434,11 @@
: public ui::EventHandler {
public:
KeyboardDrivenOobeKeyHandler() { Shell::Get()->AddPreTargetHandler(this); }
+
+ KeyboardDrivenOobeKeyHandler(const KeyboardDrivenOobeKeyHandler&) = delete;
+ KeyboardDrivenOobeKeyHandler& operator=(const KeyboardDrivenOobeKeyHandler&) =
+ delete;
+
~KeyboardDrivenOobeKeyHandler() override {
Shell::Get()->RemovePreTargetHandler(this);
}
@@ -442,8 +451,6 @@
event->StopPropagation();
}
}
-
- DISALLOW_COPY_AND_ASSIGN(KeyboardDrivenOobeKeyHandler);
};
////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ash/login/ui/login_display_host_webui.h b/chrome/browser/ash/login/ui/login_display_host_webui.h
index 41fcfe42..3ff2fcf 100644
--- a/chrome/browser/ash/login/ui/login_display_host_webui.h
+++ b/chrome/browser/ash/login/ui/login_display_host_webui.h
@@ -59,6 +59,10 @@
public MultiUserWindowManagerObserver {
public:
LoginDisplayHostWebUI();
+
+ LoginDisplayHostWebUI(const LoginDisplayHostWebUI&) = delete;
+ LoginDisplayHostWebUI& operator=(const LoginDisplayHostWebUI&) = delete;
+
~LoginDisplayHostWebUI() override;
// LoginDisplayHost:
@@ -285,8 +289,6 @@
base::ObserverList<LoginDisplayHost::Observer> observers_;
base::WeakPtrFactory<LoginDisplayHostWebUI> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostWebUI);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/ui/login_display_mojo.h b/chrome/browser/ash/login/ui/login_display_mojo.h
index b4cb575..f568a29b 100644
--- a/chrome/browser/ash/login/ui/login_display_mojo.h
+++ b/chrome/browser/ash/login/ui/login_display_mojo.h
@@ -22,6 +22,10 @@
public user_manager::UserManager::Observer {
public:
explicit LoginDisplayMojo(LoginDisplayHostMojo* host);
+
+ LoginDisplayMojo(const LoginDisplayMojo&) = delete;
+ LoginDisplayMojo& operator=(const LoginDisplayMojo&) = delete;
+
~LoginDisplayMojo() override;
// Updates the state of the authentication methods supported for the user.
@@ -64,8 +68,6 @@
LoginDisplayWebUIHandler* webui_handler_ = nullptr;
base::WeakPtrFactory<LoginDisplayMojo> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LoginDisplayMojo);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/ui/login_display_webui.h b/chrome/browser/ash/login/ui/login_display_webui.h
index f955c6f..ae1f99b 100644
--- a/chrome/browser/ash/login/ui/login_display_webui.h
+++ b/chrome/browser/ash/login/ui/login_display_webui.h
@@ -21,6 +21,10 @@
public ui::UserActivityObserver {
public:
LoginDisplayWebUI();
+
+ LoginDisplayWebUI(const LoginDisplayWebUI&) = delete;
+ LoginDisplayWebUI& operator=(const LoginDisplayWebUI&) = delete;
+
~LoginDisplayWebUI() override;
// LoginDisplay implementation:
@@ -57,8 +61,6 @@
// Reference to the WebUI handling layer for the login screen
LoginDisplayWebUIHandler* webui_handler_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(LoginDisplayWebUI);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/ui/login_feedback.cc b/chrome/browser/ash/login/ui/login_feedback.cc
index 16df2902..d15ef52 100644
--- a/chrome/browser/ash/login/ui/login_feedback.cc
+++ b/chrome/browser/ash/login/ui/login_feedback.cc
@@ -51,6 +51,10 @@
class FeedbackExtensionLoader : public extensions::ExtensionRegistryObserver {
public:
explicit FeedbackExtensionLoader(Profile* profile);
+
+ FeedbackExtensionLoader(const FeedbackExtensionLoader&) = delete;
+ FeedbackExtensionLoader& operator=(const FeedbackExtensionLoader&) = delete;
+
~FeedbackExtensionLoader() override;
// Loads the feedback extension on the given profile and invokes
@@ -73,8 +77,6 @@
extensions::ExtensionRegistry* extension_registry_;
base::OnceClosure on_ready_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(FeedbackExtensionLoader);
};
FeedbackExtensionLoader::FeedbackExtensionLoader(Profile* profile)
@@ -124,6 +126,10 @@
: public extensions::AppWindowRegistry::Observer {
public:
explicit FeedbackWindowHandler(LoginFeedback* owner);
+
+ FeedbackWindowHandler(const FeedbackWindowHandler&) = delete;
+ FeedbackWindowHandler& operator=(const FeedbackWindowHandler&) = delete;
+
~FeedbackWindowHandler() override;
bool HasFeedbackAppWindow() const;
@@ -134,8 +140,6 @@
private:
LoginFeedback* const owner_;
extensions::AppWindowRegistry* const window_registry_;
-
- DISALLOW_COPY_AND_ASSIGN(FeedbackWindowHandler);
};
LoginFeedback::FeedbackWindowHandler::FeedbackWindowHandler(
diff --git a/chrome/browser/ash/login/ui/login_feedback.h b/chrome/browser/ash/login/ui/login_feedback.h
index 605fa3c..9ae9330 100644
--- a/chrome/browser/ash/login/ui/login_feedback.h
+++ b/chrome/browser/ash/login/ui/login_feedback.h
@@ -22,6 +22,10 @@
class LoginFeedback {
public:
explicit LoginFeedback(Profile* signin_profile);
+
+ LoginFeedback(const LoginFeedback&) = delete;
+ LoginFeedback& operator=(const LoginFeedback&) = delete;
+
~LoginFeedback();
// Request to show the feedback UI with `description`. `finished_callback`
@@ -50,8 +54,6 @@
std::unique_ptr<FeedbackExtensionLoader> feedback_extension_loader_;
base::WeakPtrFactory<LoginFeedback> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LoginFeedback);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/ui/login_feedback_browsertest.cc b/chrome/browser/ash/login/ui/login_feedback_browsertest.cc
index 94b0a4f9..419f232 100644
--- a/chrome/browser/ash/login/ui/login_feedback_browsertest.cc
+++ b/chrome/browser/ash/login/ui/login_feedback_browsertest.cc
@@ -31,11 +31,14 @@
LoginFeedbackTest() : LoginManagerTest() {
login_mixin_.AppendRegularUsers(2);
}
+
+ LoginFeedbackTest(const LoginFeedbackTest&) = delete;
+ LoginFeedbackTest& operator=(const LoginFeedbackTest&) = delete;
+
~LoginFeedbackTest() override {}
private:
LoginManagerMixin login_mixin_{&mixin_host_};
- DISALLOW_COPY_AND_ASSIGN(LoginFeedbackTest);
};
void TestFeedback() {
diff --git a/chrome/browser/ash/login/ui/login_screen_extension_ui/dialog_delegate.h b/chrome/browser/ash/login/ui/login_screen_extension_ui/dialog_delegate.h
index 13df8359..108c466 100644
--- a/chrome/browser/ash/login/ui/login_screen_extension_ui/dialog_delegate.h
+++ b/chrome/browser/ash/login/ui/login_screen_extension_ui/dialog_delegate.h
@@ -32,6 +32,10 @@
class DialogDelegate : public ui::WebDialogDelegate {
public:
explicit DialogDelegate(CreateOptions* create_options);
+
+ DialogDelegate(const DialogDelegate&) = delete;
+ DialogDelegate& operator=(const DialogDelegate&) = delete;
+
~DialogDelegate() override;
void set_can_close(bool can_close) { can_close_ = can_close; }
@@ -65,8 +69,6 @@
base::OnceClosure close_callback_;
gfx::NativeWindow native_window_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(DialogDelegate);
};
} // namespace login_screen_extension_ui
diff --git a/chrome/browser/ash/login/ui/login_screen_extension_ui/web_dialog_view_unittest.cc b/chrome/browser/ash/login/ui/login_screen_extension_ui/web_dialog_view_unittest.cc
index a134374..32228778 100644
--- a/chrome/browser/ash/login/ui/login_screen_extension_ui/web_dialog_view_unittest.cc
+++ b/chrome/browser/ash/login/ui/login_screen_extension_ui/web_dialog_view_unittest.cc
@@ -25,17 +25,24 @@
class MockLoginScreen : public TestLoginScreen {
public:
MockLoginScreen() = default;
+
+ MockLoginScreen(const MockLoginScreen&) = delete;
+ MockLoginScreen& operator=(const MockLoginScreen&) = delete;
+
~MockLoginScreen() override = default;
MOCK_METHOD1(FocusLoginShelf, void(bool reverse));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockLoginScreen);
};
class LoginScreenExtensionUiWebDialogViewUnittest : public testing::Test {
public:
LoginScreenExtensionUiWebDialogViewUnittest() = default;
+
+ LoginScreenExtensionUiWebDialogViewUnittest(
+ const LoginScreenExtensionUiWebDialogViewUnittest&) = delete;
+ LoginScreenExtensionUiWebDialogViewUnittest& operator=(
+ const LoginScreenExtensionUiWebDialogViewUnittest&) = delete;
+
~LoginScreenExtensionUiWebDialogViewUnittest() override = default;
protected:
@@ -57,9 +64,6 @@
&profile, dialog_delegate_.get(),
std::make_unique<ChromeWebContentsHandler>());
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LoginScreenExtensionUiWebDialogViewUnittest);
};
TEST_F(LoginScreenExtensionUiWebDialogViewUnittest, ShouldShowCloseButton) {
diff --git a/chrome/browser/ash/login/ui/login_screen_extension_ui/window.h b/chrome/browser/ash/login/ui/login_screen_extension_ui/window.h
index 6e2496f..3dfc890 100644
--- a/chrome/browser/ash/login/ui/login_screen_extension_ui/window.h
+++ b/chrome/browser/ash/login/ui/login_screen_extension_ui/window.h
@@ -27,6 +27,10 @@
class Window {
public:
explicit Window(CreateOptions* create_options);
+
+ Window(const Window&) = delete;
+ Window& operator=(const Window&) = delete;
+
~Window();
DialogDelegate* GetDialogDelegateForTesting();
@@ -36,18 +40,18 @@
DialogDelegate* dialog_delegate_ = nullptr;
WebDialogView* dialog_view_ = nullptr;
views::Widget* dialog_widget_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(Window);
};
class WindowFactory {
public:
WindowFactory();
+
+ WindowFactory(const WindowFactory&) = delete;
+ WindowFactory& operator=(const WindowFactory&) = delete;
+
virtual ~WindowFactory();
virtual std::unique_ptr<Window> Create(CreateOptions* create_options);
-
- DISALLOW_COPY_AND_ASSIGN(WindowFactory);
};
} // namespace login_screen_extension_ui
diff --git a/chrome/browser/ash/login/ui/mock_login_display.h b/chrome/browser/ash/login/ui/mock_login_display.h
index 824f9df..d1151f9 100644
--- a/chrome/browser/ash/login/ui/mock_login_display.h
+++ b/chrome/browser/ash/login/ui/mock_login_display.h
@@ -14,6 +14,10 @@
class MockLoginDisplay : public LoginDisplay {
public:
MockLoginDisplay();
+
+ MockLoginDisplay(const MockLoginDisplay&) = delete;
+ MockLoginDisplay& operator=(const MockLoginDisplay&) = delete;
+
~MockLoginDisplay();
MOCK_METHOD0(ClearAndEnablePassword, void(void));
@@ -23,9 +27,6 @@
MOCK_METHOD1(SetUIEnabled, void(bool));
MOCK_METHOD1(ShowSigninUI, void(const std::string&));
MOCK_METHOD0(ShowAllowlistCheckFailedError, void(void));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockLoginDisplay);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/ui/mock_login_display_host.h b/chrome/browser/ash/login/ui/mock_login_display_host.h
index 48f5f22..b00ac5d 100644
--- a/chrome/browser/ash/login/ui/mock_login_display_host.h
+++ b/chrome/browser/ash/login/ui/mock_login_display_host.h
@@ -23,6 +23,10 @@
class MockLoginDisplayHost : public LoginDisplayHost {
public:
MockLoginDisplayHost();
+
+ MockLoginDisplayHost(const MockLoginDisplayHost&) = delete;
+ MockLoginDisplayHost& operator=(const MockLoginDisplayHost&) = delete;
+
virtual ~MockLoginDisplayHost();
MOCK_METHOD(LoginDisplay*, GetLoginDisplay, (), (override));
@@ -103,9 +107,6 @@
(base::RepeatingClosure on_created),
(final));
MOCK_METHOD(WizardContext*, GetWizardContextForTesting, (), (final));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockLoginDisplayHost);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/ui/oobe_ui_dialog_delegate.h b/chrome/browser/ash/login/ui/oobe_ui_dialog_delegate.h
index 90f86271..f1685d6 100644
--- a/chrome/browser/ash/login/ui/oobe_ui_dialog_delegate.h
+++ b/chrome/browser/ash/login/ui/oobe_ui_dialog_delegate.h
@@ -57,6 +57,10 @@
public SystemTrayObserver {
public:
explicit OobeUIDialogDelegate(base::WeakPtr<LoginDisplayHostMojo> controller);
+
+ OobeUIDialogDelegate(const OobeUIDialogDelegate&) = delete;
+ OobeUIDialogDelegate& operator=(const OobeUIDialogDelegate&) = delete;
+
~OobeUIDialogDelegate() override;
// Show the dialog widget.
@@ -165,8 +169,6 @@
// Whether the captive portal screen should be shown the next time the Gaia
// dialog is opened.
bool should_display_captive_portal_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(OobeUIDialogDelegate);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/ui/user_adding_screen_input_methods_controller.h b/chrome/browser/ash/login/ui/user_adding_screen_input_methods_controller.h
index e10ecf76..472559b4 100644
--- a/chrome/browser/ash/login/ui/user_adding_screen_input_methods_controller.h
+++ b/chrome/browser/ash/login/ui/user_adding_screen_input_methods_controller.h
@@ -21,6 +21,12 @@
: public UserAddingScreen::Observer {
public:
explicit UserAddingScreenInputMethodsController(UserAddingScreen* screen);
+
+ UserAddingScreenInputMethodsController(
+ const UserAddingScreenInputMethodsController&) = delete;
+ UserAddingScreenInputMethodsController& operator=(
+ const UserAddingScreenInputMethodsController&) = delete;
+
~UserAddingScreenInputMethodsController() override;
// UserAddingScreen::Observer implementation:
@@ -32,8 +38,6 @@
scoped_refptr<input_method::InputMethodManager::State> saved_ime_state_;
user_manager::User* active_user_on_show_;
-
- DISALLOW_COPY_AND_ASSIGN(UserAddingScreenInputMethodsController);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/ui/web_contents_forced_title.h b/chrome/browser/ash/login/ui/web_contents_forced_title.h
index 49b7d93..ef4347e 100644
--- a/chrome/browser/ash/login/ui/web_contents_forced_title.h
+++ b/chrome/browser/ash/login/ui/web_contents_forced_title.h
@@ -21,6 +21,9 @@
static void CreateForWebContentsWithTitle(content::WebContents* web_contents,
const std::u16string& title);
+ WebContentsForcedTitle(const WebContentsForcedTitle&) = delete;
+ WebContentsForcedTitle& operator=(const WebContentsForcedTitle&) = delete;
+
~WebContentsForcedTitle() override;
private:
@@ -34,8 +37,6 @@
std::u16string title_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(WebContentsForcedTitle);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/ui/webui_login_view.cc b/chrome/browser/ash/login/ui/webui_login_view.cc
index 7844ae7..bf2731b 100644
--- a/chrome/browser/ash/login/ui/webui_login_view.cc
+++ b/chrome/browser/ash/login/ui/webui_login_view.cc
@@ -74,6 +74,10 @@
views::FocusManager::set_arrow_key_traversal_enabled(
new_arrow_key_tranversal_enabled);
}
+
+ ScopedArrowKeyTraversal(const ScopedArrowKeyTraversal&) = delete;
+ ScopedArrowKeyTraversal& operator=(const ScopedArrowKeyTraversal&) = delete;
+
~ScopedArrowKeyTraversal() {
views::FocusManager::set_arrow_key_traversal_enabled(
previous_arrow_key_traversal_enabled_);
@@ -81,7 +85,6 @@
private:
const bool previous_arrow_key_traversal_enabled_;
- DISALLOW_COPY_AND_ASSIGN(ScopedArrowKeyTraversal);
};
} // namespace
diff --git a/chrome/browser/ash/login/ui/webui_login_view.h b/chrome/browser/ash/login/ui/webui_login_view.h
index 71cab838..1dda527 100644
--- a/chrome/browser/ash/login/ui/webui_login_view.h
+++ b/chrome/browser/ash/login/ui/webui_login_view.h
@@ -68,6 +68,10 @@
WebUILoginView(const WebViewSettings& settings,
base::WeakPtr<LoginDisplayHostWebUI> controller);
+
+ WebUILoginView(const WebUILoginView&) = delete;
+ WebUILoginView& operator=(const WebUILoginView&) = delete;
+
~WebUILoginView() override;
// Initializes the webui login view.
@@ -213,8 +217,6 @@
base::ObserverList<web_modal::ModalDialogHostObserver>::Unchecked
observer_list_;
-
- DISALLOW_COPY_AND_ASSIGN(WebUILoginView);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/user_board_view_mojo.h b/chrome/browser/ash/login/user_board_view_mojo.h
index 15b5015..d5febbb6 100644
--- a/chrome/browser/ash/login/user_board_view_mojo.h
+++ b/chrome/browser/ash/login/user_board_view_mojo.h
@@ -15,6 +15,10 @@
class UserBoardViewMojo : public UserBoardView {
public:
UserBoardViewMojo();
+
+ UserBoardViewMojo(const UserBoardViewMojo&) = delete;
+ UserBoardViewMojo& operator=(const UserBoardViewMojo&) = delete;
+
~UserBoardViewMojo() override;
// UserBoardView:
@@ -45,8 +49,6 @@
private:
base::WeakPtrFactory<UserBoardViewMojo> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UserBoardViewMojo);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/users/avatar/user_image_manager_browsertest.cc b/chrome/browser/ash/login/users/avatar/user_image_manager_browsertest.cc
index e9ae58d..803a54c 100644
--- a/chrome/browser/ash/login/users/avatar/user_image_manager_browsertest.cc
+++ b/chrome/browser/ash/login/users/avatar/user_image_manager_browsertest.cc
@@ -104,6 +104,10 @@
class UserImageChangeWaiter : public user_manager::UserManager::Observer {
public:
UserImageChangeWaiter() {}
+
+ UserImageChangeWaiter(const UserImageChangeWaiter&) = delete;
+ UserImageChangeWaiter& operator=(const UserImageChangeWaiter&) = delete;
+
~UserImageChangeWaiter() override {}
void Wait() {
@@ -121,8 +125,6 @@
private:
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(UserImageChangeWaiter);
};
} // namespace
diff --git a/chrome/browser/ash/login/users/avatar/user_image_manager_impl.cc b/chrome/browser/ash/login/users/avatar/user_image_manager_impl.cc
index 71f613c..4872c6c 100644
--- a/chrome/browser/ash/login/users/avatar/user_image_manager_impl.cc
+++ b/chrome/browser/ash/login/users/avatar/user_image_manager_impl.cc
@@ -142,6 +142,10 @@
public:
// The `Job` will update the user object corresponding to `parent`.
explicit Job(UserImageManagerImpl* parent);
+
+ Job(const Job&) = delete;
+ Job& operator=(const Job&) = delete;
+
~Job();
// Loads the image at `image_path` or one of the default images,
@@ -225,8 +229,6 @@
base::FilePath image_path_;
base::WeakPtrFactory<Job> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(Job);
};
UserImageManagerImpl::Job::Job(UserImageManagerImpl* parent)
diff --git a/chrome/browser/ash/login/users/avatar/user_image_manager_impl.h b/chrome/browser/ash/login/users/avatar/user_image_manager_impl.h
index 609162d..9a23975 100644
--- a/chrome/browser/ash/login/users/avatar/user_image_manager_impl.h
+++ b/chrome/browser/ash/login/users/avatar/user_image_manager_impl.h
@@ -43,6 +43,10 @@
// UserImageManager:
UserImageManagerImpl(const AccountId& account_id,
user_manager::UserManager* user_manager);
+
+ UserImageManagerImpl(const UserImageManagerImpl&) = delete;
+ UserImageManagerImpl& operator=(const UserImageManagerImpl&) = delete;
+
~UserImageManagerImpl() override;
void LoadUserImage() override;
@@ -206,8 +210,6 @@
bool is_random_image_set_ = false;
base::WeakPtrFactory<UserImageManagerImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UserImageManagerImpl);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/users/avatar/user_image_manager_test_util.h b/chrome/browser/ash/login/users/avatar/user_image_manager_test_util.h
index a550ad96..20048f3 100644
--- a/chrome/browser/ash/login/users/avatar/user_image_manager_test_util.h
+++ b/chrome/browser/ash/login/users/avatar/user_image_manager_test_util.h
@@ -30,6 +30,10 @@
class ImageLoader : public ImageDecoder::ImageRequest {
public:
explicit ImageLoader(const base::FilePath& path);
+
+ ImageLoader(const ImageLoader&) = delete;
+ ImageLoader& operator=(const ImageLoader&) = delete;
+
~ImageLoader() override;
gfx::ImageSkia Load();
@@ -43,8 +47,6 @@
base::RunLoop run_loop_;
gfx::ImageSkia decoded_image_;
-
- DISALLOW_COPY_AND_ASSIGN(ImageLoader);
};
} // namespace test
diff --git a/chrome/browser/ash/login/users/chrome_user_manager.h b/chrome/browser/ash/login/users/chrome_user_manager.h
index ac721b53..856da88 100644
--- a/chrome/browser/ash/login/users/chrome_user_manager.h
+++ b/chrome/browser/ash/login/users/chrome_user_manager.h
@@ -24,6 +24,10 @@
public:
explicit ChromeUserManager(
scoped_refptr<base::SingleThreadTaskRunner> task_runner);
+
+ ChromeUserManager(const ChromeUserManager&) = delete;
+ ChromeUserManager& operator=(const ChromeUserManager&) = delete;
+
~ChromeUserManager() override;
// user_manager::UserManagerBase:
@@ -81,8 +85,6 @@
LoginState::LoggedInUserType GetLoggedInUserType(
const user_manager::User& active_user,
bool is_current_user_owner) const;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeUserManager);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/users/chrome_user_manager_impl.h b/chrome/browser/ash/login/users/chrome_user_manager_impl.h
index 750f05a4..ec31be4 100644
--- a/chrome/browser/ash/login/users/chrome_user_manager_impl.h
+++ b/chrome/browser/ash/login/users/chrome_user_manager_impl.h
@@ -62,6 +62,9 @@
public ProfileManagerObserver,
public MultiProfileUserControllerDelegate {
public:
+ ChromeUserManagerImpl(const ChromeUserManagerImpl&) = delete;
+ ChromeUserManagerImpl& operator=(const ChromeUserManagerImpl&) = delete;
+
~ChromeUserManagerImpl() override;
// Creates ChromeUserManagerImpl instance.
@@ -283,8 +286,6 @@
bool user_added_removed_reporter_intialized_;
base::WeakPtrFactory<ChromeUserManagerImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeUserManagerImpl);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/users/fake_chrome_user_manager.h b/chrome/browser/ash/login/users/fake_chrome_user_manager.h
index d21d0a4..10c77f2 100644
--- a/chrome/browser/ash/login/users/fake_chrome_user_manager.h
+++ b/chrome/browser/ash/login/users/fake_chrome_user_manager.h
@@ -27,6 +27,10 @@
class FakeChromeUserManager : public ChromeUserManager {
public:
FakeChromeUserManager();
+
+ FakeChromeUserManager(const FakeChromeUserManager&) = delete;
+ FakeChromeUserManager& operator=(const FakeChromeUserManager&) = delete;
+
~FakeChromeUserManager() override;
// Create and add various types of users.
@@ -263,8 +267,6 @@
// Fake cache of removed users. Used for reporting testing.
std::vector<std::pair<std::string, user_manager::UserRemovalReason>>
removed_user_cache_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeChromeUserManager);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/users/fake_supervised_user_manager.h b/chrome/browser/ash/login/users/fake_supervised_user_manager.h
index fc3d210..a192a84d 100644
--- a/chrome/browser/ash/login/users/fake_supervised_user_manager.h
+++ b/chrome/browser/ash/login/users/fake_supervised_user_manager.h
@@ -15,6 +15,11 @@
class FakeSupervisedUserManager : public SupervisedUserManager {
public:
FakeSupervisedUserManager();
+
+ FakeSupervisedUserManager(const FakeSupervisedUserManager&) = delete;
+ FakeSupervisedUserManager& operator=(const FakeSupervisedUserManager&) =
+ delete;
+
~FakeSupervisedUserManager() override;
std::string GetUserSyncId(const std::string& user_id) const override;
@@ -27,9 +32,6 @@
void SetPasswordInformation(
const std::string& user_id,
const base::DictionaryValue* password_info) override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FakeSupervisedUserManager);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/users/multi_profile_user_controller.h b/chrome/browser/ash/login/users/multi_profile_user_controller.h
index 76be1ed7..c5d7458d 100644
--- a/chrome/browser/ash/login/users/multi_profile_user_controller.h
+++ b/chrome/browser/ash/login/users/multi_profile_user_controller.h
@@ -49,6 +49,11 @@
MultiProfileUserController(MultiProfileUserControllerDelegate* delegate,
PrefService* local_state);
+
+ MultiProfileUserController(const MultiProfileUserController&) = delete;
+ MultiProfileUserController& operator=(const MultiProfileUserController&) =
+ delete;
+
~MultiProfileUserController();
static void RegisterPrefs(PrefRegistrySimple* registry);
@@ -99,8 +104,6 @@
MultiProfileUserControllerDelegate* delegate_; // Not owned.
PrefService* local_state_; // Not owned.
std::vector<std::unique_ptr<PrefChangeRegistrar>> pref_watchers_;
-
- DISALLOW_COPY_AND_ASSIGN(MultiProfileUserController);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/users/multi_profile_user_controller_unittest.cc b/chrome/browser/ash/login/users/multi_profile_user_controller_unittest.cc
index f549849..3340ec2 100644
--- a/chrome/browser/ash/login/users/multi_profile_user_controller_unittest.cc
+++ b/chrome/browser/ash/login/users/multi_profile_user_controller_unittest.cc
@@ -127,6 +127,11 @@
}
}
+ MultiProfileUserControllerTest(const MultiProfileUserControllerTest&) =
+ delete;
+ MultiProfileUserControllerTest& operator=(
+ const MultiProfileUserControllerTest&) = delete;
+
~MultiProfileUserControllerTest() override {}
void SetUp() override {
@@ -216,9 +221,6 @@
int user_not_allowed_count_;
std::vector<AccountId> test_users_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MultiProfileUserControllerTest);
};
// Tests that everyone is allowed before a session starts.
diff --git a/chrome/browser/ash/login/users/scoped_test_user_manager.h b/chrome/browser/ash/login/users/scoped_test_user_manager.h
index d08e18c0..4be673a 100644
--- a/chrome/browser/ash/login/users/scoped_test_user_manager.h
+++ b/chrome/browser/ash/login/users/scoped_test_user_manager.h
@@ -17,12 +17,14 @@
class ScopedTestUserManager {
public:
ScopedTestUserManager();
+
+ ScopedTestUserManager(const ScopedTestUserManager&) = delete;
+ ScopedTestUserManager& operator=(const ScopedTestUserManager&) = delete;
+
~ScopedTestUserManager();
private:
std::unique_ptr<ChromeUserManager> chrome_user_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedTestUserManager);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/users/supervised_user_manager.h b/chrome/browser/ash/login/users/supervised_user_manager.h
index d0a620a..d1e5957 100644
--- a/chrome/browser/ash/login/users/supervised_user_manager.h
+++ b/chrome/browser/ash/login/users/supervised_user_manager.h
@@ -33,6 +33,10 @@
static void RegisterLocalStatePrefs(PrefRegistrySimple* registry);
SupervisedUserManager() {}
+
+ SupervisedUserManager(const SupervisedUserManager&) = delete;
+ SupervisedUserManager& operator=(const SupervisedUserManager&) = delete;
+
virtual ~SupervisedUserManager() {}
// Returns sync_user_id for supervised user with `user_id` or empty string if
@@ -66,9 +70,6 @@
virtual void SetPasswordInformation(
const std::string& user_id,
const base::DictionaryValue* password_info) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SupervisedUserManager);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/users/supervised_user_manager_impl.h b/chrome/browser/ash/login/users/supervised_user_manager_impl.h
index 6922d18..e16078f 100644
--- a/chrome/browser/ash/login/users/supervised_user_manager_impl.h
+++ b/chrome/browser/ash/login/users/supervised_user_manager_impl.h
@@ -21,6 +21,10 @@
// Implementation of the UserManager.
class SupervisedUserManagerImpl : public SupervisedUserManager {
public:
+ SupervisedUserManagerImpl(const SupervisedUserManagerImpl&) = delete;
+ SupervisedUserManagerImpl& operator=(const SupervisedUserManagerImpl&) =
+ delete;
+
~SupervisedUserManagerImpl() override;
std::string GetUserSyncId(const std::string& user_id) const override;
@@ -75,8 +79,6 @@
// Interface to the signed settings store.
CrosSettings* cros_settings_;
-
- DISALLOW_COPY_AND_ASSIGN(SupervisedUserManagerImpl);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/users/user_manager_interface.h b/chrome/browser/ash/login/users/user_manager_interface.h
index 5739d93..bae68ab4 100644
--- a/chrome/browser/ash/login/users/user_manager_interface.h
+++ b/chrome/browser/ash/login/users/user_manager_interface.h
@@ -22,6 +22,10 @@
class UserManagerInterface {
public:
UserManagerInterface() {}
+
+ UserManagerInterface(const UserManagerInterface&) = delete;
+ UserManagerInterface& operator=(const UserManagerInterface&) = delete;
+
virtual ~UserManagerInterface() {}
virtual MultiProfileUserController* GetMultiProfileUserController() = 0;
@@ -47,8 +51,6 @@
// Resets user flow for user identified by `account_id`.
virtual void ResetUserFlow(const AccountId& account_id) = 0;
-
- DISALLOW_COPY_AND_ASSIGN(UserManagerInterface);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/version_info_updater.h b/chrome/browser/ash/login/version_info_updater.h
index bb7ee22..139d30f 100644
--- a/chrome/browser/ash/login/version_info_updater.h
+++ b/chrome/browser/ash/login/version_info_updater.h
@@ -46,6 +46,10 @@
};
explicit VersionInfoUpdater(Delegate* delegate);
+
+ VersionInfoUpdater(const VersionInfoUpdater&) = delete;
+ VersionInfoUpdater& operator=(const VersionInfoUpdater&) = delete;
+
~VersionInfoUpdater() override;
// Sets delegate.
@@ -100,8 +104,6 @@
// at a later time without worrying that they will actually try to
// happen after the lifetime of this object.
base::WeakPtrFactory<VersionInfoUpdater> weak_pointer_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(VersionInfoUpdater);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/version_updater/version_updater.h b/chrome/browser/ash/login/version_updater/version_updater.h
index 57a176a..d10147bb 100644
--- a/chrome/browser/ash/login/version_updater/version_updater.h
+++ b/chrome/browser/ash/login/version_updater/version_updater.h
@@ -111,6 +111,10 @@
base::OnceCallback<void(const UpdateEngineClient::EolInfo& eol_info)>;
explicit VersionUpdater(VersionUpdater::Delegate* delegate);
+
+ VersionUpdater(const VersionUpdater&) = delete;
+ VersionUpdater& operator=(const VersionUpdater&) = delete;
+
~VersionUpdater() override;
// Resets `VersionUpdater` to initial state.
@@ -204,8 +208,6 @@
const base::TickClock* tick_clock_;
base::WeakPtrFactory<VersionUpdater> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(VersionUpdater);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/webview_login_browsertest.cc b/chrome/browser/ash/login/webview_login_browsertest.cc
index d9c7c329..918da9e 100644
--- a/chrome/browser/ash/login/webview_login_browsertest.cc
+++ b/chrome/browser/ash/login/webview_login_browsertest.cc
@@ -292,6 +292,10 @@
class WebviewLoginTest : public OobeBaseTest {
public:
WebviewLoginTest() = default;
+
+ WebviewLoginTest(const WebviewLoginTest&) = delete;
+ WebviewLoginTest& operator=(const WebviewLoginTest&) = delete;
+
~WebviewLoginTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -368,9 +372,6 @@
ScopedTestingCrosSettings scoped_testing_cros_settings_;
FakeGaiaMixin fake_gaia_{&mixin_host_};
base::test::ScopedFeatureList scoped_feature_list_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WebviewLoginTest);
};
/* is kGaiaCloseViewMessage enabled */
diff --git a/chrome/browser/ash/login/wizard_controller.h b/chrome/browser/ash/login/wizard_controller.h
index 96da110..9fc4f284 100644
--- a/chrome/browser/ash/login/wizard_controller.h
+++ b/chrome/browser/ash/login/wizard_controller.h
@@ -94,6 +94,10 @@
enum class ScreenShownStatus { kSkipped = 0, kShown = 1, kMaxValue = kShown };
explicit WizardController(WizardContext* wizard_context);
+
+ WizardController(const WizardController&) = delete;
+ WizardController& operator=(const WizardController&) = delete;
+
~WizardController();
// Returns the default wizard controller if it has been created. This is a
@@ -518,8 +522,6 @@
base::ObserverList<ScreenObserver> screen_observers_;
base::WeakPtrFactory<WizardController> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WizardController);
};
} // namespace ash
diff --git a/chrome/browser/ash/login/wizard_controller_browsertest.cc b/chrome/browser/ash/login/wizard_controller_browsertest.cc
index bc8143e..c1e8371 100644
--- a/chrome/browser/ash/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/ash/login/wizard_controller_browsertest.cc
@@ -183,6 +183,11 @@
&fake_auto_enrollment_client_factory_);
}
+ ScopedFakeAutoEnrollmentClientFactory(
+ const ScopedFakeAutoEnrollmentClientFactory&) = delete;
+ ScopedFakeAutoEnrollmentClientFactory& operator=(
+ const ScopedFakeAutoEnrollmentClientFactory&) = delete;
+
~ScopedFakeAutoEnrollmentClientFactory() {
controller_->SetAutoEnrollmentClientFactoryForTesting(nullptr);
}
@@ -229,8 +234,6 @@
policy::FakeAutoEnrollmentClient* created_auto_enrollment_client_ = nullptr;
base::OnceClosure run_on_auto_enrollment_client_created_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedFakeAutoEnrollmentClientFactory);
};
struct SwitchLanguageTestData {
diff --git a/chrome/browser/ash/mobile/mobile_activator_unittest.cc b/chrome/browser/ash/mobile/mobile_activator_unittest.cc
index 4cc930d..1f0a2f3 100644
--- a/chrome/browser/ash/mobile/mobile_activator_unittest.cc
+++ b/chrome/browser/ash/mobile/mobile_activator_unittest.cc
@@ -45,6 +45,10 @@
.WillByDefault(WithArgs<1>(
Invoke(this, &TestMobileActivator::set_state_for_test)));
}
+
+ TestMobileActivator(const TestMobileActivator&) = delete;
+ TestMobileActivator& operator=(const TestMobileActivator&) = delete;
+
virtual ~TestMobileActivator() {}
MOCK_METHOD3(ChangeState,
@@ -88,8 +92,6 @@
void DCheckOnThread(const BrowserThread::ID id) const {}
NetworkState* cellular_network_;
-
- DISALLOW_COPY_AND_ASSIGN(TestMobileActivator);
};
class MobileActivatorTest : public testing::Test {
@@ -100,6 +102,10 @@
cellular_network_.PropertyChanged(shill::kTypeProperty,
base::Value(shill::kTypeCellular));
}
+
+ MobileActivatorTest(const MobileActivatorTest&) = delete;
+ MobileActivatorTest& operator=(const MobileActivatorTest&) = delete;
+
~MobileActivatorTest() override {}
protected:
@@ -125,9 +131,6 @@
chromeos::NetworkHandlerTestHelper network_handler_test_helper_;
NetworkState cellular_network_;
TestMobileActivator mobile_activator_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MobileActivatorTest);
};
TEST_F(MobileActivatorTest, OTAHasNetworkConnection) {
diff --git a/chrome/browser/ash/night_light/night_light_client.h b/chrome/browser/ash/night_light/night_light_client.h
index 9422546f1..c2a700e8 100644
--- a/chrome/browser/ash/night_light/night_light_client.h
+++ b/chrome/browser/ash/night_light/night_light_client.h
@@ -31,6 +31,10 @@
public:
explicit NightLightClient(
scoped_refptr<network::SharedURLLoaderFactory> factory);
+
+ NightLightClient(const NightLightClient&) = delete;
+ NightLightClient& operator=(const NightLightClient&) = delete;
+
~NightLightClient() override;
// Starts watching changes in the Night Light schedule type in order to begin
@@ -107,8 +111,6 @@
// "custom", which means this client will be retrieving the IP-based
// geoposition once per day.
bool using_geoposition_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(NightLightClient);
};
#endif // CHROME_BROWSER_ASH_NIGHT_LIGHT_NIGHT_LIGHT_CLIENT_H_
diff --git a/chrome/browser/ash/night_light/night_light_client_unittest.cc b/chrome/browser/ash/night_light/night_light_client_unittest.cc
index aef563b..5258d74 100644
--- a/chrome/browser/ash/night_light/night_light_client_unittest.cc
+++ b/chrome/browser/ash/night_light/night_light_client_unittest.cc
@@ -35,6 +35,10 @@
class FakeNightLightController : public ash::NightLightController {
public:
FakeNightLightController() = default;
+
+ FakeNightLightController(const FakeNightLightController&) = delete;
+ FakeNightLightController& operator=(const FakeNightLightController&) = delete;
+
~FakeNightLightController() override = default;
const SimpleGeoposition& position() const { return position_; }
@@ -59,8 +63,6 @@
// The number of times a new position is pushed to this controller.
int position_pushes_num_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(FakeNightLightController);
};
// A fake implementation of NightLightClient that doesn't perform any actual
@@ -74,6 +76,10 @@
std::make_unique<base::OneShotTimer>(this /* tick_clock */));
SetClockForTesting(this);
}
+
+ FakeNightLightClient(const FakeNightLightClient&) = delete;
+ FakeNightLightClient& operator=(const FakeNightLightClient&) = delete;
+
~FakeNightLightClient() override = default;
// base::Clock:
@@ -109,14 +115,16 @@
// The number of new geoposition requests that have been triggered.
int geoposition_requests_num_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(FakeNightLightClient);
};
// Base test fixture.
class NightLightClientTest : public testing::TestWithParam<ScheduleType> {
public:
NightLightClientTest() = default;
+
+ NightLightClientTest(const NightLightClientTest&) = delete;
+ NightLightClientTest& operator=(const NightLightClientTest&) = delete;
+
~NightLightClientTest() override = default;
void SetUp() override {
@@ -131,9 +139,6 @@
FakeNightLightController controller_;
FakeNightLightClient client_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NightLightClientTest);
};
// Test that the client is retrieving geoposition periodically only when the
diff --git a/chrome/browser/ash/notifications/gnubby_notification.h b/chrome/browser/ash/notifications/gnubby_notification.h
index a487d514..e4d51e5 100644
--- a/chrome/browser/ash/notifications/gnubby_notification.h
+++ b/chrome/browser/ash/notifications/gnubby_notification.h
@@ -24,6 +24,9 @@
public:
GnubbyNotification();
+ GnubbyNotification(const GnubbyNotification&) = delete;
+ GnubbyNotification& operator=(const GnubbyNotification&) = delete;
+
// Resets GnubbyClient NotificationHandler.
~GnubbyNotification() override;
@@ -43,8 +46,6 @@
bool notificationActive = false;
base::WeakPtrFactory<GnubbyNotification> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(GnubbyNotification);
};
} // namespace ash
diff --git a/chrome/browser/ash/notifications/idle_app_name_notification_view.h b/chrome/browser/ash/notifications/idle_app_name_notification_view.h
index 5cde5092..ce0f9daa 100644
--- a/chrome/browser/ash/notifications/idle_app_name_notification_view.h
+++ b/chrome/browser/ash/notifications/idle_app_name_notification_view.h
@@ -28,6 +28,11 @@
IdleAppNameNotificationView(int message_visibility_time_in_ms,
int animation_time_ms,
const extensions::Extension* extension);
+
+ IdleAppNameNotificationView(const IdleAppNameNotificationView&) = delete;
+ IdleAppNameNotificationView& operator=(const IdleAppNameNotificationView&) =
+ delete;
+
virtual ~IdleAppNameNotificationView();
// Close and destroy the message instantly.
@@ -47,8 +52,6 @@
// A reference to an existing message.
IdleAppNameNotificationDelegateView* view_;
-
- DISALLOW_COPY_AND_ASSIGN(IdleAppNameNotificationView);
};
} // namespace ash
diff --git a/chrome/browser/ash/notifications/idle_app_name_notification_view_unittest.cc b/chrome/browser/ash/notifications/idle_app_name_notification_view_unittest.cc
index 0f987ba..68ae99dd 100644
--- a/chrome/browser/ash/notifications/idle_app_name_notification_view_unittest.cc
+++ b/chrome/browser/ash/notifications/idle_app_name_notification_view_unittest.cc
@@ -25,6 +25,11 @@
IdleAppNameNotificationViewTest()
: BrowserWithTestWindowTest(Browser::TYPE_NORMAL) {}
+ IdleAppNameNotificationViewTest(const IdleAppNameNotificationViewTest&) =
+ delete;
+ IdleAppNameNotificationViewTest& operator=(
+ const IdleAppNameNotificationViewTest&) = delete;
+
~IdleAppNameNotificationViewTest() override {}
void SetUp() override {
@@ -72,8 +77,6 @@
// Extensions to test with.
scoped_refptr<extensions::Extension> correct_extension_;
scoped_refptr<extensions::Extension> incorrect_extension_;
-
- DISALLOW_COPY_AND_ASSIGN(IdleAppNameNotificationViewTest);
};
// Check that creating and immediate destroying does not crash (and closes the
diff --git a/chrome/browser/ash/notifications/kiosk_external_update_notification.h b/chrome/browser/ash/notifications/kiosk_external_update_notification.h
index 0a19118..3b080d06a 100644
--- a/chrome/browser/ash/notifications/kiosk_external_update_notification.h
+++ b/chrome/browser/ash/notifications/kiosk_external_update_notification.h
@@ -17,6 +17,12 @@
class KioskExternalUpdateNotification {
public:
explicit KioskExternalUpdateNotification(const std::u16string& message);
+
+ KioskExternalUpdateNotification(const KioskExternalUpdateNotification&) =
+ delete;
+ KioskExternalUpdateNotification& operator=(
+ const KioskExternalUpdateNotification&) = delete;
+
virtual ~KioskExternalUpdateNotification();
void ShowMessage(const std::u16string& message);
@@ -27,8 +33,6 @@
void CreateAndShowNotificationView(const std::u16string& message);
KioskExternalUpdateNotificationView* view_; // Owned by views hierarchy.
-
- DISALLOW_COPY_AND_ASSIGN(KioskExternalUpdateNotification);
};
} // namespace ash
diff --git a/chrome/browser/ash/notifications/low_disk_notification.h b/chrome/browser/ash/notifications/low_disk_notification.h
index cc403d5..f2c7d50 100644
--- a/chrome/browser/ash/notifications/low_disk_notification.h
+++ b/chrome/browser/ash/notifications/low_disk_notification.h
@@ -32,6 +32,9 @@
// Registers this class as the UserDataAuthClient LowDiskSpaceHandler.
LowDiskNotification();
+ LowDiskNotification(const LowDiskNotification&) = delete;
+ LowDiskNotification& operator=(const LowDiskNotification&) = delete;
+
// Resets UserDataAuthClient LowDiskSpaceHandler.
~LowDiskNotification() override;
@@ -64,8 +67,6 @@
base::TimeDelta notification_interval_;
base::ThreadChecker thread_checker_;
base::WeakPtrFactory<LowDiskNotification> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LowDiskNotification);
};
} // namespace ash
diff --git a/chrome/browser/ash/notifications/screen_capture_notification_ui_ash.h b/chrome/browser/ash/notifications/screen_capture_notification_ui_ash.h
index ef32560b..56a4090 100644
--- a/chrome/browser/ash/notifications/screen_capture_notification_ui_ash.h
+++ b/chrome/browser/ash/notifications/screen_capture_notification_ui_ash.h
@@ -15,6 +15,12 @@
public:
// |text| is used to specify the text for the notification.
explicit ScreenCaptureNotificationUIAsh(const std::u16string& text);
+
+ ScreenCaptureNotificationUIAsh(const ScreenCaptureNotificationUIAsh&) =
+ delete;
+ ScreenCaptureNotificationUIAsh& operator=(
+ const ScreenCaptureNotificationUIAsh&) = delete;
+
~ScreenCaptureNotificationUIAsh() override;
// ScreenCaptureNotificationUI overrides.
@@ -28,8 +34,6 @@
const std::u16string text_;
base::OnceClosure stop_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ScreenCaptureNotificationUIAsh);
};
} // namespace ash
diff --git a/chrome/browser/ash/ownership/fake_owner_settings_service.h b/chrome/browser/ash/ownership/fake_owner_settings_service.h
index ad869d0..8e45ad34 100644
--- a/chrome/browser/ash/ownership/fake_owner_settings_service.h
+++ b/chrome/browser/ash/ownership/fake_owner_settings_service.h
@@ -28,6 +28,9 @@
Profile* profile,
const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util);
+ FakeOwnerSettingsService(const FakeOwnerSettingsService&) = delete;
+ FakeOwnerSettingsService& operator=(const FakeOwnerSettingsService&) = delete;
+
~FakeOwnerSettingsService() override;
void set_set_management_settings_result(bool success) {
@@ -46,8 +49,6 @@
bool set_management_settings_result_ = true;
ManagementSettings last_settings_;
StubCrosSettingsProvider* settings_provider_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeOwnerSettingsService);
};
} // namespace ash
diff --git a/chrome/browser/ash/ownership/owner_settings_service_ash.h b/chrome/browser/ash/ownership/owner_settings_service_ash.h
index 72878d0..2b9fe02 100644
--- a/chrome/browser/ash/ownership/owner_settings_service_ash.h
+++ b/chrome/browser/ash/ownership/owner_settings_service_ash.h
@@ -60,6 +60,9 @@
std::string device_id;
};
+ OwnerSettingsServiceAsh(const OwnerSettingsServiceAsh&) = delete;
+ OwnerSettingsServiceAsh& operator=(const OwnerSettingsServiceAsh&) = delete;
+
~OwnerSettingsServiceAsh() override;
static OwnerSettingsServiceAsh* FromWebUI(content::WebUI* web_ui);
@@ -193,8 +196,6 @@
base::WeakPtrFactory<OwnerSettingsServiceAsh> weak_factory_{this};
base::WeakPtrFactory<OwnerSettingsServiceAsh> store_settings_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceAsh);
};
} // namespace ash
diff --git a/chrome/browser/ash/ownership/owner_settings_service_ash_unittest.cc b/chrome/browser/ash/ownership/owner_settings_service_ash_unittest.cc
index c94ead42..fc47825 100644
--- a/chrome/browser/ash/ownership/owner_settings_service_ash_unittest.cc
+++ b/chrome/browser/ash/ownership/owner_settings_service_ash_unittest.cc
@@ -47,6 +47,9 @@
service_->AddObserver(this);
}
+ PrefsChecker(const PrefsChecker&) = delete;
+ PrefsChecker& operator=(const PrefsChecker&) = delete;
+
~PrefsChecker() override { service_->RemoveObserver(this); }
// OwnerSettingsService::Observer implementation:
@@ -79,8 +82,6 @@
using SetRequest = std::pair<std::string, base::Value>;
base::queue<SetRequest> set_requests_;
-
- DISALLOW_COPY_AND_ASSIGN(PrefsChecker);
};
bool FindInListValue(const std::string& needle, const base::Value* haystack) {
@@ -379,6 +380,12 @@
: public OwnerSettingsServiceAshTest {
public:
OwnerSettingsServiceAshNoOwnerTest() {}
+
+ OwnerSettingsServiceAshNoOwnerTest(
+ const OwnerSettingsServiceAshNoOwnerTest&) = delete;
+ OwnerSettingsServiceAshNoOwnerTest& operator=(
+ const OwnerSettingsServiceAshNoOwnerTest&) = delete;
+
~OwnerSettingsServiceAshNoOwnerTest() override {}
void SetUp() override {
@@ -392,9 +399,6 @@
ASSERT_TRUE(service_);
ASSERT_FALSE(service_->IsOwner());
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceAshNoOwnerTest);
};
TEST_F(OwnerSettingsServiceAshNoOwnerTest, SingleSetTest) {
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_image_download_client.h b/chrome/browser/ash/plugin_vm/plugin_vm_image_download_client.h
index 0f2bd79..9ef4624 100644
--- a/chrome/browser/ash/plugin_vm/plugin_vm_image_download_client.h
+++ b/chrome/browser/ash/plugin_vm/plugin_vm_image_download_client.h
@@ -26,6 +26,11 @@
class PluginVmImageDownloadClient : public download::Client {
public:
explicit PluginVmImageDownloadClient(Profile* profile);
+
+ PluginVmImageDownloadClient(const PluginVmImageDownloadClient&) = delete;
+ PluginVmImageDownloadClient& operator=(const PluginVmImageDownloadClient&) =
+ delete;
+
~PluginVmImageDownloadClient() override;
private:
@@ -61,8 +66,6 @@
download::GetUploadDataCallback callback) override;
absl::optional<double> GetFractionComplete(int64_t bytes_downloaded);
-
- DISALLOW_COPY_AND_ASSIGN(PluginVmImageDownloadClient);
};
} // namespace plugin_vm
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_installer_unittest.cc b/chrome/browser/ash/plugin_vm/plugin_vm_installer_unittest.cc
index cf3f564..1ba59aa 100644
--- a/chrome/browser/ash/plugin_vm/plugin_vm_installer_unittest.cc
+++ b/chrome/browser/ash/plugin_vm/plugin_vm_installer_unittest.cc
@@ -155,6 +155,11 @@
class PluginVmInstallerTestBase : public testing::Test {
public:
PluginVmInstallerTestBase() = default;
+
+ PluginVmInstallerTestBase(const PluginVmInstallerTestBase&) = delete;
+ PluginVmInstallerTestBase& operator=(const PluginVmInstallerTestBase&) =
+ delete;
+
~PluginVmInstallerTestBase() override = default;
protected:
@@ -291,13 +296,17 @@
}
base::ScopedTempDir profiles_dir_;
-
- DISALLOW_COPY_AND_ASSIGN(PluginVmInstallerTestBase);
};
class PluginVmInstallerDownloadServiceTest : public PluginVmInstallerTestBase {
public:
PluginVmInstallerDownloadServiceTest() = default;
+
+ PluginVmInstallerDownloadServiceTest(
+ const PluginVmInstallerDownloadServiceTest&) = delete;
+ PluginVmInstallerDownloadServiceTest& operator=(
+ const PluginVmInstallerDownloadServiceTest&) = delete;
+
~PluginVmInstallerDownloadServiceTest() override = default;
protected:
@@ -326,12 +335,16 @@
private:
std::unique_ptr<PluginVmImageDownloadClient> client_;
- DISALLOW_COPY_AND_ASSIGN(PluginVmInstallerDownloadServiceTest);
};
class PluginVmInstallerDriveTest : public PluginVmInstallerTestBase {
public:
PluginVmInstallerDriveTest() = default;
+
+ PluginVmInstallerDriveTest(const PluginVmInstallerDriveTest&) = delete;
+ PluginVmInstallerDriveTest& operator=(const PluginVmInstallerDriveTest&) =
+ delete;
+
~PluginVmInstallerDriveTest() override = default;
protected:
@@ -394,9 +407,6 @@
PluginVmDriveImageDownloadService* drive_download_service_;
drive::FakeDriveService* fake_drive_service_;
std::unique_ptr<base::HistogramTester> histogram_tester_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PluginVmInstallerDriveTest);
};
TEST_F(PluginVmInstallerDownloadServiceTest, ProgressUpdates) {
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.h b/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.h
index e002045..acefe00 100644
--- a/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.h
+++ b/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.h
@@ -47,6 +47,10 @@
using LaunchPluginVmCallback = base::OnceCallback<void(bool success)>;
explicit PluginVmManagerImpl(Profile* profile);
+
+ PluginVmManagerImpl(const PluginVmManagerImpl&) = delete;
+ PluginVmManagerImpl& operator=(const PluginVmManagerImpl&) = delete;
+
~PluginVmManagerImpl() override;
void OnPrimaryUserSessionStarted() override;
@@ -186,8 +190,6 @@
bool pending_destroy_disk_image_ = false;
base::WeakPtrFactory<PluginVmManagerImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PluginVmManagerImpl);
};
} // namespace plugin_vm
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl_unittest.cc b/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl_unittest.cc
index f591883..03b9220 100644
--- a/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl_unittest.cc
+++ b/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl_unittest.cc
@@ -70,6 +70,9 @@
chromeos::DlcserviceClient::InitializeFake();
}
+ PluginVmManagerImplTest(const PluginVmManagerImplTest&) = delete;
+ PluginVmManagerImplTest& operator=(const PluginVmManagerImplTest&) = delete;
+
~PluginVmManagerImplTest() override {
chromeos::DlcserviceClient::Shutdown();
histogram_tester_.reset();
@@ -143,9 +146,6 @@
std::unique_ptr<ash::ShelfModel> shelf_model_;
std::unique_ptr<ChromeShelfController> chrome_shelf_controller_;
std::unique_ptr<base::HistogramTester> histogram_tester_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PluginVmManagerImplTest);
};
TEST_F(PluginVmManagerImplTest, LaunchPluginVmRequiresPluginVmAllowed) {
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_test_helper.h b/chrome/browser/ash/plugin_vm/plugin_vm_test_helper.h
index fa5ab167..1bd947e7 100644
--- a/chrome/browser/ash/plugin_vm/plugin_vm_test_helper.h
+++ b/chrome/browser/ash/plugin_vm/plugin_vm_test_helper.h
@@ -37,6 +37,10 @@
class PluginVmTestHelper {
public:
explicit PluginVmTestHelper(TestingProfile* testing_profile);
+
+ PluginVmTestHelper(const PluginVmTestHelper&) = delete;
+ PluginVmTestHelper& operator=(const PluginVmTestHelper&) = delete;
+
~PluginVmTestHelper();
void SetPolicyRequirementsToAllowPluginVm();
@@ -58,8 +62,6 @@
std::unique_ptr<user_manager::ScopedUserManager> scoped_user_manager_;
base::test::ScopedFeatureList scoped_feature_list_;
std::unique_ptr<base::test::ScopedRunningOnChromeOS> running_on_chromeos_;
-
- DISALLOW_COPY_AND_ASSIGN(PluginVmTestHelper);
};
} // namespace plugin_vm
diff --git a/chrome/browser/ash/policy/active_directory/active_directory_policy_manager.h b/chrome/browser/ash/policy/active_directory/active_directory_policy_manager.h
index 5fefbb7..60f64af 100644
--- a/chrome/browser/ash/policy/active_directory/active_directory_policy_manager.h
+++ b/chrome/browser/ash/policy/active_directory/active_directory_policy_manager.h
@@ -37,6 +37,10 @@
public CloudPolicyStore::Observer,
public ComponentActiveDirectoryPolicyService::Delegate {
public:
+ ActiveDirectoryPolicyManager(const ActiveDirectoryPolicyManager&) = delete;
+ ActiveDirectoryPolicyManager& operator=(const ActiveDirectoryPolicyManager&) =
+ delete;
+
~ActiveDirectoryPolicyManager() override;
// ConfigurationPolicyProvider:
@@ -134,8 +138,6 @@
// Must be last member.
base::WeakPtrFactory<ActiveDirectoryPolicyManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ActiveDirectoryPolicyManager);
};
// Manages user policy for Active Directory managed devices.
@@ -157,6 +159,11 @@
std::unique_ptr<CloudPolicyStore> store,
std::unique_ptr<CloudExternalDataManager> external_data_manager);
+ UserActiveDirectoryPolicyManager(const UserActiveDirectoryPolicyManager&) =
+ delete;
+ UserActiveDirectoryPolicyManager& operator=(
+ const UserActiveDirectoryPolicyManager&) = delete;
+
~UserActiveDirectoryPolicyManager() override;
// ConfigurationPolicyProvider:
@@ -204,8 +211,6 @@
// Must be last member.
base::WeakPtrFactory<UserActiveDirectoryPolicyManager> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(UserActiveDirectoryPolicyManager);
};
// Manages device policy for Active Directory managed devices.
@@ -213,6 +218,12 @@
public:
explicit DeviceActiveDirectoryPolicyManager(
std::unique_ptr<CloudPolicyStore> store);
+
+ DeviceActiveDirectoryPolicyManager(
+ const DeviceActiveDirectoryPolicyManager&) = delete;
+ DeviceActiveDirectoryPolicyManager& operator=(
+ const DeviceActiveDirectoryPolicyManager&) = delete;
+
~DeviceActiveDirectoryPolicyManager() override;
// ConfigurationPolicyProvider:
@@ -234,8 +245,6 @@
// it is passed to this class.
std::unique_ptr<ForwardingSchemaRegistry>
signin_profile_forwarding_schema_registry_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceActiveDirectoryPolicyManager);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever.h b/chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever.h
index cd79573..3bbd7fe 100644
--- a/chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever.h
+++ b/chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever.h
@@ -49,6 +49,11 @@
std::vector<PolicyNamespace> namespaces,
RetrieveCallback callback);
+ ComponentActiveDirectoryPolicyRetriever(
+ const ComponentActiveDirectoryPolicyRetriever&) = delete;
+ ComponentActiveDirectoryPolicyRetriever& operator=(
+ const ComponentActiveDirectoryPolicyRetriever&) = delete;
+
~ComponentActiveDirectoryPolicyRetriever();
// Starts retrieving policy from Session Manager as specified in the
@@ -86,7 +91,6 @@
base::WeakPtrFactory<ComponentActiveDirectoryPolicyRetriever>
weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(ComponentActiveDirectoryPolicyRetriever);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/active_directory/component_active_directory_policy_service.h b/chrome/browser/ash/policy/active_directory/component_active_directory_policy_service.h
index 2d1ad63..f42eeaa 100644
--- a/chrome/browser/ash/policy/active_directory/component_active_directory_policy_service.h
+++ b/chrome/browser/ash/policy/active_directory/component_active_directory_policy_service.h
@@ -66,6 +66,12 @@
const std::string& account_id,
Delegate* delegate,
SchemaRegistry* schema_registry);
+
+ ComponentActiveDirectoryPolicyService(
+ const ComponentActiveDirectoryPolicyService&) = delete;
+ ComponentActiveDirectoryPolicyService& operator=(
+ const ComponentActiveDirectoryPolicyService&) = delete;
+
~ComponentActiveDirectoryPolicyService() override;
// Retrieves policies from Session Manager, validates schemas and signals
@@ -124,7 +130,6 @@
base::WeakPtrFactory<ComponentActiveDirectoryPolicyService> weak_ptr_factory_{
this};
- DISALLOW_COPY_AND_ASSIGN(ComponentActiveDirectoryPolicyService);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/arc/android_management_client.h b/chrome/browser/ash/policy/arc/android_management_client.h
index 416d5c5..1552634 100644
--- a/chrome/browser/ash/policy/arc/android_management_client.h
+++ b/chrome/browser/ash/policy/arc/android_management_client.h
@@ -55,6 +55,10 @@
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
const CoreAccountId& account_id,
signin::IdentityManager* identity_manager);
+
+ AndroidManagementClient(const AndroidManagementClient&) = delete;
+ AndroidManagementClient& operator=(const AndroidManagementClient&) = delete;
+
~AndroidManagementClient();
// Starts sending of check Android management request to DM server, issues
@@ -97,8 +101,6 @@
StatusCallback callback_;
base::WeakPtrFactory<AndroidManagementClient> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AndroidManagementClient);
};
// Outputs the stringified |result| to |os|. This is only for logging purposes.
diff --git a/chrome/browser/ash/policy/core/browser_policy_connector_ash.h b/chrome/browser/ash/policy/core/browser_policy_connector_ash.h
index 492995d..2f23088d 100644
--- a/chrome/browser/ash/policy/core/browser_policy_connector_ash.h
+++ b/chrome/browser/ash/policy/core/browser_policy_connector_ash.h
@@ -68,6 +68,10 @@
public:
BrowserPolicyConnectorAsh();
+ BrowserPolicyConnectorAsh(const BrowserPolicyConnectorAsh&) = delete;
+ BrowserPolicyConnectorAsh& operator=(const BrowserPolicyConnectorAsh&) =
+ delete;
+
~BrowserPolicyConnectorAsh() override;
// Helper that returns a new BACKGROUND SequencedTaskRunner. Each
@@ -336,8 +340,6 @@
std::unique_ptr<chromeos::attestation::AttestationFlow> attestation_flow_;
base::WeakPtrFactory<BrowserPolicyConnectorAsh> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnectorAsh);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/core/cached_policy_key_loader.h b/chrome/browser/ash/policy/core/cached_policy_key_loader.h
index add0a6a..566d2e3d 100644
--- a/chrome/browser/ash/policy/core/cached_policy_key_loader.h
+++ b/chrome/browser/ash/policy/core/cached_policy_key_loader.h
@@ -35,6 +35,10 @@
scoped_refptr<base::SequencedTaskRunner> task_runner,
const AccountId& account_id,
const base::FilePath& user_policy_key_dir);
+
+ CachedPolicyKeyLoader(const CachedPolicyKeyLoader&) = delete;
+ CachedPolicyKeyLoader& operator=(const CachedPolicyKeyLoader&) = delete;
+
~CachedPolicyKeyLoader();
// Invokes |callback| after loading |policy_key_|, if it hasn't been loaded
@@ -97,8 +101,6 @@
// Must be the last memeber.
base::WeakPtrFactory<CachedPolicyKeyLoader> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CachedPolicyKeyLoader);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/core/device_cloud_policy_browsertest.cc b/chrome/browser/ash/policy/core/device_cloud_policy_browsertest.cc
index b508966..978e7c99 100644
--- a/chrome/browser/ash/policy/core/device_cloud_policy_browsertest.cc
+++ b/chrome/browser/ash/policy/core/device_cloud_policy_browsertest.cc
@@ -251,6 +251,12 @@
static constexpr int kFakePolicyPublicKeyVersion = 1;
SigninExtensionsDeviceCloudPolicyBrowserTest() = default;
+
+ SigninExtensionsDeviceCloudPolicyBrowserTest(
+ const SigninExtensionsDeviceCloudPolicyBrowserTest&) = delete;
+ SigninExtensionsDeviceCloudPolicyBrowserTest& operator=(
+ const SigninExtensionsDeviceCloudPolicyBrowserTest&) = delete;
+
~SigninExtensionsDeviceCloudPolicyBrowserTest() override = default;
void SetUp() override {
@@ -373,8 +379,6 @@
}
ash::LocalPolicyTestServerMixin local_policy_mixin_{&mixin_host_};
-
- DISALLOW_COPY_AND_ASSIGN(SigninExtensionsDeviceCloudPolicyBrowserTest);
};
} // namespace
diff --git a/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h b/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h
index f2fb71a..3face30 100644
--- a/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h
+++ b/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h
@@ -79,6 +79,11 @@
std::unique_ptr<CloudExternalDataManager> external_data_manager,
const scoped_refptr<base::SequencedTaskRunner>& task_runner,
ServerBackedStateKeysBroker* state_keys_broker);
+
+ DeviceCloudPolicyManagerAsh(const DeviceCloudPolicyManagerAsh&) = delete;
+ DeviceCloudPolicyManagerAsh& operator=(const DeviceCloudPolicyManagerAsh&) =
+ delete;
+
~DeviceCloudPolicyManagerAsh() override;
// Initializes state keys.
@@ -219,8 +224,6 @@
bool component_policy_disabled_for_testing_ = false;
base::ObserverList<Observer, true>::Unchecked observers_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceCloudPolicyManagerAsh);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/core/device_cloud_policy_store_ash.h b/chrome/browser/ash/policy/core/device_cloud_policy_store_ash.h
index 70de057..69bb35d 100644
--- a/chrome/browser/ash/policy/core/device_cloud_policy_store_ash.h
+++ b/chrome/browser/ash/policy/core/device_cloud_policy_store_ash.h
@@ -39,6 +39,11 @@
ash::DeviceSettingsService* device_settings_service,
chromeos::InstallAttributes* install_attributes,
scoped_refptr<base::SequencedTaskRunner> background_task_runner);
+
+ DeviceCloudPolicyStoreAsh(const DeviceCloudPolicyStoreAsh&) = delete;
+ DeviceCloudPolicyStoreAsh& operator=(const DeviceCloudPolicyStoreAsh&) =
+ delete;
+
~DeviceCloudPolicyStoreAsh() override;
// CloudPolicyStore:
@@ -95,8 +100,6 @@
scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
base::WeakPtrFactory<DeviceCloudPolicyStoreAsh> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceCloudPolicyStoreAsh);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/core/device_local_account_browsertest.cc b/chrome/browser/ash/policy/core/device_local_account_browsertest.cc
index 65f0e65a..2f41b154 100644
--- a/chrome/browser/ash/policy/core/device_local_account_browsertest.cc
+++ b/chrome/browser/ash/policy/core/device_local_account_browsertest.cc
@@ -302,6 +302,10 @@
};
typedef std::map<std::string, Update> UpdateMap;
+ TestingUpdateManifestProvider(const TestingUpdateManifestProvider&) = delete;
+ TestingUpdateManifestProvider& operator=(
+ const TestingUpdateManifestProvider&) = delete;
+
~TestingUpdateManifestProvider();
friend class RefCountedThreadSafe<TestingUpdateManifestProvider>;
@@ -311,8 +315,6 @@
std::string relative_update_url_;
UpdateMap updates_;
-
- DISALLOW_COPY_AND_ASSIGN(TestingUpdateManifestProvider);
};
TestingUpdateManifestProvider::Update::Update(const std::string& version,
@@ -765,6 +767,9 @@
profile_manager_observer_.Observe(g_browser_process->profile_manager());
}
+ ExtensionInstallObserver(const ExtensionInstallObserver&) = delete;
+ ExtensionInstallObserver& operator=(const ExtensionInstallObserver&) = delete;
+
~ExtensionInstallObserver() override {
if (registry_ != nullptr)
registry_->RemoveObserver(this);
@@ -813,8 +818,6 @@
profile_manager_observer_{this};
std::string waiting_extension_id_;
bool observed_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionInstallObserver);
};
// Tests that the data associated with a device local account is removed when
diff --git a/chrome/browser/ash/policy/core/device_local_account_extension_tracker.h b/chrome/browser/ash/policy/core/device_local_account_extension_tracker.h
index 7376b96..7246aea 100644
--- a/chrome/browser/ash/policy/core/device_local_account_extension_tracker.h
+++ b/chrome/browser/ash/policy/core/device_local_account_extension_tracker.h
@@ -27,6 +27,11 @@
CloudPolicyStore* store,
SchemaRegistry* schema_registry);
+ DeviceLocalAccountExtensionTracker(
+ const DeviceLocalAccountExtensionTracker&) = delete;
+ DeviceLocalAccountExtensionTracker& operator=(
+ const DeviceLocalAccountExtensionTracker&) = delete;
+
~DeviceLocalAccountExtensionTracker() override;
// CloudPolicyStore::Observer:
@@ -38,8 +43,6 @@
CloudPolicyStore* store_;
SchemaRegistry* schema_registry_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountExtensionTracker);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_provider.h b/chrome/browser/ash/policy/core/device_local_account_policy_provider.h
index 0d3e126..b33c889d 100644
--- a/chrome/browser/ash/policy/core/device_local_account_policy_provider.h
+++ b/chrome/browser/ash/policy/core/device_local_account_policy_provider.h
@@ -32,6 +32,12 @@
DeviceLocalAccountPolicyProvider(const std::string& user_id,
DeviceLocalAccountPolicyService* service,
DeviceLocalAccount::Type type);
+
+ DeviceLocalAccountPolicyProvider(const DeviceLocalAccountPolicyProvider&) =
+ delete;
+ DeviceLocalAccountPolicyProvider& operator=(
+ const DeviceLocalAccountPolicyProvider&) = delete;
+
~DeviceLocalAccountPolicyProvider() override;
// Factory function to create and initialize a provider for |user_id|. Returns
@@ -79,8 +85,6 @@
bool waiting_for_policy_refresh_;
base::WeakPtrFactory<DeviceLocalAccountPolicyProvider> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountPolicyProvider);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_service.h b/chrome/browser/ash/policy/core/device_local_account_policy_service.h
index 07511cc..463c9a2 100644
--- a/chrome/browser/ash/policy/core/device_local_account_policy_service.h
+++ b/chrome/browser/ash/policy/core/device_local_account_policy_service.h
@@ -74,6 +74,12 @@
const scoped_refptr<base::SequencedTaskRunner>&
resource_cache_task_runner,
AffiliatedInvalidationServiceProvider* invalidation_service_provider);
+
+ DeviceLocalAccountPolicyBroker(const DeviceLocalAccountPolicyBroker&) =
+ delete;
+ DeviceLocalAccountPolicyBroker& operator=(
+ const DeviceLocalAccountPolicyBroker&) = delete;
+
~DeviceLocalAccountPolicyBroker() override;
// Initialize the broker, start asynchronous load of its |store_|.
@@ -146,8 +152,6 @@
base::RepeatingClosure policy_update_callback_;
std::unique_ptr<AffiliatedCloudPolicyInvalidator> invalidator_;
const scoped_refptr<base::SequencedTaskRunner> resource_cache_task_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountPolicyBroker);
};
// Manages user policy blobs for device-local accounts present on the device.
@@ -178,6 +182,12 @@
scoped_refptr<base::SequencedTaskRunner>
external_data_service_backend_task_runner,
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory);
+
+ DeviceLocalAccountPolicyService(const DeviceLocalAccountPolicyService&) =
+ delete;
+ DeviceLocalAccountPolicyService& operator=(
+ const DeviceLocalAccountPolicyService&) = delete;
+
virtual ~DeviceLocalAccountPolicyService();
// Shuts down the service and prevents further policy fetches from the cloud.
@@ -283,8 +293,6 @@
const base::FilePath component_policy_cache_root_;
base::WeakPtrFactory<DeviceLocalAccountPolicyService> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountPolicyService);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_service_unittest.cc b/chrome/browser/ash/policy/core/device_local_account_policy_service_unittest.cc
index c198325..cd461172 100644
--- a/chrome/browser/ash/policy/core/device_local_account_policy_service_unittest.cc
+++ b/chrome/browser/ash/policy/core/device_local_account_policy_service_unittest.cc
@@ -89,6 +89,12 @@
: public ash::DeviceSettingsTestBase {
public:
DeviceLocalAccountPolicyServiceTestBase();
+
+ DeviceLocalAccountPolicyServiceTestBase(
+ const DeviceLocalAccountPolicyServiceTestBase&) = delete;
+ DeviceLocalAccountPolicyServiceTestBase& operator=(
+ const DeviceLocalAccountPolicyServiceTestBase&) = delete;
+
~DeviceLocalAccountPolicyServiceTestBase() override;
// ash::DeviceSettingsTestBase:
@@ -117,9 +123,6 @@
FakeAffiliatedInvalidationServiceProvider
affiliated_invalidation_service_provider_;
std::unique_ptr<DeviceLocalAccountPolicyService> service_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountPolicyServiceTestBase);
};
class DeviceLocalAccountPolicyServiceTest
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_store.h b/chrome/browser/ash/policy/core/device_local_account_policy_store.h
index 926445a..178c264e 100644
--- a/chrome/browser/ash/policy/core/device_local_account_policy_store.h
+++ b/chrome/browser/ash/policy/core/device_local_account_policy_store.h
@@ -37,6 +37,11 @@
chromeos::SessionManagerClient* client,
ash::DeviceSettingsService* device_settings_service,
scoped_refptr<base::SequencedTaskRunner> background_task_runner);
+
+ DeviceLocalAccountPolicyStore(const DeviceLocalAccountPolicyStore&) = delete;
+ DeviceLocalAccountPolicyStore& operator=(
+ const DeviceLocalAccountPolicyStore&) = delete;
+
~DeviceLocalAccountPolicyStore() override;
const std::string& account_id() const {
@@ -103,8 +108,6 @@
ash::DeviceSettingsService* device_settings_service_;
base::WeakPtrFactory<DeviceLocalAccountPolicyStore> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountPolicyStore);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/core/device_policy_decoder_unittest.cc b/chrome/browser/ash/policy/core/device_policy_decoder_unittest.cc
index 1d7609dc..420b4bc 100644
--- a/chrome/browser/ash/policy/core/device_policy_decoder_unittest.cc
+++ b/chrome/browser/ash/policy/core/device_policy_decoder_unittest.cc
@@ -58,14 +58,15 @@
class DevicePolicyDecoderTest : public testing::Test {
public:
DevicePolicyDecoderTest() = default;
+
+ DevicePolicyDecoderTest(const DevicePolicyDecoderTest&) = delete;
+ DevicePolicyDecoderTest& operator=(const DevicePolicyDecoderTest&) = delete;
+
~DevicePolicyDecoderTest() override = default;
protected:
std::unique_ptr<base::Value> GetWallpaperDict() const;
std::unique_ptr<base::Value> GetBluetoothServiceAllowedList() const;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DevicePolicyDecoderTest);
};
std::unique_ptr<base::Value> DevicePolicyDecoderTest::GetWallpaperDict() const {
diff --git a/chrome/browser/ash/policy/core/fake_device_cloud_policy_manager.h b/chrome/browser/ash/policy/core/fake_device_cloud_policy_manager.h
index c0cd20d..618f575 100644
--- a/chrome/browser/ash/policy/core/fake_device_cloud_policy_manager.h
+++ b/chrome/browser/ash/policy/core/fake_device_cloud_policy_manager.h
@@ -24,6 +24,11 @@
FakeDeviceCloudPolicyManager(
std::unique_ptr<DeviceCloudPolicyStoreAsh> store,
const scoped_refptr<base::SequencedTaskRunner>& task_runner);
+
+ FakeDeviceCloudPolicyManager(const FakeDeviceCloudPolicyManager&) = delete;
+ FakeDeviceCloudPolicyManager& operator=(const FakeDeviceCloudPolicyManager&) =
+ delete;
+
~FakeDeviceCloudPolicyManager() override;
void set_unregister_result(bool value) { unregister_result_ = value; }
@@ -34,8 +39,6 @@
private:
bool unregister_result_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeDeviceCloudPolicyManager);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.cc b/chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.cc
index 669cf3ff..dba23db 100644
--- a/chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.cc
+++ b/chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.cc
@@ -42,6 +42,11 @@
public OAuth2AccessTokenConsumer {
public:
explicit PolicyOAuth2TokenFetcherImpl(const std::string& consumer_name);
+
+ PolicyOAuth2TokenFetcherImpl(const PolicyOAuth2TokenFetcherImpl&) = delete;
+ PolicyOAuth2TokenFetcherImpl& operator=(const PolicyOAuth2TokenFetcherImpl&) =
+ delete;
+
~PolicyOAuth2TokenFetcherImpl() override;
private:
@@ -120,8 +125,6 @@
const std::string consumer_name_;
base::WeakPtrFactory<PolicyOAuth2TokenFetcherImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PolicyOAuth2TokenFetcherImpl);
};
PolicyOAuth2TokenFetcherImpl::PolicyOAuth2TokenFetcherImpl(
@@ -251,6 +254,11 @@
class PolicyOAuth2TokenFetcherFake : public PolicyOAuth2TokenFetcher {
public:
PolicyOAuth2TokenFetcherFake() {}
+
+ PolicyOAuth2TokenFetcherFake(const PolicyOAuth2TokenFetcherFake&) = delete;
+ PolicyOAuth2TokenFetcherFake& operator=(const PolicyOAuth2TokenFetcherFake&) =
+ delete;
+
~PolicyOAuth2TokenFetcherFake() override {}
private:
@@ -285,8 +293,6 @@
const std::string refresh_token_ = "fake_refresh_token";
const std::string access_token_ = "fake_access_token";
-
- DISALLOW_COPY_AND_ASSIGN(PolicyOAuth2TokenFetcherFake);
};
} // namespace
diff --git a/chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.h b/chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.h
index 11a24973..fe4b1bb 100644
--- a/chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.h
+++ b/chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.h
@@ -38,6 +38,10 @@
const GoogleServiceAuthError&)>;
PolicyOAuth2TokenFetcher();
+
+ PolicyOAuth2TokenFetcher(const PolicyOAuth2TokenFetcher&) = delete;
+ PolicyOAuth2TokenFetcher& operator=(const PolicyOAuth2TokenFetcher&) = delete;
+
virtual ~PolicyOAuth2TokenFetcher();
// Fetches the device management service's oauth2 token. This may be fetched
@@ -56,9 +60,6 @@
virtual bool Failed() const = 0;
virtual const std::string& OAuth2RefreshToken() const = 0;
virtual const std::string& OAuth2AccessToken() const = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PolicyOAuth2TokenFetcher);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.h b/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.h
index a6b11d6..de5decec 100644
--- a/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.h
+++ b/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.h
@@ -111,6 +111,11 @@
base::OnceClosure fatal_error_callback,
const AccountId& account_id,
const scoped_refptr<base::SequencedTaskRunner>& task_runner);
+
+ UserCloudPolicyManagerAsh(const UserCloudPolicyManagerAsh&) = delete;
+ UserCloudPolicyManagerAsh& operator=(const UserCloudPolicyManagerAsh&) =
+ delete;
+
~UserCloudPolicyManagerAsh() override;
// Initializes the cloud connection. |local_state| and
@@ -342,8 +347,6 @@
// whether this class has triggered a re-registration after the client failed
// to load policy with error |DM_STATUS_SERVICE_DEVICE_NOT_FOUND|.
bool is_in_reregistration_state_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyManagerAsh);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/core/user_cloud_policy_store_ash.h b/chrome/browser/ash/policy/core/user_cloud_policy_store_ash.h
index 2d7e3d0..85bced9 100644
--- a/chrome/browser/ash/policy/core/user_cloud_policy_store_ash.h
+++ b/chrome/browser/ash/policy/core/user_cloud_policy_store_ash.h
@@ -49,6 +49,10 @@
const AccountId& account_id,
const base::FilePath& user_policy_key_dir,
bool is_active_directory);
+
+ UserCloudPolicyStoreAsh(const UserCloudPolicyStoreAsh&) = delete;
+ UserCloudPolicyStoreAsh& operator=(const UserCloudPolicyStoreAsh&) = delete;
+
~UserCloudPolicyStoreAsh() override;
// CloudPolicyStore:
@@ -100,8 +104,6 @@
std::unique_ptr<CachedPolicyKeyLoader> cached_policy_key_loader_;
base::WeakPtrFactory<UserCloudPolicyStoreAsh> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyStoreAsh);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder.h b/chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder.h
index 15a67b8..d12d580 100644
--- a/chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder.h
+++ b/chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder.h
@@ -55,6 +55,11 @@
// until that point.
UserCloudPolicyTokenForwarder(UserCloudPolicyManagerAsh* manager,
signin::IdentityManager* identity_manager);
+
+ UserCloudPolicyTokenForwarder(const UserCloudPolicyTokenForwarder&) = delete;
+ UserCloudPolicyTokenForwarder& operator=(
+ const UserCloudPolicyTokenForwarder&) = delete;
+
~UserCloudPolicyTokenForwarder() override;
// KeyedService:
@@ -103,8 +108,6 @@
const base::Clock* clock_;
base::WeakPtrFactory<UserCloudPolicyTokenForwarder> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyTokenForwarder);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder_unittest.cc b/chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder_unittest.cc
index 74bdd3e..248c816 100644
--- a/chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder_unittest.cc
+++ b/chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder_unittest.cc
@@ -79,14 +79,16 @@
account_id,
task_runner) {}
+ MockUserCloudPolicyManagerAsh(const MockUserCloudPolicyManagerAsh&) = delete;
+ MockUserCloudPolicyManagerAsh& operator=(
+ const MockUserCloudPolicyManagerAsh&) = delete;
+
~MockUserCloudPolicyManagerAsh() override = default;
MOCK_METHOD1(OnAccessTokenAvailable, void(const std::string&));
private:
void OnFatalError() {}
-
- DISALLOW_COPY_AND_ASSIGN(MockUserCloudPolicyManagerAsh);
};
class UserCloudPolicyTokenForwarderTest : public testing::Test {
diff --git a/chrome/browser/ash/policy/core/user_policy_test_helper.h b/chrome/browser/ash/policy/core/user_policy_test_helper.h
index 647576f..1e607f53 100644
--- a/chrome/browser/ash/policy/core/user_policy_test_helper.h
+++ b/chrome/browser/ash/policy/core/user_policy_test_helper.h
@@ -29,6 +29,10 @@
public:
UserPolicyTestHelper(const std::string& account_id,
ash::LocalPolicyTestServerMixin* local_policy_server);
+
+ UserPolicyTestHelper(const UserPolicyTestHelper&) = delete;
+ UserPolicyTestHelper& operator=(const UserPolicyTestHelper&) = delete;
+
virtual ~UserPolicyTestHelper();
void SetPolicy(const base::Value& mandatory, const base::Value& recommended);
@@ -50,8 +54,6 @@
private:
const std::string account_id_;
ash::LocalPolicyTestServerMixin* local_policy_server_;
-
- DISALLOW_COPY_AND_ASSIGN(UserPolicyTestHelper);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/display/display_resolution_handler.h b/chrome/browser/ash/policy/display/display_resolution_handler.h
index 86be200..f6bd240 100644
--- a/chrome/browser/ash/policy/display/display_resolution_handler.h
+++ b/chrome/browser/ash/policy/display/display_resolution_handler.h
@@ -34,6 +34,9 @@
public:
DisplayResolutionHandler();
+ DisplayResolutionHandler(const DisplayResolutionHandler&) = delete;
+ DisplayResolutionHandler& operator=(const DisplayResolutionHandler&) = delete;
+
~DisplayResolutionHandler() override;
// DisplaySettingsPolicyHandler
@@ -52,8 +55,6 @@
std::unique_ptr<ExternalDisplaySettings> external_display_settings_;
std::unique_ptr<InternalDisplaySettings> internal_display_settings_;
std::set<std::string> resized_display_ids_;
-
- DISALLOW_COPY_AND_ASSIGN(DisplayResolutionHandler);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/display/display_rotation_default_handler.h b/chrome/browser/ash/policy/display/display_rotation_default_handler.h
index c31c9725..73ceb6b 100644
--- a/chrome/browser/ash/policy/display/display_rotation_default_handler.h
+++ b/chrome/browser/ash/policy/display/display_rotation_default_handler.h
@@ -30,6 +30,10 @@
public:
DisplayRotationDefaultHandler();
+ DisplayRotationDefaultHandler(const DisplayRotationDefaultHandler&) = delete;
+ DisplayRotationDefaultHandler& operator=(
+ const DisplayRotationDefaultHandler&) = delete;
+
~DisplayRotationDefaultHandler() override;
// DisplaySettingsPolicyHandler
@@ -44,8 +48,6 @@
display::Display::Rotation display_rotation_default_ =
display::Display::ROTATE_0;
std::set<std::string> rotated_display_ids_;
-
- DISALLOW_COPY_AND_ASSIGN(DisplayRotationDefaultHandler);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/display/display_settings_handler.h b/chrome/browser/ash/policy/display/display_settings_handler.h
index f6c39e9..61e4b1a 100644
--- a/chrome/browser/ash/policy/display/display_settings_handler.h
+++ b/chrome/browser/ash/policy/display/display_settings_handler.h
@@ -52,6 +52,9 @@
// This class must be constructed after CrosSettings is initialized.
DisplaySettingsHandler();
+ DisplaySettingsHandler(const DisplaySettingsHandler&) = delete;
+ DisplaySettingsHandler& operator=(const DisplaySettingsHandler&) = delete;
+
~DisplaySettingsHandler() override;
// ash::mojom::CrosDisplayConfigObserver
@@ -101,8 +104,6 @@
// Must be the last member.
base::WeakPtrFactory<DisplaySettingsHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DisplaySettingsHandler);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.h b/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.h
index 87263da..3be0ff3 100644
--- a/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.h
+++ b/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.h
@@ -85,6 +85,10 @@
class FactoryImpl : public Factory {
public:
FactoryImpl();
+
+ FactoryImpl(const FactoryImpl&) = delete;
+ FactoryImpl& operator=(const FactoryImpl&) = delete;
+
~FactoryImpl() override;
std::unique_ptr<AutoEnrollmentClient> CreateForFRE(
@@ -106,11 +110,11 @@
int power_initial,
int power_limit,
PrivateMembershipRlweClient::Factory* psm_rlwe_client_factory) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FactoryImpl);
};
+ AutoEnrollmentClientImpl(const AutoEnrollmentClientImpl&) = delete;
+ AutoEnrollmentClientImpl& operator=(const AutoEnrollmentClientImpl&) = delete;
+
~AutoEnrollmentClientImpl() override;
// Registers preferences in local state.
@@ -298,8 +302,6 @@
// |AutoEnrollmentClient| used for FRE and ".InitialEnrollment" for an
// |AutoEnrollmentclient| used for initial enrollment.
const std::string uma_suffix_;
-
- DISALLOW_COPY_AND_ASSIGN(AutoEnrollmentClientImpl);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h b/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h
index 7e3369f8..94d7d674 100644
--- a/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h
+++ b/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h
@@ -56,6 +56,10 @@
DeviceCloudPolicyManagerAsh* policy_manager,
chromeos::system::StatisticsProvider* statistics_provider);
+ DeviceCloudPolicyInitializer(const DeviceCloudPolicyInitializer&) = delete;
+ DeviceCloudPolicyInitializer& operator=(const DeviceCloudPolicyInitializer&) =
+ delete;
+
~DeviceCloudPolicyInitializer() override;
virtual void Init();
@@ -106,8 +110,6 @@
// The URLLoaderFactory set in tests.
scoped_refptr<network::SharedURLLoaderFactory>
system_url_loader_factory_for_testing_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceCloudPolicyInitializer);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/enrollment/enrollment_handler.h b/chrome/browser/ash/policy/enrollment/enrollment_handler.h
index 4819ec9..01e645b 100644
--- a/chrome/browser/ash/policy/enrollment/enrollment_handler.h
+++ b/chrome/browser/ash/policy/enrollment/enrollment_handler.h
@@ -81,6 +81,10 @@
const std::string& requisition,
const std::string& sub_organization,
EnrollmentCallback completion_callback);
+
+ EnrollmentHandler(const EnrollmentHandler&) = delete;
+ EnrollmentHandler& operator=(const EnrollmentHandler&) = delete;
+
~EnrollmentHandler() override;
// Starts the enrollment process and reports the result to
@@ -249,8 +253,6 @@
int lockbox_init_duration_ = 0;
base::WeakPtrFactory<EnrollmentHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EnrollmentHandler);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/enrollment/fake_auto_enrollment_client.h b/chrome/browser/ash/policy/enrollment/fake_auto_enrollment_client.h
index 587634c..c9b496be 100644
--- a/chrome/browser/ash/policy/enrollment/fake_auto_enrollment_client.h
+++ b/chrome/browser/ash/policy/enrollment/fake_auto_enrollment_client.h
@@ -29,6 +29,10 @@
explicit FactoryImpl(
const base::RepeatingCallback<void(FakeAutoEnrollmentClient*)>&
fake_client_created_callback);
+
+ FactoryImpl(const FactoryImpl&) = delete;
+ FactoryImpl& operator=(const FactoryImpl&) = delete;
+
~FactoryImpl() override;
std::unique_ptr<AutoEnrollmentClient> CreateForFRE(
@@ -55,8 +59,6 @@
private:
base::RepeatingCallback<void(FakeAutoEnrollmentClient*)>
fake_client_created_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(FactoryImpl);
};
explicit FakeAutoEnrollmentClient(const ProgressCallback& progress_callback);
diff --git a/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.h b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.h
index 5463994..fff83156 100644
--- a/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.h
+++ b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.h
@@ -35,6 +35,11 @@
CloudExternalDataManagerBase(
const GetChromePolicyDetailsCallback& get_policy_details,
scoped_refptr<base::SequencedTaskRunner> backend_task_runner);
+
+ CloudExternalDataManagerBase(const CloudExternalDataManagerBase&) = delete;
+ CloudExternalDataManagerBase& operator=(const CloudExternalDataManagerBase&) =
+ delete;
+
~CloudExternalDataManagerBase() override;
// Allows downloaded external data to be cached in |external_data_store|.
@@ -79,8 +84,6 @@
std::unique_ptr<Backend> backend_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(CloudExternalDataManagerBase);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.cc b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.cc
index d6cf319..fa21941c 100644
--- a/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.cc
+++ b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.cc
@@ -37,6 +37,10 @@
PolicyServiceObserver(CloudExternalDataPolicyObserver* parent,
const std::string& user_id,
PolicyService* policy_service);
+
+ PolicyServiceObserver(const PolicyServiceObserver&) = delete;
+ PolicyServiceObserver& operator=(const PolicyServiceObserver&) = delete;
+
~PolicyServiceObserver() override;
// PolicyService::Observer:
@@ -48,8 +52,6 @@
CloudExternalDataPolicyObserver* parent_;
const std::string user_id_;
PolicyService* policy_service_;
-
- DISALLOW_COPY_AND_ASSIGN(PolicyServiceObserver);
};
CloudExternalDataPolicyObserver::PolicyServiceObserver::PolicyServiceObserver(
diff --git a/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer_unittest.cc b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer_unittest.cc
index f70647d..2c1a54b 100644
--- a/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer_unittest.cc
+++ b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer_unittest.cc
@@ -94,6 +94,12 @@
typedef std::pair<std::string, std::string> FetchedCall;
CloudExternalDataPolicyObserverTest();
+
+ CloudExternalDataPolicyObserverTest(
+ const CloudExternalDataPolicyObserverTest&) = delete;
+ CloudExternalDataPolicyObserverTest& operator=(
+ const CloudExternalDataPolicyObserverTest&) = delete;
+
~CloudExternalDataPolicyObserverTest() override;
// ash::DeviceSettingsTestBase:
@@ -164,9 +170,6 @@
TestingProfileManager profile_manager_;
session_manager::SessionManager session_manager_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CloudExternalDataPolicyObserverTest);
};
CloudExternalDataPolicyObserverTest::CloudExternalDataPolicyObserverTest()
diff --git a/chrome/browser/ash/policy/external_data/device_local_account_external_data_service.h b/chrome/browser/ash/policy/external_data/device_local_account_external_data_service.h
index 179655ce..f8a98ebc 100644
--- a/chrome/browser/ash/policy/external_data/device_local_account_external_data_service.h
+++ b/chrome/browser/ash/policy/external_data/device_local_account_external_data_service.h
@@ -32,6 +32,12 @@
DeviceLocalAccountExternalDataService(
DeviceLocalAccountPolicyService* parent,
scoped_refptr<base::SequencedTaskRunner> backend_task_runner);
+
+ DeviceLocalAccountExternalDataService(
+ const DeviceLocalAccountExternalDataService&) = delete;
+ DeviceLocalAccountExternalDataService& operator=(
+ const DeviceLocalAccountExternalDataService&) = delete;
+
~DeviceLocalAccountExternalDataService() override;
// DeviceLocalAccountPolicyService::Observer:
@@ -52,8 +58,6 @@
std::unique_ptr<ResourceCache> resource_cache_;
ExternalDataManagerMap external_data_managers_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountExternalDataService);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager.h b/chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager.h
index 7109e1a..1165714c 100644
--- a/chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager.h
+++ b/chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager.h
@@ -37,6 +37,12 @@
scoped_refptr<base::SequencedTaskRunner> backend_task_runner,
const base::FilePath& cache_path,
CloudPolicyStore* policy_store);
+
+ DevicePolicyCloudExternalDataManager(
+ const DevicePolicyCloudExternalDataManager&) = delete;
+ DevicePolicyCloudExternalDataManager& operator=(
+ const DevicePolicyCloudExternalDataManager&) = delete;
+
~DevicePolicyCloudExternalDataManager() override;
// Sets the cache maximum size for testing.
@@ -46,8 +52,6 @@
private:
// Cache used by the data store. Must outlive the data store.
std::unique_ptr<ResourceCache> resource_cache_;
-
- DISALLOW_COPY_AND_ASSIGN(DevicePolicyCloudExternalDataManager);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.h b/chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.h
index c2efbda..9613d14 100644
--- a/chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.h
@@ -24,6 +24,12 @@
CrostiniAnsiblePlaybookExternalDataHandler(
ash::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service);
+
+ CrostiniAnsiblePlaybookExternalDataHandler(
+ const CrostiniAnsiblePlaybookExternalDataHandler&) = delete;
+ CrostiniAnsiblePlaybookExternalDataHandler& operator=(
+ const CrostiniAnsiblePlaybookExternalDataHandler&) = delete;
+
~CrostiniAnsiblePlaybookExternalDataHandler() override;
// CloudExternalDataPolicyHandler:
@@ -37,8 +43,6 @@
private:
CloudExternalDataPolicyObserver crostini_ansible_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniAnsiblePlaybookExternalDataHandler);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/external_data/handlers/device_printers_external_data_handler.h b/chrome/browser/ash/policy/external_data/handlers/device_printers_external_data_handler.h
index 8d508ca..600cdf2 100644
--- a/chrome/browser/ash/policy/external_data/handlers/device_printers_external_data_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/device_printers_external_data_handler.h
@@ -25,6 +25,12 @@
DevicePrintersExternalDataHandler(
PolicyService* policy_service,
base::WeakPtr<ash::BulkPrintersCalculator> device_calculator);
+
+ DevicePrintersExternalDataHandler(const DevicePrintersExternalDataHandler&) =
+ delete;
+ DevicePrintersExternalDataHandler& operator=(
+ const DevicePrintersExternalDataHandler&) = delete;
+
~DevicePrintersExternalDataHandler() override;
// DeviceCloudExternalDataPolicyHandler:
@@ -40,8 +46,6 @@
std::unique_ptr<DeviceCloudExternalDataPolicyObserver>
device_printers_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(DevicePrintersExternalDataHandler);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h b/chrome/browser/ash/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h
index 8dd50c9..623f5b5 100644
--- a/chrome/browser/ash/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h
@@ -26,6 +26,12 @@
public:
DeviceWallpaperImageExternalDataHandler(PrefService* local_state,
PolicyService* policy_service);
+
+ DeviceWallpaperImageExternalDataHandler(
+ const DeviceWallpaperImageExternalDataHandler&) = delete;
+ DeviceWallpaperImageExternalDataHandler& operator=(
+ const DeviceWallpaperImageExternalDataHandler&) = delete;
+
~DeviceWallpaperImageExternalDataHandler() override;
static void RegisterPrefs(PrefRegistrySimple* registry);
@@ -42,8 +48,6 @@
std::unique_ptr<DeviceCloudExternalDataPolicyObserver>
device_wallpaper_image_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceWallpaperImageExternalDataHandler);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.h b/chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.h
index da1dbdf..26cdaee 100644
--- a/chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.h
@@ -23,6 +23,12 @@
public:
explicit DeviceWilcoDtcConfigurationExternalDataHandler(
PolicyService* policy_service);
+
+ DeviceWilcoDtcConfigurationExternalDataHandler(
+ const DeviceWilcoDtcConfigurationExternalDataHandler&) = delete;
+ DeviceWilcoDtcConfigurationExternalDataHandler& operator=(
+ const DeviceWilcoDtcConfigurationExternalDataHandler&) = delete;
+
~DeviceWilcoDtcConfigurationExternalDataHandler() override;
// DeviceCloudExternalDataPolicyHandler:
@@ -35,8 +41,6 @@
private:
std::unique_ptr<DeviceCloudExternalDataPolicyObserver>
device_wilco_dtc_configuration_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceWilcoDtcConfigurationExternalDataHandler);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/external_data/handlers/print_servers_external_data_handler.h b/chrome/browser/ash/policy/external_data/handlers/print_servers_external_data_handler.h
index b800489..b6b283b 100644
--- a/chrome/browser/ash/policy/external_data/handlers/print_servers_external_data_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/print_servers_external_data_handler.h
@@ -25,6 +25,12 @@
PrintServersExternalDataHandler(
ash::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service);
+
+ PrintServersExternalDataHandler(const PrintServersExternalDataHandler&) =
+ delete;
+ PrintServersExternalDataHandler& operator=(
+ const PrintServersExternalDataHandler&) = delete;
+
~PrintServersExternalDataHandler() override;
// CloudExternalDataPolicyHandler:
@@ -40,8 +46,6 @@
private:
CloudExternalDataPolicyObserver print_servers_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(PrintServersExternalDataHandler);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.h b/chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.h
index a7d67789..14f9c25 100644
--- a/chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.h
@@ -24,6 +24,12 @@
UserAvatarImageExternalDataHandler(
ash::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service);
+
+ UserAvatarImageExternalDataHandler(
+ const UserAvatarImageExternalDataHandler&) = delete;
+ UserAvatarImageExternalDataHandler& operator=(
+ const UserAvatarImageExternalDataHandler&) = delete;
+
~UserAvatarImageExternalDataHandler() override;
// CloudExternalDataPolicyHandler:
@@ -39,8 +45,6 @@
private:
CloudExternalDataPolicyObserver user_avatar_image_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(UserAvatarImageExternalDataHandler);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.h b/chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.h
index a105ca5..53855c5 100644
--- a/chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.h
@@ -24,6 +24,12 @@
WallpaperImageExternalDataHandler(
ash::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service);
+
+ WallpaperImageExternalDataHandler(const WallpaperImageExternalDataHandler&) =
+ delete;
+ WallpaperImageExternalDataHandler& operator=(
+ const WallpaperImageExternalDataHandler&) = delete;
+
~WallpaperImageExternalDataHandler() override;
// CloudExternalDataPolicyHandler:
@@ -37,8 +43,6 @@
private:
CloudExternalDataPolicyObserver wallpaper_image_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(WallpaperImageExternalDataHandler);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/external_data/user_cloud_external_data_manager.h b/chrome/browser/ash/policy/external_data/user_cloud_external_data_manager.h
index b9f185e..2396563 100644
--- a/chrome/browser/ash/policy/external_data/user_cloud_external_data_manager.h
+++ b/chrome/browser/ash/policy/external_data/user_cloud_external_data_manager.h
@@ -37,6 +37,11 @@
scoped_refptr<base::SequencedTaskRunner> backend_task_runner,
const base::FilePath& cache_path,
CloudPolicyStore* policy_store);
+
+ UserCloudExternalDataManager(const UserCloudExternalDataManager&) = delete;
+ UserCloudExternalDataManager& operator=(const UserCloudExternalDataManager&) =
+ delete;
+
~UserCloudExternalDataManager() override;
private:
@@ -57,8 +62,6 @@
// |resource_cache_|.
// Because of this destruction sequence, a scoped_ptr cannot be used.
ResourceCache* resource_cache_;
-
- DISALLOW_COPY_AND_ASSIGN(UserCloudExternalDataManager);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/handlers/bluetooth_policy_handler.h b/chrome/browser/ash/policy/handlers/bluetooth_policy_handler.h
index c81dfb72e..20d3522 100644
--- a/chrome/browser/ash/policy/handlers/bluetooth_policy_handler.h
+++ b/chrome/browser/ash/policy/handlers/bluetooth_policy_handler.h
@@ -19,6 +19,10 @@
class BluetoothPolicyHandler {
public:
explicit BluetoothPolicyHandler(ash::CrosSettings* cros_settings);
+
+ BluetoothPolicyHandler(const BluetoothPolicyHandler&) = delete;
+ BluetoothPolicyHandler& operator=(const BluetoothPolicyHandler&) = delete;
+
~BluetoothPolicyHandler();
private:
@@ -37,8 +41,6 @@
base::CallbackListSubscription allowed_services_subscription_;
scoped_refptr<device::BluetoothAdapter> adapter_;
base::WeakPtrFactory<BluetoothPolicyHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BluetoothPolicyHandler);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/handlers/configuration_policy_handler_ash.h b/chrome/browser/ash/policy/handlers/configuration_policy_handler_ash.h
index 74794e0..cbd84ca6 100644
--- a/chrome/browser/ash/policy/handlers/configuration_policy_handler_ash.h
+++ b/chrome/browser/ash/policy/handlers/configuration_policy_handler_ash.h
@@ -23,6 +23,11 @@
class ExternalDataPolicyHandler : public TypeCheckingPolicyHandler {
public:
explicit ExternalDataPolicyHandler(const char* policy_name);
+
+ ExternalDataPolicyHandler(const ExternalDataPolicyHandler&) = delete;
+ ExternalDataPolicyHandler& operator=(const ExternalDataPolicyHandler&) =
+ delete;
+
~ExternalDataPolicyHandler() override;
// TypeCheckingPolicyHandler:
@@ -31,9 +36,6 @@
void ApplyPolicySettings(const PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ExternalDataPolicyHandler);
};
// ConfigurationPolicyHandler for validation of the network configuration
@@ -44,6 +46,11 @@
static NetworkConfigurationPolicyHandler* CreateForUserPolicy();
static NetworkConfigurationPolicyHandler* CreateForDevicePolicy();
+ NetworkConfigurationPolicyHandler(const NetworkConfigurationPolicyHandler&) =
+ delete;
+ NetworkConfigurationPolicyHandler& operator=(
+ const NetworkConfigurationPolicyHandler&) = delete;
+
~NetworkConfigurationPolicyHandler() override;
// ConfigurationPolicyHandler methods:
@@ -71,8 +78,6 @@
// The name of the pref to apply the policy to.
const char* pref_path_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkConfigurationPolicyHandler);
};
// Maps the PinnedLauncherApps policy to the corresponding pref. List entries
@@ -80,6 +85,12 @@
class PinnedLauncherAppsPolicyHandler : public ListPolicyHandler {
public:
PinnedLauncherAppsPolicyHandler();
+
+ PinnedLauncherAppsPolicyHandler(const PinnedLauncherAppsPolicyHandler&) =
+ delete;
+ PinnedLauncherAppsPolicyHandler& operator=(
+ const PinnedLauncherAppsPolicyHandler&) = delete;
+
~PinnedLauncherAppsPolicyHandler() override;
protected:
@@ -92,22 +103,21 @@
// Converts the list of strings |filtered_list| to a list of dictionaries and
// sets the pref.
void ApplyList(base::Value filtered_list, PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PinnedLauncherAppsPolicyHandler);
};
class ScreenMagnifierPolicyHandler : public IntRangePolicyHandlerBase {
public:
ScreenMagnifierPolicyHandler();
+
+ ScreenMagnifierPolicyHandler(const ScreenMagnifierPolicyHandler&) = delete;
+ ScreenMagnifierPolicyHandler& operator=(const ScreenMagnifierPolicyHandler&) =
+ delete;
+
~ScreenMagnifierPolicyHandler() override;
// IntRangePolicyHandlerBase:
void ApplyPolicySettings(const PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ScreenMagnifierPolicyHandler);
};
// Policy handler for login screen power management settings. This does not
@@ -117,14 +127,17 @@
: public SchemaValidatingPolicyHandler {
public:
explicit LoginScreenPowerManagementPolicyHandler(const Schema& chrome_schema);
+
+ LoginScreenPowerManagementPolicyHandler(
+ const LoginScreenPowerManagementPolicyHandler&) = delete;
+ LoginScreenPowerManagementPolicyHandler& operator=(
+ const LoginScreenPowerManagementPolicyHandler&) = delete;
+
~LoginScreenPowerManagementPolicyHandler() override;
// SchemaValidatingPolicyHandler:
void ApplyPolicySettings(const PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LoginScreenPowerManagementPolicyHandler);
};
// Handles the deprecated IdleAction policy, so both kIdleActionBattery and
@@ -132,14 +145,16 @@
class DeprecatedIdleActionHandler : public IntRangePolicyHandlerBase {
public:
DeprecatedIdleActionHandler();
+
+ DeprecatedIdleActionHandler(const DeprecatedIdleActionHandler&) = delete;
+ DeprecatedIdleActionHandler& operator=(const DeprecatedIdleActionHandler&) =
+ delete;
+
~DeprecatedIdleActionHandler() override;
// IntRangePolicyHandlerBase:
void ApplyPolicySettings(const PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DeprecatedIdleActionHandler);
};
class PowerManagementIdleSettingsPolicyHandler
@@ -147,41 +162,49 @@
public:
explicit PowerManagementIdleSettingsPolicyHandler(
const Schema& chrome_schema);
+
+ PowerManagementIdleSettingsPolicyHandler(
+ const PowerManagementIdleSettingsPolicyHandler&) = delete;
+ PowerManagementIdleSettingsPolicyHandler& operator=(
+ const PowerManagementIdleSettingsPolicyHandler&) = delete;
+
~PowerManagementIdleSettingsPolicyHandler() override;
// SchemaValidatingPolicyHandler:
void ApplyPolicySettings(const PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PowerManagementIdleSettingsPolicyHandler);
};
class ScreenLockDelayPolicyHandler : public SchemaValidatingPolicyHandler {
public:
explicit ScreenLockDelayPolicyHandler(const Schema& chrome_schema);
+
+ ScreenLockDelayPolicyHandler(const ScreenLockDelayPolicyHandler&) = delete;
+ ScreenLockDelayPolicyHandler& operator=(const ScreenLockDelayPolicyHandler&) =
+ delete;
+
~ScreenLockDelayPolicyHandler() override;
// SchemaValidatingPolicyHandler:
void ApplyPolicySettings(const PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ScreenLockDelayPolicyHandler);
};
class ScreenBrightnessPercentPolicyHandler
: public SchemaValidatingPolicyHandler {
public:
explicit ScreenBrightnessPercentPolicyHandler(const Schema& chrome_schema);
+
+ ScreenBrightnessPercentPolicyHandler(
+ const ScreenBrightnessPercentPolicyHandler&) = delete;
+ ScreenBrightnessPercentPolicyHandler& operator=(
+ const ScreenBrightnessPercentPolicyHandler&) = delete;
+
~ScreenBrightnessPercentPolicyHandler() override;
// SchemaValidatingPolicyHandler:
void ApplyPolicySettings(const PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ScreenBrightnessPercentPolicyHandler);
};
// Supported values for the |ArcBackupRestoreServiceEnabled| and
diff --git a/chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler.h b/chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler.h
index 74440fe..a2792140 100644
--- a/chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler.h
+++ b/chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler.h
@@ -22,6 +22,11 @@
DeviceDockMacAddressHandler(
ash::CrosSettings* cros_settings,
chromeos::NetworkDeviceHandler* network_device_handler);
+
+ DeviceDockMacAddressHandler(const DeviceDockMacAddressHandler&) = delete;
+ DeviceDockMacAddressHandler& operator=(const DeviceDockMacAddressHandler&) =
+ delete;
+
~DeviceDockMacAddressHandler();
private:
@@ -31,8 +36,6 @@
chromeos::NetworkDeviceHandler* network_device_handler_;
base::CallbackListSubscription dock_mac_address_source_policy_subscription_;
base::WeakPtrFactory<DeviceDockMacAddressHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceDockMacAddressHandler);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/handlers/device_name_policy_handler_impl.h b/chrome/browser/ash/policy/handlers/device_name_policy_handler_impl.h
index 306c6e99..c66ca92b 100644
--- a/chrome/browser/ash/policy/handlers/device_name_policy_handler_impl.h
+++ b/chrome/browser/ash/policy/handlers/device_name_policy_handler_impl.h
@@ -29,6 +29,11 @@
public chromeos::NetworkStateHandlerObserver {
public:
explicit DeviceNamePolicyHandlerImpl(ash::CrosSettings* cros_settings);
+
+ DeviceNamePolicyHandlerImpl(const DeviceNamePolicyHandlerImpl&) = delete;
+ DeviceNamePolicyHandlerImpl& operator=(const DeviceNamePolicyHandlerImpl&) =
+ delete;
+
~DeviceNamePolicyHandlerImpl() override;
// DeviceNamePolicyHandler:
@@ -73,8 +78,6 @@
base::CallbackListSubscription configurable_policy_subscription_;
std::string hostname_;
base::WeakPtrFactory<DeviceNamePolicyHandlerImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceNamePolicyHandlerImpl);
};
std::ostream& operator<<(
diff --git a/chrome/browser/ash/policy/handlers/device_wifi_allowed_handler.h b/chrome/browser/ash/policy/handlers/device_wifi_allowed_handler.h
index 867899c..cbb9668 100644
--- a/chrome/browser/ash/policy/handlers/device_wifi_allowed_handler.h
+++ b/chrome/browser/ash/policy/handlers/device_wifi_allowed_handler.h
@@ -17,6 +17,10 @@
class DeviceWiFiAllowedHandler {
public:
explicit DeviceWiFiAllowedHandler(ash::CrosSettings* cros_settings);
+
+ DeviceWiFiAllowedHandler(const DeviceWiFiAllowedHandler&) = delete;
+ DeviceWiFiAllowedHandler& operator=(const DeviceWiFiAllowedHandler&) = delete;
+
~DeviceWiFiAllowedHandler();
private:
@@ -25,8 +29,6 @@
ash::CrosSettings* cros_settings_;
base::CallbackListSubscription wifi_policy_subscription_;
base::WeakPtrFactory<DeviceWiFiAllowedHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceWiFiAllowedHandler);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.h b/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.h
index ff288f6..29bfafb 100644
--- a/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.h
+++ b/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.h
@@ -29,6 +29,10 @@
static LockToSingleUserManager* GetLockToSingleUserManagerInstance();
LockToSingleUserManager();
+
+ LockToSingleUserManager(const LockToSingleUserManager&) = delete;
+ LockToSingleUserManager& operator=(const LockToSingleUserManager&) = delete;
+
~LockToSingleUserManager() override;
// Notify that a VM is being started from outside of Chrome
@@ -76,8 +80,6 @@
base::WeakPtrFactory<LockToSingleUserManager> weak_factory_{this};
friend class LockToSingleUserManagerTest;
-
- DISALLOW_COPY_AND_ASSIGN(LockToSingleUserManager);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/handlers/lock_to_single_user_manager_unittest.cc b/chrome/browser/ash/policy/handlers/lock_to_single_user_manager_unittest.cc
index cd73b8c..2bd979d 100644
--- a/chrome/browser/ash/policy/handlers/lock_to_single_user_manager_unittest.cc
+++ b/chrome/browser/ash/policy/handlers/lock_to_single_user_manager_unittest.cc
@@ -34,6 +34,11 @@
class LockToSingleUserManagerTest : public BrowserWithTestWindowTest {
public:
LockToSingleUserManagerTest() = default;
+
+ LockToSingleUserManagerTest(const LockToSingleUserManagerTest&) = delete;
+ LockToSingleUserManagerTest& operator=(const LockToSingleUserManagerTest&) =
+ delete;
+
~LockToSingleUserManagerTest() override = default;
void SetUp() override {
@@ -153,8 +158,6 @@
chromeos::SessionTerminationManager termination_manager_;
std::unique_ptr<LockToSingleUserManager> lock_to_single_user_manager_;
chromeos::FakeConciergeClient* fake_concierge_client_;
-
- DISALLOW_COPY_AND_ASSIGN(LockToSingleUserManagerTest);
};
TEST_F(LockToSingleUserManagerTest, ArcSessionLockTest) {
diff --git a/chrome/browser/ash/policy/handlers/tpm_auto_update_mode_policy_handler.h b/chrome/browser/ash/policy/handlers/tpm_auto_update_mode_policy_handler.h
index 53b47b80..06875a3 100644
--- a/chrome/browser/ash/policy/handlers/tpm_auto_update_mode_policy_handler.h
+++ b/chrome/browser/ash/policy/handlers/tpm_auto_update_mode_policy_handler.h
@@ -53,6 +53,12 @@
TPMAutoUpdateModePolicyHandler(ash::CrosSettings* cros_settings,
PrefService* local_state);
+
+ TPMAutoUpdateModePolicyHandler(const TPMAutoUpdateModePolicyHandler&) =
+ delete;
+ TPMAutoUpdateModePolicyHandler& operator=(
+ const TPMAutoUpdateModePolicyHandler&) = delete;
+
~TPMAutoUpdateModePolicyHandler();
// Sets a UpdateCheckerCallback for testing.
@@ -108,8 +114,6 @@
ShowNotificationCallback show_notification_callback_;
base::WeakPtrFactory<TPMAutoUpdateModePolicyHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TPMAutoUpdateModePolicyHandler);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/invalidation/affiliated_cloud_policy_invalidator.h b/chrome/browser/ash/policy/invalidation/affiliated_cloud_policy_invalidator.h
index 82ad72f..c65fec1 100644
--- a/chrome/browser/ash/policy/invalidation/affiliated_cloud_policy_invalidator.h
+++ b/chrome/browser/ash/policy/invalidation/affiliated_cloud_policy_invalidator.h
@@ -44,6 +44,12 @@
CloudPolicyCore* core,
AffiliatedInvalidationServiceProvider* invalidation_service_provider,
const std::string& device_local_account_id);
+
+ AffiliatedCloudPolicyInvalidator(const AffiliatedCloudPolicyInvalidator&) =
+ delete;
+ AffiliatedCloudPolicyInvalidator& operator=(
+ const AffiliatedCloudPolicyInvalidator&) = delete;
+
~AffiliatedCloudPolicyInvalidator() override;
// AffiliatedInvalidationServiceProvider::Consumer:
@@ -72,8 +78,6 @@
// The current |CloudPolicyInvalidator|. nullptr if no connected invalidation
// service is available.
std::unique_ptr<CloudPolicyInvalidator> invalidator_;
-
- DISALLOW_COPY_AND_ASSIGN(AffiliatedCloudPolicyInvalidator);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.cc b/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.cc
index db34355..ace27d4 100644
--- a/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.cc
+++ b/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.cc
@@ -77,6 +77,11 @@
explicit InvalidationServiceObserver(
AffiliatedInvalidationServiceProviderImpl* parent,
invalidation::InvalidationService* invalidation_service);
+
+ InvalidationServiceObserver(const InvalidationServiceObserver&) = delete;
+ InvalidationServiceObserver& operator=(const InvalidationServiceObserver&) =
+ delete;
+
~InvalidationServiceObserver() override;
invalidation::InvalidationService* GetInvalidationService();
@@ -98,8 +103,6 @@
// The number of times TRANSIENT_INVALIDATION_ERROR should cause disconnect.
int transient_error_disconnect_limit_ = kTransientErrorDisconnectLimit;
-
- DISALLOW_COPY_AND_ASSIGN(InvalidationServiceObserver);
};
AffiliatedInvalidationServiceProviderImpl::InvalidationServiceObserver::
diff --git a/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.h b/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.h
index 9e3e086..bfd7584 100644
--- a/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.h
+++ b/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.h
@@ -32,6 +32,12 @@
public session_manager::SessionManagerObserver {
public:
AffiliatedInvalidationServiceProviderImpl();
+
+ AffiliatedInvalidationServiceProviderImpl(
+ const AffiliatedInvalidationServiceProviderImpl&) = delete;
+ AffiliatedInvalidationServiceProviderImpl& operator=(
+ const AffiliatedInvalidationServiceProviderImpl&) = delete;
+
~AffiliatedInvalidationServiceProviderImpl() override;
// session_manager::SessionManagerObserver:
@@ -111,8 +117,6 @@
int consumer_count_;
bool is_shut_down_;
-
- DISALLOW_COPY_AND_ASSIGN(AffiliatedInvalidationServiceProviderImpl);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl_unittest.cc b/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl_unittest.cc
index f03bdea..d006279 100644
--- a/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl_unittest.cc
+++ b/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl_unittest.cc
@@ -81,6 +81,10 @@
class FakeConsumer : public AffiliatedInvalidationServiceProvider::Consumer {
public:
explicit FakeConsumer(AffiliatedInvalidationServiceProviderImpl* provider);
+
+ FakeConsumer(const FakeConsumer&) = delete;
+ FakeConsumer& operator=(const FakeConsumer&) = delete;
+
~FakeConsumer() override;
// AffiliatedInvalidationServiceProvider::Consumer:
@@ -96,8 +100,6 @@
int invalidation_service_set_count_ = 0;
invalidation::InvalidationService* invalidation_service_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(FakeConsumer);
};
class AffiliatedInvalidationServiceProviderImplTest : public testing::Test {
diff --git a/chrome/browser/ash/policy/login/login_profile_policy_provider.h b/chrome/browser/ash/policy/login/login_profile_policy_provider.h
index caaa404..647f4a5 100644
--- a/chrome/browser/ash/policy/login/login_profile_policy_provider.h
+++ b/chrome/browser/ash/policy/login/login_profile_policy_provider.h
@@ -21,6 +21,11 @@
public PolicyService::Observer {
public:
explicit LoginProfilePolicyProvider(PolicyService* device_policy_service);
+
+ LoginProfilePolicyProvider(const LoginProfilePolicyProvider&) = delete;
+ LoginProfilePolicyProvider& operator=(const LoginProfilePolicyProvider&) =
+ delete;
+
~LoginProfilePolicyProvider() override;
// ConfigurationPolicyProvider:
@@ -44,8 +49,6 @@
bool waiting_for_device_policy_refresh_;
base::WeakPtrFactory<LoginProfilePolicyProvider> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LoginProfilePolicyProvider);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/login/wildcard_login_checker.h b/chrome/browser/ash/policy/login/wildcard_login_checker.h
index 2094da5..4529561 100644
--- a/chrome/browser/ash/policy/login/wildcard_login_checker.h
+++ b/chrome/browser/ash/policy/login/wildcard_login_checker.h
@@ -32,6 +32,10 @@
using StatusCallback = base::OnceCallback<void(Result)>;
WildcardLoginChecker();
+
+ WildcardLoginChecker(const WildcardLoginChecker&) = delete;
+ WildcardLoginChecker& operator=(const WildcardLoginChecker&) = delete;
+
virtual ~WildcardLoginChecker();
// Starts checking with a provided refresh token.
@@ -61,8 +65,6 @@
std::unique_ptr<PolicyOAuth2TokenFetcher> token_fetcher_;
std::unique_ptr<UserInfoFetcher> user_info_fetcher_;
-
- DISALLOW_COPY_AND_ASSIGN(WildcardLoginChecker);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/networking/device_network_configuration_updater.h b/chrome/browser/ash/policy/networking/device_network_configuration_updater.h
index 1d8e4bf..df5b160 100644
--- a/chrome/browser/ash/policy/networking/device_network_configuration_updater.h
+++ b/chrome/browser/ash/policy/networking/device_network_configuration_updater.h
@@ -40,6 +40,11 @@
// listening for notifications from CrosSettings.
class DeviceNetworkConfigurationUpdater : public NetworkConfigurationUpdater {
public:
+ DeviceNetworkConfigurationUpdater(const DeviceNetworkConfigurationUpdater&) =
+ delete;
+ DeviceNetworkConfigurationUpdater& operator=(
+ const DeviceNetworkConfigurationUpdater&) = delete;
+
~DeviceNetworkConfigurationUpdater() override;
// Fetches the device's administrator-annotated asset ID.
@@ -94,8 +99,6 @@
DeviceAssetIDFetcher device_asset_id_fetcher_;
base::WeakPtrFactory<DeviceNetworkConfigurationUpdater> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceNetworkConfigurationUpdater);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/networking/network_configuration_updater.h b/chrome/browser/ash/policy/networking/network_configuration_updater.h
index 489064e..ec0b4abc 100644
--- a/chrome/browser/ash/policy/networking/network_configuration_updater.h
+++ b/chrome/browser/ash/policy/networking/network_configuration_updater.h
@@ -43,6 +43,10 @@
class NetworkConfigurationUpdater : public chromeos::PolicyCertificateProvider,
public PolicyService::Observer {
public:
+ NetworkConfigurationUpdater(const NetworkConfigurationUpdater&) = delete;
+ NetworkConfigurationUpdater& operator=(const NetworkConfigurationUpdater&) =
+ delete;
+
~NetworkConfigurationUpdater() override;
// PolicyService::Observer overrides
@@ -166,8 +170,6 @@
// changes.
base::ObserverList<chromeos::PolicyCertificateProvider::Observer,
true>::Unchecked observer_list_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkConfigurationUpdater);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/networking/network_configuration_updater_unittest.cc b/chrome/browser/ash/policy/networking/network_configuration_updater_unittest.cc
index 0e993e1..8da21e9 100644
--- a/chrome/browser/ash/policy/networking/network_configuration_updater_unittest.cc
+++ b/chrome/browser/ash/policy/networking/network_configuration_updater_unittest.cc
@@ -75,15 +75,16 @@
set_display_email(kFakeUserEmail);
set_username_hash(kFakeUsernameHash);
}
+
+ FakeUser(const FakeUser&) = delete;
+ FakeUser& operator=(const FakeUser&) = delete;
+
~FakeUser() override {}
// User overrides
user_manager::UserType GetType() const override {
return user_manager::USER_TYPE_REGULAR;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FakeUser);
};
class MockPolicyProvidedCertsObserver
@@ -125,6 +126,10 @@
using OncParsedCertificates = chromeos::onc::OncParsedCertificates;
FakeCertificateImporter() : call_count_(0) {}
+
+ FakeCertificateImporter(const FakeCertificateImporter&) = delete;
+ FakeCertificateImporter& operator=(const FakeCertificateImporter&) = delete;
+
~FakeCertificateImporter() override {}
void SetExpectedONCClientCertificates(
@@ -167,8 +172,6 @@
expected_client_certificates_;
net::ScopedCERTCertificateList onc_trusted_certificates_;
unsigned int call_count_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeCertificateImporter);
};
// Note: HexSSID 737369642D6E6F6E65 maps to "ssid-none".
diff --git a/chrome/browser/ash/policy/networking/policy_cert_service.h b/chrome/browser/ash/policy/networking/policy_cert_service.h
index 39ae8f6e2..44aa2531 100644
--- a/chrome/browser/ash/policy/networking/policy_cert_service.h
+++ b/chrome/browser/ash/policy/networking/policy_cert_service.h
@@ -59,6 +59,10 @@
bool may_use_profile_wide_trust_anchors,
const std::string& user_id,
user_manager::UserManager* user_manager);
+
+ PolicyCertService(const PolicyCertService&) = delete;
+ PolicyCertService& operator=(const PolicyCertService&) = delete;
+
~PolicyCertService() override;
// Returns true if the profile that owns this service has used certificates
@@ -130,8 +134,6 @@
// as intermediates when NSS verifies a certificate.
std::unique_ptr<network::NSSTempCertsCacheChromeOS>
temp_policy_provided_certs_;
-
- DISALLOW_COPY_AND_ASSIGN(PolicyCertService);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/networking/policy_certs_browsertest.cc b/chrome/browser/ash/policy/networking/policy_certs_browsertest.cc
index 6a8b20e2c..8d757d3 100644
--- a/chrome/browser/ash/policy/networking/policy_certs_browsertest.cc
+++ b/chrome/browser/ash/policy/networking/policy_certs_browsertest.cc
@@ -141,6 +141,10 @@
network_cert_loader_->AddObserver(this);
}
+ NetworkCertLoaderTestObserver(const NetworkCertLoaderTestObserver&) = delete;
+ NetworkCertLoaderTestObserver& operator=(
+ const NetworkCertLoaderTestObserver&) = delete;
+
~NetworkCertLoaderTestObserver() override {
network_cert_loader_->RemoveObserver(this);
}
@@ -153,8 +157,6 @@
private:
chromeos::NetworkCertLoader* network_cert_loader_;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkCertLoaderTestObserver);
};
// Allows waiting until the |CertDatabase| notifies its observers that it has
diff --git a/chrome/browser/ash/policy/networking/user_network_configuration_updater.h b/chrome/browser/ash/policy/networking/user_network_configuration_updater.h
index e64668e..e8335eac 100644
--- a/chrome/browser/ash/policy/networking/user_network_configuration_updater.h
+++ b/chrome/browser/ash/policy/networking/user_network_configuration_updater.h
@@ -53,6 +53,11 @@
public KeyedService,
public content::NotificationObserver {
public:
+ UserNetworkConfigurationUpdater(const UserNetworkConfigurationUpdater&) =
+ delete;
+ UserNetworkConfigurationUpdater& operator=(
+ const UserNetworkConfigurationUpdater&) = delete;
+
~UserNetworkConfigurationUpdater() override;
// Creates an updater that applies the ONC user policy from |policy_service|
@@ -119,8 +124,6 @@
content::NotificationRegistrar registrar_;
base::WeakPtrFactory<UserNetworkConfigurationUpdater> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UserNetworkConfigurationUpdater);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/remote_commands/affiliated_remote_commands_invalidator.h b/chrome/browser/ash/policy/remote_commands/affiliated_remote_commands_invalidator.h
index 7fd033e..ce8e434 100644
--- a/chrome/browser/ash/policy/remote_commands/affiliated_remote_commands_invalidator.h
+++ b/chrome/browser/ash/policy/remote_commands/affiliated_remote_commands_invalidator.h
@@ -25,6 +25,12 @@
CloudPolicyCore* core,
AffiliatedInvalidationServiceProvider* invalidation_service_provider,
PolicyInvalidationScope scope);
+
+ AffiliatedRemoteCommandsInvalidator(
+ const AffiliatedRemoteCommandsInvalidator&) = delete;
+ AffiliatedRemoteCommandsInvalidator& operator=(
+ const AffiliatedRemoteCommandsInvalidator&) = delete;
+
~AffiliatedRemoteCommandsInvalidator() override;
// AffiliatedInvalidationServiceProvider::Consumer:
@@ -38,8 +44,6 @@
std::unique_ptr<RemoteCommandsInvalidatorImpl> invalidator_;
const PolicyInvalidationScope scope_;
-
- DISALLOW_COPY_AND_ASSIGN(AffiliatedRemoteCommandsInvalidator);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/remote_commands/crd_host_delegate.h b/chrome/browser/ash/policy/remote_commands/crd_host_delegate.h
index ea2de9e8..9d49d7d 100644
--- a/chrome/browser/ash/policy/remote_commands/crd_host_delegate.h
+++ b/chrome/browser/ash/policy/remote_commands/crd_host_delegate.h
@@ -33,6 +33,10 @@
CRDHostDelegate();
explicit CRDHostDelegate(std::unique_ptr<NativeMessageHostFactory> factory);
+
+ CRDHostDelegate(const CRDHostDelegate&) = delete;
+ CRDHostDelegate& operator=(const CRDHostDelegate&) = delete;
+
~CRDHostDelegate() override;
// DeviceCommandStartCRDSessionJob::Delegate:
@@ -91,8 +95,6 @@
bool remote_connected_;
base::WeakPtrFactory<CRDHostDelegate> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CRDHostDelegate);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_fetch_status_job.h b/chrome/browser/ash/policy/remote_commands/device_command_fetch_status_job.h
index 1882d0a4..996be693 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_fetch_status_job.h
+++ b/chrome/browser/ash/policy/remote_commands/device_command_fetch_status_job.h
@@ -13,6 +13,11 @@
class DeviceCommandFetchStatusJob : public RemoteCommandJob {
public:
DeviceCommandFetchStatusJob();
+
+ DeviceCommandFetchStatusJob(const DeviceCommandFetchStatusJob&) = delete;
+ DeviceCommandFetchStatusJob& operator=(const DeviceCommandFetchStatusJob&) =
+ delete;
+
~DeviceCommandFetchStatusJob() override;
// RemoteCommandJob:
@@ -22,9 +27,6 @@
// RemoteCommandJob:
void RunImpl(CallbackWithResult succeeded_callback,
CallbackWithResult failed_callback) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DeviceCommandFetchStatusJob);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_reboot_job.h b/chrome/browser/ash/policy/remote_commands/device_command_reboot_job.h
index b987de9..e4b9a446 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_reboot_job.h
+++ b/chrome/browser/ash/policy/remote_commands/device_command_reboot_job.h
@@ -20,6 +20,10 @@
public:
explicit DeviceCommandRebootJob(
chromeos::PowerManagerClient* power_manager_client);
+
+ DeviceCommandRebootJob(const DeviceCommandRebootJob&) = delete;
+ DeviceCommandRebootJob& operator=(const DeviceCommandRebootJob&) = delete;
+
~DeviceCommandRebootJob() override;
// RemoteCommandJob:
@@ -31,8 +35,6 @@
CallbackWithResult failed_callback) override;
chromeos::PowerManagerClient* power_manager_client_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceCommandRebootJob);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_refresh_machine_certificate_job.h b/chrome/browser/ash/policy/remote_commands/device_command_refresh_machine_certificate_job.h
index 9a05556..af729bf 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_refresh_machine_certificate_job.h
+++ b/chrome/browser/ash/policy/remote_commands/device_command_refresh_machine_certificate_job.h
@@ -22,6 +22,12 @@
explicit DeviceCommandRefreshMachineCertificateJob(
ash::attestation::MachineCertificateUploader*
machine_certificate_uploader);
+
+ DeviceCommandRefreshMachineCertificateJob(
+ const DeviceCommandRefreshMachineCertificateJob&) = delete;
+ DeviceCommandRefreshMachineCertificateJob& operator=(
+ const DeviceCommandRefreshMachineCertificateJob&) = delete;
+
~DeviceCommandRefreshMachineCertificateJob() override;
// RemoteCommandJob:
@@ -41,8 +47,6 @@
base::WeakPtrFactory<DeviceCommandRefreshMachineCertificateJob>
weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceCommandRefreshMachineCertificateJob);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_remote_powerwash_job.h b/chrome/browser/ash/policy/remote_commands/device_command_remote_powerwash_job.h
index b2f3264..cdd3c88 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_remote_powerwash_job.h
+++ b/chrome/browser/ash/policy/remote_commands/device_command_remote_powerwash_job.h
@@ -15,6 +15,12 @@
class DeviceCommandRemotePowerwashJob : public RemoteCommandJob {
public:
explicit DeviceCommandRemotePowerwashJob(RemoteCommandsService* service);
+
+ DeviceCommandRemotePowerwashJob(const DeviceCommandRemotePowerwashJob&) =
+ delete;
+ DeviceCommandRemotePowerwashJob& operator=(
+ const DeviceCommandRemotePowerwashJob&) = delete;
+
~DeviceCommandRemotePowerwashJob() override;
// RemoteCommandJob:
@@ -28,8 +34,6 @@
private:
RemoteCommandsService* const service_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceCommandRemotePowerwashJob);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.cc
index 643c26d..ebc49e9 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.cc
+++ b/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.cc
@@ -67,6 +67,10 @@
: public RemoteCommandJob::ResultPayload {
public:
explicit Payload(ResultCode result_code);
+
+ Payload(const Payload&) = delete;
+ Payload& operator=(const Payload&) = delete;
+
~Payload() override {}
// RemoteCommandJob::ResultPayload:
@@ -74,8 +78,6 @@
private:
std::string payload_;
-
- DISALLOW_COPY_AND_ASSIGN(Payload);
};
DeviceCommandScreenshotJob::Payload::Payload(ResultCode result_code) {
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.h b/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.h
index 60f3f3e6..e2e3a57 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.h
+++ b/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.h
@@ -87,6 +87,11 @@
explicit DeviceCommandScreenshotJob(
std::unique_ptr<Delegate> screenshot_delegate);
+
+ DeviceCommandScreenshotJob(const DeviceCommandScreenshotJob&) = delete;
+ DeviceCommandScreenshotJob& operator=(const DeviceCommandScreenshotJob&) =
+ delete;
+
~DeviceCommandScreenshotJob() override;
// RemoteCommandJob:
@@ -133,8 +138,6 @@
std::unique_ptr<UploadJob> upload_job_;
base::WeakPtrFactory<DeviceCommandScreenshotJob> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceCommandScreenshotJob);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job.h b/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job.h
index 9c847b5..4490e62 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job.h
+++ b/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job.h
@@ -15,6 +15,11 @@
class DeviceCommandSetVolumeJob : public RemoteCommandJob {
public:
DeviceCommandSetVolumeJob();
+
+ DeviceCommandSetVolumeJob(const DeviceCommandSetVolumeJob&) = delete;
+ DeviceCommandSetVolumeJob& operator=(const DeviceCommandSetVolumeJob&) =
+ delete;
+
~DeviceCommandSetVolumeJob() override;
// RemoteCommandJob:
@@ -29,8 +34,6 @@
private:
// New volume level to be set, value in range [0,100].
int volume_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceCommandSetVolumeJob);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.h b/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.h
index 631061b..4faf86f 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.h
+++ b/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.h
@@ -76,6 +76,12 @@
};
explicit DeviceCommandStartCRDSessionJob(Delegate* crd_host_delegate);
+
+ DeviceCommandStartCRDSessionJob(const DeviceCommandStartCRDSessionJob&) =
+ delete;
+ DeviceCommandStartCRDSessionJob& operator=(
+ const DeviceCommandStartCRDSessionJob&) = delete;
+
~DeviceCommandStartCRDSessionJob() override;
// RemoteCommandJob:
@@ -161,8 +167,6 @@
bool terminate_session_attempted_ = false;
base::WeakPtrFactory<DeviceCommandStartCRDSessionJob> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceCommandStartCRDSessionJob);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_wipe_users_job.h b/chrome/browser/ash/policy/remote_commands/device_command_wipe_users_job.h
index a6da9cd..41b7026 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_wipe_users_job.h
+++ b/chrome/browser/ash/policy/remote_commands/device_command_wipe_users_job.h
@@ -15,6 +15,11 @@
class DeviceCommandWipeUsersJob : public RemoteCommandJob {
public:
explicit DeviceCommandWipeUsersJob(RemoteCommandsService* service);
+
+ DeviceCommandWipeUsersJob(const DeviceCommandWipeUsersJob&) = delete;
+ DeviceCommandWipeUsersJob& operator=(const DeviceCommandWipeUsersJob&) =
+ delete;
+
~DeviceCommandWipeUsersJob() override;
// RemoteCommandJob:
@@ -28,8 +33,6 @@
private:
RemoteCommandsService* const service_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceCommandWipeUsersJob);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/remote_commands/device_commands_factory_ash.h b/chrome/browser/ash/policy/remote_commands/device_commands_factory_ash.h
index bd2ec93..d7cddd2f 100644
--- a/chrome/browser/ash/policy/remote_commands/device_commands_factory_ash.h
+++ b/chrome/browser/ash/policy/remote_commands/device_commands_factory_ash.h
@@ -19,6 +19,10 @@
public:
explicit DeviceCommandsFactoryAsh(
DeviceCloudPolicyManagerAsh* policy_manager);
+
+ DeviceCommandsFactoryAsh(const DeviceCommandsFactoryAsh&) = delete;
+ DeviceCommandsFactoryAsh& operator=(const DeviceCommandsFactoryAsh&) = delete;
+
~DeviceCommandsFactoryAsh() override;
// RemoteCommandsFactory:
@@ -31,8 +35,6 @@
std::unique_ptr<CRDHostDelegate> crd_host_delegate_;
CRDHostDelegate* GetCRDHostDelegate();
-
- DISALLOW_COPY_AND_ASSIGN(DeviceCommandsFactoryAsh);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/remote_commands/screenshot_delegate.h b/chrome/browser/ash/policy/remote_commands/screenshot_delegate.h
index d233ab2..ed118b3 100644
--- a/chrome/browser/ash/policy/remote_commands/screenshot_delegate.h
+++ b/chrome/browser/ash/policy/remote_commands/screenshot_delegate.h
@@ -24,6 +24,10 @@
class ScreenshotDelegate : public DeviceCommandScreenshotJob::Delegate {
public:
ScreenshotDelegate();
+
+ ScreenshotDelegate(const ScreenshotDelegate&) = delete;
+ ScreenshotDelegate& operator=(const ScreenshotDelegate&) = delete;
+
~ScreenshotDelegate() override;
// DeviceCommandScreenshotJob::Delegate:
@@ -40,8 +44,6 @@
scoped_refptr<base::RefCountedMemory> png_data);
base::WeakPtrFactory<ScreenshotDelegate> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ScreenshotDelegate);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/remote_commands/user_command_arc_job.h b/chrome/browser/ash/policy/remote_commands/user_command_arc_job.h
index 09363465..1e985df 100644
--- a/chrome/browser/ash/policy/remote_commands/user_command_arc_job.h
+++ b/chrome/browser/ash/policy/remote_commands/user_command_arc_job.h
@@ -17,6 +17,10 @@
class UserCommandArcJob : public RemoteCommandJob {
public:
explicit UserCommandArcJob(Profile* profile);
+
+ UserCommandArcJob(const UserCommandArcJob&) = delete;
+ UserCommandArcJob& operator=(const UserCommandArcJob&) = delete;
+
~UserCommandArcJob() override;
// RemoteCommandJob:
@@ -32,8 +36,6 @@
private:
Profile* const profile_;
std::string command_payload_;
-
- DISALLOW_COPY_AND_ASSIGN(UserCommandArcJob);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/remote_commands/user_commands_factory_ash.h b/chrome/browser/ash/policy/remote_commands/user_commands_factory_ash.h
index 3c79959..4d78d353 100644
--- a/chrome/browser/ash/policy/remote_commands/user_commands_factory_ash.h
+++ b/chrome/browser/ash/policy/remote_commands/user_commands_factory_ash.h
@@ -17,6 +17,10 @@
class UserCommandsFactoryAsh : public RemoteCommandsFactory {
public:
explicit UserCommandsFactoryAsh(Profile* profile);
+
+ UserCommandsFactoryAsh(const UserCommandsFactoryAsh&) = delete;
+ UserCommandsFactoryAsh& operator=(const UserCommandsFactoryAsh&) = delete;
+
~UserCommandsFactoryAsh() override;
// RemoteCommandsFactory:
@@ -26,8 +30,6 @@
private:
Profile* const profile_;
-
- DISALLOW_COPY_AND_ASSIGN(UserCommandsFactoryAsh);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper.h b/chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper.h
index c2f41ea..4d45108 100644
--- a/chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper.h
+++ b/chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper.h
@@ -31,6 +31,11 @@
// all accesses to the log file.
class AppInstallEventLogManagerWrapper : public content::NotificationObserver {
public:
+ AppInstallEventLogManagerWrapper(const AppInstallEventLogManagerWrapper&) =
+ delete;
+ AppInstallEventLogManagerWrapper& operator=(
+ const AppInstallEventLogManagerWrapper&) = delete;
+
~AppInstallEventLogManagerWrapper() override;
// Creates a new |AppInstallEventLogManager| to handle app push-install event
@@ -81,8 +86,6 @@
// Notification observer, used to destroy the |log_manager_| when the user is
// logging out, giving it an opportunity to log the event.
content::NotificationRegistrar notification_registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(AppInstallEventLogManagerWrapper);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/reporting/arc_app_install_event_log_collector_unittest.cc b/chrome/browser/ash/policy/reporting/arc_app_install_event_log_collector_unittest.cc
index 568e17c52..328b9ba 100644
--- a/chrome/browser/ash/policy/reporting/arc_app_install_event_log_collector_unittest.cc
+++ b/chrome/browser/ash/policy/reporting/arc_app_install_event_log_collector_unittest.cc
@@ -45,6 +45,12 @@
: public ArcAppInstallEventLogCollector::Delegate {
public:
FakeAppInstallEventLogCollectorDelegate() = default;
+
+ FakeAppInstallEventLogCollectorDelegate(
+ const FakeAppInstallEventLogCollectorDelegate&) = delete;
+ FakeAppInstallEventLogCollectorDelegate& operator=(
+ const FakeAppInstallEventLogCollectorDelegate&) = delete;
+
~FakeAppInstallEventLogCollectorDelegate() override = default;
struct Request {
@@ -92,8 +98,6 @@
int add_for_all_count_ = 0;
int add_count_ = 0;
std::vector<Request> requests_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeAppInstallEventLogCollectorDelegate);
};
int64_t TimeToTimestamp(base::Time time) {
diff --git a/chrome/browser/ash/policy/rsu/lookup_key_uploader.h b/chrome/browser/ash/policy/rsu/lookup_key_uploader.h
index 3e4a260..5549e2ee 100644
--- a/chrome/browser/ash/policy/rsu/lookup_key_uploader.h
+++ b/chrome/browser/ash/policy/rsu/lookup_key_uploader.h
@@ -38,6 +38,9 @@
PrefService* pref_service,
ash::attestation::EnrollmentCertificateUploader* certificate_uploader);
+ LookupKeyUploader(const LookupKeyUploader&) = delete;
+ LookupKeyUploader& operator=(const LookupKeyUploader&) = delete;
+
~LookupKeyUploader() override;
private:
@@ -79,8 +82,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate the weak pointers before any other members are destroyed.
base::WeakPtrFactory<LookupKeyUploader> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LookupKeyUploader);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_update_checker.h b/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_update_checker.h
index 81c4cfa..197fde0 100644
--- a/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_update_checker.h
+++ b/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_update_checker.h
@@ -32,6 +32,11 @@
ash::CrosSettings* cros_settings,
chromeos::NetworkStateHandler* network_state_handler,
std::unique_ptr<ScheduledTaskExecutor> update_check_executor);
+
+ DeviceScheduledUpdateChecker(const DeviceScheduledUpdateChecker&) = delete;
+ DeviceScheduledUpdateChecker& operator=(const DeviceScheduledUpdateChecker&) =
+ delete;
+
~DeviceScheduledUpdateChecker() override;
// chromeos::system::TimezoneSettings::Observer implementation.
@@ -94,8 +99,6 @@
// Timer that is scheduled to check for updates.
std::unique_ptr<ScheduledTaskExecutor> update_check_executor_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceScheduledUpdateChecker);
};
namespace update_checker_internal {
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/os_and_policies_update_checker.h b/chrome/browser/ash/policy/scheduled_task_handler/os_and_policies_update_checker.h
index 53bb15a..9c18723 100644
--- a/chrome/browser/ash/policy/scheduled_task_handler/os_and_policies_update_checker.h
+++ b/chrome/browser/ash/policy/scheduled_task_handler/os_and_policies_update_checker.h
@@ -44,6 +44,11 @@
public:
explicit OsAndPoliciesUpdateChecker(
chromeos::NetworkStateHandler* network_state_handler);
+
+ OsAndPoliciesUpdateChecker(const OsAndPoliciesUpdateChecker&) = delete;
+ OsAndPoliciesUpdateChecker& operator=(const OsAndPoliciesUpdateChecker&) =
+ delete;
+
~OsAndPoliciesUpdateChecker() override;
using UpdateCheckCompletionCallback = base::OnceCallback<void(bool result)>;
@@ -130,8 +135,6 @@
chromeos::UpdateEngineClient* const update_engine_client_;
base::WeakPtrFactory<OsAndPoliciesUpdateChecker> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(OsAndPoliciesUpdateChecker);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/scoped_wake_lock.h b/chrome/browser/ash/policy/scheduled_task_handler/scoped_wake_lock.h
index a518c2b..d432724 100644
--- a/chrome/browser/ash/policy/scheduled_task_handler/scoped_wake_lock.h
+++ b/chrome/browser/ash/policy/scheduled_task_handler/scoped_wake_lock.h
@@ -21,6 +21,10 @@
class ScopedWakeLock {
public:
ScopedWakeLock(device::mojom::WakeLockType type, const std::string& reason);
+
+ ScopedWakeLock(const ScopedWakeLock&) = delete;
+ ScopedWakeLock& operator=(const ScopedWakeLock&) = delete;
+
~ScopedWakeLock();
// Movable only.
@@ -35,8 +39,6 @@
private:
mojo::Remote<device::mojom::WakeLock> wake_lock_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedWakeLock);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/task_executor_with_retries.h b/chrome/browser/ash/policy/scheduled_task_handler/task_executor_with_retries.h
index 822d3a6..a932681c 100644
--- a/chrome/browser/ash/policy/scheduled_task_handler/task_executor_with_retries.h
+++ b/chrome/browser/ash/policy/scheduled_task_handler/task_executor_with_retries.h
@@ -30,6 +30,10 @@
// given up.
// |retry_time| - Time between each retry.
TaskExecutorWithRetries(int max_retries, base::TimeDelta retry_time);
+
+ TaskExecutorWithRetries(const TaskExecutorWithRetries&) = delete;
+ TaskExecutorWithRetries& operator=(const TaskExecutorWithRetries&) = delete;
+
~TaskExecutorWithRetries();
// Runs |task| and caches |retry_failure_cb| which will be called when
@@ -65,8 +69,6 @@
// Timer used to retry |task| passed in |ScheduleRetry|.
base::OneShotTimer retry_timer_;
-
- DISALLOW_COPY_AND_ASSIGN(TaskExecutorWithRetries);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/test/device_scheduled_update_checker_unittest.cc b/chrome/browser/ash/policy/scheduled_task_handler/test/device_scheduled_update_checker_unittest.cc
index c919634..751eaf5 100644
--- a/chrome/browser/ash/policy/scheduled_task_handler/test/device_scheduled_update_checker_unittest.cc
+++ b/chrome/browser/ash/policy/scheduled_task_handler/test/device_scheduled_update_checker_unittest.cc
@@ -78,6 +78,11 @@
network_state_handler,
std::move(task_executor)) {}
+ DeviceScheduledUpdateCheckerForTest(
+ const DeviceScheduledUpdateCheckerForTest&) = delete;
+ DeviceScheduledUpdateCheckerForTest& operator=(
+ const DeviceScheduledUpdateCheckerForTest&) = delete;
+
~DeviceScheduledUpdateCheckerForTest() override {
TestingBrowserProcess::GetGlobal()->ShutdownBrowserPolicyConnector();
}
@@ -107,8 +112,6 @@
// Number of calls to |OnUpdateCheckCompletion| with |result| = true.
int update_check_completions_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceScheduledUpdateCheckerForTest);
};
class DeviceScheduledUpdateCheckerTest : public testing::Test {
@@ -144,6 +147,11 @@
std::move(task_executor));
}
+ DeviceScheduledUpdateCheckerTest(const DeviceScheduledUpdateCheckerTest&) =
+ delete;
+ DeviceScheduledUpdateCheckerTest& operator=(
+ const DeviceScheduledUpdateCheckerTest&) = delete;
+
~DeviceScheduledUpdateCheckerTest() override {
device_scheduled_update_checker_.reset();
network_state_test_helper_.reset();
@@ -358,8 +366,6 @@
chromeos::ScopedStubInstallAttributes test_install_attributes_{
chromeos::StubInstallAttributes::CreateCloudManaged("fake-domain",
"fake-id")};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceScheduledUpdateCheckerTest);
};
TEST_F(DeviceScheduledUpdateCheckerTest, CheckIfDailyUpdateCheckIsScheduled) {
diff --git a/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker.h b/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker.h
index cd37f4db0..4da962ec 100644
--- a/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker.h
+++ b/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker.h
@@ -37,6 +37,11 @@
explicit ServerBackedStateKeysBroker(
chromeos::SessionManagerClient* session_manager_client);
+
+ ServerBackedStateKeysBroker(const ServerBackedStateKeysBroker&) = delete;
+ ServerBackedStateKeysBroker& operator=(const ServerBackedStateKeysBroker&) =
+ delete;
+
~ServerBackedStateKeysBroker();
// Registers a callback to be invoked whenever the state keys get updated.
@@ -93,8 +98,6 @@
StateKeysCallbackList request_callbacks_;
base::WeakPtrFactory<ServerBackedStateKeysBroker> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ServerBackedStateKeysBroker);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker_unittest.cc b/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker_unittest.cc
index 329eb32b..069d6812 100644
--- a/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker_unittest.cc
+++ b/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker_unittest.cc
@@ -26,6 +26,12 @@
state_keys_.push_back("3");
fake_session_manager_client_.set_server_backed_state_keys(state_keys_);
}
+
+ ServerBackedStateKeysBrokerTest(const ServerBackedStateKeysBrokerTest&) =
+ delete;
+ ServerBackedStateKeysBrokerTest& operator=(
+ const ServerBackedStateKeysBrokerTest&) = delete;
+
~ServerBackedStateKeysBrokerTest() override {}
void StateKeysUpdated() { updated_ = true; }
@@ -50,9 +56,6 @@
bool updated_;
std::vector<std::string> callback_state_keys_;
bool callback_invoked_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ServerBackedStateKeysBrokerTest);
};
TEST_F(ServerBackedStateKeysBrokerTest, Load) {
diff --git a/chrome/browser/ash/policy/status_collector/child_status_collector.h b/chrome/browser/ash/policy/status_collector/child_status_collector.h
index 7653087..355206f 100644
--- a/chrome/browser/ash/policy/status_collector/child_status_collector.h
+++ b/chrome/browser/ash/policy/status_collector/child_status_collector.h
@@ -59,6 +59,10 @@
chromeos::system::StatisticsProvider* provider,
const AndroidStatusFetcher& android_status_fetcher,
base::TimeDelta activity_day_start);
+
+ ChildStatusCollector(const ChildStatusCollector&) = delete;
+ ChildStatusCollector& operator=(const ChildStatusCollector&) = delete;
+
~ChildStatusCollector() override;
// StatusCollector:
@@ -150,8 +154,6 @@
std::unique_ptr<ChildActivityStorage> activity_storage_;
base::WeakPtrFactory<ChildStatusCollector> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChildStatusCollector);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/status_collector/device_status_collector.h b/chrome/browser/ash/policy/status_collector/device_status_collector.h
index 555dcc7..d8fd792 100644
--- a/chrome/browser/ash/policy/status_collector/device_status_collector.h
+++ b/chrome/browser/ash/policy/status_collector/device_status_collector.h
@@ -97,6 +97,10 @@
class SampledData {
public:
SampledData();
+
+ SampledData(const SampledData&) = delete;
+ SampledData& operator=(const SampledData&) = delete;
+
~SampledData();
// Sampling timestamp.
@@ -107,8 +111,6 @@
std::map<std::string, enterprise_management::ThermalSample> thermal_samples;
// CPU thermal samples.
std::map<std::string, enterprise_management::CPUTempInfo> cpu_samples;
-
- DISALLOW_COPY_AND_ASSIGN(SampledData);
};
// Collects and summarizes the status of an enterprise-managed ChromeOS device.
@@ -196,6 +198,9 @@
DeviceStatusCollector(PrefService* pref_service,
chromeos::system::StatisticsProvider* provider);
+ DeviceStatusCollector(const DeviceStatusCollector&) = delete;
+ DeviceStatusCollector& operator=(const DeviceStatusCollector&) = delete;
+
~DeviceStatusCollector() override;
// StatusCollector:
@@ -489,8 +494,6 @@
std::unique_ptr<EnterpriseActivityStorage> activity_storage_;
base::WeakPtrFactory<DeviceStatusCollector> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceStatusCollector);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc b/chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc
index 3b23f50..0fab7c2 100644
--- a/chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc
+++ b/chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc
@@ -907,6 +907,10 @@
chromeos::SeneschalClient::InitializeFake();
}
+ DeviceStatusCollectorTest(const DeviceStatusCollectorTest&) = delete;
+ DeviceStatusCollectorTest& operator=(const DeviceStatusCollectorTest&) =
+ delete;
+
~DeviceStatusCollectorTest() override {
chromeos::SeneschalClient::Shutdown();
// |testing_profile_| must be destroyed while ConciergeClient is alive.
@@ -1186,9 +1190,6 @@
// This property is required to instantiate the session manager, a singleton
// which is used by the device status collector.
session_manager::SessionManager session_manager_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DeviceStatusCollectorTest);
};
TEST_F(DeviceStatusCollectorTest, AllIdle) {
diff --git a/chrome/browser/ash/policy/uploading/heartbeat_scheduler.h b/chrome/browser/ash/policy/uploading/heartbeat_scheduler.h
index d7ba8238..d4e7e5f 100644
--- a/chrome/browser/ash/policy/uploading/heartbeat_scheduler.h
+++ b/chrome/browser/ash/policy/uploading/heartbeat_scheduler.h
@@ -51,6 +51,9 @@
const std::string& device_id,
const scoped_refptr<base::SequencedTaskRunner>& task_runner);
+ HeartbeatScheduler(const HeartbeatScheduler&) = delete;
+ HeartbeatScheduler& operator=(const HeartbeatScheduler&) = delete;
+
~HeartbeatScheduler() override;
// Returns the time of the last heartbeat, or Time(0) if no heartbeat
@@ -157,8 +160,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate the weak pointers before any other members are destroyed.
base::WeakPtrFactory<HeartbeatScheduler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(HeartbeatScheduler);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/uploading/heartbeat_scheduler_unittest.cc b/chrome/browser/ash/policy/uploading/heartbeat_scheduler_unittest.cc
index 34fc2fff3..96051df 100644
--- a/chrome/browser/ash/policy/uploading/heartbeat_scheduler_unittest.cc
+++ b/chrome/browser/ash/policy/uploading/heartbeat_scheduler_unittest.cc
@@ -59,6 +59,9 @@
public:
MockGCMDriver() { IgnoreDefaultHeartbeatsInterval(); }
+ MockGCMDriver(const MockGCMDriver&) = delete;
+ MockGCMDriver& operator=(const MockGCMDriver&) = delete;
+
~MockGCMDriver() override {}
MOCK_METHOD2(RegisterImpl,
@@ -120,8 +123,6 @@
private:
gcm::GCMConnectionObserver* observer_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(MockGCMDriver);
};
class HeartbeatSchedulerTest : public testing::Test {
diff --git a/chrome/browser/ash/policy/uploading/status_uploader.h b/chrome/browser/ash/policy/uploading/status_uploader.h
index ccda664..b5c92839 100644
--- a/chrome/browser/ash/policy/uploading/status_uploader.h
+++ b/chrome/browser/ash/policy/uploading/status_uploader.h
@@ -39,6 +39,9 @@
const scoped_refptr<base::SequencedTaskRunner>& task_runner,
base::TimeDelta default_upload_frequency);
+ StatusUploader(const StatusUploader&) = delete;
+ StatusUploader& operator=(const StatusUploader&) = delete;
+
~StatusUploader() override;
// Returns the time of the last successful upload, or Time(0) if no upload
@@ -113,8 +116,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate the weak pointers before any other members are destroyed.
base::WeakPtrFactory<StatusUploader> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(StatusUploader);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/uploading/system_log_uploader.cc b/chrome/browser/ash/policy/uploading/system_log_uploader.cc
index 876d46b..e9d0ad6 100644
--- a/chrome/browser/ash/policy/uploading/system_log_uploader.cc
+++ b/chrome/browser/ash/policy/uploading/system_log_uploader.cc
@@ -151,6 +151,10 @@
public:
explicit SystemLogDelegate(
scoped_refptr<base::SequencedTaskRunner> task_runner);
+
+ SystemLogDelegate(const SystemLogDelegate&) = delete;
+ SystemLogDelegate& operator=(const SystemLogDelegate&) = delete;
+
~SystemLogDelegate() override;
// SystemLogUploader::Delegate:
@@ -167,8 +171,6 @@
private:
// TaskRunner used for scheduling upload the upload task.
const scoped_refptr<base::SequencedTaskRunner> task_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(SystemLogDelegate);
};
SystemLogDelegate::SystemLogDelegate(
diff --git a/chrome/browser/ash/policy/uploading/system_log_uploader.h b/chrome/browser/ash/policy/uploading/system_log_uploader.h
index 97bd7f9..9082d78 100644
--- a/chrome/browser/ash/policy/uploading/system_log_uploader.h
+++ b/chrome/browser/ash/policy/uploading/system_log_uploader.h
@@ -114,6 +114,9 @@
std::unique_ptr<Delegate> syslog_delegate,
const scoped_refptr<base::SequencedTaskRunner>& task_runner);
+ SystemLogUploader(const SystemLogUploader&) = delete;
+ SystemLogUploader& operator=(const SystemLogUploader&) = delete;
+
~SystemLogUploader() override;
// Returns the time of the last upload attempt, or Time(0) if no upload has
@@ -192,8 +195,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate the weak pointers before any other members are destroyed.
base::WeakPtrFactory<SystemLogUploader> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SystemLogUploader);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/uploading/upload_job_impl.h b/chrome/browser/ash/policy/uploading/upload_job_impl.h
index 01a4e3d1..a316c4e 100644
--- a/chrome/browser/ash/policy/uploading/upload_job_impl.h
+++ b/chrome/browser/ash/policy/uploading/upload_job_impl.h
@@ -71,6 +71,10 @@
std::unique_ptr<MimeBoundaryGenerator> boundary_generator,
net::NetworkTrafficAnnotationTag traffic_annotation,
scoped_refptr<base::SequencedTaskRunner> task_runner);
+
+ UploadJobImpl(const UploadJobImpl&) = delete;
+ UploadJobImpl& operator=(const UploadJobImpl&) = delete;
+
~UploadJobImpl() override;
// UploadJob:
@@ -189,8 +193,6 @@
// Should remain the last member so it will be destroyed first and
// invalidate all weak pointers.
base::WeakPtrFactory<UploadJobImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UploadJobImpl);
};
} // namespace policy
diff --git a/chrome/browser/ash/policy/uploading/upload_job_unittest.cc b/chrome/browser/ash/policy/uploading/upload_job_unittest.cc
index bb01f271..a9b82d09 100644
--- a/chrome/browser/ash/policy/uploading/upload_job_unittest.cc
+++ b/chrome/browser/ash/policy/uploading/upload_job_unittest.cc
@@ -53,6 +53,12 @@
public:
explicit RepeatingMimeBoundaryGenerator(char character)
: character_(character) {}
+
+ RepeatingMimeBoundaryGenerator(const RepeatingMimeBoundaryGenerator&) =
+ delete;
+ RepeatingMimeBoundaryGenerator& operator=(
+ const RepeatingMimeBoundaryGenerator&) = delete;
+
~RepeatingMimeBoundaryGenerator() override {}
// MimeBoundaryGenerator:
@@ -63,8 +69,6 @@
private:
const char character_;
-
- DISALLOW_COPY_AND_ASSIGN(RepeatingMimeBoundaryGenerator);
};
class FakeOAuth2AccessTokenManagerWithCaching
@@ -72,6 +76,12 @@
public:
explicit FakeOAuth2AccessTokenManagerWithCaching(
OAuth2AccessTokenManager::Delegate* delegate);
+
+ FakeOAuth2AccessTokenManagerWithCaching(
+ const FakeOAuth2AccessTokenManagerWithCaching&) = delete;
+ FakeOAuth2AccessTokenManagerWithCaching& operator=(
+ const FakeOAuth2AccessTokenManagerWithCaching&) = delete;
+
~FakeOAuth2AccessTokenManagerWithCaching() override;
// FakeOAuth2AccessTokenManager:
@@ -97,8 +107,6 @@
private:
base::queue<std::string> token_replies_;
std::set<std::string> valid_tokens_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeOAuth2AccessTokenManagerWithCaching);
};
FakeOAuth2AccessTokenManagerWithCaching::
diff --git a/chrome/browser/ash/policy/value_validation/onc_policy_value_validator_base.h b/chrome/browser/ash/policy/value_validation/onc_policy_value_validator_base.h
index 7f7366a..9b5fb9e 100644
--- a/chrome/browser/ash/policy/value_validation/onc_policy_value_validator_base.h
+++ b/chrome/browser/ash/policy/value_validation/onc_policy_value_validator_base.h
@@ -23,6 +23,11 @@
ONCPolicyValueValidatorBase(const std::string& onc_policy_name,
::onc::ONCSource source)
: policy_name_(onc_policy_name), source_(source) {}
+
+ ONCPolicyValueValidatorBase(const ONCPolicyValueValidatorBase&) = delete;
+ ONCPolicyValueValidatorBase& operator=(const ONCPolicyValueValidatorBase&) =
+ delete;
+
virtual ~ONCPolicyValueValidatorBase() {}
// PolicyValueValidator:
@@ -75,8 +80,6 @@
private:
const std::string policy_name_;
const ::onc::ONCSource source_;
-
- DISALLOW_COPY_AND_ASSIGN(ONCPolicyValueValidatorBase);
};
} // namespace policy
diff --git a/chrome/browser/ash/power/auto_screen_brightness/adapter.h b/chrome/browser/ash/power/auto_screen_brightness/adapter.h
index de5b160..59808eb 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/adapter.h
+++ b/chrome/browser/ash/power/auto_screen_brightness/adapter.h
@@ -159,6 +159,10 @@
Modeller* modeller,
ModelConfigLoader* model_config_loader,
MetricsReporter* metrics_reporter);
+
+ Adapter(const Adapter&) = delete;
+ Adapter& operator=(const Adapter&) = delete;
+
~Adapter() override;
// Must be called before the Adapter is used.
@@ -407,8 +411,6 @@
// Hence we do not store any ALS data that arrives less than
// |lid_open_delay_time_| from |lid_reopen_time_|.
base::TimeDelta lid_open_delay_time_ = base::TimeDelta::FromSeconds(2);
-
- DISALLOW_COPY_AND_ASSIGN(Adapter);
};
} // namespace auto_screen_brightness
diff --git a/chrome/browser/ash/power/auto_screen_brightness/adapter_unittest.cc b/chrome/browser/ash/power/auto_screen_brightness/adapter_unittest.cc
index c6fa187c..7819acea 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/adapter_unittest.cc
+++ b/chrome/browser/ash/power/auto_screen_brightness/adapter_unittest.cc
@@ -133,6 +133,9 @@
AdapterTest()
: task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
+ AdapterTest(const AdapterTest&) = delete;
+ AdapterTest& operator=(const AdapterTest&) = delete;
+
~AdapterTest() override = default;
void SetUp() override {
@@ -314,9 +317,6 @@
base::test::ScopedFeatureList scoped_feature_list_;
std::unique_ptr<Adapter> adapter_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AdapterTest);
};
// AlsReader is |kDisabled| when Adapter is created.
diff --git a/chrome/browser/ash/power/auto_screen_brightness/als_file_reader.h b/chrome/browser/ash/power/auto_screen_brightness/als_file_reader.h
index e513238..b84d76f4 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/als_file_reader.h
+++ b/chrome/browser/ash/power/auto_screen_brightness/als_file_reader.h
@@ -36,6 +36,10 @@
base::TimeDelta::FromSecondsD(1.0 / AlsReader::kAlsPollFrequency);
explicit AlsFileReader(AlsReader* als_reader);
+
+ AlsFileReader(const AlsFileReader&) = delete;
+ AlsFileReader& operator=(const AlsFileReader&) = delete;
+
~AlsFileReader() override;
// Checks if an ALS is enabled, and if the config is valid . Also
@@ -86,8 +90,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<AlsFileReader> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AlsFileReader);
};
} // namespace auto_screen_brightness
diff --git a/chrome/browser/ash/power/auto_screen_brightness/als_samples.h b/chrome/browser/ash/power/auto_screen_brightness/als_samples.h
index 2c157d4..31ff25c 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/als_samples.h
+++ b/chrome/browser/ash/power/auto_screen_brightness/als_samples.h
@@ -32,6 +32,10 @@
// Constructs a buffer that keeps samples younger than |horizon|. |horizon|
// should be greater than 0.
explicit AmbientLightSampleBuffer(base::TimeDelta horizon);
+
+ AmbientLightSampleBuffer(const AmbientLightSampleBuffer&) = delete;
+ AmbientLightSampleBuffer& operator=(const AmbientLightSampleBuffer&) = delete;
+
~AmbientLightSampleBuffer();
// Adds |sample| to the buffer and discards samples that are now too old.
@@ -60,7 +64,6 @@
// Removes samples from |samples_| that have time <= |now| - |horizon_|.
void Prune(base::TimeTicks now);
- DISALLOW_COPY_AND_ASSIGN(AmbientLightSampleBuffer);
};
} // namespace auto_screen_brightness
diff --git a/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor.h b/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor.h
index 079ff2c..44bd57cf 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor.h
+++ b/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor.h
@@ -26,6 +26,10 @@
class Observer : public base::CheckedObserver {
public:
Observer() = default;
+
+ Observer(const Observer&) = delete;
+ Observer& operator=(const Observer&) = delete;
+
~Observer() override = default;
// Called when BrightnessMonitor is initialized.
@@ -42,9 +46,6 @@
// Called for every user request, i.e. it's not consolidated like
// |OnUserBrightnessChanged|.
virtual void OnUserBrightnessChangeRequested() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Observer);
};
virtual ~BrightnessMonitor() = default;
diff --git a/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor_impl.h b/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor_impl.h
index 59114198..faa474c0 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor_impl.h
+++ b/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor_impl.h
@@ -33,6 +33,10 @@
base::TimeDelta::FromSeconds(3);
BrightnessMonitorImpl();
+
+ BrightnessMonitorImpl(const BrightnessMonitorImpl&) = delete;
+ BrightnessMonitorImpl& operator=(const BrightnessMonitorImpl&) = delete;
+
~BrightnessMonitorImpl() override;
// Must be called before the BrightnessMonitorImpl is used.
@@ -102,8 +106,6 @@
base::ObserverList<BrightnessMonitor::Observer> observers_;
base::WeakPtrFactory<BrightnessMonitorImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BrightnessMonitorImpl);
};
} // namespace auto_screen_brightness
diff --git a/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor_impl_unittest.cc b/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor_impl_unittest.cc
index 90f6a6e1..df99441 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor_impl_unittest.cc
+++ b/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor_impl_unittest.cc
@@ -24,6 +24,10 @@
class TestObserver : public BrightnessMonitor::Observer {
public:
TestObserver() {}
+
+ TestObserver(const TestObserver&) = delete;
+ TestObserver& operator=(const TestObserver&) = delete;
+
~TestObserver() override = default;
// BrightnessMonitor::Observer overrides:
@@ -62,8 +66,6 @@
int num_brightness_changes_ = 0;
int num_user_brightness_change_requested_ = 0;
absl::optional<BrightnessMonitor::Status> status_;
-
- DISALLOW_COPY_AND_ASSIGN(TestObserver);
};
} // namespace
@@ -72,6 +74,10 @@
BrightnessMonitorImplTest()
: task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
+ BrightnessMonitorImplTest(const BrightnessMonitorImplTest&) = delete;
+ BrightnessMonitorImplTest& operator=(const BrightnessMonitorImplTest&) =
+ delete;
+
~BrightnessMonitorImplTest() override {}
// testing::Test:
@@ -124,9 +130,6 @@
std::unique_ptr<BrightnessMonitorImpl> monitor_;
std::unique_ptr<TestObserver> test_observer_;
base::test::ScopedFeatureList scoped_feature_list_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BrightnessMonitorImplTest);
};
TEST_F(BrightnessMonitorImplTest, ReportSuccess) {
diff --git a/chrome/browser/ash/power/auto_screen_brightness/controller.h b/chrome/browser/ash/power/auto_screen_brightness/controller.h
index 6261d1ed..fddfeb9 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/controller.h
+++ b/chrome/browser/ash/power/auto_screen_brightness/controller.h
@@ -28,6 +28,10 @@
class Controller : public session_manager::SessionManagerObserver {
public:
Controller();
+
+ Controller(const Controller&) = delete;
+ Controller& operator=(const Controller&) = delete;
+
~Controller() override;
// session_manager::SessionManagerObserver overrides:
@@ -53,8 +57,6 @@
std::unique_ptr<ModelConfigLoaderImpl> model_config_loader_;
std::unique_ptr<ModellerImpl> modeller_;
std::unique_ptr<Adapter> adapter_;
-
- DISALLOW_COPY_AND_ASSIGN(Controller);
};
} // namespace auto_screen_brightness
diff --git a/chrome/browser/ash/power/auto_screen_brightness/fake_brightness_monitor.h b/chrome/browser/ash/power/auto_screen_brightness/fake_brightness_monitor.h
index 22630a0..b40b510 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/fake_brightness_monitor.h
+++ b/chrome/browser/ash/power/auto_screen_brightness/fake_brightness_monitor.h
@@ -17,6 +17,10 @@
class FakeBrightnessMonitor : public BrightnessMonitor {
public:
FakeBrightnessMonitor();
+
+ FakeBrightnessMonitor(const FakeBrightnessMonitor&) = delete;
+ FakeBrightnessMonitor& operator=(const FakeBrightnessMonitor&) = delete;
+
~FakeBrightnessMonitor() override;
void set_status(const Status status) { brightness_monitor_status_ = status; }
@@ -44,8 +48,6 @@
base::ObserverList<BrightnessMonitor::Observer> observers_;
base::WeakPtrFactory<FakeBrightnessMonitor> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FakeBrightnessMonitor);
};
} // namespace auto_screen_brightness
diff --git a/chrome/browser/ash/power/auto_screen_brightness/fake_model_config_loader.h b/chrome/browser/ash/power/auto_screen_brightness/fake_model_config_loader.h
index c193d21..fd7028d9 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/fake_model_config_loader.h
+++ b/chrome/browser/ash/power/auto_screen_brightness/fake_model_config_loader.h
@@ -20,6 +20,10 @@
class FakeModelConfigLoader : public ModelConfigLoader {
public:
FakeModelConfigLoader();
+
+ FakeModelConfigLoader(const FakeModelConfigLoader&) = delete;
+ FakeModelConfigLoader& operator=(const FakeModelConfigLoader&) = delete;
+
~FakeModelConfigLoader() override;
void set_model_config(const ModelConfig& model_config) {
@@ -45,8 +49,6 @@
ModelConfig model_config_;
base::ObserverList<Observer> observers_;
base::WeakPtrFactory<FakeModelConfigLoader> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FakeModelConfigLoader);
};
} // namespace auto_screen_brightness
diff --git a/chrome/browser/ash/power/auto_screen_brightness/gaussian_trainer.h b/chrome/browser/ash/power/auto_screen_brightness/gaussian_trainer.h
index 3138b76..a06ee81 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/gaussian_trainer.h
+++ b/chrome/browser/ash/power/auto_screen_brightness/gaussian_trainer.h
@@ -77,6 +77,10 @@
};
GaussianTrainer();
+
+ GaussianTrainer(const GaussianTrainer&) = delete;
+ GaussianTrainer& operator=(const GaussianTrainer&) = delete;
+
~GaussianTrainer() override;
// Trainer overrides:
@@ -130,8 +134,6 @@
// calculated from the global curve's brightness values.
std::vector<double> min_ratios_;
std::vector<double> max_ratios_;
-
- DISALLOW_COPY_AND_ASSIGN(GaussianTrainer);
};
} // namespace auto_screen_brightness
diff --git a/chrome/browser/ash/power/auto_screen_brightness/gaussian_trainer_unittest.cc b/chrome/browser/ash/power/auto_screen_brightness/gaussian_trainer_unittest.cc
index 6663a1f..e4ca757 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/gaussian_trainer_unittest.cc
+++ b/chrome/browser/ash/power/auto_screen_brightness/gaussian_trainer_unittest.cc
@@ -35,6 +35,9 @@
gaussian_trainer_ = std::make_unique<GaussianTrainer>();
}
+ GaussianTrainerTest(const GaussianTrainerTest&) = delete;
+ GaussianTrainerTest& operator=(const GaussianTrainerTest&) = delete;
+
~GaussianTrainerTest() override = default;
protected:
@@ -79,9 +82,6 @@
base::HistogramTester histogram_tester_;
std::unique_ptr<GaussianTrainer> gaussian_trainer_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(GaussianTrainerTest);
};
// Tests the effect of |brightness_bound_scale| on outlier checks. A larger
diff --git a/chrome/browser/ash/power/auto_screen_brightness/metrics_reporter.cc b/chrome/browser/ash/power/auto_screen_brightness/metrics_reporter.cc
index d68c408..3dec83c 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/metrics_reporter.cc
+++ b/chrome/browser/ash/power/auto_screen_brightness/metrics_reporter.cc
@@ -65,6 +65,10 @@
public:
explicit DailyEventObserver(MetricsReporter* reporter)
: reporter_(reporter) {}
+
+ DailyEventObserver(const DailyEventObserver&) = delete;
+ DailyEventObserver& operator=(const DailyEventObserver&) = delete;
+
~DailyEventObserver() override = default;
// metrics::DailyEvent::Observer:
@@ -74,8 +78,6 @@
private:
MetricsReporter* reporter_; // Not owned.
-
- DISALLOW_COPY_AND_ASSIGN(DailyEventObserver);
};
void MetricsReporter::RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
diff --git a/chrome/browser/ash/power/auto_screen_brightness/metrics_reporter.h b/chrome/browser/ash/power/auto_screen_brightness/metrics_reporter.h
index 7c6ba0e..3e570fc 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/metrics_reporter.h
+++ b/chrome/browser/ash/power/auto_screen_brightness/metrics_reporter.h
@@ -67,6 +67,10 @@
// RegisterLocalStatePrefs() must be called before instantiating this class.
MetricsReporter(PowerManagerClient* power_manager_client,
PrefService* local_state_pref_service);
+
+ MetricsReporter(const MetricsReporter&) = delete;
+ MetricsReporter& operator=(const MetricsReporter&) = delete;
+
~MetricsReporter() override;
// PowerManagerClient::Observer:
@@ -107,8 +111,6 @@
// Daily count for each DeviceClass. Ordered by DeviceClass values.
// Initial values will be loaded from prefs service.
std::array<int, kNumberDeviceClasses> daily_counts_;
-
- DISALLOW_COPY_AND_ASSIGN(MetricsReporter);
};
} // namespace auto_screen_brightness
diff --git a/chrome/browser/ash/power/auto_screen_brightness/metrics_reporter_unittest.cc b/chrome/browser/ash/power/auto_screen_brightness/metrics_reporter_unittest.cc
index c5f5946..a437c947 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/metrics_reporter_unittest.cc
+++ b/chrome/browser/ash/power/auto_screen_brightness/metrics_reporter_unittest.cc
@@ -34,6 +34,10 @@
class MetricsReporterTest : public testing::Test {
public:
MetricsReporterTest() = default;
+
+ MetricsReporterTest(const MetricsReporterTest&) = delete;
+ MetricsReporterTest& operator=(const MetricsReporterTest&) = delete;
+
~MetricsReporterTest() override = default;
void SetUp() override {
@@ -78,9 +82,6 @@
base::test::TaskEnvironment task_environment_;
TestingPrefServiceSimple pref_service_;
std::unique_ptr<MetricsReporter> reporter_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MetricsReporterTest);
};
TEST_F(MetricsReporterTest, CountAndReportEvents) {
diff --git a/chrome/browser/ash/power/auto_screen_brightness/model_config_loader.h b/chrome/browser/ash/power/auto_screen_brightness/model_config_loader.h
index 871f478..2e120f8 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/model_config_loader.h
+++ b/chrome/browser/ash/power/auto_screen_brightness/model_config_loader.h
@@ -23,6 +23,10 @@
class Observer : public base::CheckedObserver {
public:
Observer() = default;
+
+ Observer(const Observer&) = delete;
+ Observer& operator=(const Observer&) = delete;
+
~Observer() override = default;
// Called when the ModelConfigLoader is initialized. |model_config| is only
@@ -30,9 +34,6 @@
// from experiment flags.
virtual void OnModelConfigLoaded(
absl::optional<ModelConfig> model_config) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Observer);
};
virtual ~ModelConfigLoader() = default;
diff --git a/chrome/browser/ash/power/auto_screen_brightness/model_config_loader_impl.h b/chrome/browser/ash/power/auto_screen_brightness/model_config_loader_impl.h
index 6c2a80f5..8036231 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/model_config_loader_impl.h
+++ b/chrome/browser/ash/power/auto_screen_brightness/model_config_loader_impl.h
@@ -26,6 +26,10 @@
class ModelConfigLoaderImpl : public ModelConfigLoader {
public:
ModelConfigLoaderImpl();
+
+ ModelConfigLoaderImpl(const ModelConfigLoaderImpl&) = delete;
+ ModelConfigLoaderImpl& operator=(const ModelConfigLoaderImpl&) = delete;
+
~ModelConfigLoaderImpl() override;
// ModelConfigLoader overrides:
@@ -71,8 +75,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<ModelConfigLoaderImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ModelConfigLoaderImpl);
};
} // namespace auto_screen_brightness
diff --git a/chrome/browser/ash/power/auto_screen_brightness/model_config_loader_impl_unittest.cc b/chrome/browser/ash/power/auto_screen_brightness/model_config_loader_impl_unittest.cc
index 2e0dbbe..cf42c930 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/model_config_loader_impl_unittest.cc
+++ b/chrome/browser/ash/power/auto_screen_brightness/model_config_loader_impl_unittest.cc
@@ -30,6 +30,10 @@
class TestObserver : public ModelConfigLoader::Observer {
public:
TestObserver() {}
+
+ TestObserver(const TestObserver&) = delete;
+ TestObserver& operator=(const TestObserver&) = delete;
+
~TestObserver() override = default;
// ModelConfigLoader::Observer overrides:
@@ -46,8 +50,6 @@
private:
bool model_config_loader_initialized_ = false;
absl::optional<ModelConfig> model_config_;
-
- DISALLOW_COPY_AND_ASSIGN(TestObserver);
};
} // namespace
@@ -60,6 +62,10 @@
temp_params_path_ = temp_dir_.GetPath().Append("model_params.json");
}
+ ModelConfigLoaderImplTest(const ModelConfigLoaderImplTest&) = delete;
+ ModelConfigLoaderImplTest& operator=(const ModelConfigLoaderImplTest&) =
+ delete;
+
~ModelConfigLoaderImplTest() override {
base::ThreadPoolInstance::Get()->FlushForTesting();
}
@@ -102,9 +108,6 @@
std::unique_ptr<ModelConfigLoaderImpl> model_config_loader_;
std::unique_ptr<TestObserver> test_observer_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ModelConfigLoaderImplTest);
};
TEST_F(ModelConfigLoaderImplTest, ValidModelParamsLoaded) {
diff --git a/chrome/browser/ash/power/auto_screen_brightness/modeller.h b/chrome/browser/ash/power/auto_screen_brightness/modeller.h
index 03b5e57..57acadf 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/modeller.h
+++ b/chrome/browser/ash/power/auto_screen_brightness/modeller.h
@@ -21,6 +21,10 @@
class Observer : public base::CheckedObserver {
public:
Observer() = default;
+
+ Observer(const Observer&) = delete;
+ Observer& operator=(const Observer&) = delete;
+
~Observer() override = default;
// Called when a new curve (|brightness_curve|) is trained.
@@ -31,9 +35,6 @@
// |global_curve| and |personal_curve| will be nullopt. If there is only a
// global curve, then |personal_curve| will be nullopt.
virtual void OnModelInitialized(const Model& model) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Observer);
};
virtual ~Modeller() = default;
diff --git a/chrome/browser/ash/power/auto_screen_brightness/modeller_impl.h b/chrome/browser/ash/power/auto_screen_brightness/modeller_impl.h
index 606f483..1ba38b8 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/modeller_impl.h
+++ b/chrome/browser/ash/power/auto_screen_brightness/modeller_impl.h
@@ -78,6 +78,10 @@
ModelConfigLoader* model_config_loader,
ui::UserActivityDetector* user_activity_detector,
std::unique_ptr<Trainer> trainer);
+
+ ModellerImpl(const ModellerImpl&) = delete;
+ ModellerImpl& operator=(const ModellerImpl&) = delete;
+
~ModellerImpl() override;
// Modeller overrides:
@@ -284,8 +288,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<ModellerImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ModellerImpl);
};
// Saves |model| to disk at location specified by |model_saving_spec| and
diff --git a/chrome/browser/ash/power/auto_screen_brightness/modeller_impl_unittest.cc b/chrome/browser/ash/power/auto_screen_brightness/modeller_impl_unittest.cc
index 6bbf7ca..19d0f82 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/modeller_impl_unittest.cc
+++ b/chrome/browser/ash/power/auto_screen_brightness/modeller_impl_unittest.cc
@@ -78,6 +78,10 @@
// If personal curve is valid, then the trainer must be configured.
DCHECK(!is_personal_curve_valid_ || is_configured_);
}
+
+ FakeTrainer(const FakeTrainer&) = delete;
+ FakeTrainer& operator=(const FakeTrainer&) = delete;
+
~FakeTrainer() override = default;
// Trainer overrides:
@@ -129,13 +133,15 @@
bool return_new_curve_ = false;
double curve_error_ = 0.0;
-
- DISALLOW_COPY_AND_ASSIGN(FakeTrainer);
};
class TestObserver : public Modeller::Observer {
public:
TestObserver() {}
+
+ TestObserver(const TestObserver&) = delete;
+ TestObserver& operator=(const TestObserver&) = delete;
+
~TestObserver() override = default;
// Modeller::Observer overrides:
@@ -165,8 +171,6 @@
private:
bool model_initialized_ = false;
Model model_;
-
- DISALLOW_COPY_AND_ASSIGN(TestObserver);
};
} // namespace
@@ -190,6 +194,9 @@
std::make_unique<FakeLightProvider>(als_reader_.get());
}
+ ModellerImplTest(const ModellerImplTest&) = delete;
+ ModellerImplTest& operator=(const ModellerImplTest&) = delete;
+
~ModellerImplTest() override {
base::ThreadPoolInstance::Get()->FlushForTesting();
}
@@ -283,9 +290,6 @@
std::unique_ptr<ModellerImpl> modeller_;
std::unique_ptr<TestObserver> test_observer_;
base::test::ScopedFeatureList scoped_feature_list_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ModellerImplTest);
};
// AlsReader is |kDisabled| when Modeller is created.
diff --git a/chrome/browser/ash/power/cpu_data_collector.h b/chrome/browser/ash/power/cpu_data_collector.h
index c982ba5..4e8e549 100644
--- a/chrome/browser/ash/power/cpu_data_collector.h
+++ b/chrome/browser/ash/power/cpu_data_collector.h
@@ -66,6 +66,10 @@
}
CpuDataCollector();
+
+ CpuDataCollector(const CpuDataCollector&) = delete;
+ CpuDataCollector& operator=(const CpuDataCollector&) = delete;
+
~CpuDataCollector();
// Starts a repeating timer which periodically runs a callback to collect
@@ -139,7 +143,6 @@
int cpu_count_;
base::WeakPtrFactory<CpuDataCollector> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(CpuDataCollector);
};
} // namespace ash
diff --git a/chrome/browser/ash/power/extension_event_observer.h b/chrome/browser/ash/power/extension_event_observer.h
index e545278..3a3c439 100644
--- a/chrome/browser/ash/power/extension_event_observer.h
+++ b/chrome/browser/ash/power/extension_event_observer.h
@@ -45,6 +45,9 @@
public:
class TestApi {
public:
+ TestApi(const TestApi&) = delete;
+ TestApi& operator=(const TestApi&) = delete;
+
~TestApi();
// Runs |suspend_readiness_callback_| if it is non-null and then resets it.
@@ -61,8 +64,6 @@
explicit TestApi(base::WeakPtr<ExtensionEventObserver> parent);
base::WeakPtr<ExtensionEventObserver> parent_;
-
- DISALLOW_COPY_AND_ASSIGN(TestApi);
};
ExtensionEventObserver();
diff --git a/chrome/browser/ash/power/extension_event_observer_unittest.cc b/chrome/browser/ash/power/extension_event_observer_unittest.cc
index b194dd9..31eac9c6 100644
--- a/chrome/browser/ash/power/extension_event_observer_unittest.cc
+++ b/chrome/browser/ash/power/extension_event_observer_unittest.cc
@@ -41,6 +41,10 @@
: fake_user_manager_(new FakeChromeUserManager()),
scoped_user_manager_enabler_(base::WrapUnique(fake_user_manager_)) {}
+ ExtensionEventObserverTest(const ExtensionEventObserverTest&) = delete;
+ ExtensionEventObserverTest& operator=(const ExtensionEventObserverTest&) =
+ delete;
+
~ExtensionEventObserverTest() override = default;
// ChromeRenerViewHostTestHarness overrides:
@@ -131,8 +135,6 @@
user_manager::ScopedUserManager scoped_user_manager_enabler_;
std::vector<scoped_refptr<const extensions::Extension>> created_apps_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionEventObserverTest);
};
// Tests that the ExtensionEventObserver reports readiness for suspend when
diff --git a/chrome/browser/ash/power/freezer_cgroup_process_manager.cc b/chrome/browser/ash/power/freezer_cgroup_process_manager.cc
index 69ce384..fa2d14b 100644
--- a/chrome/browser/ash/power/freezer_cgroup_process_manager.cc
+++ b/chrome/browser/ash/power/freezer_cgroup_process_manager.cc
@@ -41,6 +41,9 @@
DCHECK(ui_thread_->RunsTasksInCurrentSequence());
}
+ FileWorker(const FileWorker&) = delete;
+ FileWorker& operator=(const FileWorker&) = delete;
+
// Called on FILE thread.
virtual ~FileWorker() { DCHECK(file_thread_->RunsTasksInCurrentSequence()); }
@@ -152,8 +155,6 @@
// True iff FreezeRenderers() wrote its command successfully the last time it
// was called.
bool froze_successfully_;
-
- DISALLOW_COPY_AND_ASSIGN(FileWorker);
};
FreezerCgroupProcessManager::FreezerCgroupProcessManager()
diff --git a/chrome/browser/ash/power/freezer_cgroup_process_manager.h b/chrome/browser/ash/power/freezer_cgroup_process_manager.h
index 3e5d53f..a4cb431 100644
--- a/chrome/browser/ash/power/freezer_cgroup_process_manager.h
+++ b/chrome/browser/ash/power/freezer_cgroup_process_manager.h
@@ -23,6 +23,11 @@
class FreezerCgroupProcessManager : public RendererFreezer::Delegate {
public:
FreezerCgroupProcessManager();
+
+ FreezerCgroupProcessManager(const FreezerCgroupProcessManager&) = delete;
+ FreezerCgroupProcessManager& operator=(const FreezerCgroupProcessManager&) =
+ delete;
+
~FreezerCgroupProcessManager() override;
// RendererFreezer::Delegate overrides.
@@ -37,8 +42,6 @@
class FileWorker;
std::unique_ptr<FileWorker> file_worker_;
-
- DISALLOW_COPY_AND_ASSIGN(FreezerCgroupProcessManager);
};
} // namespace ash
diff --git a/chrome/browser/ash/power/idle_action_warning_observer.h b/chrome/browser/ash/power/idle_action_warning_observer.h
index 33a1d081..c9d64fc 100644
--- a/chrome/browser/ash/power/idle_action_warning_observer.h
+++ b/chrome/browser/ash/power/idle_action_warning_observer.h
@@ -20,6 +20,11 @@
public views::WidgetObserver {
public:
IdleActionWarningObserver();
+
+ IdleActionWarningObserver(const IdleActionWarningObserver&) = delete;
+ IdleActionWarningObserver& operator=(const IdleActionWarningObserver&) =
+ delete;
+
~IdleActionWarningObserver() override;
// PowerManagerClient::Observer:
@@ -37,8 +42,6 @@
// Used to derive the correct idle action (IdleActionAC/IdleActionBattery).
bool on_battery_power_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(IdleActionWarningObserver);
};
} // namespace ash
diff --git a/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager.h b/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager.h
index f51f1d0..88fe27b 100644
--- a/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager.h
+++ b/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager.h
@@ -61,6 +61,11 @@
mojo::PendingReceiver<viz::mojom::VideoDetectorObserver> receiver,
std::unique_ptr<base::RepeatingTimer> periodic_timer);
+ AdaptiveScreenBrightnessManager(const AdaptiveScreenBrightnessManager&) =
+ delete;
+ AdaptiveScreenBrightnessManager& operator=(
+ const AdaptiveScreenBrightnessManager&) = delete;
+
~AdaptiveScreenBrightnessManager() override;
// Returns a new instance of AdaptiveScreenBrightnessManager.
@@ -155,8 +160,6 @@
absl::optional<ScreenBrightnessEvent_Event_Reason> reason_;
base::WeakPtrFactory<AdaptiveScreenBrightnessManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AdaptiveScreenBrightnessManager);
};
} // namespace ml
diff --git a/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager_unittest.cc b/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager_unittest.cc
index 04a662e..8ec37330 100644
--- a/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager_unittest.cc
+++ b/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager_unittest.cc
@@ -55,6 +55,12 @@
: public AdaptiveScreenBrightnessUkmLogger {
public:
TestingAdaptiveScreenBrightnessUkmLogger() = default;
+
+ TestingAdaptiveScreenBrightnessUkmLogger(
+ const TestingAdaptiveScreenBrightnessUkmLogger&) = delete;
+ TestingAdaptiveScreenBrightnessUkmLogger& operator=(
+ const TestingAdaptiveScreenBrightnessUkmLogger&) = delete;
+
~TestingAdaptiveScreenBrightnessUkmLogger() override = default;
const std::vector<LogActivityInfo>& log_activity_info() const {
@@ -71,8 +77,6 @@
private:
std::vector<LogActivityInfo> log_activity_info_;
-
- DISALLOW_COPY_AND_ASSIGN(TestingAdaptiveScreenBrightnessUkmLogger);
};
} // namespace
@@ -86,6 +90,11 @@
base::test::TaskEnvironment::TimeSource::MOCK_TIME,
base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED) {}
+ AdaptiveScreenBrightnessManagerTest(
+ const AdaptiveScreenBrightnessManagerTest&) = delete;
+ AdaptiveScreenBrightnessManagerTest& operator=(
+ const AdaptiveScreenBrightnessManagerTest&) = delete;
+
~AdaptiveScreenBrightnessManagerTest() override = default;
void SetUp() override {
@@ -233,8 +242,6 @@
ui::UserActivityDetector user_activity_detector_;
std::unique_ptr<AdaptiveScreenBrightnessManager> screen_brightness_manager_;
TestingAdaptiveScreenBrightnessUkmLogger* ukm_logger_;
-
- DISALLOW_COPY_AND_ASSIGN(AdaptiveScreenBrightnessManagerTest);
};
TEST_F(AdaptiveScreenBrightnessManagerTest, PeriodicLogging) {
diff --git a/chrome/browser/ash/power/ml/adaptive_screen_brightness_ukm_logger_impl.h b/chrome/browser/ash/power/ml/adaptive_screen_brightness_ukm_logger_impl.h
index eba6630..9da1c64 100644
--- a/chrome/browser/ash/power/ml/adaptive_screen_brightness_ukm_logger_impl.h
+++ b/chrome/browser/ash/power/ml/adaptive_screen_brightness_ukm_logger_impl.h
@@ -17,6 +17,12 @@
: public AdaptiveScreenBrightnessUkmLogger {
public:
AdaptiveScreenBrightnessUkmLoggerImpl() = default;
+
+ AdaptiveScreenBrightnessUkmLoggerImpl(
+ const AdaptiveScreenBrightnessUkmLoggerImpl&) = delete;
+ AdaptiveScreenBrightnessUkmLoggerImpl& operator=(
+ const AdaptiveScreenBrightnessUkmLoggerImpl&) = delete;
+
~AdaptiveScreenBrightnessUkmLoggerImpl() override;
// ash::power::ml::AdaptiveScreenBrightnessUkmLogger overrides:
@@ -28,8 +34,6 @@
// This ID is incremented each time a ScreenBrightessEvent is logged to UKM.
// Event index resets when a new user session starts.
int next_sequence_id_ = 1;
-
- DISALLOW_COPY_AND_ASSIGN(AdaptiveScreenBrightnessUkmLoggerImpl);
};
} // namespace ml
diff --git a/chrome/browser/ash/power/ml/boot_clock.h b/chrome/browser/ash/power/ml/boot_clock.h
index 7360f8a..2104c0ebf 100644
--- a/chrome/browser/ash/power/ml/boot_clock.h
+++ b/chrome/browser/ash/power/ml/boot_clock.h
@@ -21,6 +21,10 @@
class BootClock {
public:
BootClock();
+
+ BootClock(const BootClock&) = delete;
+ BootClock& operator=(const BootClock&) = delete;
+
~BootClock();
base::TimeDelta GetTimeSinceBoot() const;
@@ -29,8 +33,6 @@
// Null unless time is mocked. When time is mocked, this pretends boot
// happened 5 minutes before the creation of this BootClock.
const base::TimeTicks mock_boot_time_;
-
- DISALLOW_COPY_AND_ASSIGN(BootClock);
};
} // namespace ml
diff --git a/chrome/browser/ash/power/ml/idle_event_notifier.h b/chrome/browser/ash/power/ml/idle_event_notifier.h
index 75279a8..cd1096e 100644
--- a/chrome/browser/ash/power/ml/idle_event_notifier.h
+++ b/chrome/browser/ash/power/ml/idle_event_notifier.h
@@ -95,6 +95,10 @@
PowerManagerClient* power_client,
ui::UserActivityDetector* detector,
mojo::PendingReceiver<viz::mojom::VideoDetectorObserver> receiver);
+
+ IdleEventNotifier(const IdleEventNotifier&) = delete;
+ IdleEventNotifier& operator=(const IdleEventNotifier&) = delete;
+
~IdleEventNotifier() override;
// chromeos::PowerManagerClient::Observer overrides:
@@ -170,8 +174,6 @@
std::unique_ptr<RecentEventsCounter> key_counter_;
std::unique_ptr<RecentEventsCounter> mouse_counter_;
std::unique_ptr<RecentEventsCounter> touch_counter_;
-
- DISALLOW_COPY_AND_ASSIGN(IdleEventNotifier);
};
} // namespace ml
diff --git a/chrome/browser/ash/power/ml/idle_event_notifier_unittest.cc b/chrome/browser/ash/power/ml/idle_event_notifier_unittest.cc
index 25a06fca..3478e97 100644
--- a/chrome/browser/ash/power/ml/idle_event_notifier_unittest.cc
+++ b/chrome/browser/ash/power/ml/idle_event_notifier_unittest.cc
@@ -61,6 +61,9 @@
base::test::TaskEnvironment::TimeSource::MOCK_TIME,
base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED) {}
+ IdleEventNotifierTest(const IdleEventNotifierTest&) = delete;
+ IdleEventNotifierTest& operator=(const IdleEventNotifierTest&) = delete;
+
~IdleEventNotifierTest() override = default;
void SetUp() override {
@@ -87,9 +90,6 @@
power_manager::PowerSupplyProperties ac_power_;
power_manager::PowerSupplyProperties disconnected_power_;
ui::UserActivityDetector user_activity_detector_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(IdleEventNotifierTest);
};
// After initialization, |external_power_| is not set up.
diff --git a/chrome/browser/ash/power/ml/recent_events_counter.h b/chrome/browser/ash/power/ml/recent_events_counter.h
index 47d9b70..17fbc607 100644
--- a/chrome/browser/ash/power/ml/recent_events_counter.h
+++ b/chrome/browser/ash/power/ml/recent_events_counter.h
@@ -36,6 +36,10 @@
// Count events for a time period of length |duration| using
// |num_buckets| buckets.
RecentEventsCounter(base::TimeDelta duration, int num_buckets);
+
+ RecentEventsCounter(const RecentEventsCounter&) = delete;
+ RecentEventsCounter& operator=(const RecentEventsCounter&) = delete;
+
~RecentEventsCounter();
// Log an event at timedelta |timestamp|. |timestamp| cannot be negative.
@@ -63,8 +67,6 @@
base::TimeDelta bucket_duration_;
// The latest timedelta that has been logged.
base::TimeDelta latest_;
-
- DISALLOW_COPY_AND_ASSIGN(RecentEventsCounter);
};
} // namespace ml
diff --git a/chrome/browser/ash/power/ml/smart_dim/builtin_worker.h b/chrome/browser/ash/power/ml/smart_dim/builtin_worker.h
index c6975c29..0ed03c8 100644
--- a/chrome/browser/ash/power/ml/smart_dim/builtin_worker.h
+++ b/chrome/browser/ash/power/ml/smart_dim/builtin_worker.h
@@ -19,6 +19,10 @@
class BuiltinWorker : public SmartDimWorker {
public:
BuiltinWorker();
+
+ BuiltinWorker(const BuiltinWorker&) = delete;
+ BuiltinWorker& operator=(const BuiltinWorker&) = delete;
+
~BuiltinWorker() override;
// SmartDimWorker overrides:
@@ -31,8 +35,6 @@
// Loads the built-in preprocessor config if not loaded yet. Also
// initializes the model_ and executor_ with built-in model.
void LazyInitialize();
-
- DISALLOW_COPY_AND_ASSIGN(BuiltinWorker);
};
} // namespace ml
diff --git a/chrome/browser/ash/power/ml/smart_dim/download_worker.h b/chrome/browser/ash/power/ml/smart_dim/download_worker.h
index 5ddd194..d07f569 100644
--- a/chrome/browser/ash/power/ml/smart_dim/download_worker.h
+++ b/chrome/browser/ash/power/ml/smart_dim/download_worker.h
@@ -21,6 +21,10 @@
class DownloadWorker : public SmartDimWorker {
public:
DownloadWorker();
+
+ DownloadWorker(const DownloadWorker&) = delete;
+ DownloadWorker& operator=(const DownloadWorker&) = delete;
+
~DownloadWorker() override;
// SmartDimWorker overrides:
@@ -53,8 +57,6 @@
void LoadModelAndCreateGraphExecutor(const std::string& model_flatbuffer);
void OnJsonParsed(const std::string& model_flatbuffer,
const data_decoder::DataDecoder::ValueOrError result);
-
- DISALLOW_COPY_AND_ASSIGN(DownloadWorker);
};
} // namespace ml
diff --git a/chrome/browser/ash/power/ml/smart_dim/smart_dim_worker.h b/chrome/browser/ash/power/ml/smart_dim/smart_dim_worker.h
index 6821e6d6..f6d4faf 100644
--- a/chrome/browser/ash/power/ml/smart_dim/smart_dim_worker.h
+++ b/chrome/browser/ash/power/ml/smart_dim/smart_dim_worker.h
@@ -31,6 +31,10 @@
class SmartDimWorker {
public:
SmartDimWorker();
+
+ SmartDimWorker(const SmartDimWorker&) = delete;
+ SmartDimWorker& operator=(const SmartDimWorker&) = delete;
+
virtual ~SmartDimWorker();
// Gets model score threshold above which the screen dim is recommended.
@@ -63,9 +67,6 @@
// Remotes used to execute functions in the ML service side.
mojo::Remote<chromeos::machine_learning::mojom::Model> model_;
mojo::Remote<chromeos::machine_learning::mojom::GraphExecutor> executor_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SmartDimWorker);
};
} // namespace ml
diff --git a/chrome/browser/ash/power/ml/user_activity_controller.h b/chrome/browser/ash/power/ml/user_activity_controller.h
index 0612627..0ca5576 100644
--- a/chrome/browser/ash/power/ml/user_activity_controller.h
+++ b/chrome/browser/ash/power/ml/user_activity_controller.h
@@ -22,6 +22,10 @@
class UserActivityController {
public:
UserActivityController();
+
+ UserActivityController(const UserActivityController&) = delete;
+ UserActivityController& operator=(const UserActivityController&) = delete;
+
~UserActivityController();
// Prepares features, makes smart dim decision and returns the result via
@@ -32,8 +36,6 @@
std::unique_ptr<IdleEventNotifier> idle_event_notifier_;
UserActivityUkmLoggerImpl user_activity_ukm_logger_;
std::unique_ptr<UserActivityManager> user_activity_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(UserActivityController);
};
} // namespace ml
diff --git a/chrome/browser/ash/power/ml/user_activity_manager.h b/chrome/browser/ash/power/ml/user_activity_manager.h
index 8dfc009..33d2005 100644
--- a/chrome/browser/ash/power/ml/user_activity_manager.h
+++ b/chrome/browser/ash/power/ml/user_activity_manager.h
@@ -94,6 +94,10 @@
session_manager::SessionManager* session_manager,
mojo::PendingReceiver<viz::mojom::VideoDetectorObserver> receiver,
const ChromeUserManager* user_manager);
+
+ UserActivityManager(const UserActivityManager&) = delete;
+ UserActivityManager& operator=(const UserActivityManager&) = delete;
+
~UserActivityManager() override;
// ui::UserActivityObserver overrides.
@@ -290,8 +294,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<UserActivityManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UserActivityManager);
};
} // namespace ml
diff --git a/chrome/browser/ash/power/ml/user_activity_manager_unittest.cc b/chrome/browser/ash/power/ml/user_activity_manager_unittest.cc
index 67d3f78..2fe8a42 100644
--- a/chrome/browser/ash/power/ml/user_activity_manager_unittest.cc
+++ b/chrome/browser/ash/power/ml/user_activity_manager_unittest.cc
@@ -88,6 +88,11 @@
class TestingUserActivityUkmLogger : public UserActivityUkmLogger {
public:
TestingUserActivityUkmLogger() = default;
+
+ TestingUserActivityUkmLogger(const TestingUserActivityUkmLogger&) = delete;
+ TestingUserActivityUkmLogger& operator=(const TestingUserActivityUkmLogger&) =
+ delete;
+
~TestingUserActivityUkmLogger() override = default;
const std::vector<UserActivityEvent>& events() const { return events_; }
@@ -99,8 +104,6 @@
private:
std::vector<UserActivityEvent> events_;
-
- DISALLOW_COPY_AND_ASSIGN(TestingUserActivityUkmLogger);
};
class UserActivityManagerTest : public ChromeRenderViewHostTestHarness {
@@ -111,6 +114,9 @@
base::test::TaskEnvironment::TimeSource::MOCK_TIME,
base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED) {}
+ UserActivityManagerTest(const UserActivityManagerTest&) = delete;
+ UserActivityManagerTest& operator=(const UserActivityManagerTest&) = delete;
+
~UserActivityManagerTest() override = default;
// ChromeRenderViewHostTestHarness:
@@ -278,8 +284,6 @@
std::unique_ptr<IdleEventNotifier> idle_event_notifier_;
session_manager::SessionManager session_manager_;
std::unique_ptr<UserActivityManager> activity_logger_;
-
- DISALLOW_COPY_AND_ASSIGN(UserActivityManagerTest);
};
// After an idle event, we have a ui::Event, we should expect one
diff --git a/chrome/browser/ash/power/ml/user_activity_ukm_logger_impl.h b/chrome/browser/ash/power/ml/user_activity_ukm_logger_impl.h
index 65a1196..dfa6f61 100644
--- a/chrome/browser/ash/power/ml/user_activity_ukm_logger_impl.h
+++ b/chrome/browser/ash/power/ml/user_activity_ukm_logger_impl.h
@@ -18,6 +18,11 @@
class UserActivityUkmLoggerImpl : public UserActivityUkmLogger {
public:
UserActivityUkmLoggerImpl();
+
+ UserActivityUkmLoggerImpl(const UserActivityUkmLoggerImpl&) = delete;
+ UserActivityUkmLoggerImpl& operator=(const UserActivityUkmLoggerImpl&) =
+ delete;
+
~UserActivityUkmLoggerImpl() override;
// ash::power::ml::UserActivityUkmLogger overrides:
@@ -31,8 +36,6 @@
// This ID is incremented each time a UserActivity is logged to UKM.
// Event index starts from 1, and resets when a new session starts.
int next_sequence_id_ = 1;
-
- DISALLOW_COPY_AND_ASSIGN(UserActivityUkmLoggerImpl);
};
} // namespace ml
diff --git a/chrome/browser/ash/power/power_metrics_reporter.cc b/chrome/browser/ash/power/power_metrics_reporter.cc
index dcbea40..1b2d061 100644
--- a/chrome/browser/ash/power/power_metrics_reporter.cc
+++ b/chrome/browser/ash/power/power_metrics_reporter.cc
@@ -55,6 +55,10 @@
public:
explicit DailyEventObserver(PowerMetricsReporter* reporter)
: reporter_(reporter) {}
+
+ DailyEventObserver(const DailyEventObserver&) = delete;
+ DailyEventObserver& operator=(const DailyEventObserver&) = delete;
+
~DailyEventObserver() override = default;
// metrics::DailyEvent::Observer:
@@ -64,8 +68,6 @@
private:
PowerMetricsReporter* reporter_; // Not owned.
-
- DISALLOW_COPY_AND_ASSIGN(DailyEventObserver);
};
const char PowerMetricsReporter::kDailyEventIntervalName[] =
diff --git a/chrome/browser/ash/power/power_metrics_reporter.h b/chrome/browser/ash/power/power_metrics_reporter.h
index 0f81070..1087af1 100644
--- a/chrome/browser/ash/power/power_metrics_reporter.h
+++ b/chrome/browser/ash/power/power_metrics_reporter.h
@@ -37,6 +37,10 @@
// RegisterLocalStatePrefs() must be called before instantiating this class.
PowerMetricsReporter(PowerManagerClient* power_manager_client,
PrefService* local_state_pref_service);
+
+ PowerMetricsReporter(const PowerMetricsReporter&) = delete;
+ PowerMetricsReporter& operator=(const PowerMetricsReporter&) = delete;
+
~PowerMetricsReporter() override;
// PowerManagerClient::Observer:
@@ -71,8 +75,6 @@
// Map from local store pref name backing a daily count to the count itself.
std::map<std::string, int> daily_counts_;
-
- DISALLOW_COPY_AND_ASSIGN(PowerMetricsReporter);
};
} // namespace ash
diff --git a/chrome/browser/ash/power/power_metrics_reporter_unittest.cc b/chrome/browser/ash/power/power_metrics_reporter_unittest.cc
index 04ce228..d4a20d2d 100644
--- a/chrome/browser/ash/power/power_metrics_reporter_unittest.cc
+++ b/chrome/browser/ash/power/power_metrics_reporter_unittest.cc
@@ -20,6 +20,10 @@
class PowerMetricsReporterTest : public testing::Test {
public:
PowerMetricsReporterTest() = default;
+
+ PowerMetricsReporterTest(const PowerMetricsReporterTest&) = delete;
+ PowerMetricsReporterTest& operator=(const PowerMetricsReporterTest&) = delete;
+
~PowerMetricsReporterTest() override = default;
void SetUp() override {
@@ -89,9 +93,6 @@
base::test::TaskEnvironment task_environment_;
TestingPrefServiceSimple pref_service_;
std::unique_ptr<PowerMetricsReporter> reporter_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PowerMetricsReporterTest);
};
TEST_F(PowerMetricsReporterTest, CountAndReportEvents) {
diff --git a/chrome/browser/ash/power/process_data_collector_unittest.cc b/chrome/browser/ash/power/process_data_collector_unittest.cc
index 6f5de69..c54443e7 100644
--- a/chrome/browser/ash/power/process_data_collector_unittest.cc
+++ b/chrome/browser/ash/power/process_data_collector_unittest.cc
@@ -228,6 +228,9 @@
CHECK(proc_dir_.CreateUniqueTempDir());
}
+ ProcessDataCollectorTest(const ProcessDataCollectorTest&) = delete;
+ ProcessDataCollectorTest& operator=(const ProcessDataCollectorTest&) = delete;
+
~ProcessDataCollectorTest() override { ProcessDataCollector::Shutdown(); }
protected:
@@ -388,8 +391,6 @@
// |ProcessDataCollector| which needs to compared against |timestep_info|.
void ValidateProcessList(const TimeStepExpectedResult& timestep_info,
const std::vector<ProcessUsageData>& process_list);
-
- DISALLOW_COPY_AND_ASSIGN(ProcessDataCollectorTest);
};
ProcessDataCollector::Config ProcessDataCollectorTest::CreateConfig(
diff --git a/chrome/browser/ash/power/renderer_freezer.h b/chrome/browser/ash/power/renderer_freezer.h
index 78dd6df..ef06795 100644
--- a/chrome/browser/ash/power/renderer_freezer.h
+++ b/chrome/browser/ash/power/renderer_freezer.h
@@ -59,6 +59,10 @@
};
explicit RendererFreezer(std::unique_ptr<Delegate> delegate);
+
+ RendererFreezer(const RendererFreezer&) = delete;
+ RendererFreezer& operator=(const RendererFreezer&) = delete;
+
~RendererFreezer() override;
// PowerManagerClient::RenderProcessManagerDelegate implementation.
@@ -97,8 +101,6 @@
content::NotificationRegistrar registrar_;
base::WeakPtrFactory<RendererFreezer> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(RendererFreezer);
};
} // namespace ash
diff --git a/chrome/browser/ash/power/renderer_freezer_unittest.cc b/chrome/browser/ash/power/renderer_freezer_unittest.cc
index dad525d..f25ba58f 100644
--- a/chrome/browser/ash/power/renderer_freezer_unittest.cc
+++ b/chrome/browser/ash/power/renderer_freezer_unittest.cc
@@ -44,6 +44,10 @@
class ActionRecorder {
public:
ActionRecorder() {}
+
+ ActionRecorder(const ActionRecorder&) = delete;
+ ActionRecorder& operator=(const ActionRecorder&) = delete;
+
virtual ~ActionRecorder() {}
// Returns a comma-separated string describing the actions that were
@@ -67,8 +71,6 @@
private:
// Comma-separated list of actions that have been performed.
std::string actions_;
-
- DISALLOW_COPY_AND_ASSIGN(ActionRecorder);
};
// Actions that can be returned by TestDelegate::GetActions().
@@ -86,6 +88,9 @@
: can_freeze_renderers_(true),
thaw_renderers_result_(true) {}
+ TestDelegate(const TestDelegate&) = delete;
+ TestDelegate& operator=(const TestDelegate&) = delete;
+
~TestDelegate() override {}
// RendererFreezer::Delegate overrides.
@@ -121,8 +126,6 @@
private:
bool can_freeze_renderers_;
bool thaw_renderers_result_;
-
- DISALLOW_COPY_AND_ASSIGN(TestDelegate);
};
} // namespace
@@ -131,6 +134,9 @@
public:
RendererFreezerTest() : test_delegate_(new TestDelegate()) {}
+ RendererFreezerTest(const RendererFreezerTest&) = delete;
+ RendererFreezerTest& operator=(const RendererFreezerTest&) = delete;
+
~RendererFreezerTest() override = default;
// testing::Test:
@@ -154,8 +160,6 @@
private:
content::BrowserTaskEnvironment task_environment_;
-
- DISALLOW_COPY_AND_ASSIGN(RendererFreezerTest);
};
// Tests that the RendererFreezer freezes renderers on suspend and thaws them on
@@ -211,6 +215,12 @@
class RendererFreezerTestWithExtensions : public RendererFreezerTest {
public:
RendererFreezerTestWithExtensions() {}
+
+ RendererFreezerTestWithExtensions(const RendererFreezerTestWithExtensions&) =
+ delete;
+ RendererFreezerTestWithExtensions& operator=(
+ const RendererFreezerTestWithExtensions&) = delete;
+
~RendererFreezerTestWithExtensions() override {}
// testing::Test overrides.
@@ -275,8 +285,6 @@
private:
// Chrome OS needs the CrosSettings test helper.
ScopedCrosSettingsTestHelper cros_settings_test_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(RendererFreezerTestWithExtensions);
};
// Tests that the RendererFreezer freezes renderers that are not hosting
diff --git a/chrome/browser/ash/printing/automatic_usb_printer_configurer.h b/chrome/browser/ash/printing/automatic_usb_printer_configurer.h
index f46b699..b179735 100644
--- a/chrome/browser/ash/printing/automatic_usb_printer_configurer.h
+++ b/chrome/browser/ash/printing/automatic_usb_printer_configurer.h
@@ -30,6 +30,10 @@
chromeos::PrinterInstallationManager* installation_manager,
UsbPrinterNotificationController* notification_controller);
+ AutomaticUsbPrinterConfigurer(const AutomaticUsbPrinterConfigurer&) = delete;
+ AutomaticUsbPrinterConfigurer& operator=(
+ const AutomaticUsbPrinterConfigurer&) = delete;
+
~AutomaticUsbPrinterConfigurer() override;
// CupsPrintersManager::Observer override.
@@ -78,8 +82,6 @@
base::flat_set<std::string> unconfigured_printers_;
base::WeakPtrFactory<AutomaticUsbPrinterConfigurer> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AutomaticUsbPrinterConfigurer);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/automatic_usb_printer_configurer_unittest.cc b/chrome/browser/ash/printing/automatic_usb_printer_configurer_unittest.cc
index 3051d201..a46dec8 100644
--- a/chrome/browser/ash/printing/automatic_usb_printer_configurer_unittest.cc
+++ b/chrome/browser/ash/printing/automatic_usb_printer_configurer_unittest.cc
@@ -171,6 +171,11 @@
auto_usb_printer_configurer_.get());
}
+ AutomaticUsbPrinterConfigurerTest(const AutomaticUsbPrinterConfigurerTest&) =
+ delete;
+ AutomaticUsbPrinterConfigurerTest& operator=(
+ const AutomaticUsbPrinterConfigurerTest&) = delete;
+
~AutomaticUsbPrinterConfigurerTest() override = default;
protected:
@@ -180,8 +185,6 @@
std::unique_ptr<FakeUsbPrinterNotificationController>
fake_notification_controller_;
std::unique_ptr<AutomaticUsbPrinterConfigurer> auto_usb_printer_configurer_;
-
- DISALLOW_COPY_AND_ASSIGN(AutomaticUsbPrinterConfigurerTest);
};
TEST_F(AutomaticUsbPrinterConfigurerTest,
diff --git a/chrome/browser/ash/printing/bulk_printers_calculator_factory.h b/chrome/browser/ash/printing/bulk_printers_calculator_factory.h
index 7c0e1fa..1a451228 100644
--- a/chrome/browser/ash/printing/bulk_printers_calculator_factory.h
+++ b/chrome/browser/ash/printing/bulk_printers_calculator_factory.h
@@ -26,6 +26,11 @@
static BulkPrintersCalculatorFactory* Get();
BulkPrintersCalculatorFactory();
+
+ BulkPrintersCalculatorFactory(const BulkPrintersCalculatorFactory&) = delete;
+ BulkPrintersCalculatorFactory& operator=(
+ const BulkPrintersCalculatorFactory&) = delete;
+
~BulkPrintersCalculatorFactory();
// Returns a WeakPtr to the BulkPrintersCalculator registered for
@@ -54,8 +59,6 @@
printers_by_user_;
std::unique_ptr<BulkPrintersCalculator> device_printers_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(BulkPrintersCalculatorFactory);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/calculators_policies_binder.h b/chrome/browser/ash/printing/calculators_policies_binder.h
index 533d96ec..666cea0 100644
--- a/chrome/browser/ash/printing/calculators_policies_binder.h
+++ b/chrome/browser/ash/printing/calculators_policies_binder.h
@@ -38,6 +38,10 @@
PrefService* prefs,
base::WeakPtr<BulkPrintersCalculator> calculator);
+ CalculatorsPoliciesBinder(const CalculatorsPoliciesBinder&) = delete;
+ CalculatorsPoliciesBinder& operator=(const CalculatorsPoliciesBinder&) =
+ delete;
+
virtual ~CalculatorsPoliciesBinder();
protected:
@@ -77,8 +81,6 @@
const char* allowlist_name_;
base::WeakPtr<BulkPrintersCalculator> calculator_;
base::WeakPtrFactory<CalculatorsPoliciesBinder> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CalculatorsPoliciesBinder);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/enterprise_printers_provider.cc b/chrome/browser/ash/printing/enterprise_printers_provider.cc
index 7e261ac..57afa70 100644
--- a/chrome/browser/ash/printing/enterprise_printers_provider.cc
+++ b/chrome/browser/ash/printing/enterprise_printers_provider.cc
@@ -94,6 +94,11 @@
&EnterprisePrintersProviderImpl::UpdateUserRecommendedPrinters);
}
+ EnterprisePrintersProviderImpl(const EnterprisePrintersProviderImpl&) =
+ delete;
+ EnterprisePrintersProviderImpl& operator=(
+ const EnterprisePrintersProviderImpl&) = delete;
+
~EnterprisePrintersProviderImpl() override {
if (device_printers_)
device_printers_->RemoveObserver(this);
@@ -273,7 +278,6 @@
base::ObserverList<EnterprisePrintersProvider::Observer>::Unchecked
observers_;
SEQUENCE_CHECKER(sequence_checker_);
- DISALLOW_COPY_AND_ASSIGN(EnterprisePrintersProviderImpl);
};
} // namespace
diff --git a/chrome/browser/ash/printing/enterprise_printers_provider.h b/chrome/browser/ash/printing/enterprise_printers_provider.h
index 90d663f3b..b9a501de 100644
--- a/chrome/browser/ash/printing/enterprise_printers_provider.h
+++ b/chrome/browser/ash/printing/enterprise_printers_provider.h
@@ -48,6 +48,11 @@
static std::unique_ptr<EnterprisePrintersProvider> Create(
CrosSettings* settings,
Profile* profile);
+
+ EnterprisePrintersProvider(const EnterprisePrintersProvider&) = delete;
+ EnterprisePrintersProvider& operator=(const EnterprisePrintersProvider&) =
+ delete;
+
virtual ~EnterprisePrintersProvider() = default;
// This method also directly calls OnPrintersChanged(...) from |observer|.
@@ -56,9 +61,6 @@
protected:
EnterprisePrintersProvider() = default;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(EnterprisePrintersProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/history/print_job_database_impl.h b/chrome/browser/ash/printing/history/print_job_database_impl.h
index c25fb829..53bfaa2 100644
--- a/chrome/browser/ash/printing/history/print_job_database_impl.h
+++ b/chrome/browser/ash/printing/history/print_job_database_impl.h
@@ -27,6 +27,10 @@
public:
PrintJobDatabaseImpl(leveldb_proto::ProtoDatabaseProvider* database_provider,
base::FilePath profile_path);
+
+ PrintJobDatabaseImpl(const PrintJobDatabaseImpl&) = delete;
+ PrintJobDatabaseImpl& operator=(const PrintJobDatabaseImpl&) = delete;
+
~PrintJobDatabaseImpl() override;
// PrintJobDatabase:
@@ -99,8 +103,6 @@
std::queue<base::OnceClosure> deferred_callbacks_;
base::WeakPtrFactory<PrintJobDatabaseImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PrintJobDatabaseImpl);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/history/print_job_history_cleaner.h b/chrome/browser/ash/printing/history/print_job_history_cleaner.h
index 782c9d7..345f817 100644
--- a/chrome/browser/ash/printing/history/print_job_history_cleaner.h
+++ b/chrome/browser/ash/printing/history/print_job_history_cleaner.h
@@ -26,6 +26,10 @@
PrintJobHistoryCleaner(PrintJobDatabase* print_job_database,
PrefService* pref_service);
+
+ PrintJobHistoryCleaner(const PrintJobHistoryCleaner&) = delete;
+ PrintJobHistoryCleaner& operator=(const PrintJobHistoryCleaner&) = delete;
+
~PrintJobHistoryCleaner();
// Removes expired print jobs from the database.
@@ -60,8 +64,6 @@
base::Time oldest_print_job_completion_time_;
base::WeakPtrFactory<PrintJobHistoryCleaner> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PrintJobHistoryCleaner);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/history/print_job_history_service.h b/chrome/browser/ash/printing/history/print_job_history_service.h
index f095f21..66d7ba23 100644
--- a/chrome/browser/ash/printing/history/print_job_history_service.h
+++ b/chrome/browser/ash/printing/history/print_job_history_service.h
@@ -24,6 +24,10 @@
};
PrintJobHistoryService();
+
+ PrintJobHistoryService(const PrintJobHistoryService&) = delete;
+ PrintJobHistoryService& operator=(const PrintJobHistoryService&) = delete;
+
~PrintJobHistoryService() override;
// Register the print job history preferences with the |registry|.
@@ -42,8 +46,6 @@
protected:
base::ObserverList<PrintJobHistoryService::Observer>::Unchecked observers_;
-
- DISALLOW_COPY_AND_ASSIGN(PrintJobHistoryService);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/history/print_job_history_service_impl.h b/chrome/browser/ash/printing/history/print_job_history_service_impl.h
index eb676a8f..e4a2c3ff 100644
--- a/chrome/browser/ash/printing/history/print_job_history_service_impl.h
+++ b/chrome/browser/ash/printing/history/print_job_history_service_impl.h
@@ -29,6 +29,11 @@
std::unique_ptr<PrintJobDatabase> print_job_database,
chromeos::CupsPrintJobManager* print_job_manager,
PrefService* pref_service);
+
+ PrintJobHistoryServiceImpl(const PrintJobHistoryServiceImpl&) = delete;
+ PrintJobHistoryServiceImpl& operator=(const PrintJobHistoryServiceImpl&) =
+ delete;
+
~PrintJobHistoryServiceImpl() override;
// PrintJobHistoryService:
@@ -69,8 +74,6 @@
// Used for avoiding that callbacks are called after the class was
// destroyed already.
base::WeakPtrFactory<PrintJobHistoryServiceImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PrintJobHistoryServiceImpl);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/history/test_print_job_database.h b/chrome/browser/ash/printing/history/test_print_job_database.h
index b948189..bf96fa0 100644
--- a/chrome/browser/ash/printing/history/test_print_job_database.h
+++ b/chrome/browser/ash/printing/history/test_print_job_database.h
@@ -16,6 +16,10 @@
class TestPrintJobDatabase : public PrintJobDatabase {
public:
TestPrintJobDatabase();
+
+ TestPrintJobDatabase(const TestPrintJobDatabase&) = delete;
+ TestPrintJobDatabase& operator=(const TestPrintJobDatabase&) = delete;
+
~TestPrintJobDatabase() override;
// PrintJobDatabase:
@@ -33,8 +37,6 @@
// In-memory database of PrintJobInfo.
std::unordered_map<std::string, chromeos::printing::proto::PrintJobInfo>
database_;
-
- DISALLOW_COPY_AND_ASSIGN(TestPrintJobDatabase);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/ppd_resolution_state.h b/chrome/browser/ash/printing/ppd_resolution_state.h
index 0ff356f..d4a8eb1 100644
--- a/chrome/browser/ash/printing/ppd_resolution_state.h
+++ b/chrome/browser/ash/printing/ppd_resolution_state.h
@@ -17,6 +17,10 @@
PpdResolutionState();
PpdResolutionState(PpdResolutionState&& other);
PpdResolutionState& operator=(PpdResolutionState&& rhs);
+
+ PpdResolutionState(const PpdResolutionState&) = delete;
+ PpdResolutionState& operator=(const PpdResolutionState&) = delete;
+
~PpdResolutionState();
// Marks PPD resolution was successful and stores |ppd_reference|.
@@ -54,8 +58,6 @@
bool is_not_autoconfigurable_;
chromeos::Printer::PpdReference ppd_reference_;
std::string usb_manufacturer_;
-
- DISALLOW_COPY_AND_ASSIGN(PpdResolutionState);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/ppd_resolution_state_unittest.cc b/chrome/browser/ash/printing/ppd_resolution_state_unittest.cc
index 77b2543..61150d0 100644
--- a/chrome/browser/ash/printing/ppd_resolution_state_unittest.cc
+++ b/chrome/browser/ash/printing/ppd_resolution_state_unittest.cc
@@ -14,10 +14,11 @@
class PpdResolutionStateTest : public testing::Test {
public:
PpdResolutionStateTest() = default;
- ~PpdResolutionStateTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(PpdResolutionStateTest);
+ PpdResolutionStateTest(const PpdResolutionStateTest&) = delete;
+ PpdResolutionStateTest& operator=(const PpdResolutionStateTest&) = delete;
+
+ ~PpdResolutionStateTest() override = default;
};
TEST_F(PpdResolutionStateTest, TestDefaultState) {
diff --git a/chrome/browser/ash/printing/ppd_resolution_tracker.h b/chrome/browser/ash/printing/ppd_resolution_tracker.h
index 61c52f9e..e39f9699 100644
--- a/chrome/browser/ash/printing/ppd_resolution_tracker.h
+++ b/chrome/browser/ash/printing/ppd_resolution_tracker.h
@@ -20,6 +20,10 @@
PpdResolutionTracker();
PpdResolutionTracker(PpdResolutionTracker&& other);
PpdResolutionTracker& operator=(PpdResolutionTracker&& rhs);
+
+ PpdResolutionTracker(const PpdResolutionTracker&) = delete;
+ PpdResolutionTracker& operator=(const PpdResolutionTracker&) = delete;
+
~PpdResolutionTracker();
// Returns true if a |printer_id| is in |printer_state_| and if the printer
@@ -69,8 +73,6 @@
bool PrinterStateExists(const std::string& printer_id) const;
std::unordered_map<std::string, PpdResolutionState> printer_state_;
-
- DISALLOW_COPY_AND_ASSIGN(PpdResolutionTracker);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/ppd_resolution_tracker_unittest.cc b/chrome/browser/ash/printing/ppd_resolution_tracker_unittest.cc
index 41fb34df..737710a8 100644
--- a/chrome/browser/ash/printing/ppd_resolution_tracker_unittest.cc
+++ b/chrome/browser/ash/printing/ppd_resolution_tracker_unittest.cc
@@ -14,9 +14,11 @@
class PpdResolutionTrackerTest : public testing::Test {
public:
PpdResolutionTrackerTest() = default;
- ~PpdResolutionTrackerTest() override = default;
- DISALLOW_COPY_AND_ASSIGN(PpdResolutionTrackerTest);
+ PpdResolutionTrackerTest(const PpdResolutionTrackerTest&) = delete;
+ PpdResolutionTrackerTest& operator=(const PpdResolutionTrackerTest&) = delete;
+
+ ~PpdResolutionTrackerTest() override = default;
};
TEST_F(PpdResolutionTrackerTest, PendingResolution) {
diff --git a/chrome/browser/ash/printing/printer_event_tracker.h b/chrome/browser/ash/printing/printer_event_tracker.h
index 0c965ff..1e96d5d 100644
--- a/chrome/browser/ash/printing/printer_event_tracker.h
+++ b/chrome/browser/ash/printing/printer_event_tracker.h
@@ -32,6 +32,10 @@
};
PrinterEventTracker();
+
+ PrinterEventTracker(const PrinterEventTracker&) = delete;
+ PrinterEventTracker& operator=(const PrinterEventTracker&) = delete;
+
~PrinterEventTracker() override;
// If |logging| is true, logging is enabled. If |logging| is false, logging is
@@ -67,8 +71,6 @@
bool logging_ = false;
std::vector<metrics::PrinterEventProto> events_;
base::Lock lock_;
-
- DISALLOW_COPY_AND_ASSIGN(PrinterEventTracker);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/printer_event_tracker_factory.h b/chrome/browser/ash/printing/printer_event_tracker_factory.h
index 154f093..96331016c 100644
--- a/chrome/browser/ash/printing/printer_event_tracker_factory.h
+++ b/chrome/browser/ash/printing/printer_event_tracker_factory.h
@@ -19,6 +19,11 @@
content::BrowserContext* browser_context);
PrinterEventTrackerFactory();
+
+ PrinterEventTrackerFactory(const PrinterEventTrackerFactory&) = delete;
+ PrinterEventTrackerFactory& operator=(const PrinterEventTrackerFactory&) =
+ delete;
+
~PrinterEventTrackerFactory() override;
// Enables/Disables logging for all trackers. Trackers created in the future
@@ -34,8 +39,6 @@
content::BrowserContext* context) const override;
content::BrowserContext* GetBrowserContextToUse(
content::BrowserContext* context) const override;
-
- DISALLOW_COPY_AND_ASSIGN(PrinterEventTrackerFactory);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/printer_event_tracker_unittest.cc b/chrome/browser/ash/printing/printer_event_tracker_unittest.cc
index 1bb65e4..9703a0f4 100644
--- a/chrome/browser/ash/printing/printer_event_tracker_unittest.cc
+++ b/chrome/browser/ash/printing/printer_event_tracker_unittest.cc
@@ -26,6 +26,10 @@
class PrinterEventTrackerTest : public testing::Test {
public:
PrinterEventTrackerTest() = default;
+
+ PrinterEventTrackerTest(const PrinterEventTrackerTest&) = delete;
+ PrinterEventTrackerTest& operator=(const PrinterEventTrackerTest&) = delete;
+
~PrinterEventTrackerTest() override = default;
protected:
@@ -38,9 +42,6 @@
tracker_.FlushPrinterEvents(&events);
return events;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PrinterEventTrackerTest);
};
TEST_F(PrinterEventTrackerTest, RecordsWhenEnabled) {
diff --git a/chrome/browser/ash/printing/printer_metrics_provider.h b/chrome/browser/ash/printing/printer_metrics_provider.h
index a108228..140c5a4 100644
--- a/chrome/browser/ash/printing/printer_metrics_provider.h
+++ b/chrome/browser/ash/printing/printer_metrics_provider.h
@@ -17,6 +17,10 @@
class PrinterMetricsProvider : public metrics::MetricsProvider {
public:
PrinterMetricsProvider();
+
+ PrinterMetricsProvider(const PrinterMetricsProvider&) = delete;
+ PrinterMetricsProvider& operator=(const PrinterMetricsProvider&) = delete;
+
~PrinterMetricsProvider() override;
// metrics::MetricsProvider overrides:
@@ -24,9 +28,6 @@
void OnRecordingDisabled() override;
void ProvideCurrentSessionData(
metrics::ChromeUserMetricsExtension* uma_proto) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PrinterMetricsProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/printers_sync_bridge.h b/chrome/browser/ash/printing/printers_sync_bridge.h
index 67cfc8f..55267aab 100644
--- a/chrome/browser/ash/printing/printers_sync_bridge.h
+++ b/chrome/browser/ash/printing/printers_sync_bridge.h
@@ -30,6 +30,10 @@
public:
PrintersSyncBridge(syncer::OnceModelTypeStoreFactory callback,
base::RepeatingClosure error_callback);
+
+ PrintersSyncBridge(const PrintersSyncBridge&) = delete;
+ PrintersSyncBridge& operator=(const PrintersSyncBridge&) = delete;
+
~PrintersSyncBridge() override;
// ModelTypeSyncBridge implementation.
@@ -102,8 +106,6 @@
// In memory cache of printer information. Access to this is synchronized with
// |data_lock_|.
std::map<std::string, std::unique_ptr<sync_pb::PrinterSpecifics>> all_data_;
-
- DISALLOW_COPY_AND_ASSIGN(PrintersSyncBridge);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/server_printers_fetcher.cc b/chrome/browser/ash/printing/server_printers_fetcher.cc
index 31ac751..56c9afc 100644
--- a/chrome/browser/ash/printing/server_printers_fetcher.cc
+++ b/chrome/browser/ash/printing/server_printers_fetcher.cc
@@ -66,6 +66,9 @@
profile->GetURLLoaderFactory()->Clone()));
}
+ PrivateImplementation(const PrivateImplementation&) = delete;
+ PrivateImplementation& operator=(const PrivateImplementation&) = delete;
+
~PrivateImplementation() override = default;
// Schedule the given object for deletion. May be called from any
@@ -228,7 +231,6 @@
std::unique_ptr<network::SimpleURLLoader> simple_url_loader_;
SEQUENCE_CHECKER(sequence_checker_);
- DISALLOW_COPY_AND_ASSIGN(PrivateImplementation);
};
ServerPrintersFetcher::ServerPrintersFetcher(Profile* profile,
diff --git a/chrome/browser/ash/printing/server_printers_fetcher.h b/chrome/browser/ash/printing/server_printers_fetcher.h
index afa2edb..199fb26 100644
--- a/chrome/browser/ash/printing/server_printers_fetcher.h
+++ b/chrome/browser/ash/printing/server_printers_fetcher.h
@@ -45,6 +45,10 @@
const GURL& server_url,
const std::string& server_name,
OnPrintersFetchedCallback cb);
+
+ ServerPrintersFetcher(const ServerPrintersFetcher&) = delete;
+ ServerPrintersFetcher& operator=(const ServerPrintersFetcher&) = delete;
+
virtual ~ServerPrintersFetcher();
PrintServerQueryResult GetLastError() const;
@@ -58,8 +62,6 @@
};
// Internal object.
std::unique_ptr<PrivateImplementation, PimDeleter> pim_;
-
- DISALLOW_COPY_AND_ASSIGN(ServerPrintersFetcher);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/server_printers_provider.cc b/chrome/browser/ash/printing/server_printers_provider.cc
index 8443d45..16125c2f 100644
--- a/chrome/browser/ash/printing/server_printers_provider.cc
+++ b/chrome/browser/ash/printing/server_printers_provider.cc
@@ -47,6 +47,10 @@
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
}
+ ServerPrintersProviderImpl(const ServerPrintersProviderImpl&) = delete;
+ ServerPrintersProviderImpl& operator=(const ServerPrintersProviderImpl&) =
+ delete;
+
~ServerPrintersProviderImpl() override = default;
void RegisterPrintersFoundCallback(OnPrintersUpdateCallback cb) override {
@@ -168,7 +172,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<ServerPrintersProviderImpl> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(ServerPrintersProviderImpl);
};
} // namespace
diff --git a/chrome/browser/ash/printing/server_printers_provider.h b/chrome/browser/ash/printing/server_printers_provider.h
index c9b8fd9..9558feef 100644
--- a/chrome/browser/ash/printing/server_printers_provider.h
+++ b/chrome/browser/ash/printing/server_printers_provider.h
@@ -27,6 +27,10 @@
class ServerPrintersProvider {
public:
static std::unique_ptr<ServerPrintersProvider> Create(Profile* profile);
+
+ ServerPrintersProvider(const ServerPrintersProvider&) = delete;
+ ServerPrintersProvider& operator=(const ServerPrintersProvider&) = delete;
+
virtual ~ServerPrintersProvider() = default;
using OnPrintersUpdateCallback = base::RepeatingCallback<void(bool complete)>;
@@ -48,9 +52,6 @@
protected:
ServerPrintersProvider() = default;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ServerPrintersProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/usb_printer_detector.h b/chrome/browser/ash/printing/usb_printer_detector.h
index f0701bb5a..688ba0ee 100644
--- a/chrome/browser/ash/printing/usb_printer_detector.h
+++ b/chrome/browser/ash/printing/usb_printer_detector.h
@@ -24,13 +24,13 @@
static std::unique_ptr<UsbPrinterDetector> CreateForTesting(
mojo::PendingRemote<device::mojom::UsbDeviceManager> usb_manager);
+ UsbPrinterDetector(const UsbPrinterDetector&) = delete;
+ UsbPrinterDetector& operator=(const UsbPrinterDetector&) = delete;
+
~UsbPrinterDetector() override = default;
protected:
UsbPrinterDetector() = default;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(UsbPrinterDetector);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/usb_printer_notification.h b/chrome/browser/ash/printing/usb_printer_notification.h
index 1a9f6c8..2fbef66 100644
--- a/chrome/browser/ash/printing/usb_printer_notification.h
+++ b/chrome/browser/ash/printing/usb_printer_notification.h
@@ -33,6 +33,9 @@
Type type,
Profile* profile);
+ UsbPrinterNotification(const UsbPrinterNotification&) = delete;
+ UsbPrinterNotification& operator=(const UsbPrinterNotification&) = delete;
+
virtual ~UsbPrinterNotification();
// Closes the notification, removing it from the notification tray.
@@ -56,8 +59,6 @@
bool visible_;
base::WeakPtrFactory<UsbPrinterNotification> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UsbPrinterNotification);
};
} // namespace ash
diff --git a/chrome/browser/ash/printing/usb_printer_notification_controller.h b/chrome/browser/ash/printing/usb_printer_notification_controller.h
index 4abaf64..c4cb4b08 100644
--- a/chrome/browser/ash/printing/usb_printer_notification_controller.h
+++ b/chrome/browser/ash/printing/usb_printer_notification_controller.h
@@ -25,6 +25,11 @@
static std::unique_ptr<UsbPrinterNotificationController> Create(
Profile* profile);
+ UsbPrinterNotificationController(const UsbPrinterNotificationController&) =
+ delete;
+ UsbPrinterNotificationController& operator=(
+ const UsbPrinterNotificationController&) = delete;
+
virtual ~UsbPrinterNotificationController() = default;
// Creates a notification for an ephemeral printer. This is a no-op if there
@@ -49,8 +54,6 @@
protected:
UsbPrinterNotificationController() = default;
-
- DISALLOW_COPY_AND_ASSIGN(UsbPrinterNotificationController);
};
} // namespace ash
diff --git a/chrome/browser/ash/profiles/profile_helper.h b/chrome/browser/ash/profiles/profile_helper.h
index e6fabed3..4e3c915 100644
--- a/chrome/browser/ash/profiles/profile_helper.h
+++ b/chrome/browser/ash/profiles/profile_helper.h
@@ -40,6 +40,10 @@
: public user_manager::UserManager::UserSessionStateObserver {
public:
ProfileHelper();
+
+ ProfileHelper(const ProfileHelper&) = delete;
+ ProfileHelper& operator=(const ProfileHelper&) = delete;
+
~ProfileHelper() override;
// Creates and returns ProfileHelper implementation instance to
@@ -202,8 +206,6 @@
// If true and enable_profile_to_user_testing is true then primary user will
// always be returned by GetUserByProfile().
static bool always_return_primary_user_for_testing;
-
- DISALLOW_COPY_AND_ASSIGN(ProfileHelper);
};
} // namespace ash
diff --git a/chrome/browser/ash/release_notes/release_notes_notification.h b/chrome/browser/ash/release_notes/release_notes_notification.h
index fffe9d3e..f32f06a 100644
--- a/chrome/browser/ash/release_notes/release_notes_notification.h
+++ b/chrome/browser/ash/release_notes/release_notes_notification.h
@@ -26,6 +26,10 @@
class ReleaseNotesNotification {
public:
explicit ReleaseNotesNotification(Profile* profile);
+
+ ReleaseNotesNotification(const ReleaseNotesNotification&) = delete;
+ ReleaseNotesNotification& operator=(const ReleaseNotesNotification&) = delete;
+
~ReleaseNotesNotification();
// Checks profile preferences and release notes storage to determine whether
@@ -48,8 +52,6 @@
release_notes_available_notification_;
base::WeakPtrFactory<ReleaseNotesNotification> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ReleaseNotesNotification);
};
} // namespace ash
diff --git a/chrome/browser/ash/release_notes/release_notes_notification_unittest.cc b/chrome/browser/ash/release_notes/release_notes_notification_unittest.cc
index 6699e4b..53668be 100644
--- a/chrome/browser/ash/release_notes/release_notes_notification_unittest.cc
+++ b/chrome/browser/ash/release_notes/release_notes_notification_unittest.cc
@@ -26,6 +26,11 @@
class ReleaseNotesNotificationTest : public BrowserWithTestWindowTest {
public:
ReleaseNotesNotificationTest() {}
+
+ ReleaseNotesNotificationTest(const ReleaseNotesNotificationTest&) = delete;
+ ReleaseNotesNotificationTest& operator=(const ReleaseNotesNotificationTest&) =
+ delete;
+
~ReleaseNotesNotificationTest() override = default;
// BrowserWithTestWindowTest:
@@ -72,8 +77,6 @@
private:
std::unique_ptr<NotificationDisplayServiceTester> tester_;
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(ReleaseNotesNotificationTest);
};
TEST_F(ReleaseNotesNotificationTest, DoNotShowReleaseNotesNotification) {
diff --git a/chrome/browser/ash/release_notes/release_notes_storage.h b/chrome/browser/ash/release_notes/release_notes_storage.h
index 20b3641..15b89c0 100644
--- a/chrome/browser/ash/release_notes/release_notes_storage.h
+++ b/chrome/browser/ash/release_notes/release_notes_storage.h
@@ -20,6 +20,10 @@
static void RegisterProfilePrefs(PrefRegistrySimple* registry);
explicit ReleaseNotesStorage(Profile* profile);
+
+ ReleaseNotesStorage(const ReleaseNotesStorage&) = delete;
+ ReleaseNotesStorage& operator=(const ReleaseNotesStorage&) = delete;
+
~ReleaseNotesStorage();
// Returns true if system has been updated since last notification, user
@@ -40,8 +44,6 @@
private:
Profile* const profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ReleaseNotesStorage);
};
} // namespace ash
diff --git a/chrome/browser/ash/settings/cros_settings.h b/chrome/browser/ash/settings/cros_settings.h
index 209d8a8..087b953 100644
--- a/chrome/browser/ash/settings/cros_settings.h
+++ b/chrome/browser/ash/settings/cros_settings.h
@@ -50,6 +50,10 @@
// production code uses the singleton returned by Get() above.
CrosSettings(DeviceSettingsService* device_settings_service,
PrefService* local_state);
+
+ CrosSettings(const CrosSettings&) = delete;
+ CrosSettings& operator=(const CrosSettings&) = delete;
+
virtual ~CrosSettings();
// Helper function to test if the given |path| is a valid cros setting.
@@ -145,8 +149,6 @@
settings_observers_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(CrosSettings);
};
// Helper class for tests. Initializes the CrosSettings singleton on
@@ -154,10 +156,11 @@
class ScopedTestCrosSettings {
public:
explicit ScopedTestCrosSettings(PrefService* local_state);
- ~ScopedTestCrosSettings();
- private:
- DISALLOW_COPY_AND_ASSIGN(ScopedTestCrosSettings);
+ ScopedTestCrosSettings(const ScopedTestCrosSettings&) = delete;
+ ScopedTestCrosSettings& operator=(const ScopedTestCrosSettings&) = delete;
+
+ ~ScopedTestCrosSettings();
};
} // namespace ash
diff --git a/chrome/browser/ash/settings/device_settings_provider.h b/chrome/browser/ash/settings/device_settings_provider.h
index 4fc704c..31b3d663 100644
--- a/chrome/browser/ash/settings/device_settings_provider.h
+++ b/chrome/browser/ash/settings/device_settings_provider.h
@@ -45,6 +45,10 @@
DeviceSettingsProvider(const NotifyObserversCallback& notify_cb,
DeviceSettingsService* device_settings_service,
PrefService* pref_service);
+
+ DeviceSettingsProvider(const DeviceSettingsProvider&) = delete;
+ DeviceSettingsProvider& operator=(const DeviceSettingsProvider&) = delete;
+
~DeviceSettingsProvider() override;
// Returns true if |path| is handled by this provider.
@@ -148,8 +152,6 @@
FRIEND_TEST_ALL_PREFIXES(DeviceSettingsProviderTest, SetPrefFailed);
FRIEND_TEST_ALL_PREFIXES(DeviceSettingsProviderTest, SetPrefSucceed);
FRIEND_TEST_ALL_PREFIXES(DeviceSettingsProviderTest, SetPrefTwice);
-
- DISALLOW_COPY_AND_ASSIGN(DeviceSettingsProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/settings/device_settings_service.h b/chrome/browser/ash/settings/device_settings_service.h
index ffaa40e..55dc0b0 100644
--- a/chrome/browser/ash/settings/device_settings_service.h
+++ b/chrome/browser/ash/settings/device_settings_service.h
@@ -107,6 +107,10 @@
// Creates a device settings service instance. This is meant for unit tests,
// production code uses the singleton returned by Get() above.
DeviceSettingsService();
+
+ DeviceSettingsService(const DeviceSettingsService&) = delete;
+ DeviceSettingsService& operator=(const DeviceSettingsService&) = delete;
+
~DeviceSettingsService() override;
// To be called on startup once threads are initialized and D-Bus is ready.
@@ -281,8 +285,6 @@
device_off_hours_controller_;
base::WeakPtrFactory<DeviceSettingsService> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceSettingsService);
};
// Helper class for tests. Initializes the DeviceSettingsService singleton on
@@ -290,10 +292,13 @@
class ScopedTestDeviceSettingsService {
public:
ScopedTestDeviceSettingsService();
- ~ScopedTestDeviceSettingsService();
- private:
- DISALLOW_COPY_AND_ASSIGN(ScopedTestDeviceSettingsService);
+ ScopedTestDeviceSettingsService(const ScopedTestDeviceSettingsService&) =
+ delete;
+ ScopedTestDeviceSettingsService& operator=(
+ const ScopedTestDeviceSettingsService&) = delete;
+
+ ~ScopedTestDeviceSettingsService();
};
} // namespace ash
diff --git a/chrome/browser/ash/settings/device_settings_test_helper.h b/chrome/browser/ash/settings/device_settings_test_helper.h
index ba2f04ac..a58b390c 100644
--- a/chrome/browser/ash/settings/device_settings_test_helper.h
+++ b/chrome/browser/ash/settings/device_settings_test_helper.h
@@ -30,11 +30,16 @@
class ScopedDeviceSettingsTestHelper {
public:
ScopedDeviceSettingsTestHelper();
+
+ ScopedDeviceSettingsTestHelper(const ScopedDeviceSettingsTestHelper&) =
+ delete;
+ ScopedDeviceSettingsTestHelper& operator=(
+ const ScopedDeviceSettingsTestHelper&) = delete;
+
~ScopedDeviceSettingsTestHelper();
private:
FakeSessionManagerClient session_manager_client_;
- DISALLOW_COPY_AND_ASSIGN(ScopedDeviceSettingsTestHelper);
};
// A convenience test base class that initializes a DeviceSettingsService
diff --git a/chrome/browser/ash/settings/scoped_cros_settings_test_helper.h b/chrome/browser/ash/settings/scoped_cros_settings_test_helper.h
index 7e80d8a..d665ae3 100644
--- a/chrome/browser/ash/settings/scoped_cros_settings_test_helper.h
+++ b/chrome/browser/ash/settings/scoped_cros_settings_test_helper.h
@@ -36,6 +36,11 @@
// up by another (instantiated or base) class, creating another one causes
// crash.
explicit ScopedCrosSettingsTestHelper(bool create_settings_service = true);
+
+ ScopedCrosSettingsTestHelper(const ScopedCrosSettingsTestHelper&) = delete;
+ ScopedCrosSettingsTestHelper& operator=(const ScopedCrosSettingsTestHelper&) =
+ delete;
+
~ScopedCrosSettingsTestHelper();
// This replaces the DeviceSettingsProvider with a simple stub that stores
@@ -95,8 +100,6 @@
StubCrosSettingsProvider* stub_settings_provider_ptr_;
void Initialize(bool create_settings_service);
-
- DISALLOW_COPY_AND_ASSIGN(ScopedCrosSettingsTestHelper);
};
} // namespace ash
diff --git a/chrome/browser/ash/settings/scoped_testing_cros_settings.h b/chrome/browser/ash/settings/scoped_testing_cros_settings.h
index 6b25acdd..f5ae854 100644
--- a/chrome/browser/ash/settings/scoped_testing_cros_settings.h
+++ b/chrome/browser/ash/settings/scoped_testing_cros_settings.h
@@ -37,6 +37,10 @@
// for testing.
ScopedTestingCrosSettings();
+ ScopedTestingCrosSettings(const ScopedTestingCrosSettings&) = delete;
+ ScopedTestingCrosSettings& operator=(const ScopedTestingCrosSettings&) =
+ delete;
+
~ScopedTestingCrosSettings();
StubCrosSettingsProvider* device_settings() { return device_settings_ptr_; }
@@ -49,8 +53,6 @@
// These are raw pointers since these objects are owned by |test_instance_|.
StubCrosSettingsProvider* device_settings_ptr_;
SystemSettingsProvider* system_settings_ptr_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedTestingCrosSettings);
};
} // namespace ash
diff --git a/chrome/browser/ash/settings/session_manager_operation.h b/chrome/browser/ash/settings/session_manager_operation.h
index 434fd1a7..412c32682 100644
--- a/chrome/browser/ash/settings/session_manager_operation.h
+++ b/chrome/browser/ash/settings/session_manager_operation.h
@@ -39,6 +39,10 @@
// Creates a new load operation.
explicit SessionManagerOperation(Callback callback);
+
+ SessionManagerOperation(const SessionManagerOperation&) = delete;
+ SessionManagerOperation& operator=(const SessionManagerOperation&) = delete;
+
virtual ~SessionManagerOperation();
// Starts the operation.
@@ -131,8 +135,6 @@
device_settings_;
base::WeakPtrFactory<SessionManagerOperation> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SessionManagerOperation);
};
// This operation loads the public owner key from disk if appropriate, fetches
@@ -147,14 +149,15 @@
bool cloud_validations,
bool force_immediate_load,
Callback callback);
+
+ LoadSettingsOperation(const LoadSettingsOperation&) = delete;
+ LoadSettingsOperation& operator=(const LoadSettingsOperation&) = delete;
+
~LoadSettingsOperation() override;
protected:
// SessionManagerOperation:
void Run() override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LoadSettingsOperation);
};
// Stores a pre-generated policy blob and reloads the device settings from
@@ -165,6 +168,10 @@
StoreSettingsOperation(
Callback callback,
std::unique_ptr<enterprise_management::PolicyFetchResponse> policy);
+
+ StoreSettingsOperation(const StoreSettingsOperation&) = delete;
+ StoreSettingsOperation& operator=(const StoreSettingsOperation&) = delete;
+
~StoreSettingsOperation() override;
protected:
@@ -178,8 +185,6 @@
std::unique_ptr<enterprise_management::PolicyFetchResponse> policy_;
base::WeakPtrFactory<StoreSettingsOperation> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(StoreSettingsOperation);
};
} // namespace ash
diff --git a/chrome/browser/ash/settings/shutdown_policy_forwarder.h b/chrome/browser/ash/settings/shutdown_policy_forwarder.h
index 341ffe7..ed4e8397 100644
--- a/chrome/browser/ash/settings/shutdown_policy_forwarder.h
+++ b/chrome/browser/ash/settings/shutdown_policy_forwarder.h
@@ -14,6 +14,10 @@
class ShutdownPolicyForwarder : public ShutdownPolicyHandler::Delegate {
public:
ShutdownPolicyForwarder();
+
+ ShutdownPolicyForwarder(const ShutdownPolicyForwarder&) = delete;
+ ShutdownPolicyForwarder& operator=(const ShutdownPolicyForwarder&) = delete;
+
~ShutdownPolicyForwarder() override;
private:
@@ -21,8 +25,6 @@
void OnShutdownPolicyChanged(bool reboot_on_shutdown) override;
ShutdownPolicyHandler shutdown_policy_handler_;
-
- DISALLOW_COPY_AND_ASSIGN(ShutdownPolicyForwarder);
};
} // namespace ash
diff --git a/chrome/browser/ash/settings/stub_cros_settings_provider.h b/chrome/browser/ash/settings/stub_cros_settings_provider.h
index 0e38887..84203ab 100644
--- a/chrome/browser/ash/settings/stub_cros_settings_provider.h
+++ b/chrome/browser/ash/settings/stub_cros_settings_provider.h
@@ -20,6 +20,10 @@
public:
explicit StubCrosSettingsProvider(const NotifyObserversCallback& notify_cb);
StubCrosSettingsProvider();
+
+ StubCrosSettingsProvider(const StubCrosSettingsProvider&) = delete;
+ StubCrosSettingsProvider& operator=(const StubCrosSettingsProvider&) = delete;
+
~StubCrosSettingsProvider() override;
// CrosSettingsProvider implementation.
@@ -59,8 +63,6 @@
// Pending callbacks to invoke when switching away from TEMPORARILY_UNTRUSTED.
std::vector<base::OnceClosure> callbacks_;
-
- DISALLOW_COPY_AND_ASSIGN(StubCrosSettingsProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/settings/supervised_user_cros_settings_provider.h b/chrome/browser/ash/settings/supervised_user_cros_settings_provider.h
index a87dd7f..522ec104 100644
--- a/chrome/browser/ash/settings/supervised_user_cros_settings_provider.h
+++ b/chrome/browser/ash/settings/supervised_user_cros_settings_provider.h
@@ -21,6 +21,12 @@
public:
explicit SupervisedUserCrosSettingsProvider(
const CrosSettingsProvider::NotifyObserversCallback& notify_cb);
+
+ SupervisedUserCrosSettingsProvider(
+ const SupervisedUserCrosSettingsProvider&) = delete;
+ SupervisedUserCrosSettingsProvider& operator=(
+ const SupervisedUserCrosSettingsProvider&) = delete;
+
~SupervisedUserCrosSettingsProvider() override;
// CrosSettingsProvider:
@@ -31,8 +37,6 @@
private:
// Cros pref name to pref value.
std::map<std::string, base::Value> child_user_restrictions_;
-
- DISALLOW_COPY_AND_ASSIGN(SupervisedUserCrosSettingsProvider);
};
} // namespace ash
diff --git a/chrome/browser/ash/settings/token_encryptor.h b/chrome/browser/ash/settings/token_encryptor.h
index a27edcc..3c4b6e2 100644
--- a/chrome/browser/ash/settings/token_encryptor.h
+++ b/chrome/browser/ash/settings/token_encryptor.h
@@ -38,6 +38,10 @@
class CryptohomeTokenEncryptor : public TokenEncryptor {
public:
explicit CryptohomeTokenEncryptor(const std::string& system_salt);
+
+ CryptohomeTokenEncryptor(const CryptohomeTokenEncryptor&) = delete;
+ CryptohomeTokenEncryptor& operator=(const CryptohomeTokenEncryptor&) = delete;
+
~CryptohomeTokenEncryptor() override;
// TokenEncryptor overrides:
@@ -68,8 +72,6 @@
// A key based on the system salt. Useful for encrypting device-level
// data for which we have no additional credentials.
std::unique_ptr<crypto::SymmetricKey> system_salt_key_;
-
- DISALLOW_COPY_AND_ASSIGN(CryptohomeTokenEncryptor);
};
} // namespace ash
diff --git a/chrome/browser/ash/smb_client/discovery/fake_netbios_client.h b/chrome/browser/ash/smb_client/discovery/fake_netbios_client.h
index 1b7a204..1459941 100644
--- a/chrome/browser/ash/smb_client/discovery/fake_netbios_client.h
+++ b/chrome/browser/ash/smb_client/discovery/fake_netbios_client.h
@@ -30,6 +30,9 @@
explicit FakeNetBiosClient(
std::map<net::IPEndPoint, std::vector<uint8_t>> fake_data);
+ FakeNetBiosClient(const FakeNetBiosClient&) = delete;
+ FakeNetBiosClient& operator=(const FakeNetBiosClient&) = delete;
+
~FakeNetBiosClient() override;
// NetBiosClientInterface override.
@@ -39,8 +42,6 @@
private:
std::map<net::IPEndPoint, std::vector<uint8_t>> fake_data_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeNetBiosClient);
};
} // namespace smb_client
diff --git a/chrome/browser/ash/smb_client/discovery/host_locator.h b/chrome/browser/ash/smb_client/discovery/host_locator.h
index 202dc3aa..3ab6be59 100644
--- a/chrome/browser/ash/smb_client/discovery/host_locator.h
+++ b/chrome/browser/ash/smb_client/discovery/host_locator.h
@@ -28,15 +28,16 @@
class HostLocator {
public:
HostLocator() = default;
+
+ HostLocator(const HostLocator&) = delete;
+ HostLocator& operator=(const HostLocator&) = delete;
+
virtual ~HostLocator() = default;
// Finds hosts in the local network. |callback| will be called once finished
// finding all the hosts. If no hosts are found, an empty map will be passed
// in the |callback|.
virtual void FindHosts(FindHostsCallback callback) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(HostLocator);
};
} // namespace smb_client
diff --git a/chrome/browser/ash/smb_client/discovery/in_memory_host_locator.h b/chrome/browser/ash/smb_client/discovery/in_memory_host_locator.h
index 332eb3e..400197c 100644
--- a/chrome/browser/ash/smb_client/discovery/in_memory_host_locator.h
+++ b/chrome/browser/ash/smb_client/discovery/in_memory_host_locator.h
@@ -17,6 +17,9 @@
InMemoryHostLocator();
explicit InMemoryHostLocator(bool should_run_synchronously);
+ InMemoryHostLocator(const InMemoryHostLocator&) = delete;
+ InMemoryHostLocator& operator=(const InMemoryHostLocator&) = delete;
+
~InMemoryHostLocator() override;
// Adds host with |hostname| and |address| to host_map_.
@@ -38,8 +41,6 @@
HostMap host_map_;
FindHostsCallback stored_callback_;
bool should_run_synchronously_ = true;
-
- DISALLOW_COPY_AND_ASSIGN(InMemoryHostLocator);
};
} // namespace smb_client
diff --git a/chrome/browser/ash/smb_client/discovery/in_memory_host_locator_unittest.cc b/chrome/browser/ash/smb_client/discovery/in_memory_host_locator_unittest.cc
index 9db2f45..d641919a 100644
--- a/chrome/browser/ash/smb_client/discovery/in_memory_host_locator_unittest.cc
+++ b/chrome/browser/ash/smb_client/discovery/in_memory_host_locator_unittest.cc
@@ -36,6 +36,10 @@
class InMemoryHostLocatorTest : public testing::Test {
public:
InMemoryHostLocatorTest() = default;
+
+ InMemoryHostLocatorTest(const InMemoryHostLocatorTest&) = delete;
+ InMemoryHostLocatorTest& operator=(const InMemoryHostLocatorTest&) = delete;
+
~InMemoryHostLocatorTest() override = default;
protected:
@@ -48,9 +52,6 @@
}
InMemoryHostLocator locator_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(InMemoryHostLocatorTest);
};
TEST_F(InMemoryHostLocatorTest, AddHostShouldNotBeEqual) {
diff --git a/chrome/browser/ash/smb_client/discovery/mdns_host_locator.cc b/chrome/browser/ash/smb_client/discovery/mdns_host_locator.cc
index 2ced78a1..c121c8b 100644
--- a/chrome/browser/ash/smb_client/discovery/mdns_host_locator.cc
+++ b/chrome/browser/ash/smb_client/discovery/mdns_host_locator.cc
@@ -56,6 +56,9 @@
DETACH_FROM_SEQUENCE(sequence_checker_);
}
+ Impl(const Impl&) = delete;
+ Impl& operator=(const Impl&) = delete;
+
~Impl() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); }
void FindHosts(FindHostsCallback callback);
@@ -118,8 +121,6 @@
std::vector<std::unique_ptr<net::MDnsTransaction>> transactions_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(Impl);
};
MDnsHostLocator::MDnsHostLocator()
diff --git a/chrome/browser/ash/smb_client/discovery/mdns_host_locator.h b/chrome/browser/ash/smb_client/discovery/mdns_host_locator.h
index aa4e13f..7fc1b2c 100644
--- a/chrome/browser/ash/smb_client/discovery/mdns_host_locator.h
+++ b/chrome/browser/ash/smb_client/discovery/mdns_host_locator.h
@@ -26,6 +26,10 @@
class MDnsHostLocator : public HostLocator {
public:
MDnsHostLocator();
+
+ MDnsHostLocator(const MDnsHostLocator&) = delete;
+ MDnsHostLocator& operator=(const MDnsHostLocator&) = delete;
+
~MDnsHostLocator() override;
// HostLocator override.
@@ -55,8 +59,6 @@
// Must be last member.
base::WeakPtrFactory<MDnsHostLocator> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MDnsHostLocator);
};
} // namespace smb_client
diff --git a/chrome/browser/ash/smb_client/discovery/mdns_host_locator_unittest.cc b/chrome/browser/ash/smb_client/discovery/mdns_host_locator_unittest.cc
index e9ba999..b531870e 100644
--- a/chrome/browser/ash/smb_client/discovery/mdns_host_locator_unittest.cc
+++ b/chrome/browser/ash/smb_client/discovery/mdns_host_locator_unittest.cc
@@ -11,10 +11,11 @@
class MDnsHostLocatorTest : public testing::Test {
public:
MDnsHostLocatorTest() = default;
- ~MDnsHostLocatorTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(MDnsHostLocatorTest);
+ MDnsHostLocatorTest(const MDnsHostLocatorTest&) = delete;
+ MDnsHostLocatorTest& operator=(const MDnsHostLocatorTest&) = delete;
+
+ ~MDnsHostLocatorTest() override = default;
};
TEST_F(MDnsHostLocatorTest, RemoveLocal) {
diff --git a/chrome/browser/ash/smb_client/discovery/netbios_client.h b/chrome/browser/ash/smb_client/discovery/netbios_client.h
index 6d6f4e5..4cee23a 100644
--- a/chrome/browser/ash/smb_client/discovery/netbios_client.h
+++ b/chrome/browser/ash/smb_client/discovery/netbios_client.h
@@ -52,6 +52,9 @@
explicit NetBiosClient(network::mojom::NetworkContext* network_context);
+ NetBiosClient(const NetBiosClient&) = delete;
+ NetBiosClient& operator=(const NetBiosClient&) = delete;
+
~NetBiosClient() override;
// NetBiosClientInterface override.
@@ -103,8 +106,6 @@
std::unique_ptr<FirewallHole> firewall_hole_;
mojo::Remote<network::mojom::UDPSocket> server_socket_;
mojo::Receiver<network::mojom::UDPSocketListener> listener_receiver_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NetBiosClient);
};
} // namespace smb_client
diff --git a/chrome/browser/ash/smb_client/discovery/netbios_client_interface.h b/chrome/browser/ash/smb_client/discovery/netbios_client_interface.h
index ba513ff..df92a023 100644
--- a/chrome/browser/ash/smb_client/discovery/netbios_client_interface.h
+++ b/chrome/browser/ash/smb_client/discovery/netbios_client_interface.h
@@ -23,6 +23,9 @@
class NetBiosClientInterface {
public:
+ NetBiosClientInterface(const NetBiosClientInterface&) = delete;
+ NetBiosClientInterface& operator=(const NetBiosClientInterface&) = delete;
+
virtual ~NetBiosClientInterface() = default;
// Starts the Name Query Request process. Any response packets that match
@@ -33,8 +36,6 @@
protected:
NetBiosClientInterface() = default;
-
- DISALLOW_COPY_AND_ASSIGN(NetBiosClientInterface);
};
} // namespace smb_client
diff --git a/chrome/browser/ash/smb_client/discovery/netbios_host_locator.h b/chrome/browser/ash/smb_client/discovery/netbios_host_locator.h
index 87e82f1f..61068d0 100644
--- a/chrome/browser/ash/smb_client/discovery/netbios_host_locator.h
+++ b/chrome/browser/ash/smb_client/discovery/netbios_host_locator.h
@@ -43,6 +43,9 @@
SmbProviderClient* smb_provider_client,
std::unique_ptr<base::OneShotTimer> timer);
+ NetBiosHostLocator(const NetBiosHostLocator&) = delete;
+ NetBiosHostLocator& operator=(const NetBiosHostLocator&) = delete;
+
~NetBiosHostLocator() override;
// HostLocator override.
@@ -108,8 +111,6 @@
// scope. One NetBiosClient exists for each network interface on the device.
std::list<std::unique_ptr<NetBiosClientInterface>> netbios_clients_;
std::unique_ptr<base::OneShotTimer> timer_;
-
- DISALLOW_COPY_AND_ASSIGN(NetBiosHostLocator);
};
} // namespace smb_client
diff --git a/chrome/browser/ash/smb_client/discovery/netbios_host_locator_unittest.cc b/chrome/browser/ash/smb_client/discovery/netbios_host_locator_unittest.cc
index a3f7042..c880f8c 100644
--- a/chrome/browser/ash/smb_client/discovery/netbios_host_locator_unittest.cc
+++ b/chrome/browser/ash/smb_client/discovery/netbios_host_locator_unittest.cc
@@ -91,6 +91,9 @@
&NetBiosHostLocatorTest::SetTrueOnReturned, base::Unretained(this));
}
+ NetBiosHostLocatorTest(const NetBiosHostLocatorTest&) = delete;
+ NetBiosHostLocatorTest& operator=(const NetBiosHostLocatorTest&) = delete;
+
~NetBiosHostLocatorTest() override = default;
protected:
@@ -152,8 +155,6 @@
// Each entry in the map represents an IP, packet pair that should be returned
// by that NetBiosClient.
std::vector<std::map<net::IPEndPoint, Packet>> clients_data_;
-
- DISALLOW_COPY_AND_ASSIGN(NetBiosHostLocatorTest);
};
// Calculate broadcast address correctly calculates the broadcast address
diff --git a/chrome/browser/ash/smb_client/discovery/network_scanner.h b/chrome/browser/ash/smb_client/discovery/network_scanner.h
index b84bdca..1d5be29 100644
--- a/chrome/browser/ash/smb_client/discovery/network_scanner.h
+++ b/chrome/browser/ash/smb_client/discovery/network_scanner.h
@@ -39,6 +39,10 @@
class NetworkScanner : public base::SupportsWeakPtr<NetworkScanner> {
public:
NetworkScanner();
+
+ NetworkScanner(const NetworkScanner&) = delete;
+ NetworkScanner& operator=(const NetworkScanner&) = delete;
+
~NetworkScanner();
// Query the registered HostLocators and return all the hosts found.
@@ -96,8 +100,6 @@
// FindHostsInNetwork() from concurrently executing. Used only for DCHECKing
// if FindHostsInNetwork() is already running.
bool running_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkScanner);
};
} // namespace smb_client
diff --git a/chrome/browser/ash/smb_client/discovery/network_scanner_unittest.cc b/chrome/browser/ash/smb_client/discovery/network_scanner_unittest.cc
index 29f6e40..4a1aa50 100644
--- a/chrome/browser/ash/smb_client/discovery/network_scanner_unittest.cc
+++ b/chrome/browser/ash/smb_client/discovery/network_scanner_unittest.cc
@@ -35,6 +35,10 @@
class NetworkScannerTest : public testing::Test {
public:
NetworkScannerTest() = default;
+
+ NetworkScannerTest(const NetworkScannerTest&) = delete;
+ NetworkScannerTest& operator=(const NetworkScannerTest&) = delete;
+
~NetworkScannerTest() override = default;
protected:
@@ -68,8 +72,6 @@
private:
NetworkScanner scanner_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkScannerTest);
};
TEST_F(NetworkScannerTest, SuccessIsFalseAndHostsMapIsEmptyWithNoLocator) {
diff --git a/chrome/browser/ash/system/automatic_reboot_manager.h b/chrome/browser/ash/system/automatic_reboot_manager.h
index 8b87419b..230ecddc 100644
--- a/chrome/browser/ash/system/automatic_reboot_manager.h
+++ b/chrome/browser/ash/system/automatic_reboot_manager.h
@@ -81,6 +81,10 @@
public content::NotificationObserver {
public:
explicit AutomaticRebootManager(const base::TickClock* clock);
+
+ AutomaticRebootManager(const AutomaticRebootManager&) = delete;
+ AutomaticRebootManager& operator=(const AutomaticRebootManager&) = delete;
+
~AutomaticRebootManager() override;
AutomaticRebootManagerObserver::Reason reboot_reason() const {
@@ -179,8 +183,6 @@
session_manager_observation_{this};
base::WeakPtrFactory<AutomaticRebootManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AutomaticRebootManager);
};
} // namespace system
diff --git a/chrome/browser/ash/system/automatic_reboot_manager_unittest.cc b/chrome/browser/ash/system/automatic_reboot_manager_unittest.cc
index 4ac164b..7520701 100644
--- a/chrome/browser/ash/system/automatic_reboot_manager_unittest.cc
+++ b/chrome/browser/ash/system/automatic_reboot_manager_unittest.cc
@@ -114,6 +114,12 @@
: public AutomaticRebootManagerObserver {
public:
MockAutomaticRebootManagerObserver();
+
+ MockAutomaticRebootManagerObserver(
+ const MockAutomaticRebootManagerObserver&) = delete;
+ MockAutomaticRebootManagerObserver& operator=(
+ const MockAutomaticRebootManagerObserver&) = delete;
+
~MockAutomaticRebootManagerObserver() override;
void Init(AutomaticRebootManager* automatic_reboot_manger);
@@ -126,8 +132,6 @@
void StopObserving();
AutomaticRebootManager* automatic_reboot_manger_;
-
- DISALLOW_COPY_AND_ASSIGN(MockAutomaticRebootManagerObserver);
};
} // namespace
diff --git a/chrome/browser/ash/system/fake_input_device_settings.h b/chrome/browser/ash/system/fake_input_device_settings.h
index 639aa1e..5054281f 100644
--- a/chrome/browser/ash/system/fake_input_device_settings.h
+++ b/chrome/browser/ash/system/fake_input_device_settings.h
@@ -17,6 +17,10 @@
public InputDeviceSettings::FakeInterface {
public:
FakeInputDeviceSettings();
+
+ FakeInputDeviceSettings(const FakeInputDeviceSettings&) = delete;
+ FakeInputDeviceSettings& operator=(const FakeInputDeviceSettings&) = delete;
+
~FakeInputDeviceSettings() override;
// Overridden from InputDeviceSettings.
@@ -65,8 +69,6 @@
bool touchpad_exists_ = true;
bool mouse_exists_ = true;
bool pointing_stick_exists_ = true;
-
- DISALLOW_COPY_AND_ASSIGN(FakeInputDeviceSettings);
};
} // namespace system
diff --git a/chrome/browser/ash/system/pointer_device_observer.h b/chrome/browser/ash/system/pointer_device_observer.h
index 7aa81024..7c2fb7a 100644
--- a/chrome/browser/ash/system/pointer_device_observer.h
+++ b/chrome/browser/ash/system/pointer_device_observer.h
@@ -16,6 +16,10 @@
class PointerDeviceObserver : public ui::InputDeviceEventObserver {
public:
PointerDeviceObserver();
+
+ PointerDeviceObserver(const PointerDeviceObserver&) = delete;
+ PointerDeviceObserver& operator=(const PointerDeviceObserver&) = delete;
+
~PointerDeviceObserver() override;
// Start observing device hierarchy.
@@ -54,8 +58,6 @@
base::ObserverList<Observer>::Unchecked observers_;
base::WeakPtrFactory<PointerDeviceObserver> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PointerDeviceObserver);
};
} // namespace system
diff --git a/chrome/browser/ash/system/procfs_util_unittest.cc b/chrome/browser/ash/system/procfs_util_unittest.cc
index 7f148f6..d1d63847 100644
--- a/chrome/browser/ash/system/procfs_util_unittest.cc
+++ b/chrome/browser/ash/system/procfs_util_unittest.cc
@@ -19,6 +19,10 @@
slash_proc_ = temp_dir_.GetPath().Append("proc");
CHECK(base::CreateDirectory(slash_proc_));
}
+
+ ProcfsUtilTest(const ProcfsUtilTest&) = delete;
+ ProcfsUtilTest& operator=(const ProcfsUtilTest&) = delete;
+
~ProcfsUtilTest() override = default;
// Write |contents| to file |file_name| under /proc.
@@ -44,8 +48,6 @@
private:
base::ScopedTempDir temp_dir_;
-
- DISALLOW_COPY_AND_ASSIGN(ProcfsUtilTest);
};
TEST_F(ProcfsUtilTest, GetSingleProcStatSuccess) {
diff --git a/chrome/browser/ash/system/system_clock.h b/chrome/browser/ash/system/system_clock.h
index 746b4fd1..f633dfa 100644
--- a/chrome/browser/ash/system/system_clock.h
+++ b/chrome/browser/ash/system/system_clock.h
@@ -37,6 +37,10 @@
public user_manager::UserManager::UserSessionStateObserver {
public:
SystemClock();
+
+ SystemClock(const SystemClock&) = delete;
+ SystemClock& operator=(const SystemClock&) = delete;
+
~SystemClock() override;
// Could be used to temporary set the required clock type. At most one should
@@ -94,8 +98,6 @@
base::CallbackListSubscription device_settings_observer_;
base::WeakPtrFactory<SystemClock> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SystemClock);
};
} // namespace system
diff --git a/chrome/browser/ash/system/timezone_resolver_manager.h b/chrome/browser/ash/system/timezone_resolver_manager.h
index 45962c7..7215246 100644
--- a/chrome/browser/ash/system/timezone_resolver_manager.h
+++ b/chrome/browser/ash/system/timezone_resolver_manager.h
@@ -38,6 +38,10 @@
};
TimeZoneResolverManager();
+
+ TimeZoneResolverManager(const TimeZoneResolverManager&) = delete;
+ TimeZoneResolverManager& operator=(const TimeZoneResolverManager&) = delete;
+
~TimeZoneResolverManager() override;
// This sets primary_user_prefs_.
@@ -105,8 +109,6 @@
bool initialized_ = false;
base::WeakPtrFactory<TimeZoneResolverManager> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TimeZoneResolverManager);
};
} // namespace system
diff --git a/chrome/browser/ash/system/tray_accessibility_browsertest.cc b/chrome/browser/ash/system/tray_accessibility_browsertest.cc
index f478b9fe..4a06fc8 100644
--- a/chrome/browser/ash/system/tray_accessibility_browsertest.cc
+++ b/chrome/browser/ash/system/tray_accessibility_browsertest.cc
@@ -590,6 +590,11 @@
class TrayAccessibilityLoginTest : public TrayAccessibilityTest {
public:
TrayAccessibilityLoginTest() = default;
+
+ TrayAccessibilityLoginTest(const TrayAccessibilityLoginTest&) = delete;
+ TrayAccessibilityLoginTest& operator=(const TrayAccessibilityLoginTest&) =
+ delete;
+
~TrayAccessibilityLoginTest() = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -597,9 +602,6 @@
command_line->AppendSwitch(switches::kLoginManager);
command_line->AppendSwitch(switches::kForceLoginManagerInTests);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TrayAccessibilityLoginTest);
};
IN_PROC_BROWSER_TEST_P(TrayAccessibilityLoginTest,
diff --git a/chrome/browser/ash/system_logs/command_line_log_source.h b/chrome/browser/ash/system_logs/command_line_log_source.h
index 9cd37c31..b0865e3f 100644
--- a/chrome/browser/ash/system_logs/command_line_log_source.h
+++ b/chrome/browser/ash/system_logs/command_line_log_source.h
@@ -15,13 +15,14 @@
class CommandLineLogSource : public SystemLogsSource {
public:
CommandLineLogSource();
+
+ CommandLineLogSource(const CommandLineLogSource&) = delete;
+ CommandLineLogSource& operator=(const CommandLineLogSource&) = delete;
+
~CommandLineLogSource() override;
// SystemLogsSource override.
void Fetch(SysLogsSourceCallback callback) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CommandLineLogSource);
};
} // namespace system_logs
diff --git a/chrome/browser/ash/system_logs/dbus_log_source.h b/chrome/browser/ash/system_logs/dbus_log_source.h
index efccdcf0..855b477 100644
--- a/chrome/browser/ash/system_logs/dbus_log_source.h
+++ b/chrome/browser/ash/system_logs/dbus_log_source.h
@@ -14,13 +14,14 @@
class DBusLogSource : public SystemLogsSource {
public:
DBusLogSource();
+
+ DBusLogSource(const DBusLogSource&) = delete;
+ DBusLogSource& operator=(const DBusLogSource&) = delete;
+
~DBusLogSource() override;
// SystemLogsSource override.
void Fetch(SysLogsSourceCallback request) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DBusLogSource);
};
} // namespace system_logs
diff --git a/chrome/browser/ash/system_logs/debug_daemon_log_source.h b/chrome/browser/ash/system_logs/debug_daemon_log_source.h
index adf4f82..7bcfacac 100644
--- a/chrome/browser/ash/system_logs/debug_daemon_log_source.h
+++ b/chrome/browser/ash/system_logs/debug_daemon_log_source.h
@@ -31,6 +31,10 @@
class DebugDaemonLogSource : public SystemLogsSource {
public:
explicit DebugDaemonLogSource(bool scrub);
+
+ DebugDaemonLogSource(const DebugDaemonLogSource&) = delete;
+ DebugDaemonLogSource& operator=(const DebugDaemonLogSource&) = delete;
+
~DebugDaemonLogSource() override;
// SystemLogsSource override:
@@ -73,8 +77,6 @@
int num_pending_requests_;
bool scrub_;
base::WeakPtrFactory<DebugDaemonLogSource> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DebugDaemonLogSource);
};
diff --git a/chrome/browser/ash/system_logs/device_event_log_source.h b/chrome/browser/ash/system_logs/device_event_log_source.h
index a1e6058..475c5bb 100644
--- a/chrome/browser/ash/system_logs/device_event_log_source.h
+++ b/chrome/browser/ash/system_logs/device_event_log_source.h
@@ -14,13 +14,14 @@
class DeviceEventLogSource : public SystemLogsSource {
public:
DeviceEventLogSource();
+
+ DeviceEventLogSource(const DeviceEventLogSource&) = delete;
+ DeviceEventLogSource& operator=(const DeviceEventLogSource&) = delete;
+
~DeviceEventLogSource() override;
// SystemLogsSource override.
void Fetch(SysLogsSourceCallback request) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DeviceEventLogSource);
};
} // namespace system_logs
diff --git a/chrome/browser/ash/system_logs/iwlwifi_dump_log_source.h b/chrome/browser/ash/system_logs/iwlwifi_dump_log_source.h
index 960fd58..f88cc5e7 100644
--- a/chrome/browser/ash/system_logs/iwlwifi_dump_log_source.h
+++ b/chrome/browser/ash/system_logs/iwlwifi_dump_log_source.h
@@ -25,13 +25,14 @@
class IwlwifiDumpChecker : public SystemLogsSource {
public:
IwlwifiDumpChecker();
+
+ IwlwifiDumpChecker(const IwlwifiDumpChecker&) = delete;
+ IwlwifiDumpChecker& operator=(const IwlwifiDumpChecker&) = delete;
+
~IwlwifiDumpChecker() override;
// system_logs::SystemLogsSource:
void Fetch(SysLogsSourceCallback callback) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(IwlwifiDumpChecker);
};
// Fetches information from the /var/log/last_iwlwifi_dump file, if
@@ -39,13 +40,14 @@
class IwlwifiDumpLogSource : public SystemLogsSource {
public:
IwlwifiDumpLogSource();
+
+ IwlwifiDumpLogSource(const IwlwifiDumpLogSource&) = delete;
+ IwlwifiDumpLogSource& operator=(const IwlwifiDumpLogSource&) = delete;
+
~IwlwifiDumpLogSource() override;
// system_logs::SystemLogsSource:
void Fetch(SysLogsSourceCallback callback) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(IwlwifiDumpLogSource);
};
// Checks to see if |sys_logs| contains the iwlwifi logs key.
diff --git a/chrome/browser/ash/system_logs/single_debug_daemon_log_source.h b/chrome/browser/ash/system_logs/single_debug_daemon_log_source.h
index 87b1ae6..0c385a8 100644
--- a/chrome/browser/ash/system_logs/single_debug_daemon_log_source.h
+++ b/chrome/browser/ash/system_logs/single_debug_daemon_log_source.h
@@ -37,6 +37,11 @@
};
explicit SingleDebugDaemonLogSource(SupportedSource source);
+
+ SingleDebugDaemonLogSource(const SingleDebugDaemonLogSource&) = delete;
+ SingleDebugDaemonLogSource& operator=(const SingleDebugDaemonLogSource&) =
+ delete;
+
~SingleDebugDaemonLogSource() override;
// system_logs::SystemLogsSource:
@@ -49,8 +54,6 @@
absl::optional<std::string> result) const;
base::WeakPtrFactory<SingleDebugDaemonLogSource> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SingleDebugDaemonLogSource);
};
} // namespace system_logs
diff --git a/chrome/browser/ash/system_logs/single_log_file_log_source.h b/chrome/browser/ash/system_logs/single_log_file_log_source.h
index bf5fc6e..ab3b530c 100644
--- a/chrome/browser/ash/system_logs/single_log_file_log_source.h
+++ b/chrome/browser/ash/system_logs/single_log_file_log_source.h
@@ -49,6 +49,10 @@
};
explicit SingleLogFileLogSource(SupportedSource source);
+
+ SingleLogFileLogSource(const SingleLogFileLogSource&) = delete;
+ SingleLogFileLogSource& operator=(const SingleLogFileLogSource&) = delete;
+
~SingleLogFileLogSource() override;
// During testing, use this to set a custom Chrome start time to override the
@@ -107,8 +111,6 @@
size_t max_read_size_;
base::WeakPtrFactory<SingleLogFileLogSource> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SingleLogFileLogSource);
};
} // namespace system_logs
diff --git a/chrome/browser/ash/system_logs/single_log_file_log_source_unittest.cc b/chrome/browser/ash/system_logs/single_log_file_log_source_unittest.cc
index 418b0647..607b72c 100644
--- a/chrome/browser/ash/system_logs/single_log_file_log_source_unittest.cc
+++ b/chrome/browser/ash/system_logs/single_log_file_log_source_unittest.cc
@@ -26,6 +26,10 @@
InitializeTestLogDir();
}
+ SingleLogFileLogSourceTest(const SingleLogFileLogSourceTest&) = delete;
+ SingleLogFileLogSourceTest& operator=(const SingleLogFileLogSourceTest&) =
+ delete;
+
~SingleLogFileLogSourceTest() override {
SingleLogFileLogSource::SetChromeStartTimeForTesting(nullptr);
}
@@ -132,8 +136,6 @@
// Path to the dummy log file in |log_dir_|.
base::FilePath log_file_path_;
-
- DISALLOW_COPY_AND_ASSIGN(SingleLogFileLogSourceTest);
};
TEST_F(SingleLogFileLogSourceTest, EmptyFile) {
diff --git a/chrome/browser/ash/system_logs/touch_log_source.h b/chrome/browser/ash/system_logs/touch_log_source.h
index 1d9d453..149039a2 100644
--- a/chrome/browser/ash/system_logs/touch_log_source.h
+++ b/chrome/browser/ash/system_logs/touch_log_source.h
@@ -13,13 +13,15 @@
class TouchLogSource : public SystemLogsSource {
public:
TouchLogSource() : SystemLogsSource("Touch") {}
+
+ TouchLogSource(const TouchLogSource&) = delete;
+ TouchLogSource& operator=(const TouchLogSource&) = delete;
+
~TouchLogSource() override {}
private:
// Overridden from SystemLogsSource:
void Fetch(SysLogsSourceCallback callback) override;
-
- DISALLOW_COPY_AND_ASSIGN(TouchLogSource);
};
} // namespace system_logs
diff --git a/chrome/browser/ash/usb/cros_usb_detector.h b/chrome/browser/ash/usb/cros_usb_detector.h
index 9b91174..5c2d9a5 100644
--- a/chrome/browser/ash/usb/cros_usb_detector.h
+++ b/chrome/browser/ash/usb/cros_usb_detector.h
@@ -85,6 +85,10 @@
static CrosUsbDetector* Get();
CrosUsbDetector();
+
+ CrosUsbDetector(const CrosUsbDetector&) = delete;
+ CrosUsbDetector& operator=(const CrosUsbDetector&) = delete;
+
~CrosUsbDetector() override;
void SetDeviceManagerForTesting(
@@ -269,8 +273,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate its weak pointers before any other members are destroyed.
base::WeakPtrFactory<CrosUsbDetector> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CrosUsbDetector);
};
} // namespace ash
diff --git a/chrome/browser/ash/usb/cros_usb_detector_unittest.cc b/chrome/browser/ash/usb/cros_usb_detector_unittest.cc
index 0c67e58..1afd87c 100644
--- a/chrome/browser/ash/usb/cros_usb_detector_unittest.cc
+++ b/chrome/browser/ash/usb/cros_usb_detector_unittest.cc
@@ -146,6 +146,9 @@
mock_disk_mount_manager_);
}
+ CrosUsbDetectorTest(const CrosUsbDetectorTest&) = delete;
+ CrosUsbDetectorTest& operator=(const CrosUsbDetectorTest&) = delete;
+
~CrosUsbDetectorTest() override {
chromeos::disks::DiskMountManager::Shutdown();
chromeos::SeneschalClient::Shutdown();
@@ -289,9 +292,6 @@
std::unique_ptr<ash::CrosUsbDetector> cros_usb_detector_;
std::unique_ptr<crostini::CrostiniTestHelper> crostini_test_helper_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CrosUsbDetectorTest);
};
TEST_F(CrosUsbDetectorTest, UsbDeviceAddedAndRemoved) {
diff --git a/chrome/browser/ash/web_applications/terminal_source.h b/chrome/browser/ash/web_applications/terminal_source.h
index fc4acc5..e783942 100644
--- a/chrome/browser/ash/web_applications/terminal_source.h
+++ b/chrome/browser/ash/web_applications/terminal_source.h
@@ -27,6 +27,9 @@
static std::unique_ptr<TerminalSource> ForTerminal(Profile* profile);
+ TerminalSource(const TerminalSource&) = delete;
+ TerminalSource& operator=(const TerminalSource&) = delete;
+
~TerminalSource() override;
private:
@@ -53,8 +56,6 @@
std::string source_;
std::string default_file_;
ui::TemplateReplacements replacements_;
-
- DISALLOW_COPY_AND_ASSIGN(TerminalSource);
};
#endif // CHROME_BROWSER_ASH_WEB_APPLICATIONS_TERMINAL_SOURCE_H_
diff --git a/chrome/browser/ash/wilco_dtc_supportd/fake_wilco_dtc_supportd_client.h b/chrome/browser/ash/wilco_dtc_supportd/fake_wilco_dtc_supportd_client.h
index f5c6cf96..5d89dc6 100644
--- a/chrome/browser/ash/wilco_dtc_supportd/fake_wilco_dtc_supportd_client.h
+++ b/chrome/browser/ash/wilco_dtc_supportd/fake_wilco_dtc_supportd_client.h
@@ -18,6 +18,11 @@
class FakeWilcoDtcSupportdClient final : public WilcoDtcSupportdClient {
public:
FakeWilcoDtcSupportdClient();
+
+ FakeWilcoDtcSupportdClient(const FakeWilcoDtcSupportdClient&) = delete;
+ FakeWilcoDtcSupportdClient& operator=(const FakeWilcoDtcSupportdClient&) =
+ delete;
+
~FakeWilcoDtcSupportdClient() override;
// DBusClient overrides:
@@ -53,8 +58,6 @@
absl::optional<bool> bootstrap_mojo_connection_result_;
std::vector<VoidDBusMethodCallback>
pending_bootstrap_mojo_connection_callbacks_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeWilcoDtcSupportdClient);
};
} // namespace ash
diff --git a/chrome/browser/ash/wilco_dtc_supportd/testing_wilco_dtc_supportd_bridge_wrapper.h b/chrome/browser/ash/wilco_dtc_supportd/testing_wilco_dtc_supportd_bridge_wrapper.h
index cb4fbc0..d074e12 100644
--- a/chrome/browser/ash/wilco_dtc_supportd/testing_wilco_dtc_supportd_bridge_wrapper.h
+++ b/chrome/browser/ash/wilco_dtc_supportd/testing_wilco_dtc_supportd_bridge_wrapper.h
@@ -37,6 +37,11 @@
std::unique_ptr<WilcoDtcSupportdNetworkContext> network_context,
std::unique_ptr<WilcoDtcSupportdBridge>* bridge);
+ TestingWilcoDtcSupportdBridgeWrapper(
+ const TestingWilcoDtcSupportdBridgeWrapper&) = delete;
+ TestingWilcoDtcSupportdBridgeWrapper& operator=(
+ const TestingWilcoDtcSupportdBridgeWrapper&) = delete;
+
~TestingWilcoDtcSupportdBridgeWrapper();
// Simulates bootstrapping the Mojo communication between the
@@ -92,8 +97,6 @@
chromeos::wilco_dtc_supportd::mojom::WilcoDtcSupportdService>
mojo_wilco_dtc_supportd_service_receiver)>
mojo_get_service_handler_;
-
- DISALLOW_COPY_AND_ASSIGN(TestingWilcoDtcSupportdBridgeWrapper);
};
} // namespace ash
diff --git a/chrome/browser/ash/wilco_dtc_supportd/testing_wilco_dtc_supportd_network_context.h b/chrome/browser/ash/wilco_dtc_supportd/testing_wilco_dtc_supportd_network_context.h
index 309b11e8..d15edba 100644
--- a/chrome/browser/ash/wilco_dtc_supportd/testing_wilco_dtc_supportd_network_context.h
+++ b/chrome/browser/ash/wilco_dtc_supportd/testing_wilco_dtc_supportd_network_context.h
@@ -23,6 +23,12 @@
: public WilcoDtcSupportdNetworkContext {
public:
TestingWilcoDtcSupportdNetworkContext();
+
+ TestingWilcoDtcSupportdNetworkContext(
+ const TestingWilcoDtcSupportdNetworkContext&) = delete;
+ TestingWilcoDtcSupportdNetworkContext& operator=(
+ const TestingWilcoDtcSupportdNetworkContext&) = delete;
+
~TestingWilcoDtcSupportdNetworkContext() override;
// WilcoDtcSupportdNetworkContext overrides:
@@ -32,8 +38,6 @@
private:
network::TestURLLoaderFactory test_url_loader_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(TestingWilcoDtcSupportdNetworkContext);
};
} // namespace ash
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge.cc b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge.cc
index d850f24..6fa18819 100644
--- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge.cc
+++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge.cc
@@ -54,6 +54,12 @@
: public WilcoDtcSupportdBridge::Delegate {
public:
WilcoDtcSupportdBridgeDelegateImpl();
+
+ WilcoDtcSupportdBridgeDelegateImpl(
+ const WilcoDtcSupportdBridgeDelegateImpl&) = delete;
+ WilcoDtcSupportdBridgeDelegateImpl& operator=(
+ const WilcoDtcSupportdBridgeDelegateImpl&) = delete;
+
~WilcoDtcSupportdBridgeDelegateImpl() override;
// Delegate overrides:
@@ -62,9 +68,6 @@
chromeos::wilco_dtc_supportd::mojom::WilcoDtcSupportdServiceFactory>*
wilco_dtc_supportd_service_factory_mojo_remote,
base::ScopedFD* remote_endpoint_fd) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WilcoDtcSupportdBridgeDelegateImpl);
};
WilcoDtcSupportdBridgeDelegateImpl::WilcoDtcSupportdBridgeDelegateImpl() =
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge.h b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge.h
index 360edf3..99907ec 100644
--- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge.h
+++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge.h
@@ -63,6 +63,9 @@
std::unique_ptr<WilcoDtcSupportdNotificationController>
notification_controller);
+ WilcoDtcSupportdBridge(const WilcoDtcSupportdBridge&) = delete;
+ WilcoDtcSupportdBridge& operator=(const WilcoDtcSupportdBridge&) = delete;
+
~WilcoDtcSupportdBridge() override;
// Sets the Wilco DTC configuration data, passed and owned by the
@@ -159,8 +162,6 @@
base::WeakPtrFactory<WilcoDtcSupportdBridge> dbus_waiting_weak_ptr_factory_{
this};
base::WeakPtrFactory<WilcoDtcSupportdBridge> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WilcoDtcSupportdBridge);
};
} // namespace ash
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_client.cc b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_client.cc
index 7d72e50..d2c600d 100644
--- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_client.cc
+++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_client.cc
@@ -31,6 +31,11 @@
class WilcoDtcSupportdClientImpl final : public WilcoDtcSupportdClient {
public:
WilcoDtcSupportdClientImpl();
+
+ WilcoDtcSupportdClientImpl(const WilcoDtcSupportdClientImpl&) = delete;
+ WilcoDtcSupportdClientImpl& operator=(const WilcoDtcSupportdClientImpl&) =
+ delete;
+
~WilcoDtcSupportdClientImpl() override;
// WilcoDtcSupportdClient overrides:
@@ -44,8 +49,6 @@
dbus::ObjectProxy* wilco_dtc_supportd_proxy_ = nullptr;
base::WeakPtrFactory<WilcoDtcSupportdClientImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WilcoDtcSupportdClientImpl);
};
WilcoDtcSupportdClientImpl::WilcoDtcSupportdClientImpl() = default;
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.cc b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.cc
index 931724b4..9fb84c8 100644
--- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.cc
+++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.cc
@@ -31,14 +31,17 @@
: public WilcoDtcSupportdManager::Delegate {
public:
WilcoDtcSupportdManagerDelegateImpl();
+
+ WilcoDtcSupportdManagerDelegateImpl(
+ const WilcoDtcSupportdManagerDelegateImpl&) = delete;
+ WilcoDtcSupportdManagerDelegateImpl& operator=(
+ const WilcoDtcSupportdManagerDelegateImpl&) = delete;
+
~WilcoDtcSupportdManagerDelegateImpl() override;
// Delegate overrides:
std::unique_ptr<WilcoDtcSupportdBridge> CreateWilcoDtcSupportdBridge()
override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WilcoDtcSupportdManagerDelegateImpl);
};
WilcoDtcSupportdManagerDelegateImpl::WilcoDtcSupportdManagerDelegateImpl() =
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.h b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.h
index e92d533..4d94d17 100644
--- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.h
+++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.h
@@ -45,6 +45,9 @@
// For use in tests.
explicit WilcoDtcSupportdManager(std::unique_ptr<Delegate> delegate);
+ WilcoDtcSupportdManager(const WilcoDtcSupportdManager&) = delete;
+ WilcoDtcSupportdManager& operator=(const WilcoDtcSupportdManager&) = delete;
+
~WilcoDtcSupportdManager() override;
// Sets the Wilco DTC configuration data, passed by the device policy.
@@ -87,8 +90,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate its weak pointers before any other members are destroyed.
base::WeakPtrFactory<WilcoDtcSupportdManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WilcoDtcSupportdManager);
};
} // namespace ash
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_messaging.cc b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_messaging.cc
index 9d58e5b2..039f4b4 100644
--- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_messaging.cc
+++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_messaging.cc
@@ -75,6 +75,12 @@
: public extensions::NativeMessageHost {
public:
WilcoDtcSupportdExtensionOwnedMessageHost() = default;
+
+ WilcoDtcSupportdExtensionOwnedMessageHost(
+ const WilcoDtcSupportdExtensionOwnedMessageHost&) = delete;
+ WilcoDtcSupportdExtensionOwnedMessageHost& operator=(
+ const WilcoDtcSupportdExtensionOwnedMessageHost&) = delete;
+
~WilcoDtcSupportdExtensionOwnedMessageHost() override = default;
// extensions::NativeMessageHost:
@@ -207,8 +213,6 @@
// Must be the last member.
base::WeakPtrFactory<WilcoDtcSupportdExtensionOwnedMessageHost>
weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WilcoDtcSupportdExtensionOwnedMessageHost);
};
// Extensions native message host implementation that is used when the wilco_dtc
@@ -230,6 +234,11 @@
DCHECK(send_response_callback_);
}
+ WilcoDtcSupportdDaemonOwnedMessageHost(
+ const WilcoDtcSupportdDaemonOwnedMessageHost&) = delete;
+ WilcoDtcSupportdDaemonOwnedMessageHost& operator=(
+ const WilcoDtcSupportdDaemonOwnedMessageHost&) = delete;
+
~WilcoDtcSupportdDaemonOwnedMessageHost() override {
if (send_response_callback_) {
// If no response was received from the extension, pass the empty result
@@ -274,8 +283,6 @@
base::OnceCallback<void(const std::string& response)> send_response_callback_;
// Unowned.
Client* client_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(WilcoDtcSupportdDaemonOwnedMessageHost);
};
// Helper that wraps the specified OnceCallback and encapsulates logic that
@@ -297,6 +304,11 @@
std::move(original_callback_).Run(std::string() /* response */);
}
+ FirstNonEmptyMessageCallbackWrapper(
+ const FirstNonEmptyMessageCallbackWrapper&) = delete;
+ FirstNonEmptyMessageCallbackWrapper& operator=(
+ const FirstNonEmptyMessageCallbackWrapper&) = delete;
+
~FirstNonEmptyMessageCallbackWrapper() {
if (original_callback_) {
// Not all responses were received before this instance is destroyed, so
@@ -327,8 +339,6 @@
private:
base::OnceCallback<void(const std::string& response)> original_callback_;
int pending_callback_count_;
-
- DISALLOW_COPY_AND_ASSIGN(FirstNonEmptyMessageCallbackWrapper);
};
void DeliverMessageToExtension(
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_network_context.h b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_network_context.h
index 29e1fef..3b65970 100644
--- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_network_context.h
+++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_network_context.h
@@ -36,6 +36,12 @@
public network::mojom::URLLoaderNetworkServiceObserver {
public:
WilcoDtcSupportdNetworkContextImpl();
+
+ WilcoDtcSupportdNetworkContextImpl(
+ const WilcoDtcSupportdNetworkContextImpl&) = delete;
+ WilcoDtcSupportdNetworkContextImpl& operator=(
+ const WilcoDtcSupportdNetworkContextImpl&) = delete;
+
~WilcoDtcSupportdNetworkContextImpl() override;
// WilcoDtcSupportdNetworkContext overrides:
@@ -92,8 +98,6 @@
mojo::ReceiverSet<network::mojom::URLLoaderNetworkServiceObserver>
cert_receivers_;
-
- DISALLOW_COPY_AND_ASSIGN(WilcoDtcSupportdNetworkContextImpl);
};
} // namespace ash
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service.h b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service.h
index d471c48..ad4a6be9 100644
--- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service.h
+++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service.h
@@ -46,6 +46,12 @@
explicit WilcoDtcSupportdWebRequestService(
std::unique_ptr<WilcoDtcSupportdNetworkContext> network_context);
+
+ WilcoDtcSupportdWebRequestService(const WilcoDtcSupportdWebRequestService&) =
+ delete;
+ WilcoDtcSupportdWebRequestService& operator=(
+ const WilcoDtcSupportdWebRequestService&) = delete;
+
~WilcoDtcSupportdWebRequestService();
// Performs web request. The response is returned by |callback| which is
@@ -93,8 +99,6 @@
base::queue<std::unique_ptr<WebRequest>> request_queue_;
std::unique_ptr<WebRequest> active_request_;
-
- DISALLOW_COPY_AND_ASSIGN(WilcoDtcSupportdWebRequestService);
};
} // namespace ash
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
index 4a21cfb..065d83f27 100644
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
@@ -33,6 +33,12 @@
class ChromeAutocompleteProviderClient : public AutocompleteProviderClient {
public:
explicit ChromeAutocompleteProviderClient(Profile* profile);
+
+ ChromeAutocompleteProviderClient(const ChromeAutocompleteProviderClient&) =
+ delete;
+ ChromeAutocompleteProviderClient& operator=(
+ const ChromeAutocompleteProviderClient&) = delete;
+
~ChromeAutocompleteProviderClient() override;
// AutocompleteProviderClient:
@@ -142,8 +148,6 @@
std::unique_ptr<OmniboxTriggeredFeatureService>
omnibox_triggered_feature_service_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeAutocompleteProviderClient);
};
#endif // CHROME_BROWSER_AUTOCOMPLETE_CHROME_AUTOCOMPLETE_PROVIDER_CLIENT_H_
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client_unittest.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client_unittest.cc
index e64e80a..c9e19e8 100644
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client_unittest.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client_unittest.cc
@@ -21,14 +21,15 @@
class TestSchemeClassifier : public AutocompleteSchemeClassifier {
public:
TestSchemeClassifier() = default;
+
+ TestSchemeClassifier(const TestSchemeClassifier&) = delete;
+ TestSchemeClassifier& operator=(const TestSchemeClassifier&) = delete;
+
~TestSchemeClassifier() override = default;
// Overridden from AutocompleteInputSchemeClassifier:
metrics::OmniboxInputType GetInputTypeForScheme(
const std::string& scheme) const override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestSchemeClassifier);
};
metrics::OmniboxInputType TestSchemeClassifier::GetInputTypeForScheme(
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h
index 0b87c68..04f7749 100644
--- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h
+++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h
@@ -14,6 +14,12 @@
class ChromeAutocompleteSchemeClassifier : public AutocompleteSchemeClassifier {
public:
explicit ChromeAutocompleteSchemeClassifier(Profile* profile);
+
+ ChromeAutocompleteSchemeClassifier(
+ const ChromeAutocompleteSchemeClassifier&) = delete;
+ ChromeAutocompleteSchemeClassifier& operator=(
+ const ChromeAutocompleteSchemeClassifier&) = delete;
+
~ChromeAutocompleteSchemeClassifier() override;
// AutocompleteInputSchemeChecker:
@@ -22,8 +28,6 @@
private:
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeAutocompleteSchemeClassifier);
};
#endif // CHROME_BROWSER_AUTOCOMPLETE_CHROME_AUTOCOMPLETE_SCHEME_CLASSIFIER_H_
diff --git a/chrome/browser/autocomplete/keyword_extensions_delegate_impl.h b/chrome/browser/autocomplete/keyword_extensions_delegate_impl.h
index 87aa6fa..8aba9e9 100644
--- a/chrome/browser/autocomplete/keyword_extensions_delegate_impl.h
+++ b/chrome/browser/autocomplete/keyword_extensions_delegate_impl.h
@@ -31,6 +31,11 @@
public content::NotificationObserver {
public:
KeywordExtensionsDelegateImpl(Profile* profile, KeywordProvider* provider);
+
+ KeywordExtensionsDelegateImpl(const KeywordExtensionsDelegateImpl&) = delete;
+ KeywordExtensionsDelegateImpl& operator=(
+ const KeywordExtensionsDelegateImpl&) = delete;
+
~KeywordExtensionsDelegateImpl() override;
// KeywordExtensionsDelegate:
@@ -88,8 +93,6 @@
// We need our input IDs to be unique across all profiles, so we keep a global
// UID that each provider uses.
static int global_input_uid_;
-
- DISALLOW_COPY_AND_ASSIGN(KeywordExtensionsDelegateImpl);
};
#endif // CHROME_BROWSER_AUTOCOMPLETE_KEYWORD_EXTENSIONS_DELEGATE_IMPL_H_
diff --git a/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc b/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc
index 349a078..4b2c7029 100644
--- a/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc
+++ b/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc
@@ -31,15 +31,18 @@
class KeywordExtensionsDelegateImplTest : public ExtensionServiceTestBase {
public:
KeywordExtensionsDelegateImplTest() {}
+
+ KeywordExtensionsDelegateImplTest(const KeywordExtensionsDelegateImplTest&) =
+ delete;
+ KeywordExtensionsDelegateImplTest& operator=(
+ const KeywordExtensionsDelegateImplTest&) = delete;
+
~KeywordExtensionsDelegateImplTest() override {}
protected:
void SetUp() override;
void RunTest(bool incognito);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(KeywordExtensionsDelegateImplTest);
};
void KeywordExtensionsDelegateImplTest::SetUp() {
diff --git a/chrome/browser/autocomplete/shortcuts_extensions_manager.h b/chrome/browser/autocomplete/shortcuts_extensions_manager.h
index 33b3bbb..7efa519 100644
--- a/chrome/browser/autocomplete/shortcuts_extensions_manager.h
+++ b/chrome/browser/autocomplete/shortcuts_extensions_manager.h
@@ -20,6 +20,11 @@
public extensions::ExtensionRegistryObserver {
public:
explicit ShortcutsExtensionsManager(Profile* profile);
+
+ ShortcutsExtensionsManager(const ShortcutsExtensionsManager&) = delete;
+ ShortcutsExtensionsManager& operator=(const ShortcutsExtensionsManager&) =
+ delete;
+
~ShortcutsExtensionsManager() override;
// extensions::ExtensionRegistryObserver:
@@ -33,8 +38,6 @@
extensions::ExtensionRegistryObserver>
registry_observation_{this};
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ShortcutsExtensionsManager);
};
#endif // CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_EXTENSIONS_MANAGER_H_
diff --git a/chrome/browser/autofill/address_accessory_controller.h b/chrome/browser/autofill/address_accessory_controller.h
index 8d56d58..ddbb6f8 100644
--- a/chrome/browser/autofill/address_accessory_controller.h
+++ b/chrome/browser/autofill/address_accessory_controller.h
@@ -24,6 +24,11 @@
public AccessoryController {
public:
AddressAccessoryController() = default;
+
+ AddressAccessoryController(const AddressAccessoryController&) = delete;
+ AddressAccessoryController& operator=(const AddressAccessoryController&) =
+ delete;
+
~AddressAccessoryController() override = default;
// Returns true if the accessory controller may exist for |web_contents|.
@@ -39,9 +44,6 @@
// Fetches suggestions and propagates them to the frontend.
virtual void RefreshSuggestions() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AddressAccessoryController);
};
} // namespace autofill
diff --git a/chrome/browser/autofill/address_accessory_controller_impl.h b/chrome/browser/autofill/address_accessory_controller_impl.h
index fd23074e..2565a84 100644
--- a/chrome/browser/autofill/address_accessory_controller_impl.h
+++ b/chrome/browser/autofill/address_accessory_controller_impl.h
@@ -27,6 +27,11 @@
public PersonalDataManagerObserver,
public content::WebContentsUserData<AddressAccessoryControllerImpl> {
public:
+ AddressAccessoryControllerImpl(const AddressAccessoryControllerImpl&) =
+ delete;
+ AddressAccessoryControllerImpl& operator=(
+ const AddressAccessoryControllerImpl&) = delete;
+
~AddressAccessoryControllerImpl() override;
// AccessoryController:
@@ -78,8 +83,6 @@
PersonalDataManager* personal_data_manager_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(AddressAccessoryControllerImpl);
};
} // namespace autofill
diff --git a/chrome/browser/autofill/autofill_credit_card_filling_infobar_delegate_mobile_unittest.cc b/chrome/browser/autofill/autofill_credit_card_filling_infobar_delegate_mobile_unittest.cc
index 26de7b9..b6193bd 100644
--- a/chrome/browser/autofill/autofill_credit_card_filling_infobar_delegate_mobile_unittest.cc
+++ b/chrome/browser/autofill/autofill_credit_card_filling_infobar_delegate_mobile_unittest.cc
@@ -21,6 +21,12 @@
public:
AutofillCreditCardFillingInfoBarDelegateMobileTest()
: infobar_callback_has_run_(false) {}
+
+ AutofillCreditCardFillingInfoBarDelegateMobileTest(
+ const AutofillCreditCardFillingInfoBarDelegateMobileTest&) = delete;
+ AutofillCreditCardFillingInfoBarDelegateMobileTest& operator=(
+ const AutofillCreditCardFillingInfoBarDelegateMobileTest&) = delete;
+
~AutofillCreditCardFillingInfoBarDelegateMobileTest() override {}
protected:
@@ -30,9 +36,6 @@
void AcceptInfoBarCallback() { infobar_callback_has_run_ = true; }
bool infobar_callback_has_run_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AutofillCreditCardFillingInfoBarDelegateMobileTest);
};
std::unique_ptr<AutofillCreditCardFillingInfoBarDelegateMobile>
diff --git a/chrome/browser/autofill/autofill_keyboard_accessory_adapter.h b/chrome/browser/autofill/autofill_keyboard_accessory_adapter.h
index 93e9022..c5a6409 100644
--- a/chrome/browser/autofill/autofill_keyboard_accessory_adapter.h
+++ b/chrome/browser/autofill/autofill_keyboard_accessory_adapter.h
@@ -27,6 +27,12 @@
public:
AutofillKeyboardAccessoryAdapter(
base::WeakPtr<AutofillPopupController> controller);
+
+ AutofillKeyboardAccessoryAdapter(const AutofillKeyboardAccessoryAdapter&) =
+ delete;
+ AutofillKeyboardAccessoryAdapter& operator=(
+ const AutofillKeyboardAccessoryAdapter&) = delete;
+
~AutofillKeyboardAccessoryAdapter() override;
// Interface describing the minimal capabilities for the native view.
@@ -107,8 +113,6 @@
base::WeakPtrFactory<AutofillKeyboardAccessoryAdapter> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(AutofillKeyboardAccessoryAdapter);
};
} // namespace autofill
diff --git a/chrome/browser/autofill/autofill_metrics_browsertest.cc b/chrome/browser/autofill/autofill_metrics_browsertest.cc
index 29b690bc..fd9b989 100644
--- a/chrome/browser/autofill/autofill_metrics_browsertest.cc
+++ b/chrome/browser/autofill/autofill_metrics_browsertest.cc
@@ -51,6 +51,10 @@
public:
AutofillMetricsBrowserTest() {}
+ AutofillMetricsBrowserTest(const AutofillMetricsBrowserTest&) = delete;
+ AutofillMetricsBrowserTest& operator=(const AutofillMetricsBrowserTest&) =
+ delete;
+
~AutofillMetricsBrowserTest() override {}
protected:
@@ -76,9 +80,6 @@
}
std::unique_ptr<ukm::TestAutoSetUkmRecorder> test_ukm_recorder_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AutofillMetricsBrowserTest);
};
IN_PROC_BROWSER_TEST_F(AutofillMetricsBrowserTest,
@@ -206,6 +207,11 @@
public:
SitePerProcessAutofillMetricsBrowserTest() {}
+ SitePerProcessAutofillMetricsBrowserTest(
+ const SitePerProcessAutofillMetricsBrowserTest&) = delete;
+ SitePerProcessAutofillMetricsBrowserTest& operator=(
+ const SitePerProcessAutofillMetricsBrowserTest&) = delete;
+
~SitePerProcessAutofillMetricsBrowserTest() override {}
protected:
@@ -215,9 +221,6 @@
// Append --site-per-process flag.
content::IsolateAllSitesForTesting(command_line);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SitePerProcessAutofillMetricsBrowserTest);
};
IN_PROC_BROWSER_TEST_F(SitePerProcessAutofillMetricsBrowserTest,
diff --git a/chrome/browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc b/chrome/browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc
index a06d24c..397ed1f3 100644
--- a/chrome/browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc
+++ b/chrome/browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc
@@ -32,6 +32,12 @@
: public ChromeRenderViewHostTestHarness {
public:
AutofillSaveCardInfoBarDelegateMobileTest();
+
+ AutofillSaveCardInfoBarDelegateMobileTest(
+ const AutofillSaveCardInfoBarDelegateMobileTest&) = delete;
+ AutofillSaveCardInfoBarDelegateMobileTest& operator=(
+ const AutofillSaveCardInfoBarDelegateMobileTest&) = delete;
+
~AutofillSaveCardInfoBarDelegateMobileTest() override;
void SetUp() override;
@@ -63,8 +69,6 @@
}
CreditCard credit_card_to_save_;
-
- DISALLOW_COPY_AND_ASSIGN(AutofillSaveCardInfoBarDelegateMobileTest);
};
AutofillSaveCardInfoBarDelegateMobileTest::
diff --git a/chrome/browser/autofill/autofill_server_browsertest.cc b/chrome/browser/autofill/autofill_server_browsertest.cc
index d8237e2..bc7ef82 100644
--- a/chrome/browser/autofill/autofill_server_browsertest.cc
+++ b/chrome/browser/autofill/autofill_server_browsertest.cc
@@ -70,6 +70,10 @@
std::make_unique<content::URLLoaderInterceptor>(base::BindRepeating(
&WindowedNetworkObserver::OnIntercept, base::Unretained(this)));
}
+
+ WindowedNetworkObserver(const WindowedNetworkObserver&) = delete;
+ WindowedNetworkObserver& operator=(const WindowedNetworkObserver&) = delete;
+
~WindowedNetworkObserver() {}
// Waits for a network request with the |expected_upload_data_|.
@@ -122,8 +126,6 @@
scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
std::unique_ptr<content::URLLoaderInterceptor> interceptor_;
-
- DISALLOW_COPY_AND_ASSIGN(WindowedNetworkObserver);
};
} // namespace
diff --git a/chrome/browser/autofill/autofill_uitest.h b/chrome/browser/autofill/autofill_uitest.h
index 5b94560..7cbe214 100644
--- a/chrome/browser/autofill/autofill_uitest.h
+++ b/chrome/browser/autofill/autofill_uitest.h
@@ -34,6 +34,12 @@
: public autofill::BrowserAutofillManagerTestDelegate {
public:
BrowserAutofillManagerTestDelegateImpl();
+
+ BrowserAutofillManagerTestDelegateImpl(
+ const BrowserAutofillManagerTestDelegateImpl&) = delete;
+ BrowserAutofillManagerTestDelegateImpl& operator=(
+ const BrowserAutofillManagerTestDelegateImpl&) = delete;
+
~BrowserAutofillManagerTestDelegateImpl() override;
// Controls whether back-to-back events of |type|, except for the first one,
@@ -64,8 +70,6 @@
std::unique_ptr<EventWaiter<ObservedUiEvents>> event_waiter_;
DenseSet<ObservedUiEvents> ignore_back_to_back_event_types_;
ObservedUiEvents last_event_ = ObservedUiEvents::kNoEvent;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserAutofillManagerTestDelegateImpl);
};
class AutofillUiTest : public InProcessBrowserTest,
diff --git a/chrome/browser/autofill/autofill_uitest_util.cc b/chrome/browser/autofill/autofill_uitest_util.cc
index c8cf607..1803056 100644
--- a/chrome/browser/autofill/autofill_uitest_util.cc
+++ b/chrome/browser/autofill/autofill_uitest_util.cc
@@ -28,6 +28,9 @@
PersonalDataManagerFactory::GetForProfile(base_profile_)->AddObserver(this);
}
+ PdmChangeWaiter(const PdmChangeWaiter&) = delete;
+ PdmChangeWaiter& operator=(const PdmChangeWaiter&) = delete;
+
~PdmChangeWaiter() override {}
// PersonalDataManagerObserver:
@@ -54,8 +57,6 @@
bool alerted_;
bool has_run_message_loop_;
Profile* base_profile_;
-
- DISALLOW_COPY_AND_ASSIGN(PdmChangeWaiter);
};
static PersonalDataManager* GetPersonalDataManager(Profile* profile) {
diff --git a/chrome/browser/autofill/captured_sites_test_utils.h b/chrome/browser/autofill/captured_sites_test_utils.h
index 6a44f34..1957093 100644
--- a/chrome/browser/autofill/captured_sites_test_utils.h
+++ b/chrome/browser/autofill/captured_sites_test_utils.h
@@ -100,6 +100,10 @@
class IFrameWaiter : public content::WebContentsObserver {
public:
explicit IFrameWaiter(content::WebContents* webcontents);
+
+ IFrameWaiter(const IFrameWaiter&) = delete;
+ IFrameWaiter& operator=(const IFrameWaiter&) = delete;
+
~IFrameWaiter() override;
content::RenderFrameHost* WaitForFrameMatchingName(
const std::string& name,
@@ -130,8 +134,6 @@
std::string frame_name_;
GURL origin_;
GURL url_;
-
- DISALLOW_COPY_AND_ASSIGN(IFrameWaiter);
};
// TestRecipeReplayChromeFeatureActionExecutor
@@ -207,6 +209,10 @@
TestRecipeReplayer(
Browser* browser,
TestRecipeReplayChromeFeatureActionExecutor* feature_action_executor);
+
+ TestRecipeReplayer(const TestRecipeReplayer&) = delete;
+ TestRecipeReplayer& operator=(const TestRecipeReplayer&) = delete;
+
~TestRecipeReplayer();
void Setup();
void Cleanup();
@@ -366,8 +372,6 @@
// Overrides the AutofillClock to use the recorded date.
autofill::TestAutofillClock test_clock_;
-
- DISALLOW_COPY_AND_ASSIGN(TestRecipeReplayer);
};
} // namespace captured_sites_test_utils
diff --git a/chrome/browser/autofill/content_autofill_driver_browsertest.cc b/chrome/browser/autofill/content_autofill_driver_browsertest.cc
index d41430b..d357a34 100644
--- a/chrome/browser/autofill/content_autofill_driver_browsertest.cc
+++ b/chrome/browser/autofill/content_autofill_driver_browsertest.cc
@@ -40,6 +40,10 @@
class MockAutofillClient : public TestAutofillClient {
public:
MockAutofillClient() = default;
+
+ MockAutofillClient(const MockAutofillClient&) = delete;
+ MockAutofillClient& operator=(const MockAutofillClient&) = delete;
+
~MockAutofillClient() override = default;
PrefService* GetPrefs() override {
@@ -60,8 +64,6 @@
private:
sync_preferences::TestingPrefServiceSyncable prefs_;
-
- DISALLOW_COPY_AND_ASSIGN(MockAutofillClient);
};
} // namespace
diff --git a/chrome/browser/autofill/manual_filling_controller.h b/chrome/browser/autofill/manual_filling_controller.h
index 5f68a12..ea09472a 100644
--- a/chrome/browser/autofill/manual_filling_controller.h
+++ b/chrome/browser/autofill/manual_filling_controller.h
@@ -46,6 +46,10 @@
};
ManualFillingController() = default;
+
+ ManualFillingController(const ManualFillingController&) = delete;
+ ManualFillingController& operator=(const ManualFillingController&) = delete;
+
virtual ~ManualFillingController() = default;
// Returns a weak pointer to the unique ManualFillingController instance
@@ -136,9 +140,6 @@
// The web page view containing the focused field.
virtual gfx::NativeView container_view() const = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ManualFillingController);
};
#endif // CHROME_BROWSER_AUTOFILL_MANUAL_FILLING_CONTROLLER_H_
diff --git a/chrome/browser/autofill/manual_filling_controller_impl.h b/chrome/browser/autofill/manual_filling_controller_impl.h
index 9c0f99c5..5fa7900 100644
--- a/chrome/browser/autofill/manual_filling_controller_impl.h
+++ b/chrome/browser/autofill/manual_filling_controller_impl.h
@@ -32,6 +32,10 @@
public content::WebContentsUserData<ManualFillingControllerImpl>,
public base::trace_event::MemoryDumpProvider {
public:
+ ManualFillingControllerImpl(const ManualFillingControllerImpl&) = delete;
+ ManualFillingControllerImpl& operator=(const ManualFillingControllerImpl&) =
+ delete;
+
~ManualFillingControllerImpl() override;
// ManualFillingController:
@@ -166,8 +170,6 @@
base::WeakPtrFactory<ManualFillingControllerImpl> weak_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(ManualFillingControllerImpl);
};
#endif // CHROME_BROWSER_AUTOFILL_MANUAL_FILLING_CONTROLLER_IMPL_H_
diff --git a/chrome/browser/autofill/mock_address_accessory_controller.h b/chrome/browser/autofill/mock_address_accessory_controller.h
index c9a73b9..a581359a 100644
--- a/chrome/browser/autofill/mock_address_accessory_controller.h
+++ b/chrome/browser/autofill/mock_address_accessory_controller.h
@@ -15,6 +15,12 @@
: public autofill::AddressAccessoryController {
public:
MockAddressAccessoryController();
+
+ MockAddressAccessoryController(const MockAddressAccessoryController&) =
+ delete;
+ MockAddressAccessoryController& operator=(
+ const MockAddressAccessoryController&) = delete;
+
~MockAddressAccessoryController() override;
MOCK_METHOD(void,
@@ -38,9 +44,6 @@
(autofill::AccessoryAction toggled_action, bool enabled),
(override));
MOCK_METHOD(void, RefreshSuggestions, (), (override));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockAddressAccessoryController);
};
#endif // CHROME_BROWSER_AUTOFILL_MOCK_ADDRESS_ACCESSORY_CONTROLLER_H_
diff --git a/chrome/browser/autofill/mock_manual_filling_controller.h b/chrome/browser/autofill/mock_manual_filling_controller.h
index a2c8b4e9..11dd4c1d 100644
--- a/chrome/browser/autofill/mock_manual_filling_controller.h
+++ b/chrome/browser/autofill/mock_manual_filling_controller.h
@@ -14,6 +14,11 @@
public base::SupportsWeakPtr<MockManualFillingController> {
public:
MockManualFillingController();
+
+ MockManualFillingController(const MockManualFillingController&) = delete;
+ MockManualFillingController& operator=(const MockManualFillingController&) =
+ delete;
+
~MockManualFillingController() override;
MOCK_METHOD1(RefreshSuggestions, void(const autofill::AccessorySheetData&));
@@ -38,9 +43,6 @@
void(autofill::AccessoryTabType,
base::OnceCallback<void(const autofill::AccessorySheetData&)>));
MOCK_CONST_METHOD0(container_view, gfx::NativeView());
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockManualFillingController);
};
#endif // CHROME_BROWSER_AUTOFILL_MOCK_MANUAL_FILLING_CONTROLLER_H_
diff --git a/chrome/browser/autofill/mock_manual_filling_view.h b/chrome/browser/autofill/mock_manual_filling_view.h
index fa463b9..a2f60b7 100644
--- a/chrome/browser/autofill/mock_manual_filling_view.h
+++ b/chrome/browser/autofill/mock_manual_filling_view.h
@@ -13,6 +13,10 @@
class MockManualFillingView : public ManualFillingViewInterface {
public:
MockManualFillingView();
+
+ MockManualFillingView(const MockManualFillingView&) = delete;
+ MockManualFillingView& operator=(const MockManualFillingView&) = delete;
+
~MockManualFillingView() override;
MOCK_METHOD1(OnItemsAvailable, void(const autofill::AccessorySheetData&));
@@ -22,9 +26,6 @@
MOCK_METHOD0(ShowWhenKeyboardIsVisible, void());
MOCK_METHOD0(Hide, void());
MOCK_METHOD1(ShowAccessorySheetTab, void(const autofill::AccessoryTabType&));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockManualFillingView);
};
#endif // CHROME_BROWSER_AUTOFILL_MOCK_MANUAL_FILLING_VIEW_H_
diff --git a/chrome/browser/autofill/mock_password_accessory_controller.h b/chrome/browser/autofill/mock_password_accessory_controller.h
index 13df59e..e455c6d 100644
--- a/chrome/browser/autofill/mock_password_accessory_controller.h
+++ b/chrome/browser/autofill/mock_password_accessory_controller.h
@@ -18,6 +18,12 @@
class MockPasswordAccessoryController : public PasswordAccessoryController {
public:
MockPasswordAccessoryController();
+
+ MockPasswordAccessoryController(const MockPasswordAccessoryController&) =
+ delete;
+ MockPasswordAccessoryController& operator=(
+ const MockPasswordAccessoryController&) = delete;
+
~MockPasswordAccessoryController() override;
MOCK_METHOD(
@@ -54,9 +60,6 @@
OnToggleChanged,
(autofill::AccessoryAction toggled_action, bool enabled),
(override));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockPasswordAccessoryController);
};
#endif // CHROME_BROWSER_AUTOFILL_MOCK_PASSWORD_ACCESSORY_CONTROLLER_H_
diff --git a/chrome/browser/availability/availability_prober.h b/chrome/browser/availability/availability_prober.h
index 6f5f258..8e771d0 100644
--- a/chrome/browser/availability/availability_prober.h
+++ b/chrome/browser/availability/availability_prober.h
@@ -157,6 +157,10 @@
const net::NetworkTrafficAnnotationTag& traffic_annotation,
const size_t max_cache_entries,
base::TimeDelta revalidate_cache_after);
+
+ AvailabilityProber(const AvailabilityProber&) = delete;
+ AvailabilityProber& operator=(const AvailabilityProber&) = delete;
+
~AvailabilityProber() override;
// Registers the prefs used in this class.
@@ -340,8 +344,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<AvailabilityProber> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AvailabilityProber);
};
#endif // CHROME_BROWSER_AVAILABILITY_AVAILABILITY_PROBER_H_
diff --git a/chrome/browser/availability/availability_prober_browsertest.cc b/chrome/browser/availability/availability_prober_browsertest.cc
index 0757b2824..b524068 100644
--- a/chrome/browser/availability/availability_prober_browsertest.cc
+++ b/chrome/browser/availability/availability_prober_browsertest.cc
@@ -65,6 +65,11 @@
class AvailabilityProberBrowserTest : public InProcessBrowserTest {
public:
AvailabilityProberBrowserTest() = default;
+
+ AvailabilityProberBrowserTest(const AvailabilityProberBrowserTest&) = delete;
+ AvailabilityProberBrowserTest& operator=(
+ const AvailabilityProberBrowserTest&) = delete;
+
~AvailabilityProberBrowserTest() override = default;
void SetUpOnMainThread() override {
@@ -110,8 +115,6 @@
}
std::unique_ptr<net::EmbeddedTestServer> https_server_;
-
- DISALLOW_COPY_AND_ASSIGN(AvailabilityProberBrowserTest);
};
IN_PROC_BROWSER_TEST_F(AvailabilityProberBrowserTest, OK) {
diff --git a/chrome/browser/background/background_contents_service.h b/chrome/browser/background/background_contents_service.h
index 8fbaf0bf..3f34a6ec 100644
--- a/chrome/browser/background/background_contents_service.h
+++ b/chrome/browser/background/background_contents_service.h
@@ -63,6 +63,11 @@
public:
BackgroundContentsService(Profile* profile,
const base::CommandLine* command_line);
+
+ BackgroundContentsService(const BackgroundContentsService&) = delete;
+ BackgroundContentsService& operator=(const BackgroundContentsService&) =
+ delete;
+
~BackgroundContentsService() override;
// Allows tests to reduce the time between a force-installed app/extension
@@ -267,8 +272,6 @@
extension_registry_observation_{this};
base::WeakPtrFactory<BackgroundContentsService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BackgroundContentsService);
};
#endif // CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_SERVICE_H_
diff --git a/chrome/browser/background/background_contents_service_unittest.cc b/chrome/browser/background/background_contents_service_unittest.cc
index 93cfe99..b667dd0 100644
--- a/chrome/browser/background/background_contents_service_unittest.cc
+++ b/chrome/browser/background/background_contents_service_unittest.cc
@@ -49,6 +49,9 @@
service_->OnBackgroundContentsClosed(this);
}
+ MockBackgroundContents(const MockBackgroundContents&) = delete;
+ MockBackgroundContents& operator=(const MockBackgroundContents&) = delete;
+
~MockBackgroundContents() override = default;
BackgroundContentsService* service() { return service_; }
@@ -62,13 +65,16 @@
// The ID of our parent application
std::string appid_;
-
- DISALLOW_COPY_AND_ASSIGN(MockBackgroundContents);
};
class BackgroundContentsServiceTest : public testing::Test {
public:
BackgroundContentsServiceTest() = default;
+
+ BackgroundContentsServiceTest(const BackgroundContentsServiceTest&) = delete;
+ BackgroundContentsServiceTest& operator=(
+ const BackgroundContentsServiceTest&) = delete;
+
~BackgroundContentsServiceTest() override = default;
void SetUp() override {
@@ -107,15 +113,18 @@
content::BrowserTaskEnvironment task_environment_;
std::unique_ptr<base::CommandLine> command_line_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BackgroundContentsServiceTest);
};
class BackgroundContentsServiceNotificationTest
: public BrowserWithTestWindowTest {
public:
BackgroundContentsServiceNotificationTest() {}
+
+ BackgroundContentsServiceNotificationTest(
+ const BackgroundContentsServiceNotificationTest&) = delete;
+ BackgroundContentsServiceNotificationTest& operator=(
+ const BackgroundContentsServiceNotificationTest&) = delete;
+
~BackgroundContentsServiceNotificationTest() override {}
// Overridden from testing::Test
@@ -142,9 +151,6 @@
}
std::unique_ptr<NotificationDisplayServiceTester> display_service_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BackgroundContentsServiceNotificationTest);
};
TEST_F(BackgroundContentsServiceTest, Create) {
diff --git a/chrome/browser/background/background_mode_manager.h b/chrome/browser/background/background_mode_manager.h
index 4b6c6fc..79bd86aa 100644
--- a/chrome/browser/background/background_mode_manager.h
+++ b/chrome/browser/background/background_mode_manager.h
@@ -71,6 +71,10 @@
public:
BackgroundModeManager(const base::CommandLine& command_line,
ProfileAttributesStorage* profile_storage);
+
+ BackgroundModeManager(const BackgroundModeManager&) = delete;
+ BackgroundModeManager& operator=(const BackgroundModeManager&) = delete;
+
~BackgroundModeManager() override;
static void RegisterPrefs(PrefRegistrySimple* registry);
@@ -482,8 +486,6 @@
const scoped_refptr<base::SequencedTaskRunner> task_runner_;
base::WeakPtrFactory<BackgroundModeManager> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BackgroundModeManager);
};
#endif // CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_MANAGER_H_
diff --git a/chrome/browser/background/background_mode_optimizer.h b/chrome/browser/background/background_mode_optimizer.h
index 34d0786..e4aa79b 100644
--- a/chrome/browser/background/background_mode_optimizer.h
+++ b/chrome/browser/background/background_mode_optimizer.h
@@ -21,6 +21,9 @@
class BackgroundModeOptimizer : public KeepAliveStateObserver,
BrowserListObserver {
public:
+ BackgroundModeOptimizer(const BackgroundModeOptimizer&) = delete;
+ BackgroundModeOptimizer& operator=(const BackgroundModeOptimizer&) = delete;
+
~BackgroundModeOptimizer() override;
// Creates a new BackgroundModeOptimizer. Can return null if optimizations
@@ -51,8 +54,6 @@
base::TimeTicks creation_time_;
bool browser_was_added_;
-
- DISALLOW_COPY_AND_ASSIGN(BackgroundModeOptimizer);
};
#endif // CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_OPTIMIZER_H_
diff --git a/chrome/browser/background_fetch/background_fetch_browsertest.cc b/chrome/browser/background_fetch/background_fetch_browsertest.cc
index c0ca03b..4cf4612b 100644
--- a/chrome/browser/background_fetch/background_fetch_browsertest.cc
+++ b/chrome/browser/background_fetch/background_fetch_browsertest.cc
@@ -102,6 +102,12 @@
base::OnceCallback<void(const std::string& guid)>;
WaitableDownloadLoggerObserver() = default;
+
+ WaitableDownloadLoggerObserver(const WaitableDownloadLoggerObserver&) =
+ delete;
+ WaitableDownloadLoggerObserver& operator=(
+ const WaitableDownloadLoggerObserver&) = delete;
+
~WaitableDownloadLoggerObserver() override = default;
// Sets the |callback| to be invoked when a download has been accepted.
@@ -129,8 +135,6 @@
private:
DownloadAcceptedCallback download_accepted_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(WaitableDownloadLoggerObserver);
};
// Observes the offline item collection's content provider and then invokes the
@@ -145,6 +149,12 @@
base::OnceCallback<void(const OfflineItem&)>;
OfflineContentProviderObserver() = default;
+
+ OfflineContentProviderObserver(const OfflineContentProviderObserver&) =
+ delete;
+ OfflineContentProviderObserver& operator=(
+ const OfflineContentProviderObserver&) = delete;
+
~OfflineContentProviderObserver() final = default;
void set_items_added_callback(ItemsAddedCallback callback) {
@@ -224,8 +234,6 @@
bool resume_ = false;
OfflineItem latest_item_;
-
- DISALLOW_COPY_AND_ASSIGN(OfflineContentProviderObserver);
};
} // namespace
@@ -235,6 +243,11 @@
BackgroundFetchBrowserTest()
: offline_content_provider_observer_(
std::make_unique<OfflineContentProviderObserver>()) {}
+
+ BackgroundFetchBrowserTest(const BackgroundFetchBrowserTest&) = delete;
+ BackgroundFetchBrowserTest& operator=(const BackgroundFetchBrowserTest&) =
+ delete;
+
~BackgroundFetchBrowserTest() override = default;
void SetUpOnMainThread() override {
@@ -480,8 +493,6 @@
std::unique_ptr<net::EmbeddedTestServer> https_server_;
Browser* active_browser_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(BackgroundFetchBrowserTest);
};
IN_PROC_BROWSER_TEST_F(BackgroundFetchBrowserTest, DownloadService_Acceptance) {
diff --git a/chrome/browser/background_fetch/background_fetch_permission_context.h b/chrome/browser/background_fetch/background_fetch_permission_context.h
index 2eee27e..4508b0e4 100644
--- a/chrome/browser/background_fetch/background_fetch_permission_context.h
+++ b/chrome/browser/background_fetch/background_fetch_permission_context.h
@@ -20,6 +20,12 @@
public:
explicit BackgroundFetchPermissionContext(
content::BrowserContext* browser_context);
+
+ BackgroundFetchPermissionContext(const BackgroundFetchPermissionContext&) =
+ delete;
+ BackgroundFetchPermissionContext& operator=(
+ const BackgroundFetchPermissionContext&) = delete;
+
~BackgroundFetchPermissionContext() override = default;
private:
@@ -43,8 +49,6 @@
bool persist,
ContentSetting content_setting,
bool is_one_time) override;
-
- DISALLOW_COPY_AND_ASSIGN(BackgroundFetchPermissionContext);
};
#endif // CHROME_BROWSER_BACKGROUND_FETCH_BACKGROUND_FETCH_PERMISSION_CONTEXT_H_
diff --git a/chrome/browser/background_sync/background_sync_browsertest.cc b/chrome/browser/background_sync/background_sync_browsertest.cc
index 5551361..2de0fba 100644
--- a/chrome/browser/background_sync/background_sync_browsertest.cc
+++ b/chrome/browser/background_sync/background_sync_browsertest.cc
@@ -32,6 +32,11 @@
class BackgroundSyncBrowserTest : public InProcessBrowserTest {
public:
BackgroundSyncBrowserTest() = default;
+
+ BackgroundSyncBrowserTest(const BackgroundSyncBrowserTest&) = delete;
+ BackgroundSyncBrowserTest& operator=(const BackgroundSyncBrowserTest&) =
+ delete;
+
~BackgroundSyncBrowserTest() override = default;
void SetUpOnMainThread() override {
@@ -102,7 +107,6 @@
private:
std::unique_ptr<net::EmbeddedTestServer> https_server_;
- DISALLOW_COPY_AND_ASSIGN(BackgroundSyncBrowserTest);
};
IN_PROC_BROWSER_TEST_F(BackgroundSyncBrowserTest, VerifyShutdownBehavior) {
diff --git a/chrome/browser/background_sync/background_sync_content_setting_browsertest.cc b/chrome/browser/background_sync/background_sync_content_setting_browsertest.cc
index 8214eb4b..f2dd54d 100644
--- a/chrome/browser/background_sync/background_sync_content_setting_browsertest.cc
+++ b/chrome/browser/background_sync/background_sync_content_setting_browsertest.cc
@@ -21,6 +21,12 @@
class BackgroundSyncContentSettingBrowserTest : public InProcessBrowserTest {
public:
BackgroundSyncContentSettingBrowserTest() = default;
+
+ BackgroundSyncContentSettingBrowserTest(
+ const BackgroundSyncContentSettingBrowserTest&) = delete;
+ BackgroundSyncContentSettingBrowserTest& operator=(
+ const BackgroundSyncContentSettingBrowserTest&) = delete;
+
~BackgroundSyncContentSettingBrowserTest() override = default;
// ---------------------------------------------------------------------------
@@ -36,9 +42,6 @@
/* primary_url= */ url, /* secondary_url= */ url,
ContentSettingsType::BACKGROUND_SYNC, setting);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BackgroundSyncContentSettingBrowserTest);
};
IN_PROC_BROWSER_TEST_F(BackgroundSyncContentSettingBrowserTest,
diff --git a/chrome/browser/background_sync/background_sync_metrics_browsertest.cc b/chrome/browser/background_sync/background_sync_metrics_browsertest.cc
index a6f0304..aeea24f 100644
--- a/chrome/browser/background_sync/background_sync_metrics_browsertest.cc
+++ b/chrome/browser/background_sync/background_sync_metrics_browsertest.cc
@@ -20,6 +20,12 @@
class BackgroundSyncMetricsBrowserTest : public InProcessBrowserTest {
public:
BackgroundSyncMetricsBrowserTest() = default;
+
+ BackgroundSyncMetricsBrowserTest(const BackgroundSyncMetricsBrowserTest&) =
+ delete;
+ BackgroundSyncMetricsBrowserTest& operator=(
+ const BackgroundSyncMetricsBrowserTest&) = delete;
+
~BackgroundSyncMetricsBrowserTest() override = default;
void SetUpOnMainThread() override {
@@ -50,8 +56,6 @@
std::unique_ptr<ukm::TestAutoSetUkmRecorder> recorder_;
std::unique_ptr<BackgroundSyncMetrics> background_sync_metrics_;
std::unique_ptr<BackgroundSyncDelegateImpl> background_sync_delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(BackgroundSyncMetricsBrowserTest);
};
IN_PROC_BROWSER_TEST_F(BackgroundSyncMetricsBrowserTest,
diff --git a/chrome/browser/background_sync/periodic_background_sync_permission_context.h b/chrome/browser/background_sync/periodic_background_sync_permission_context.h
index d480463..821035bff 100644
--- a/chrome/browser/background_sync/periodic_background_sync_permission_context.h
+++ b/chrome/browser/background_sync/periodic_background_sync_permission_context.h
@@ -35,6 +35,12 @@
public:
explicit PeriodicBackgroundSyncPermissionContext(
content::BrowserContext* browser_context);
+
+ PeriodicBackgroundSyncPermissionContext(
+ const PeriodicBackgroundSyncPermissionContext&) = delete;
+ PeriodicBackgroundSyncPermissionContext& operator=(
+ const PeriodicBackgroundSyncPermissionContext&) = delete;
+
~PeriodicBackgroundSyncPermissionContext() override;
protected:
@@ -66,8 +72,6 @@
bool persist,
ContentSetting content_setting,
bool is_one_time) override;
-
- DISALLOW_COPY_AND_ASSIGN(PeriodicBackgroundSyncPermissionContext);
};
#endif // CHROME_BROWSER_BACKGROUND_SYNC_PERIODIC_BACKGROUND_SYNC_PERMISSION_CONTEXT_H_
diff --git a/chrome/browser/badging/badge_manager.h b/chrome/browser/badging/badge_manager.h
index ce301b2..42d73df 100644
--- a/chrome/browser/badging/badge_manager.h
+++ b/chrome/browser/badging/badge_manager.h
@@ -78,6 +78,10 @@
using BadgeValue = absl::optional<uint64_t>;
explicit BadgeManager(Profile* profile);
+
+ BadgeManager(const BadgeManager&) = delete;
+ BadgeManager& operator=(const BadgeManager&) = delete;
+
~BadgeManager() override;
// Sets the delegate used for setting/clearing badges.
@@ -191,8 +195,6 @@
// Maps app_id to badge contents.
std::map<web_app::AppId, BadgeValue> badged_apps_;
-
- DISALLOW_COPY_AND_ASSIGN(BadgeManager);
};
// Determines the text to put on the badge based on some badge_content.
diff --git a/chrome/browser/badging/badge_manager_delegate.h b/chrome/browser/badging/badge_manager_delegate.h
index a70be4b..d073a18 100644
--- a/chrome/browser/badging/badge_manager_delegate.h
+++ b/chrome/browser/badging/badge_manager_delegate.h
@@ -20,6 +20,9 @@
explicit BadgeManagerDelegate(Profile* profile, BadgeManager* badge_manager)
: profile_(profile), badge_manager_(badge_manager) {}
+ BadgeManagerDelegate(const BadgeManagerDelegate&) = delete;
+ BadgeManagerDelegate& operator=(const BadgeManagerDelegate&) = delete;
+
virtual ~BadgeManagerDelegate() = default;
// Called when the badge for |app_id| has changed.
@@ -34,8 +37,6 @@
Profile* profile_;
// The badge manager that owns this delegate.
BadgeManager* badge_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(BadgeManagerDelegate);
};
} // namespace badging
diff --git a/chrome/browser/badging/badge_manager_unittest.cc b/chrome/browser/badging/badge_manager_unittest.cc
index 132ba47..24d1a3d 100644
--- a/chrome/browser/badging/badge_manager_unittest.cc
+++ b/chrome/browser/badging/badge_manager_unittest.cc
@@ -55,6 +55,10 @@
class BadgeManagerUnittest : public ::testing::Test {
public:
BadgeManagerUnittest() = default;
+
+ BadgeManagerUnittest(const BadgeManagerUnittest&) = delete;
+ BadgeManagerUnittest& operator=(const BadgeManagerUnittest&) = delete;
+
~BadgeManagerUnittest() override = default;
void SetUp() override {
@@ -94,8 +98,6 @@
std::unique_ptr<BadgeManager> badge_manager_;
std::unique_ptr<web_app::FakeWebAppRegistryController>
fake_registry_controller_;
-
- DISALLOW_COPY_AND_ASSIGN(BadgeManagerUnittest);
};
TEST_F(BadgeManagerUnittest, SetFlagBadgeForApp) {
diff --git a/chrome/browser/banners/app_banner_manager_browsertest.cc b/chrome/browser/banners/app_banner_manager_browsertest.cc
index b20a582..df4ae89 100644
--- a/chrome/browser/banners/app_banner_manager_browsertest.cc
+++ b/chrome/browser/banners/app_banner_manager_browsertest.cc
@@ -46,6 +46,9 @@
explicit AppBannerManagerTest(content::WebContents* web_contents)
: AppBannerManager(web_contents) {}
+ AppBannerManagerTest(const AppBannerManagerTest&) = delete;
+ AppBannerManagerTest& operator=(const AppBannerManagerTest&) = delete;
+
~AppBannerManagerTest() override {}
void RequestAppBanner(const GURL& validated_url) override {
@@ -159,8 +162,6 @@
std::unique_ptr<WebappInstallSource> install_source_;
base::WeakPtrFactory<AppBannerManagerTest> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AppBannerManagerTest);
};
class AppBannerManagerBrowserTest : public AppBannerManagerBrowserTestBase {
diff --git a/chrome/browser/banners/app_banner_manager_browsertest_base.h b/chrome/browser/banners/app_banner_manager_browsertest_base.h
index 267c745..d1271fe 100644
--- a/chrome/browser/banners/app_banner_manager_browsertest_base.h
+++ b/chrome/browser/banners/app_banner_manager_browsertest_base.h
@@ -19,6 +19,12 @@
class AppBannerManagerBrowserTestBase : public InProcessBrowserTest {
public:
AppBannerManagerBrowserTestBase();
+
+ AppBannerManagerBrowserTestBase(const AppBannerManagerBrowserTestBase&) =
+ delete;
+ AppBannerManagerBrowserTestBase& operator=(
+ const AppBannerManagerBrowserTestBase&) = delete;
+
~AppBannerManagerBrowserTestBase() override;
void SetUpOnMainThread() override;
@@ -43,9 +49,6 @@
GURL GetBannerURLWithManifestAndQuery(const std::string& manifest_url,
const std::string& key,
const std::string& value);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AppBannerManagerBrowserTestBase);
web_app::ScopedOsHooksSuppress os_hooks_suppress_;
};
diff --git a/chrome/browser/banners/app_banner_manager_desktop.h b/chrome/browser/banners/app_banner_manager_desktop.h
index bb0503d7..cefc11b 100644
--- a/chrome/browser/banners/app_banner_manager_desktop.h
+++ b/chrome/browser/banners/app_banner_manager_desktop.h
@@ -33,6 +33,9 @@
public content::WebContentsUserData<AppBannerManagerDesktop>,
public web_app::AppRegistrarObserver {
public:
+ AppBannerManagerDesktop(const AppBannerManagerDesktop&) = delete;
+ AppBannerManagerDesktop& operator=(const AppBannerManagerDesktop&) = delete;
+
~AppBannerManagerDesktop() override;
static void CreateForWebContents(content::WebContents* web_contents);
@@ -104,8 +107,6 @@
base::WeakPtrFactory<AppBannerManagerDesktop> weak_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(AppBannerManagerDesktop);
};
} // namespace webapps
diff --git a/chrome/browser/banners/test_app_banner_manager_desktop.h b/chrome/browser/banners/test_app_banner_manager_desktop.h
index bfa4247..32447d6 100644
--- a/chrome/browser/banners/test_app_banner_manager_desktop.h
+++ b/chrome/browser/banners/test_app_banner_manager_desktop.h
@@ -21,6 +21,11 @@
class TestAppBannerManagerDesktop : public AppBannerManagerDesktop {
public:
explicit TestAppBannerManagerDesktop(content::WebContents* web_contents);
+
+ TestAppBannerManagerDesktop(const TestAppBannerManagerDesktop&) = delete;
+ TestAppBannerManagerDesktop& operator=(const TestAppBannerManagerDesktop&) =
+ delete;
+
~TestAppBannerManagerDesktop() override;
// Ensure this test class will be instantiated in place of
@@ -74,8 +79,6 @@
base::OnceClosure installable_quit_closure_;
base::OnceClosure on_done_;
base::OnceClosure on_install_;
-
- DISALLOW_COPY_AND_ASSIGN(TestAppBannerManagerDesktop);
};
} // namespace webapps
diff --git a/chrome/browser/battery/battery_metrics.h b/chrome/browser/battery/battery_metrics.h
index 21a434e..5c8a415 100644
--- a/chrome/browser/battery/battery_metrics.h
+++ b/chrome/browser/battery/battery_metrics.h
@@ -21,6 +21,10 @@
class BatteryMetrics {
public:
BatteryMetrics();
+
+ BatteryMetrics(const BatteryMetrics&) = delete;
+ BatteryMetrics& operator=(const BatteryMetrics&) = delete;
+
~BatteryMetrics();
// Allows tests to override how this class binds a BatteryMonitor receiver.
@@ -53,8 +57,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<BatteryMetrics> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BatteryMetrics);
};
#endif // CHROME_BROWSER_BATTERY_BATTERY_METRICS_H_
diff --git a/chrome/browser/battery/battery_metrics_browsertest.cc b/chrome/browser/battery/battery_metrics_browsertest.cc
index f9070b6..b13ac3e7 100644
--- a/chrome/browser/battery/battery_metrics_browsertest.cc
+++ b/chrome/browser/battery/battery_metrics_browsertest.cc
@@ -51,6 +51,10 @@
class MockBatteryMonitor : public device::mojom::BatteryMonitor {
public:
MockBatteryMonitor() = default;
+
+ MockBatteryMonitor(const MockBatteryMonitor&) = delete;
+ MockBatteryMonitor& operator=(const MockBatteryMonitor&) = delete;
+
~MockBatteryMonitor() override = default;
void Bind(mojo::PendingReceiver<device::mojom::BatteryMonitor> receiver) {
@@ -90,14 +94,17 @@
device::mojom::BatteryStatus status_;
bool status_to_report_ = false;
mojo::Receiver<device::mojom::BatteryMonitor> receiver_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MockBatteryMonitor);
};
// Test that the metricss around battery usage are recorded correctly.
class BatteryMetricsBrowserTest : public InProcessBrowserTest {
public:
BatteryMetricsBrowserTest() = default;
+
+ BatteryMetricsBrowserTest(const BatteryMetricsBrowserTest&) = delete;
+ BatteryMetricsBrowserTest& operator=(const BatteryMetricsBrowserTest&) =
+ delete;
+
~BatteryMetricsBrowserTest() override = default;
protected:
@@ -121,8 +128,6 @@
}
std::unique_ptr<MockBatteryMonitor> mock_battery_monitor_;
-
- DISALLOW_COPY_AND_ASSIGN(BatteryMetricsBrowserTest);
};
#if defined(OS_WIN)
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher.h b/chrome/browser/bitmap_fetcher/bitmap_fetcher.h
index 12dbdb8..f27ec6d 100644
--- a/chrome/browser/bitmap_fetcher/bitmap_fetcher.h
+++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher.h
@@ -32,6 +32,10 @@
BitmapFetcherDelegate* delegate,
const net::NetworkTrafficAnnotationTag& traffic_annotation,
data_decoder::DataDecoder* data_decoder);
+
+ BitmapFetcher(const BitmapFetcher&) = delete;
+ BitmapFetcher& operator=(const BitmapFetcher&) = delete;
+
~BitmapFetcher() override;
const GURL& url() const { return url_; }
@@ -81,8 +85,6 @@
base::TimeTicks start_time_;
base::WeakPtrFactory<BitmapFetcher> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BitmapFetcher);
};
#endif // CHROME_BROWSER_BITMAP_FETCHER_BITMAP_FETCHER_H_
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc b/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc
index e8106ab..ab8f1595 100644
--- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc
+++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc
@@ -44,6 +44,10 @@
success_(false),
async_(async) {}
+ BitmapFetcherTestDelegate(const BitmapFetcherTestDelegate&) = delete;
+ BitmapFetcherTestDelegate& operator=(const BitmapFetcherTestDelegate&) =
+ delete;
+
~BitmapFetcherTestDelegate() override { EXPECT_TRUE(called_); }
// Method inherited from BitmapFetcherDelegate.
@@ -80,8 +84,6 @@
bool success_;
bool async_;
SkBitmap bitmap_;
-
- DISALLOW_COPY_AND_ASSIGN(BitmapFetcherTestDelegate);
};
class BitmapFetcherBrowserTest : public InProcessBrowserTest {
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc
index 2f153baf..e71945f37 100644
--- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc
+++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc
@@ -85,6 +85,10 @@
public:
BitmapFetcherRequest(BitmapFetcherService::RequestId request_id,
BitmapFetcherService::BitmapFetchedCallback callback);
+
+ BitmapFetcherRequest(const BitmapFetcherRequest&) = delete;
+ BitmapFetcherRequest& operator=(const BitmapFetcherRequest&) = delete;
+
~BitmapFetcherRequest();
void NotifyImageChanged(const SkBitmap* bitmap);
@@ -98,8 +102,6 @@
const BitmapFetcherService::RequestId request_id_;
BitmapFetcherService::BitmapFetchedCallback callback_;
const BitmapFetcher* fetcher_;
-
- DISALLOW_COPY_AND_ASSIGN(BitmapFetcherRequest);
};
BitmapFetcherRequest::BitmapFetcherRequest(
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h
index c6914993..b41ba24 100644
--- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h
+++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h
@@ -48,6 +48,10 @@
};
explicit BitmapFetcherService(content::BrowserContext* context);
+
+ BitmapFetcherService(const BitmapFetcherService&) = delete;
+ BitmapFetcherService& operator=(const BitmapFetcherService&) = delete;
+
~BitmapFetcherService() override;
// Cancels a request, if it is still in-flight.
@@ -131,8 +135,6 @@
// Browser context this service is active for.
content::BrowserContext* context_;
-
- DISALLOW_COPY_AND_ASSIGN(BitmapFetcherService);
};
#endif // CHROME_BROWSER_BITMAP_FETCHER_BITMAP_FETCHER_SERVICE_H_
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index 33b0933..16ae15d 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -107,6 +107,10 @@
BookmarkFaviconFetcher(Profile* profile,
const base::FilePath& path,
BookmarksExportObserver* observer);
+
+ BookmarkFaviconFetcher(const BookmarkFaviconFetcher&) = delete;
+ BookmarkFaviconFetcher& operator=(const BookmarkFaviconFetcher&) = delete;
+
~BookmarkFaviconFetcher() override = default;
// Executes bookmark export process.
@@ -146,8 +150,6 @@
base::FilePath path_;
BookmarksExportObserver* observer_;
-
- DISALLOW_COPY_AND_ASSIGN(BookmarkFaviconFetcher);
};
// Class responsible for the actual writing. Takes ownership of favicons_map.
diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.h b/chrome/browser/bookmarks/chrome_bookmark_client.h
index 36b2d2f2..b409526c 100644
--- a/chrome/browser/bookmarks/chrome_bookmark_client.h
+++ b/chrome/browser/bookmarks/chrome_bookmark_client.h
@@ -41,6 +41,10 @@
Profile* profile,
bookmarks::ManagedBookmarkService* managed_bookmark_service,
sync_bookmarks::BookmarkSyncService* bookmark_sync_service);
+
+ ChromeBookmarkClient(const ChromeBookmarkClient&) = delete;
+ ChromeBookmarkClient& operator=(const ChromeBookmarkClient&) = delete;
+
~ChromeBookmarkClient() override;
// bookmarks::BookmarkClient:
@@ -83,8 +87,6 @@
std::unique_ptr<offline_pages::OfflinePageBookmarkObserver>
offline_page_observer_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(ChromeBookmarkClient);
};
#endif // CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_
diff --git a/chrome/browser/bookmarks/managed_bookmark_service_unittest.cc b/chrome/browser/bookmarks/managed_bookmark_service_unittest.cc
index 5c4b6b1..dfa52772 100644
--- a/chrome/browser/bookmarks/managed_bookmark_service_unittest.cc
+++ b/chrome/browser/bookmarks/managed_bookmark_service_unittest.cc
@@ -65,6 +65,11 @@
class ManagedBookmarkServiceTest : public testing::Test {
public:
ManagedBookmarkServiceTest() : managed_(nullptr), model_(nullptr) {}
+
+ ManagedBookmarkServiceTest(const ManagedBookmarkServiceTest&) = delete;
+ ManagedBookmarkServiceTest& operator=(const ManagedBookmarkServiceTest&) =
+ delete;
+
~ManagedBookmarkServiceTest() override {}
void SetUp() override {
@@ -172,8 +177,6 @@
bookmarks::MockBookmarkModelObserver observer_;
ManagedBookmarkService* managed_;
BookmarkModel* model_;
-
- DISALLOW_COPY_AND_ASSIGN(ManagedBookmarkServiceTest);
};
TEST_F(ManagedBookmarkServiceTest, LoadInitial) {
diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
index 6732a55..f091754 100644
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -116,6 +116,10 @@
class BrowserProcess {
public:
BrowserProcess();
+
+ BrowserProcess(const BrowserProcess&) = delete;
+ BrowserProcess& operator=(const BrowserProcess&) = delete;
+
virtual ~BrowserProcess();
// Invoked when the user is logging out/shutting down. When logging off we may
@@ -277,9 +281,6 @@
// or nullptr if breadcrumbs logging is disabled.
virtual breadcrumbs::BreadcrumbPersistentStorageManager*
GetBreadcrumbPersistentStorageManager() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BrowserProcess);
};
extern BrowserProcess* g_browser_process;
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 80311ef..6f97b25 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -97,6 +97,10 @@
// will take the PrefService owned by the creator as the Local State instead
// of loading the JSON file from disk.
explicit BrowserProcessImpl(StartupData* startup_data);
+
+ BrowserProcessImpl(const BrowserProcessImpl&) = delete;
+ BrowserProcessImpl& operator=(const BrowserProcessImpl&) = delete;
+
~BrowserProcessImpl() override;
// Called to complete initialization.
@@ -451,8 +455,6 @@
application_breadcrumbs_logger_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
};
#endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
diff --git a/chrome/browser/browser_process_platform_part_android.h b/chrome/browser/browser_process_platform_part_android.h
index 5008e95e..70c6e56 100644
--- a/chrome/browser/browser_process_platform_part_android.h
+++ b/chrome/browser/browser_process_platform_part_android.h
@@ -12,13 +12,15 @@
class BrowserProcessPlatformPart : public BrowserProcessPlatformPartBase {
public:
BrowserProcessPlatformPart();
+
+ BrowserProcessPlatformPart(const BrowserProcessPlatformPart&) = delete;
+ BrowserProcessPlatformPart& operator=(const BrowserProcessPlatformPart&) =
+ delete;
+
~BrowserProcessPlatformPart() override;
// Overridden from BrowserProcessPlatformPartBase:
void AttemptExit(bool try_to_quit_application) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BrowserProcessPlatformPart);
};
#endif // CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_ANDROID_H_
diff --git a/chrome/browser/browser_process_platform_part_base.h b/chrome/browser/browser_process_platform_part_base.h
index 5975043..1fa7615b 100644
--- a/chrome/browser/browser_process_platform_part_base.h
+++ b/chrome/browser/browser_process_platform_part_base.h
@@ -17,6 +17,12 @@
class BrowserProcessPlatformPartBase {
public:
BrowserProcessPlatformPartBase();
+
+ BrowserProcessPlatformPartBase(const BrowserProcessPlatformPartBase&) =
+ delete;
+ BrowserProcessPlatformPartBase& operator=(
+ const BrowserProcessPlatformPartBase&) = delete;
+
virtual ~BrowserProcessPlatformPartBase();
// Called after creating the process singleton or when another chrome
@@ -35,9 +41,6 @@
// Called at the end of BrowserProcessImpl::PreMainMessageLoopRun().
virtual void PreMainMessageLoopRun();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BrowserProcessPlatformPartBase);
};
#endif // CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_BASE_H_
diff --git a/chrome/browser/browser_process_platform_part_chromeos.h b/chrome/browser/browser_process_platform_part_chromeos.h
index 4a9122e..6aea6a4 100644
--- a/chrome/browser/browser_process_platform_part_chromeos.h
+++ b/chrome/browser/browser_process_platform_part_chromeos.h
@@ -50,6 +50,11 @@
class BrowserProcessPlatformPart : public BrowserProcessPlatformPartBase {
public:
BrowserProcessPlatformPart();
+
+ BrowserProcessPlatformPart(const BrowserProcessPlatformPart&) = delete;
+ BrowserProcessPlatformPart& operator=(const BrowserProcessPlatformPart&) =
+ delete;
+
~BrowserProcessPlatformPart() override;
void InitializeAutomaticRebootManager();
@@ -208,8 +213,6 @@
BrowserRestoreObserver browser_restore_observer;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(BrowserProcessPlatformPart);
};
#endif // CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_CHROMEOS_H_
diff --git a/chrome/browser/browser_process_platform_part_mac.h b/chrome/browser/browser_process_platform_part_mac.h
index 6a9f94e..0d2ca38 100644
--- a/chrome/browser/browser_process_platform_part_mac.h
+++ b/chrome/browser/browser_process_platform_part_mac.h
@@ -24,6 +24,11 @@
class BrowserProcessPlatformPart : public BrowserProcessPlatformPartBase {
public:
BrowserProcessPlatformPart();
+
+ BrowserProcessPlatformPart(const BrowserProcessPlatformPart&) = delete;
+ BrowserProcessPlatformPart& operator=(const BrowserProcessPlatformPart&) =
+ delete;
+
~BrowserProcessPlatformPart() override;
// Overridden from BrowserProcessPlatformPartBase:
@@ -51,8 +56,6 @@
scoped_refptr<AppShimListener> app_shim_listener_;
KeyWindowNotifier key_window_notifier_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserProcessPlatformPart);
};
#endif // CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_MAC_H_
diff --git a/chrome/browser/browsing_data/browsing_data_history_observer_service.h b/chrome/browser/browsing_data/browsing_data_history_observer_service.h
index 4cc6209..27373a0 100644
--- a/chrome/browser/browsing_data/browsing_data_history_observer_service.h
+++ b/chrome/browser/browsing_data/browsing_data_history_observer_service.h
@@ -29,6 +29,12 @@
public history::HistoryServiceObserver {
public:
explicit BrowsingDataHistoryObserverService(Profile* profile);
+
+ BrowsingDataHistoryObserverService(
+ const BrowsingDataHistoryObserverService&) = delete;
+ BrowsingDataHistoryObserverService& operator=(
+ const BrowsingDataHistoryObserverService&) = delete;
+
~BrowsingDataHistoryObserverService() override;
// history::HistoryServiceObserver:
@@ -61,8 +67,6 @@
base::ScopedObservation<history::HistoryService,
history::HistoryServiceObserver>
history_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BrowsingDataHistoryObserverService);
};
#endif // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_HISTORY_OBSERVER_SERVICE_H_
diff --git a/chrome/browser/browsing_data/browsing_data_important_sites_util.cc b/chrome/browser/browsing_data/browsing_data_important_sites_util.cc
index 5addd6e..8265889 100644
--- a/chrome/browser/browsing_data/browsing_data_important_sites_util.cc
+++ b/chrome/browser/browsing_data/browsing_data_important_sites_util.cc
@@ -17,6 +17,10 @@
BrowsingDataTaskObserver(content::BrowsingDataRemover* remover,
base::OnceCallback<void(uint64_t)> callback,
int task_count);
+
+ BrowsingDataTaskObserver(const BrowsingDataTaskObserver&) = delete;
+ BrowsingDataTaskObserver& operator=(const BrowsingDataTaskObserver&) = delete;
+
~BrowsingDataTaskObserver() override;
void OnBrowsingDataRemoverDone(uint64_t failed_data_types) override;
@@ -28,8 +32,6 @@
remover_observation_{this};
int task_count_;
uint64_t failed_data_types_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(BrowsingDataTaskObserver);
};
BrowsingDataTaskObserver::BrowsingDataTaskObserver(
diff --git a/chrome/browser/browsing_data/browsing_data_media_license_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_media_license_helper_unittest.cc
index e685cfbe..1b8dd93 100644
--- a/chrome/browser/browsing_data/browsing_data_media_license_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_media_license_helper_unittest.cc
@@ -40,6 +40,10 @@
class AwaitCompletionHelper {
public:
AwaitCompletionHelper() : start_(false), already_quit_(false) {}
+
+ AwaitCompletionHelper(const AwaitCompletionHelper&) = delete;
+ AwaitCompletionHelper& operator=(const AwaitCompletionHelper&) = delete;
+
virtual ~AwaitCompletionHelper() {}
void BlockUntilNotified() {
@@ -74,8 +78,6 @@
// immediately.
bool start_;
bool already_quit_;
-
- DISALLOW_COPY_AND_ASSIGN(AwaitCompletionHelper);
};
// The FileSystem APIs are all asynchronous; this testing class wraps up the
@@ -93,6 +95,11 @@
base::RunLoop().RunUntilIdle();
}
+ BrowsingDataMediaLicenseHelperTest(
+ const BrowsingDataMediaLicenseHelperTest&) = delete;
+ BrowsingDataMediaLicenseHelperTest& operator=(
+ const BrowsingDataMediaLicenseHelperTest&) = delete;
+
~BrowsingDataMediaLicenseHelperTest() override {
// Avoid memory leaks.
profile_.reset();
@@ -268,8 +275,6 @@
// Storage to pass information back from callbacks.
std::unique_ptr<std::list<BrowsingDataMediaLicenseHelper::MediaLicenseInfo>>
media_license_info_list_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowsingDataMediaLicenseHelperTest);
};
// Verifies that the BrowsingDataMediaLicenseHelper correctly handles an empty
diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
index a129255..75963559 100644
--- a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
@@ -34,6 +34,10 @@
BrowsingDataQuotaHelperTest() = default;
+ BrowsingDataQuotaHelperTest(const BrowsingDataQuotaHelperTest&) = delete;
+ BrowsingDataQuotaHelperTest& operator=(const BrowsingDataQuotaHelperTest&) =
+ delete;
+
~BrowsingDataQuotaHelperTest() override = default;
void SetUp() override {
@@ -133,8 +137,6 @@
QuotaInfoArray quota_info_;
int64_t quota_ = -1;
base::WeakPtrFactory<BrowsingDataQuotaHelperTest> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BrowsingDataQuotaHelperTest);
};
TEST_F(BrowsingDataQuotaHelperTest, Empty) {
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
index 43d7fd5..b8840d0 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
@@ -48,6 +48,12 @@
public:
explicit ChromeBrowsingDataRemoverDelegate(
content::BrowserContext* browser_context);
+
+ ChromeBrowsingDataRemoverDelegate(const ChromeBrowsingDataRemoverDelegate&) =
+ delete;
+ ChromeBrowsingDataRemoverDelegate& operator=(
+ const ChromeBrowsingDataRemoverDelegate&) = delete;
+
~ChromeBrowsingDataRemoverDelegate() override;
// KeyedService:
@@ -216,8 +222,6 @@
base::WeakPtrFactory<ChromeBrowsingDataRemoverDelegate> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeBrowsingDataRemoverDelegate);
};
#endif // CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_DELEGATE_H_
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc
index 64eba8d1..ea9faeb 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -352,6 +352,9 @@
std::list<net::CanonicalCookie>::iterator cookie)
: CookieTreeNode(base::UTF8ToUTF16(cookie->Name())), cookie_(cookie) {}
+ CookieTreeCookieNode(const CookieTreeCookieNode&) = delete;
+ CookieTreeCookieNode& operator=(const CookieTreeCookieNode&) = delete;
+
~CookieTreeCookieNode() override = default;
// CookieTreeNode methods:
@@ -370,8 +373,6 @@
// |cookie_| is expected to remain valid as long as the CookieTreeCookieNode
// is valid.
std::list<net::CanonicalCookie>::iterator cookie_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieTreeCookieNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -387,6 +388,10 @@
std::list<content::StorageUsageInfo>::iterator usage_info)
: CookieTreeNode(base::UTF8ToUTF16(usage_info->origin.Serialize())),
usage_info_(usage_info) {}
+
+ CookieTreeAppCacheNode(const CookieTreeAppCacheNode&) = delete;
+ CookieTreeAppCacheNode& operator=(const CookieTreeAppCacheNode&) = delete;
+
~CookieTreeAppCacheNode() override = default;
void DeleteStoredObjects() override {
@@ -408,8 +413,6 @@
private:
// |usage_info_| is expected to remain valid as long as this node is valid.
std::list<content::StorageUsageInfo>::iterator usage_info_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieTreeAppCacheNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -426,6 +429,9 @@
: CookieTreeNode(base::UTF8ToUTF16(usage_info->origin.Serialize())),
usage_info_(usage_info) {}
+ CookieTreeDatabaseNode(const CookieTreeDatabaseNode&) = delete;
+ CookieTreeDatabaseNode& operator=(const CookieTreeDatabaseNode&) = delete;
+
~CookieTreeDatabaseNode() override = default;
void DeleteStoredObjects() override {
@@ -453,8 +459,6 @@
// |database_info_| is expected to remain valid as long as the
// CookieTreeDatabaseNode is valid.
std::list<content::StorageUsageInfo>::iterator usage_info_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieTreeDatabaseNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -470,6 +474,10 @@
base::UTF8ToUTF16(local_storage_info->origin.Serialize())),
local_storage_info_(local_storage_info) {}
+ CookieTreeLocalStorageNode(const CookieTreeLocalStorageNode&) = delete;
+ CookieTreeLocalStorageNode& operator=(const CookieTreeLocalStorageNode&) =
+ delete;
+
~CookieTreeLocalStorageNode() override = default;
// CookieTreeNode methods:
@@ -500,8 +508,6 @@
// |local_storage_info_| is expected to remain valid as long as the
// CookieTreeLocalStorageNode is valid.
std::list<content::StorageUsageInfo>::iterator local_storage_info_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieTreeLocalStorageNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -517,6 +523,10 @@
base::UTF8ToUTF16(session_storage_info->origin.Serialize())),
session_storage_info_(session_storage_info) {}
+ CookieTreeSessionStorageNode(const CookieTreeSessionStorageNode&) = delete;
+ CookieTreeSessionStorageNode& operator=(const CookieTreeSessionStorageNode&) =
+ delete;
+
~CookieTreeSessionStorageNode() override = default;
// CookieTreeNode methods:
@@ -539,8 +549,6 @@
// |session_storage_info_| is expected to remain valid as long as the
// CookieTreeSessionStorageNode is valid.
std::list<content::StorageUsageInfo>::iterator session_storage_info_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieTreeSessionStorageNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -555,6 +563,9 @@
: CookieTreeNode(base::UTF8ToUTF16(usage_info->origin.Serialize())),
usage_info_(usage_info) {}
+ CookieTreeIndexedDBNode(const CookieTreeIndexedDBNode&) = delete;
+ CookieTreeIndexedDBNode& operator=(const CookieTreeIndexedDBNode&) = delete;
+
~CookieTreeIndexedDBNode() override = default;
// CookieTreeNode methods:
@@ -586,8 +597,6 @@
// |usage_info_| is expected to remain valid as long as the
// CookieTreeIndexedDBNode is valid.
std::list<content::StorageUsageInfo>::iterator usage_info_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieTreeIndexedDBNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -604,6 +613,10 @@
file_system_info)
: CookieTreeNode(base::UTF8ToUTF16(file_system_info->origin.Serialize())),
file_system_info_(file_system_info) {}
+
+ CookieTreeFileSystemNode(const CookieTreeFileSystemNode&) = delete;
+ CookieTreeFileSystemNode& operator=(const CookieTreeFileSystemNode&) = delete;
+
~CookieTreeFileSystemNode() override = default;
void DeleteStoredObjects() override {
@@ -637,8 +650,6 @@
// CookieTreeFileSystemNode is valid.
std::list<browsing_data::FileSystemHelper::FileSystemInfo>::iterator
file_system_info_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieTreeFileSystemNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -653,6 +664,9 @@
: CookieTreeNode(base::UTF8ToUTF16(quota_info->host)),
quota_info_(quota_info) {}
+ CookieTreeQuotaNode(const CookieTreeQuotaNode&) = delete;
+ CookieTreeQuotaNode& operator=(const CookieTreeQuotaNode&) = delete;
+
~CookieTreeQuotaNode() override = default;
void DeleteStoredObjects() override {
@@ -674,8 +688,6 @@
// |quota_info_| is expected to remain valid as long as the
// CookieTreeQuotaNode is valid.
std::list<BrowsingDataQuotaHelper::QuotaInfo>::iterator quota_info_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieTreeQuotaNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -690,6 +702,10 @@
: CookieTreeNode(base::UTF8ToUTF16(usage_info->origin.Serialize())),
usage_info_(usage_info) {}
+ CookieTreeServiceWorkerNode(const CookieTreeServiceWorkerNode&) = delete;
+ CookieTreeServiceWorkerNode& operator=(const CookieTreeServiceWorkerNode&) =
+ delete;
+
~CookieTreeServiceWorkerNode() override {}
// CookieTreeNode methods:
@@ -719,8 +735,6 @@
// |usage_info_| is expected to remain valid as long as the
// CookieTreeServiceWorkerNode is valid.
std::list<content::StorageUsageInfo>::iterator usage_info_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieTreeServiceWorkerNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -736,6 +750,10 @@
: CookieTreeNode(base::UTF8ToUTF16(shared_worker_info->worker.spec())),
shared_worker_info_(shared_worker_info) {}
+ CookieTreeSharedWorkerNode(const CookieTreeSharedWorkerNode&) = delete;
+ CookieTreeSharedWorkerNode& operator=(const CookieTreeSharedWorkerNode&) =
+ delete;
+
~CookieTreeSharedWorkerNode() override = default;
// CookieTreeNode methods:
@@ -759,8 +777,6 @@
// CookieTreeSharedWorkerNode is valid.
std::list<browsing_data::SharedWorkerHelper::SharedWorkerInfo>::iterator
shared_worker_info_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieTreeSharedWorkerNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -775,6 +791,10 @@
: CookieTreeNode(base::UTF8ToUTF16(usage_info->origin.Serialize())),
usage_info_(usage_info) {}
+ CookieTreeCacheStorageNode(const CookieTreeCacheStorageNode&) = delete;
+ CookieTreeCacheStorageNode& operator=(const CookieTreeCacheStorageNode&) =
+ delete;
+
~CookieTreeCacheStorageNode() override = default;
// CookieTreeNode methods:
@@ -803,8 +823,6 @@
// |usage_info_| is expected to remain valid as long as the
// CookieTreeCacheStorageNode is valid.
std::list<content::StorageUsageInfo>::iterator usage_info_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieTreeCacheStorageNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -822,6 +840,10 @@
: CookieTreeNode(base::UTF8ToUTF16(media_license_info->origin.spec())),
media_license_info_(media_license_info) {}
+ CookieTreeMediaLicenseNode(const CookieTreeMediaLicenseNode&) = delete;
+ CookieTreeMediaLicenseNode& operator=(const CookieTreeMediaLicenseNode&) =
+ delete;
+
~CookieTreeMediaLicenseNode() override = default;
void DeleteStoredObjects() override {
@@ -845,8 +867,6 @@
// CookieTreeMediaLicenseNode is valid.
std::list<BrowsingDataMediaLicenseHelper::MediaLicenseInfo>::iterator
media_license_info_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieTreeMediaLicenseNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -901,6 +921,9 @@
CookieTreeCookiesNode()
: CookieTreeNode(l10n_util::GetStringUTF16(IDS_COOKIES_COOKIES)) {}
+ CookieTreeCookiesNode(const CookieTreeCookiesNode&) = delete;
+ CookieTreeCookiesNode& operator=(const CookieTreeCookiesNode&) = delete;
+
~CookieTreeCookiesNode() override = default;
DetailedInfo GetDetailedInfo() const override {
@@ -910,9 +933,6 @@
void AddCookieNode(std::unique_ptr<CookieTreeCookieNode> child) {
AddChildSortedByTitle(std::move(child));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CookieTreeCookiesNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -923,6 +943,9 @@
explicit CookieTreeCollectionNode(const std::u16string& title)
: CookieTreeNode(title) {}
+ CookieTreeCollectionNode(const CookieTreeCollectionNode&) = delete;
+ CookieTreeCollectionNode& operator=(const CookieTreeCollectionNode&) = delete;
+
~CookieTreeCollectionNode() override = default;
int64_t InclusiveSize() const final {
@@ -931,9 +954,6 @@
return total + child->InclusiveSize();
});
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CookieTreeCollectionNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -945,6 +965,9 @@
: CookieTreeCollectionNode(
l10n_util::GetStringUTF16(IDS_COOKIES_APPLICATION_CACHES)) {}
+ CookieTreeAppCachesNode(const CookieTreeAppCachesNode&) = delete;
+ CookieTreeAppCachesNode& operator=(const CookieTreeAppCachesNode&) = delete;
+
~CookieTreeAppCachesNode() override = default;
DetailedInfo GetDetailedInfo() const override {
@@ -954,9 +977,6 @@
void AddAppCacheNode(std::unique_ptr<CookieTreeAppCacheNode> child) {
AddChildSortedByTitle(std::move(child));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CookieTreeAppCachesNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -968,6 +988,9 @@
: CookieTreeCollectionNode(
l10n_util::GetStringUTF16(IDS_COOKIES_WEB_DATABASES)) {}
+ CookieTreeDatabasesNode(const CookieTreeDatabasesNode&) = delete;
+ CookieTreeDatabasesNode& operator=(const CookieTreeDatabasesNode&) = delete;
+
~CookieTreeDatabasesNode() override = default;
DetailedInfo GetDetailedInfo() const override {
@@ -977,9 +1000,6 @@
void AddDatabaseNode(std::unique_ptr<CookieTreeDatabaseNode> child) {
AddChildSortedByTitle(std::move(child));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CookieTreeDatabasesNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -991,6 +1011,10 @@
: CookieTreeCollectionNode(
l10n_util::GetStringUTF16(IDS_COOKIES_LOCAL_STORAGE)) {}
+ CookieTreeLocalStoragesNode(const CookieTreeLocalStoragesNode&) = delete;
+ CookieTreeLocalStoragesNode& operator=(const CookieTreeLocalStoragesNode&) =
+ delete;
+
~CookieTreeLocalStoragesNode() override = default;
DetailedInfo GetDetailedInfo() const override {
@@ -1000,9 +1024,6 @@
void AddLocalStorageNode(std::unique_ptr<CookieTreeLocalStorageNode> child) {
AddChildSortedByTitle(std::move(child));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CookieTreeLocalStoragesNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -1014,6 +1035,10 @@
: CookieTreeNode(l10n_util::GetStringUTF16(IDS_COOKIES_SESSION_STORAGE)) {
}
+ CookieTreeSessionStoragesNode(const CookieTreeSessionStoragesNode&) = delete;
+ CookieTreeSessionStoragesNode& operator=(
+ const CookieTreeSessionStoragesNode&) = delete;
+
~CookieTreeSessionStoragesNode() override = default;
DetailedInfo GetDetailedInfo() const override {
@@ -1024,9 +1049,6 @@
std::unique_ptr<CookieTreeSessionStorageNode> child) {
AddChildSortedByTitle(std::move(child));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CookieTreeSessionStoragesNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -1038,6 +1060,9 @@
: CookieTreeCollectionNode(
l10n_util::GetStringUTF16(IDS_COOKIES_INDEXED_DBS)) {}
+ CookieTreeIndexedDBsNode(const CookieTreeIndexedDBsNode&) = delete;
+ CookieTreeIndexedDBsNode& operator=(const CookieTreeIndexedDBsNode&) = delete;
+
~CookieTreeIndexedDBsNode() override = default;
DetailedInfo GetDetailedInfo() const override {
@@ -1047,9 +1072,6 @@
void AddIndexedDBNode(std::unique_ptr<CookieTreeIndexedDBNode> child) {
AddChildSortedByTitle(std::move(child));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CookieTreeIndexedDBsNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -1061,6 +1083,10 @@
: CookieTreeCollectionNode(
l10n_util::GetStringUTF16(IDS_COOKIES_FILE_SYSTEMS)) {}
+ CookieTreeFileSystemsNode(const CookieTreeFileSystemsNode&) = delete;
+ CookieTreeFileSystemsNode& operator=(const CookieTreeFileSystemsNode&) =
+ delete;
+
~CookieTreeFileSystemsNode() override = default;
DetailedInfo GetDetailedInfo() const override {
@@ -1070,9 +1096,6 @@
void AddFileSystemNode(std::unique_ptr<CookieTreeFileSystemNode> child) {
AddChildSortedByTitle(std::move(child));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CookieTreeFileSystemsNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -1084,6 +1107,10 @@
: CookieTreeCollectionNode(
l10n_util::GetStringUTF16(IDS_COOKIES_SERVICE_WORKERS)) {}
+ CookieTreeServiceWorkersNode(const CookieTreeServiceWorkersNode&) = delete;
+ CookieTreeServiceWorkersNode& operator=(const CookieTreeServiceWorkersNode&) =
+ delete;
+
~CookieTreeServiceWorkersNode() override = default;
DetailedInfo GetDetailedInfo() const override {
@@ -1094,9 +1121,6 @@
std::unique_ptr<CookieTreeServiceWorkerNode> child) {
AddChildSortedByTitle(std::move(child));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CookieTreeServiceWorkersNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -1107,6 +1131,10 @@
CookieTreeSharedWorkersNode()
: CookieTreeNode(l10n_util::GetStringUTF16(IDS_COOKIES_SHARED_WORKERS)) {}
+ CookieTreeSharedWorkersNode(const CookieTreeSharedWorkersNode&) = delete;
+ CookieTreeSharedWorkersNode& operator=(const CookieTreeSharedWorkersNode&) =
+ delete;
+
~CookieTreeSharedWorkersNode() override = default;
DetailedInfo GetDetailedInfo() const override {
@@ -1116,9 +1144,6 @@
void AddSharedWorkerNode(std::unique_ptr<CookieTreeSharedWorkerNode> child) {
AddChildSortedByTitle(std::move(child));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CookieTreeSharedWorkersNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -1130,6 +1155,10 @@
: CookieTreeCollectionNode(
l10n_util::GetStringUTF16(IDS_COOKIES_CACHE_STORAGE)) {}
+ CookieTreeCacheStoragesNode(const CookieTreeCacheStoragesNode&) = delete;
+ CookieTreeCacheStoragesNode& operator=(const CookieTreeCacheStoragesNode&) =
+ delete;
+
~CookieTreeCacheStoragesNode() override = default;
DetailedInfo GetDetailedInfo() const override {
@@ -1139,9 +1168,6 @@
void AddCacheStorageNode(std::unique_ptr<CookieTreeCacheStorageNode> child) {
AddChildSortedByTitle(std::move(child));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CookieTreeCacheStoragesNode);
};
///////////////////////////////////////////////////////////////////////////////
@@ -1153,6 +1179,10 @@
: CookieTreeCollectionNode(
l10n_util::GetStringUTF16(IDS_COOKIES_MEDIA_LICENSES)) {}
+ CookieTreeMediaLicensesNode(const CookieTreeMediaLicensesNode&) = delete;
+ CookieTreeMediaLicensesNode& operator=(const CookieTreeMediaLicensesNode&) =
+ delete;
+
~CookieTreeMediaLicensesNode() override = default;
DetailedInfo GetDetailedInfo() const override {
@@ -1162,9 +1192,6 @@
void AddMediaLicenseNode(std::unique_ptr<CookieTreeMediaLicenseNode> child) {
AddChildSortedByTitle(std::move(child));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CookieTreeMediaLicensesNode);
};
///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/browsing_data/cookies_tree_model.h b/chrome/browser/browsing_data/cookies_tree_model.h
index eff649e3..81ad3ac 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.h
+++ b/chrome/browser/browsing_data/cookies_tree_model.h
@@ -146,6 +146,10 @@
CookieTreeNode() {}
explicit CookieTreeNode(const std::u16string& title)
: ui::TreeNode<CookieTreeNode>(title) {}
+
+ CookieTreeNode(const CookieTreeNode&) = delete;
+ CookieTreeNode& operator=(const CookieTreeNode&) = delete;
+
~CookieTreeNode() override {}
// Recursively traverse the child nodes of this node and collect the storage
@@ -175,9 +179,6 @@
void ReportDeletionToAuditService(
const url::Origin& origin,
AccessContextAuditDatabase::StorageAPIType type);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CookieTreeNode);
};
// CookieTreeRootNode ---------------------------------------------------------
@@ -185,6 +186,10 @@
class CookieTreeRootNode : public CookieTreeNode {
public:
explicit CookieTreeRootNode(CookiesTreeModel* model);
+
+ CookieTreeRootNode(const CookieTreeRootNode&) = delete;
+ CookieTreeRootNode& operator=(const CookieTreeRootNode&) = delete;
+
~CookieTreeRootNode() override;
CookieTreeHostNode* GetOrCreateHostNode(const GURL& url);
@@ -195,8 +200,6 @@
private:
CookiesTreeModel* model_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieTreeRootNode);
};
// CookieTreeHostNode -------------------------------------------------------
@@ -206,6 +209,10 @@
static std::u16string TitleForUrl(const GURL& url);
explicit CookieTreeHostNode(const GURL& url);
+
+ CookieTreeHostNode(const CookieTreeHostNode&) = delete;
+ CookieTreeHostNode& operator=(const CookieTreeHostNode&) = delete;
+
~CookieTreeHostNode() override;
// CookieTreeNode methods:
@@ -264,8 +271,6 @@
GURL url_;
std::string canonicalized_host_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieTreeHostNode);
};
// CookiesTreeModel -----------------------------------------------------------
diff --git a/chrome/browser/browsing_data/counters/autofill_counter_browsertest.cc b/chrome/browser/browsing_data/counters/autofill_counter_browsertest.cc
index 473dbc487..704dad4b 100644
--- a/chrome/browser/browsing_data/counters/autofill_counter_browsertest.cc
+++ b/chrome/browser/browsing_data/counters/autofill_counter_browsertest.cc
@@ -34,6 +34,10 @@
class AutofillCounterTest : public InProcessBrowserTest {
public:
AutofillCounterTest() {}
+
+ AutofillCounterTest(const AutofillCounterTest&) = delete;
+ AutofillCounterTest& operator=(const AutofillCounterTest&) = delete;
+
~AutofillCounterTest() override {}
void SetUpOnMainThread() override {
@@ -191,8 +195,6 @@
browsing_data::BrowsingDataCounter::ResultInt num_suggestions_;
browsing_data::BrowsingDataCounter::ResultInt num_credit_cards_;
browsing_data::BrowsingDataCounter::ResultInt num_addresses_;
-
- DISALLOW_COPY_AND_ASSIGN(AutofillCounterTest);
};
// Tests that we count the correct number of autocomplete suggestions.
diff --git a/chrome/browser/browsing_data/counters/browsing_data_counter_utils_browsertest.cc b/chrome/browser/browsing_data/counters/browsing_data_counter_utils_browsertest.cc
index e7074d00..0f786cca 100644
--- a/chrome/browser/browsing_data/counters/browsing_data_counter_utils_browsertest.cc
+++ b/chrome/browser/browsing_data/counters/browsing_data_counter_utils_browsertest.cc
@@ -26,10 +26,13 @@
class BrowsingDataCounterUtilsBrowserTest : public SyncTest {
public:
BrowsingDataCounterUtilsBrowserTest() : SyncTest(SINGLE_CLIENT) {}
- ~BrowsingDataCounterUtilsBrowserTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(BrowsingDataCounterUtilsBrowserTest);
+ BrowsingDataCounterUtilsBrowserTest(
+ const BrowsingDataCounterUtilsBrowserTest&) = delete;
+ BrowsingDataCounterUtilsBrowserTest& operator=(
+ const BrowsingDataCounterUtilsBrowserTest&) = delete;
+
+ ~BrowsingDataCounterUtilsBrowserTest() override = default;
};
IN_PROC_BROWSER_TEST_F(BrowsingDataCounterUtilsBrowserTest,
diff --git a/chrome/browser/browsing_data/counters/cache_counter.h b/chrome/browser/browsing_data/counters/cache_counter.h
index ca92e73d..708ce85 100644
--- a/chrome/browser/browsing_data/counters/cache_counter.h
+++ b/chrome/browser/browsing_data/counters/cache_counter.h
@@ -19,6 +19,10 @@
CacheResult(const CacheCounter* source,
int64_t cache_size,
bool is_upper_limit);
+
+ CacheResult(const CacheResult&) = delete;
+ CacheResult& operator=(const CacheResult&) = delete;
+
~CacheResult() override;
int64_t cache_size() const { return cache_size_; }
@@ -27,8 +31,6 @@
private:
int64_t cache_size_;
bool is_upper_limit_;
-
- DISALLOW_COPY_AND_ASSIGN(CacheResult);
};
explicit CacheCounter(Profile* profile);
diff --git a/chrome/browser/browsing_data/counters/downloads_counter.h b/chrome/browser/browsing_data/counters/downloads_counter.h
index 45be809..f95a032 100644
--- a/chrome/browser/browsing_data/counters/downloads_counter.h
+++ b/chrome/browser/browsing_data/counters/downloads_counter.h
@@ -14,6 +14,10 @@
class DownloadsCounter : public browsing_data::BrowsingDataCounter {
public:
explicit DownloadsCounter(Profile* profile);
+
+ DownloadsCounter(const DownloadsCounter&) = delete;
+ DownloadsCounter& operator=(const DownloadsCounter&) = delete;
+
~DownloadsCounter() override;
const char* GetPrefName() const override;
@@ -23,8 +27,6 @@
void Count() override;
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadsCounter);
};
#endif // CHROME_BROWSER_BROWSING_DATA_COUNTERS_DOWNLOADS_COUNTER_H_
diff --git a/chrome/browser/browsing_data/counters/hosted_apps_counter.h b/chrome/browser/browsing_data/counters/hosted_apps_counter.h
index 92a9fe8f..48c7848 100644
--- a/chrome/browser/browsing_data/counters/hosted_apps_counter.h
+++ b/chrome/browser/browsing_data/counters/hosted_apps_counter.h
@@ -21,14 +21,16 @@
HostedAppsResult(const HostedAppsCounter* source,
ResultInt num_apps,
const std::vector<std::string>& examples);
+
+ HostedAppsResult(const HostedAppsResult&) = delete;
+ HostedAppsResult& operator=(const HostedAppsResult&) = delete;
+
~HostedAppsResult() override;
const std::vector<std::string>& examples() const { return examples_; }
private:
const std::vector<std::string> examples_;
-
- DISALLOW_COPY_AND_ASSIGN(HostedAppsResult);
};
explicit HostedAppsCounter(Profile* profile);
diff --git a/chrome/browser/browsing_data/counters/sync_aware_counter_browsertest.cc b/chrome/browser/browsing_data/counters/sync_aware_counter_browsertest.cc
index f67f6e5..af3388d1 100644
--- a/chrome/browser/browsing_data/counters/sync_aware_counter_browsertest.cc
+++ b/chrome/browser/browsing_data/counters/sync_aware_counter_browsertest.cc
@@ -41,6 +41,10 @@
class SyncAwareCounterTest : public SyncTest {
public:
SyncAwareCounterTest() : SyncTest(SINGLE_CLIENT) {}
+
+ SyncAwareCounterTest(const SyncAwareCounterTest&) = delete;
+ SyncAwareCounterTest& operator=(const SyncAwareCounterTest&) = delete;
+
~SyncAwareCounterTest() override {}
void SetUpOnMainThread() override {
@@ -93,8 +97,6 @@
bool finished_;
bool sync_enabled_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncAwareCounterTest);
};
// Test that the counting restarts when autofill sync state changes.
diff --git a/chrome/browser/browsing_data/local_data_container.h b/chrome/browser/browsing_data/local_data_container.h
index 034c817..c26b28f9 100644
--- a/chrome/browser/browsing_data/local_data_container.h
+++ b/chrome/browser/browsing_data/local_data_container.h
@@ -73,6 +73,10 @@
scoped_refptr<browsing_data::SharedWorkerHelper> shared_worker_helper,
scoped_refptr<browsing_data::CacheStorageHelper> cache_storage_helper,
scoped_refptr<BrowsingDataMediaLicenseHelper> media_license_helper);
+
+ LocalDataContainer(const LocalDataContainer&) = delete;
+ LocalDataContainer& operator=(const LocalDataContainer&) = delete;
+
virtual ~LocalDataContainer();
// This method must be called to start the process of fetching the resources.
@@ -152,8 +156,6 @@
int batches_started_ = 0;
base::WeakPtrFactory<LocalDataContainer> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LocalDataContainer);
};
#endif // CHROME_BROWSER_BROWSING_DATA_LOCAL_DATA_CONTAINER_H_
diff --git a/chrome/browser/browsing_data/site_data_size_collector.h b/chrome/browser/browsing_data/site_data_size_collector.h
index a948da0..d336940 100644
--- a/chrome/browser/browsing_data/site_data_size_collector.h
+++ b/chrome/browser/browsing_data/site_data_size_collector.h
@@ -42,6 +42,10 @@
scoped_refptr<browsing_data::FileSystemHelper> file_system_helper,
scoped_refptr<browsing_data::ServiceWorkerHelper> service_worker_helper,
scoped_refptr<browsing_data::CacheStorageHelper> cache_storage_helper);
+
+ SiteDataSizeCollector(const SiteDataSizeCollector&) = delete;
+ SiteDataSizeCollector& operator=(const SiteDataSizeCollector&) = delete;
+
virtual ~SiteDataSizeCollector();
using FetchCallback = base::OnceCallback<void(int64_t)>;
@@ -93,8 +97,6 @@
int64_t total_bytes_;
base::WeakPtrFactory<SiteDataSizeCollector> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SiteDataSizeCollector);
};
#endif // CHROME_BROWSER_BROWSING_DATA_SITE_DATA_SIZE_COLLECTOR_H_
diff --git a/chrome/browser/cache_stats_recorder.h b/chrome/browser/cache_stats_recorder.h
index 3d8c7b5..87a75d5 100644
--- a/chrome/browser/cache_stats_recorder.h
+++ b/chrome/browser/cache_stats_recorder.h
@@ -10,6 +10,10 @@
class CacheStatsRecorder : public chrome::mojom::CacheStatsRecorder {
public:
explicit CacheStatsRecorder(int render_process_id);
+
+ CacheStatsRecorder(const CacheStatsRecorder&) = delete;
+ CacheStatsRecorder& operator=(const CacheStatsRecorder&) = delete;
+
~CacheStatsRecorder() override;
static void Create(
@@ -22,8 +26,6 @@
void RecordCacheStats(uint64_t capacity, uint64_t size) override;
const int render_process_id_;
-
- DISALLOW_COPY_AND_ASSIGN(CacheStatsRecorder);
};
#endif // CHROME_BROWSER_CACHE_STATS_RECORDER_H_
diff --git a/chrome/browser/capability_delegation_browsertest.cc b/chrome/browser/capability_delegation_browsertest.cc
index 7cb3226..c465cbf 100644
--- a/chrome/browser/capability_delegation_browsertest.cc
+++ b/chrome/browser/capability_delegation_browsertest.cc
@@ -22,6 +22,11 @@
features::kCapabilityDelegationPaymentRequest);
}
+ CapabilityDelegationBrowserTest(const CapabilityDelegationBrowserTest&) =
+ delete;
+ CapabilityDelegationBrowserTest& operator=(
+ const CapabilityDelegationBrowserTest&) = delete;
+
~CapabilityDelegationBrowserTest() override = default;
void SetUpOnMainThread() override {
@@ -35,8 +40,6 @@
private:
base::test::ScopedFeatureList feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(CapabilityDelegationBrowserTest);
};
IN_PROC_BROWSER_TEST_F(CapabilityDelegationBrowserTest, PaymentRequest) {
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index 65406fb..b77acdd0 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -199,6 +199,10 @@
class MultiNavigationObserver : public content::NotificationObserver {
public:
MultiNavigationObserver();
+
+ MultiNavigationObserver(const MultiNavigationObserver&) = delete;
+ MultiNavigationObserver& operator=(const MultiNavigationObserver&) = delete;
+
~MultiNavigationObserver() override;
// Waits for exactly |num_navigations_to_wait_for| LOAD_STOP
@@ -236,8 +240,6 @@
std::unique_ptr<base::RunLoop> run_loop_;
content::NotificationRegistrar registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(MultiNavigationObserver);
};
MultiNavigationObserver::MultiNavigationObserver()
@@ -302,6 +304,11 @@
class FailLoadsAfterLoginObserver : public content::NotificationObserver {
public:
FailLoadsAfterLoginObserver();
+
+ FailLoadsAfterLoginObserver(const FailLoadsAfterLoginObserver&) = delete;
+ FailLoadsAfterLoginObserver& operator=(const FailLoadsAfterLoginObserver&) =
+ delete;
+
~FailLoadsAfterLoginObserver() override;
void WaitForNavigations();
@@ -328,8 +335,6 @@
std::unique_ptr<base::RunLoop> run_loop_;
content::NotificationRegistrar registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(FailLoadsAfterLoginObserver);
};
FailLoadsAfterLoginObserver::FailLoadsAfterLoginObserver()
@@ -473,6 +478,11 @@
class SSLInterstitialTimerObserver {
public:
explicit SSLInterstitialTimerObserver(content::WebContents* web_contents);
+
+ SSLInterstitialTimerObserver(const SSLInterstitialTimerObserver&) = delete;
+ SSLInterstitialTimerObserver& operator=(const SSLInterstitialTimerObserver&) =
+ delete;
+
~SSLInterstitialTimerObserver();
// Waits until the interstitial delay timer in SSLErrorHandler is started.
@@ -485,8 +495,6 @@
SSLErrorHandler::TimerStartedCallback callback_;
scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLInterstitialTimerObserver);
};
SSLInterstitialTimerObserver::SSLInterstitialTimerObserver(
@@ -561,6 +569,10 @@
class CaptivePortalBrowserTest : public InProcessBrowserTest {
public:
CaptivePortalBrowserTest();
+
+ CaptivePortalBrowserTest(const CaptivePortalBrowserTest&) = delete;
+ CaptivePortalBrowserTest& operator=(const CaptivePortalBrowserTest&) = delete;
+
~CaptivePortalBrowserTest() override;
// InProcessBrowserTest:
@@ -936,9 +948,6 @@
#endif
const BrowserList* browser_list_;
bool intercept_bad_cert_ = true;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CaptivePortalBrowserTest);
};
CaptivePortalBrowserTest::CaptivePortalBrowserTest()
diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc
index 52d8e19..915c4a9 100644
--- a/chrome/browser/certificate_manager_model.cc
+++ b/chrome/browser/certificate_manager_model.cc
@@ -96,6 +96,10 @@
// certificates provided by this CertsSource changes.
explicit CertsSource(base::RepeatingClosure certs_source_updated_callback)
: certs_source_updated_callback_(certs_source_updated_callback) {}
+
+ CertsSource(const CertsSource&) = delete;
+ CertsSource& operator=(const CertsSource&) = delete;
+
virtual ~CertsSource() = default;
// Returns the CertInfos provided by this CertsSource.
@@ -173,8 +177,6 @@
// If true, the CertificateManagerModel should be holding back update
// notifications.
bool hold_back_updates_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(CertsSource);
};
namespace {
@@ -189,6 +191,10 @@
// Observe CertDatabase changes to refresh when it's updated.
cert_database_observation_.Observe(net::CertDatabase::GetInstance());
}
+
+ CertsSourcePlatformNSS(const CertsSourcePlatformNSS&) = delete;
+ CertsSourcePlatformNSS& operator=(const CertsSourcePlatformNSS&) = delete;
+
~CertsSourcePlatformNSS() override = default;
// net::CertDatabase::Observer
@@ -277,8 +283,6 @@
cert_database_observation_{this};
base::WeakPtrFactory<CertsSourcePlatformNSS> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CertsSourcePlatformNSS);
};
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -306,6 +310,9 @@
policy_certs_provider_->AddPolicyProvidedCertsObserver(this);
}
+ CertsSourcePolicy(const CertsSourcePolicy&) = delete;
+ CertsSourcePolicy& operator=(const CertsSourcePolicy&) = delete;
+
~CertsSourcePolicy() override {
policy_certs_provider_->RemovePolicyProvidedCertsObserver(this);
}
@@ -377,8 +384,6 @@
chromeos::PolicyCertificateProvider* policy_certs_provider_;
Mode mode_;
-
- DISALLOW_COPY_AND_ASSIGN(CertsSourcePolicy);
};
// Provides certificates made available by extensions through the
diff --git a/chrome/browser/certificate_manager_model.h b/chrome/browser/certificate_manager_model.h
index d4e23b1..15d34ae 100644
--- a/chrome/browser/certificate_manager_model.h
+++ b/chrome/browser/certificate_manager_model.h
@@ -58,6 +58,10 @@
bool web_trust_anchor,
bool hardware_backed,
bool device_wide);
+
+ CertInfo(const CertInfo&) = delete;
+ CertInfo& operator=(const CertInfo&) = delete;
+
~CertInfo();
CERTCertificate* cert() const { return cert_.get(); }
@@ -106,8 +110,6 @@
// Note: can be true only on Chrome OS.
bool device_wide_;
- DISALLOW_COPY_AND_ASSIGN(CertInfo);
-
FRIEND_TEST_ALL_PREFIXES(CertificateHandlerTest,
CanDeleteCertificateCommonTest);
FRIEND_TEST_ALL_PREFIXES(CertificateHandlerTest,
diff --git a/chrome/browser/chrome_back_forward_cache_browsertest.cc b/chrome/browser/chrome_back_forward_cache_browsertest.cc
index bb5e170..3b20137 100644
--- a/chrome/browser/chrome_back_forward_cache_browsertest.cc
+++ b/chrome/browser/chrome_back_forward_cache_browsertest.cc
@@ -61,6 +61,12 @@
class ChromeBackForwardCacheBrowserTest : public InProcessBrowserTest {
public:
ChromeBackForwardCacheBrowserTest() = default;
+
+ ChromeBackForwardCacheBrowserTest(const ChromeBackForwardCacheBrowserTest&) =
+ delete;
+ ChromeBackForwardCacheBrowserTest& operator=(
+ const ChromeBackForwardCacheBrowserTest&) = delete;
+
~ChromeBackForwardCacheBrowserTest() override = default;
void SetUpOnMainThread() override {
@@ -146,8 +152,6 @@
FeatureEqualOperator>
features_with_params_;
std::vector<base::Feature> disabled_features_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeBackForwardCacheBrowserTest);
};
IN_PROC_BROWSER_TEST_F(ChromeBackForwardCacheBrowserTest, Basic) {
diff --git a/chrome/browser/chrome_browser_field_trials.h b/chrome/browser/chrome_browser_field_trials.h
index e458798..0dc7054 100644
--- a/chrome/browser/chrome_browser_field_trials.h
+++ b/chrome/browser/chrome_browser_field_trials.h
@@ -17,6 +17,10 @@
class ChromeBrowserFieldTrials : public variations::PlatformFieldTrials {
public:
explicit ChromeBrowserFieldTrials(PrefService* local_state);
+
+ ChromeBrowserFieldTrials(const ChromeBrowserFieldTrials&) = delete;
+ ChromeBrowserFieldTrials& operator=(const ChromeBrowserFieldTrials&) = delete;
+
~ChromeBrowserFieldTrials() override;
// variations::PlatformFieldTrials:
@@ -34,8 +38,6 @@
// Weak pointer to the local state prefs store.
PrefService* const local_state_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeBrowserFieldTrials);
};
#endif // CHROME_BROWSER_CHROME_BROWSER_FIELD_TRIALS_H_
diff --git a/chrome/browser/chrome_browser_main_android.h b/chrome/browser/chrome_browser_main_android.h
index d9f5975..e00270a 100644
--- a/chrome/browser/chrome_browser_main_android.h
+++ b/chrome/browser/chrome_browser_main_android.h
@@ -14,6 +14,11 @@
public:
ChromeBrowserMainPartsAndroid(const content::MainFunctionParams& parameters,
StartupData* startup_data);
+
+ ChromeBrowserMainPartsAndroid(const ChromeBrowserMainPartsAndroid&) = delete;
+ ChromeBrowserMainPartsAndroid& operator=(
+ const ChromeBrowserMainPartsAndroid&) = delete;
+
~ChromeBrowserMainPartsAndroid() override;
// content::BrowserMainParts overrides.
@@ -29,8 +34,6 @@
private:
std::unique_ptr<android::ChromeBackupWatcher> backup_watcher_;
std::unique_ptr<ProfileManagerAndroid> profile_manager_android_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsAndroid);
};
#endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_ANDROID_H_
diff --git a/chrome/browser/chrome_browser_main_linux.h b/chrome/browser/chrome_browser_main_linux.h
index 8c4ca4d..a36f8a8 100644
--- a/chrome/browser/chrome_browser_main_linux.h
+++ b/chrome/browser/chrome_browser_main_linux.h
@@ -15,6 +15,11 @@
public:
ChromeBrowserMainPartsLinux(const content::MainFunctionParams& parameters,
StartupData* startup_data);
+
+ ChromeBrowserMainPartsLinux(const ChromeBrowserMainPartsLinux&) = delete;
+ ChromeBrowserMainPartsLinux& operator=(const ChromeBrowserMainPartsLinux&) =
+ delete;
+
~ChromeBrowserMainPartsLinux() override;
// ChromeBrowserMainParts overrides.
@@ -26,9 +31,6 @@
void PostBrowserStart() override;
#endif
void PostDestroyThreads() override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsLinux);
};
#endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_LINUX_H_
diff --git a/chrome/browser/chrome_browser_main_mac.h b/chrome/browser/chrome_browser_main_mac.h
index f8a20441..37d18e9 100644
--- a/chrome/browser/chrome_browser_main_mac.h
+++ b/chrome/browser/chrome_browser_main_mac.h
@@ -12,6 +12,11 @@
public:
ChromeBrowserMainPartsMac(const content::MainFunctionParams& parameters,
StartupData* startup_data);
+
+ ChromeBrowserMainPartsMac(const ChromeBrowserMainPartsMac&) = delete;
+ ChromeBrowserMainPartsMac& operator=(const ChromeBrowserMainPartsMac&) =
+ delete;
+
~ChromeBrowserMainPartsMac() override;
// BrowserParts overrides.
@@ -24,9 +29,6 @@
// Perform platform-specific work that needs to be done after the main event
// loop has ended. The embedder must be sure to call this.
static void DidEndMainMessageLoop();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsMac);
};
#endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_MAC_H_
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 205daf38..2f17b76 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -925,6 +925,12 @@
content::WebContents* web_contents)
: service_(CertificateReportingServiceFactory::GetForBrowserContext(
web_contents->GetBrowserContext())) {}
+
+ CertificateReportingServiceCertReporter(
+ const CertificateReportingServiceCertReporter&) = delete;
+ CertificateReportingServiceCertReporter& operator=(
+ const CertificateReportingServiceCertReporter&) = delete;
+
~CertificateReportingServiceCertReporter() override {}
// SSLCertReporter implementation
@@ -935,8 +941,6 @@
private:
CertificateReportingService* service_;
-
- DISALLOW_COPY_AND_ASSIGN(CertificateReportingServiceCertReporter);
};
#if BUILDFLAG(ENABLE_EXTENSIONS)
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 8375f9b4..35aeec2 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -111,6 +111,11 @@
class ChromeContentBrowserClient : public content::ContentBrowserClient {
public:
ChromeContentBrowserClient();
+
+ ChromeContentBrowserClient(const ChromeContentBrowserClient&) = delete;
+ ChromeContentBrowserClient& operator=(const ChromeContentBrowserClient&) =
+ delete;
+
~ChromeContentBrowserClient() override;
// TODO(https://crbug.com/787567): This file is about calls from content/ out
@@ -862,8 +867,6 @@
#endif
base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
};
#endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
diff --git a/chrome/browser/chrome_navigation_browsertest.cc b/chrome/browser/chrome_navigation_browsertest.cc
index ffec005d..ea30d9d 100644
--- a/chrome/browser/chrome_navigation_browsertest.cc
+++ b/chrome/browser/chrome_navigation_browsertest.cc
@@ -81,6 +81,11 @@
ChromeNavigationBrowserTest() {
scoped_feature_list_.InitAndEnableFeature(ukm::kUkmFeature);
}
+
+ ChromeNavigationBrowserTest(const ChromeNavigationBrowserTest&) = delete;
+ ChromeNavigationBrowserTest& operator=(const ChromeNavigationBrowserTest&) =
+ delete;
+
~ChromeNavigationBrowserTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -114,8 +119,6 @@
private:
std::unique_ptr<ukm::TestAutoSetUkmRecorder> test_ukm_recorder_;
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeNavigationBrowserTest);
};
// Tests that viewing frame source on a local file:// page with an iframe
@@ -1012,6 +1015,11 @@
public:
SignInIsolationBrowserTest()
: https_server_(net::EmbeddedTestServer::TYPE_HTTPS) {}
+
+ SignInIsolationBrowserTest(const SignInIsolationBrowserTest&) = delete;
+ SignInIsolationBrowserTest& operator=(const SignInIsolationBrowserTest&) =
+ delete;
+
~SignInIsolationBrowserTest() override {}
void SetUp() override {
@@ -1044,8 +1052,6 @@
private:
net::EmbeddedTestServer https_server_;
-
- DISALLOW_COPY_AND_ASSIGN(SignInIsolationBrowserTest);
};
// This test ensures that the sign-in origin requires a dedicated process. It
@@ -1076,6 +1082,11 @@
public:
WebstoreIsolationBrowserTest()
: https_server_(net::EmbeddedTestServer::TYPE_HTTPS) {}
+
+ WebstoreIsolationBrowserTest(const WebstoreIsolationBrowserTest&) = delete;
+ WebstoreIsolationBrowserTest& operator=(const WebstoreIsolationBrowserTest&) =
+ delete;
+
~WebstoreIsolationBrowserTest() override {}
void SetUp() override {
@@ -1107,8 +1118,6 @@
private:
net::EmbeddedTestServer https_server_;
-
- DISALLOW_COPY_AND_ASSIGN(WebstoreIsolationBrowserTest);
};
// Make sure that Chrome Web Store origins are isolated from the rest of their
diff --git a/chrome/browser/chrome_process_singleton.h b/chrome/browser/chrome_process_singleton.h
index 4bf0d4fd..72914c9 100644
--- a/chrome/browser/chrome_process_singleton.h
+++ b/chrome/browser/chrome_process_singleton.h
@@ -30,6 +30,9 @@
const base::FilePath& user_data_dir,
const ProcessSingleton::NotificationCallback& notification_callback);
+ ChromeProcessSingleton(const ChromeProcessSingleton&) = delete;
+ ChromeProcessSingleton& operator=(const ChromeProcessSingleton&) = delete;
+
~ChromeProcessSingleton();
// Notify another process, if available. Otherwise sets ourselves as the
@@ -64,8 +67,6 @@
// The basic ProcessSingleton
ProcessSingleton process_singleton_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeProcessSingleton);
};
#endif // CHROME_BROWSER_CHROME_PROCESS_SINGLETON_H_
diff --git a/chrome/browser/chrome_render_widget_host_browsertests.cc b/chrome/browser/chrome_render_widget_host_browsertests.cc
index 2b7075fc7..98c5bfb 100644
--- a/chrome/browser/chrome_render_widget_host_browsertests.cc
+++ b/chrome/browser/chrome_render_widget_host_browsertests.cc
@@ -31,6 +31,12 @@
class ActiveRenderWidgetHostBrowserTest : public InProcessBrowserTest {
public:
ActiveRenderWidgetHostBrowserTest() = default;
+
+ ActiveRenderWidgetHostBrowserTest(const ActiveRenderWidgetHostBrowserTest&) =
+ delete;
+ ActiveRenderWidgetHostBrowserTest& operator=(
+ const ActiveRenderWidgetHostBrowserTest&) = delete;
+
~ActiveRenderWidgetHostBrowserTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -45,9 +51,6 @@
ASSERT_TRUE(embedded_test_server()->Start());
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ActiveRenderWidgetHostBrowserTest);
};
IN_PROC_BROWSER_TEST_F(ActiveRenderWidgetHostBrowserTest,
diff --git a/chrome/browser/chrome_security_exploit_browsertest.cc b/chrome/browser/chrome_security_exploit_browsertest.cc
index dde83401..5388f84 100644
--- a/chrome/browser/chrome_security_exploit_browsertest.cc
+++ b/chrome/browser/chrome_security_exploit_browsertest.cc
@@ -50,6 +50,12 @@
: public extensions::ExtensionBrowserTest {
public:
ChromeSecurityExploitBrowserTest() {}
+
+ ChromeSecurityExploitBrowserTest(const ChromeSecurityExploitBrowserTest&) =
+ delete;
+ ChromeSecurityExploitBrowserTest& operator=(
+ const ChromeSecurityExploitBrowserTest&) = delete;
+
~ChromeSecurityExploitBrowserTest() override {}
void SetUpOnMainThread() override {
@@ -85,8 +91,6 @@
private:
const extensions::Extension* extension_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeSecurityExploitBrowserTest);
};
// Subclass of ChromeSecurityExploitBrowserTest that uses --disable-web-security
@@ -96,14 +100,18 @@
: public ChromeSecurityExploitBrowserTest {
public:
ChromeWebSecurityDisabledBrowserTest() {}
+
+ ChromeWebSecurityDisabledBrowserTest(
+ const ChromeWebSecurityDisabledBrowserTest&) = delete;
+ ChromeWebSecurityDisabledBrowserTest& operator=(
+ const ChromeWebSecurityDisabledBrowserTest&) = delete;
+
~ChromeWebSecurityDisabledBrowserTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
ChromeSecurityExploitBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kDisableWebSecurity);
}
-
- DISALLOW_COPY_AND_ASSIGN(ChromeWebSecurityDisabledBrowserTest);
};
// TODO(nasko): This test as written is incompatible with Site Isolation
diff --git a/chrome/browser/chrome_service_worker_browsertest.cc b/chrome/browser/chrome_service_worker_browsertest.cc
index 0ef41ed..34288aa 100644
--- a/chrome/browser/chrome_service_worker_browsertest.cc
+++ b/chrome/browser/chrome_service_worker_browsertest.cc
@@ -419,6 +419,10 @@
scoped_observation_.Observe(
favicon::ContentFaviconDriver::FromWebContents(web_contents));
}
+
+ FaviconUpdateWaiter(const FaviconUpdateWaiter&) = delete;
+ FaviconUpdateWaiter& operator=(const FaviconUpdateWaiter&) = delete;
+
~FaviconUpdateWaiter() override = default;
void Wait() {
@@ -446,8 +450,6 @@
favicon::FaviconDriverObserver>
scoped_observation_{this};
base::OnceClosure quit_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(FaviconUpdateWaiter);
};
class ChromeServiceWorkerLinkFetchTest : public ChromeServiceWorkerFetchTest {
@@ -794,6 +796,10 @@
public:
StaticURLDataSource(const std::string& source, const std::string& content)
: source_(source), content_(content) {}
+
+ StaticURLDataSource(const StaticURLDataSource&) = delete;
+ StaticURLDataSource& operator=(const StaticURLDataSource&) = delete;
+
~StaticURLDataSource() override = default;
// content::URLDataSource:
@@ -812,8 +818,6 @@
private:
const std::string source_;
const std::string content_;
-
- DISALLOW_COPY_AND_ASSIGN(StaticURLDataSource);
};
// Copied from devtools_browsertest.cc.
@@ -822,6 +826,10 @@
public:
MockWebUIProvider(const std::string& source, const std::string& content)
: source_(source), content_(content) {}
+
+ MockWebUIProvider(const MockWebUIProvider&) = delete;
+ MockWebUIProvider& operator=(const MockWebUIProvider&) = delete;
+
~MockWebUIProvider() override = default;
std::unique_ptr<content::WebUIController> NewWebUI(content::WebUI* web_ui,
@@ -835,7 +843,6 @@
private:
const std::string source_;
const std::string content_;
- DISALLOW_COPY_AND_ASSIGN(MockWebUIProvider);
};
// Tests that registering a service worker with a chrome:// URL fails.
diff --git a/chrome/browser/chromeos/android_sms/android_sms_app_manager.h b/chrome/browser/chromeos/android_sms/android_sms_app_manager.h
index d155a350..9ef07eb 100644
--- a/chrome/browser/chromeos/android_sms/android_sms_app_manager.h
+++ b/chrome/browser/chromeos/android_sms/android_sms_app_manager.h
@@ -33,6 +33,10 @@
};
AndroidSmsAppManager();
+
+ AndroidSmsAppManager(const AndroidSmsAppManager&) = delete;
+ AndroidSmsAppManager& operator=(const AndroidSmsAppManager&) = delete;
+
~AndroidSmsAppManager() override;
// If no app is installed, null is returned.
@@ -46,8 +50,6 @@
private:
base::ObserverList<Observer> observer_list_;
-
- DISALLOW_COPY_AND_ASSIGN(AndroidSmsAppManager);
};
} // namespace android_sms
diff --git a/chrome/browser/chromeos/android_sms/android_sms_app_manager_impl.h b/chrome/browser/chromeos/android_sms/android_sms_app_manager_impl.h
index 894389a..ad8690f 100644
--- a/chrome/browser/chromeos/android_sms/android_sms_app_manager_impl.h
+++ b/chrome/browser/chromeos/android_sms/android_sms_app_manager_impl.h
@@ -56,6 +56,10 @@
PrefService* pref_service,
app_list::AppListSyncableService* app_list_syncable_service,
std::unique_ptr<PwaDelegate> test_pwa_delegate = nullptr);
+
+ AndroidSmsAppManagerImpl(const AndroidSmsAppManagerImpl&) = delete;
+ AndroidSmsAppManagerImpl& operator=(const AndroidSmsAppManagerImpl&) = delete;
+
~AndroidSmsAppManagerImpl() override;
static void RegisterProfilePrefs(PrefRegistrySimple* registry);
@@ -104,8 +108,6 @@
std::unique_ptr<PwaDelegate> pwa_delegate_;
base::WeakPtrFactory<AndroidSmsAppManagerImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AndroidSmsAppManagerImpl);
};
} // namespace android_sms
diff --git a/chrome/browser/chromeos/android_sms/android_sms_app_manager_impl_unittest.cc b/chrome/browser/chromeos/android_sms/android_sms_app_manager_impl_unittest.cc
index 4695100..10ecfbf 100644
--- a/chrome/browser/chromeos/android_sms/android_sms_app_manager_impl_unittest.cc
+++ b/chrome/browser/chromeos/android_sms/android_sms_app_manager_impl_unittest.cc
@@ -39,6 +39,10 @@
class TestObserver : public AndroidSmsAppManager::Observer {
public:
TestObserver() = default;
+
+ TestObserver(const TestObserver&) = delete;
+ TestObserver& operator=(const TestObserver&) = delete;
+
~TestObserver() override = default;
size_t num_installed_app_url_changed_events() {
@@ -52,8 +56,6 @@
}
size_t num_installed_app_url_changed_events_ = 0u;
-
- DISALLOW_COPY_AND_ASSIGN(TestObserver);
};
class AndroidSmsAppManagerImplTest : public testing::Test {
@@ -61,6 +63,10 @@
class TestPwaDelegate : public AndroidSmsAppManagerImpl::PwaDelegate {
public:
TestPwaDelegate() = default;
+
+ TestPwaDelegate(const TestPwaDelegate&) = delete;
+ TestPwaDelegate& operator=(const TestPwaDelegate&) = delete;
+
~TestPwaDelegate() override = default;
const std::vector<std::string>& opened_app_ids() const {
@@ -100,8 +106,6 @@
transfer_item_attribute_params_;
scoped_refptr<base::TestSimpleTaskRunner> test_task_runner_ =
base::MakeRefCounted<base::TestSimpleTaskRunner>();
-
- DISALLOW_COPY_AND_ASSIGN(TestPwaDelegate);
};
AndroidSmsAppManagerImplTest() = default;
diff --git a/chrome/browser/chromeos/android_sms/android_sms_app_setup_controller.h b/chrome/browser/chromeos/android_sms/android_sms_app_setup_controller.h
index 32c64fd4..3a32c401 100644
--- a/chrome/browser/chromeos/android_sms/android_sms_app_setup_controller.h
+++ b/chrome/browser/chromeos/android_sms/android_sms_app_setup_controller.h
@@ -19,6 +19,11 @@
class AndroidSmsAppSetupController {
public:
AndroidSmsAppSetupController() = default;
+
+ AndroidSmsAppSetupController(const AndroidSmsAppSetupController&) = delete;
+ AndroidSmsAppSetupController& operator=(const AndroidSmsAppSetupController&) =
+ delete;
+
virtual ~AndroidSmsAppSetupController() = default;
using SuccessCallback = base::OnceCallback<void(bool)>;
@@ -59,9 +64,6 @@
const GURL& install_url,
const GURL& migrated_to_app_url,
SuccessCallback callback) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AndroidSmsAppSetupController);
};
} // namespace android_sms
diff --git a/chrome/browser/chromeos/android_sms/android_sms_app_setup_controller_impl.h b/chrome/browser/chromeos/android_sms/android_sms_app_setup_controller_impl.h
index aed65bb..2a0bad61 100644
--- a/chrome/browser/chromeos/android_sms/android_sms_app_setup_controller_impl.h
+++ b/chrome/browser/chromeos/android_sms/android_sms_app_setup_controller_impl.h
@@ -35,6 +35,12 @@
Profile* profile,
web_app::ExternallyManagedAppManager* externally_managed_app_manager,
HostContentSettingsMap* host_content_settings_map);
+
+ AndroidSmsAppSetupControllerImpl(const AndroidSmsAppSetupControllerImpl&) =
+ delete;
+ AndroidSmsAppSetupControllerImpl& operator=(
+ const AndroidSmsAppSetupControllerImpl&) = delete;
+
~AndroidSmsAppSetupControllerImpl() override;
private:
@@ -116,8 +122,6 @@
std::unique_ptr<PwaDelegate> pwa_delegate_;
base::WeakPtrFactory<AndroidSmsAppSetupControllerImpl> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(AndroidSmsAppSetupControllerImpl);
};
} // namespace android_sms
diff --git a/chrome/browser/chromeos/android_sms/android_sms_pairing_state_tracker_impl.h b/chrome/browser/chromeos/android_sms/android_sms_pairing_state_tracker_impl.h
index c0a16b6c..04e8910 100644
--- a/chrome/browser/chromeos/android_sms/android_sms_pairing_state_tracker_impl.h
+++ b/chrome/browser/chromeos/android_sms/android_sms_pairing_state_tracker_impl.h
@@ -27,6 +27,12 @@
AndroidSmsPairingStateTrackerImpl(
Profile* profile,
AndroidSmsAppManager* android_sms_app_manager);
+
+ AndroidSmsPairingStateTrackerImpl(const AndroidSmsPairingStateTrackerImpl&) =
+ delete;
+ AndroidSmsPairingStateTrackerImpl& operator=(
+ const AndroidSmsPairingStateTrackerImpl&) = delete;
+
~AndroidSmsPairingStateTrackerImpl() override;
// AndroidSmsPairingStateTracker:
@@ -56,8 +62,6 @@
bool was_paired_on_last_update_ = false;
base::WeakPtrFactory<AndroidSmsPairingStateTrackerImpl> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(AndroidSmsPairingStateTrackerImpl);
};
} // namespace android_sms
diff --git a/chrome/browser/chromeos/android_sms/android_sms_service.h b/chrome/browser/chromeos/android_sms/android_sms_service.h
index 91c63ba3..e1681482 100644
--- a/chrome/browser/chromeos/android_sms/android_sms_service.h
+++ b/chrome/browser/chromeos/android_sms/android_sms_service.h
@@ -51,6 +51,10 @@
multidevice_setup::MultiDeviceSetupClient* multidevice_setup_client,
web_app::WebAppProvider* web_app_provider,
app_list::AppListSyncableService* app_list_syncable_service);
+
+ AndroidSmsService(const AndroidSmsService&) = delete;
+ AndroidSmsService& operator=(const AndroidSmsService&) = delete;
+
~AndroidSmsService() override;
AndroidSmsAppManager* android_sms_app_manager() {
@@ -79,8 +83,6 @@
android_sms_pairing_state_tracker_;
std::unique_ptr<PairingLostNotifier> pairing_lost_notifier_;
std::unique_ptr<ConnectionManager> connection_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(AndroidSmsService);
};
} // namespace android_sms
diff --git a/chrome/browser/chromeos/android_sms/connection_establisher.h b/chrome/browser/chromeos/android_sms/connection_establisher.h
index 0f8f929..69a5f126 100644
--- a/chrome/browser/chromeos/android_sms/connection_establisher.h
+++ b/chrome/browser/chromeos/android_sms/connection_establisher.h
@@ -19,6 +19,9 @@
public:
enum class ConnectionMode { kStartConnection, kResumeExistingConnection };
+ ConnectionEstablisher(const ConnectionEstablisher&) = delete;
+ ConnectionEstablisher& operator=(const ConnectionEstablisher&) = delete;
+
virtual ~ConnectionEstablisher() = default;
virtual void EstablishConnection(
@@ -32,9 +35,6 @@
protected:
ConnectionEstablisher() = default;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ConnectionEstablisher);
};
} // namespace android_sms
diff --git a/chrome/browser/chromeos/android_sms/connection_manager.h b/chrome/browser/chromeos/android_sms/connection_manager.h
index 3901046..c9fda62 100644
--- a/chrome/browser/chromeos/android_sms/connection_manager.h
+++ b/chrome/browser/chromeos/android_sms/connection_manager.h
@@ -52,6 +52,10 @@
Profile* profile,
AndroidSmsAppManager* android_sms_app_manager,
multidevice_setup::MultiDeviceSetupClient* multidevice_setup_client);
+
+ ConnectionManager(const ConnectionManager&) = delete;
+ ConnectionManager& operator=(const ConnectionManager&) = delete;
+
~ConnectionManager() override;
// Sends a start connection message to the service worker.
@@ -64,13 +68,14 @@
class ServiceWorkerProvider {
public:
ServiceWorkerProvider();
+
+ ServiceWorkerProvider(const ServiceWorkerProvider&) = delete;
+ ServiceWorkerProvider& operator=(const ServiceWorkerProvider&) = delete;
+
virtual ~ServiceWorkerProvider();
virtual content::ServiceWorkerContext* Get(const GURL& url,
Profile* profile);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ServiceWorkerProvider);
};
ConnectionManager(
@@ -118,8 +123,6 @@
// The URL of the Android Messages PWA, if it is currently enabled. If the
// feature is not currently enabled, this field is null.
absl::optional<GURL> enabled_pwa_url_;
-
- DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
};
} // namespace android_sms
diff --git a/chrome/browser/chromeos/android_sms/connection_manager_unittest.cc b/chrome/browser/chromeos/android_sms/connection_manager_unittest.cc
index 54071e3..55ec1a71 100644
--- a/chrome/browser/chromeos/android_sms/connection_manager_unittest.cc
+++ b/chrome/browser/chromeos/android_sms/connection_manager_unittest.cc
@@ -43,6 +43,11 @@
content::FakeServiceWorkerContext* old_url_service_worker)
: new_url_service_worker_(new_url_service_worker),
old_url_service_worker_(old_url_service_worker) {}
+
+ TestServiceWorkerProvider(const TestServiceWorkerProvider&) = delete;
+ TestServiceWorkerProvider& operator=(const TestServiceWorkerProvider&) =
+ delete;
+
~TestServiceWorkerProvider() override = default;
private:
@@ -61,8 +66,6 @@
content::FakeServiceWorkerContext* new_url_service_worker_;
content::FakeServiceWorkerContext* old_url_service_worker_;
-
- DISALLOW_COPY_AND_ASSIGN(TestServiceWorkerProvider);
};
enum class PwaState { kEnabledWithNewUrl, kEnabledWithOldUrl, kDisabled };
diff --git a/chrome/browser/chromeos/android_sms/fake_android_sms_app_manager.h b/chrome/browser/chromeos/android_sms/fake_android_sms_app_manager.h
index a7312ac..6d45fa0 100644
--- a/chrome/browser/chromeos/android_sms/fake_android_sms_app_manager.h
+++ b/chrome/browser/chromeos/android_sms/fake_android_sms_app_manager.h
@@ -25,6 +25,10 @@
public multidevice_setup::FakeAndroidSmsAppHelperDelegate {
public:
FakeAndroidSmsAppManager();
+
+ FakeAndroidSmsAppManager(const FakeAndroidSmsAppManager&) = delete;
+ FakeAndroidSmsAppManager& operator=(const FakeAndroidSmsAppManager&) = delete;
+
~FakeAndroidSmsAppManager() override;
void SetInstalledAppUrl(const absl::optional<GURL>& url);
@@ -34,8 +38,6 @@
absl::optional<GURL> GetCurrentAppUrl() override;
absl::optional<GURL> url_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeAndroidSmsAppManager);
};
} // namespace android_sms
diff --git a/chrome/browser/chromeos/android_sms/fake_android_sms_app_setup_controller.h b/chrome/browser/chromeos/android_sms/fake_android_sms_app_setup_controller.h
index d1e25e2..ee35c4e 100644
--- a/chrome/browser/chromeos/android_sms/fake_android_sms_app_setup_controller.h
+++ b/chrome/browser/chromeos/android_sms/fake_android_sms_app_setup_controller.h
@@ -25,6 +25,12 @@
class FakeAndroidSmsAppSetupController : public AndroidSmsAppSetupController {
public:
FakeAndroidSmsAppSetupController();
+
+ FakeAndroidSmsAppSetupController(const FakeAndroidSmsAppSetupController&) =
+ delete;
+ FakeAndroidSmsAppSetupController& operator=(
+ const FakeAndroidSmsAppSetupController&) = delete;
+
~FakeAndroidSmsAppSetupController() override;
struct AppMetadata {
@@ -89,8 +95,6 @@
std::list<std::unique_ptr<DeleteCookieData>> pending_delete_cookie_requests_;
base::flat_map<GURL, AppMetadata> install_url_to_metadata_map_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeAndroidSmsAppSetupController);
};
} // namespace android_sms
diff --git a/chrome/browser/chromeos/android_sms/fake_connection_establisher.h b/chrome/browser/chromeos/android_sms/fake_connection_establisher.h
index cd8fa8da..2353d68 100644
--- a/chrome/browser/chromeos/android_sms/fake_connection_establisher.h
+++ b/chrome/browser/chromeos/android_sms/fake_connection_establisher.h
@@ -18,6 +18,11 @@
class FakeConnectionEstablisher : public ConnectionEstablisher {
public:
FakeConnectionEstablisher();
+
+ FakeConnectionEstablisher(const FakeConnectionEstablisher&) = delete;
+ FakeConnectionEstablisher& operator=(const FakeConnectionEstablisher&) =
+ delete;
+
~FakeConnectionEstablisher() override;
const std::vector<
@@ -46,8 +51,6 @@
establish_connection_calls_;
std::vector<std::tuple<GURL, content::ServiceWorkerContext*>>
tear_down_connection_calls_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeConnectionEstablisher);
};
} // namespace android_sms
diff --git a/chrome/browser/chromeos/android_sms/fcm_connection_establisher.h b/chrome/browser/chromeos/android_sms/fcm_connection_establisher.h
index c4f4193..16a2ac9 100644
--- a/chrome/browser/chromeos/android_sms/fcm_connection_establisher.h
+++ b/chrome/browser/chromeos/android_sms/fcm_connection_establisher.h
@@ -25,6 +25,10 @@
public:
explicit FcmConnectionEstablisher(
std::unique_ptr<base::OneShotTimer> retry_timer);
+
+ FcmConnectionEstablisher(const FcmConnectionEstablisher&) = delete;
+ FcmConnectionEstablisher& operator=(const FcmConnectionEstablisher&) = delete;
+
~FcmConnectionEstablisher() override;
// ConnectionEstablisher:
@@ -100,8 +104,6 @@
static const base::TimeDelta kRetryDelay;
base::WeakPtrFactory<FcmConnectionEstablisher> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FcmConnectionEstablisher);
};
} // namespace android_sms
diff --git a/chrome/browser/chromeos/android_sms/pairing_lost_notifier.h b/chrome/browser/chromeos/android_sms/pairing_lost_notifier.h
index b9e0a2d..fbd0af37 100644
--- a/chrome/browser/chromeos/android_sms/pairing_lost_notifier.h
+++ b/chrome/browser/chromeos/android_sms/pairing_lost_notifier.h
@@ -31,6 +31,10 @@
PrefService* pref_service,
multidevice_setup::AndroidSmsAppHelperDelegate*
android_sms_app_helper_delegate);
+
+ PairingLostNotifier(const PairingLostNotifier&) = delete;
+ PairingLostNotifier& operator=(const PairingLostNotifier&) = delete;
+
~PairingLostNotifier() override;
static void RegisterProfilePrefs(PrefRegistrySimple* registry);
@@ -55,8 +59,6 @@
android_sms_app_helper_delegate_;
base::WeakPtrFactory<PairingLostNotifier> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PairingLostNotifier);
};
} // namespace android_sms
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index f590f9f1..1b7d61b 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -455,6 +455,9 @@
std::make_unique<MachineLearningDecisionServiceProvider>()));
}
+ DBusServices(const DBusServices&) = delete;
+ DBusServices& operator=(const DBusServices&) = delete;
+
~DBusServices() {
ash::rollback_network_config::Shutdown();
sensors::SensorHalDispatcher::Shutdown();
@@ -514,8 +517,6 @@
std::unique_ptr<CrosDBusService> lock_to_single_user_service_;
std::unique_ptr<CrosDBusService> mojo_connection_service_;
std::unique_ptr<CrosDBusService> dlp_files_policy_service_;
-
- DISALLOW_COPY_AND_ASSIGN(DBusServices);
};
} // namespace internal
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
index bf2b3c75..4f3edca 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
@@ -121,6 +121,12 @@
public:
ChromeBrowserMainPartsChromeos(const content::MainFunctionParams& parameters,
StartupData* startup_data);
+
+ ChromeBrowserMainPartsChromeos(const ChromeBrowserMainPartsChromeos&) =
+ delete;
+ ChromeBrowserMainPartsChromeos& operator=(
+ const ChromeBrowserMainPartsChromeos&) = delete;
+
~ChromeBrowserMainPartsChromeos() override;
// ChromeBrowserMainParts overrides.
@@ -232,8 +238,6 @@
std::unique_ptr<ash::quick_pair::QuickPairBrowserDelegateImpl>
quick_pair_delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/chrome_content_browser_client_chromeos_part.h b/chrome/browser/chromeos/chrome_content_browser_client_chromeos_part.h
index eea4b98..114af25f 100644
--- a/chrome/browser/chromeos/chrome_content_browser_client_chromeos_part.h
+++ b/chrome/browser/chromeos/chrome_content_browser_client_chromeos_part.h
@@ -14,6 +14,12 @@
: public ChromeContentBrowserClientParts {
public:
ChromeContentBrowserClientChromeOsPart();
+
+ ChromeContentBrowserClientChromeOsPart(
+ const ChromeContentBrowserClientChromeOsPart&) = delete;
+ ChromeContentBrowserClientChromeOsPart& operator=(
+ const ChromeContentBrowserClientChromeOsPart&) = delete;
+
~ChromeContentBrowserClientChromeOsPart() override;
// ChromeContentBrowserClientParts:
@@ -21,9 +27,6 @@
blink::web_pref::WebPreferences* web_prefs) override;
static bool UseDefaultFontSizeForTest(const GURL& url);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClientChromeOsPart);
};
#endif // CHROME_BROWSER_CHROMEOS_CHROME_CONTENT_BROWSER_CLIENT_CHROMEOS_PART_H_
diff --git a/chrome/browser/chromeos/concierge_helper_service.h b/chrome/browser/chromeos/concierge_helper_service.h
index e2cbe23c..eadaaeaf 100644
--- a/chrome/browser/chromeos/concierge_helper_service.h
+++ b/chrome/browser/chromeos/concierge_helper_service.h
@@ -21,14 +21,15 @@
content::BrowserContext* context);
ConciergeHelperService();
+
+ ConciergeHelperService(const ConciergeHelperService&) = delete;
+ ConciergeHelperService& operator=(const ConciergeHelperService&) = delete;
+
~ConciergeHelperService() override = default;
void SetArcVmCpuRestriction(bool do_restrict);
void SetTerminaVmCpuRestriction(bool do_restrict);
void SetPluginVmCpuRestriction(bool do_restrict);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ConciergeHelperService);
};
class ConciergeHelperServiceFactory : public BrowserContextKeyedServiceFactory {
diff --git a/chrome/browser/chromeos/concierge_helper_service_unittest.cc b/chrome/browser/chromeos/concierge_helper_service_unittest.cc
index b63c2b6..82a9b0d0 100644
--- a/chrome/browser/chromeos/concierge_helper_service_unittest.cc
+++ b/chrome/browser/chromeos/concierge_helper_service_unittest.cc
@@ -21,6 +21,10 @@
class TestConciergeClient : public FakeConciergeClient {
public:
static void Initialize() { new TestConciergeClient(); }
+
+ TestConciergeClient(const TestConciergeClient&) = delete;
+ TestConciergeClient& operator=(const TestConciergeClient&) = delete;
+
~TestConciergeClient() override = default;
void SetVmCpuRestriction(
@@ -67,13 +71,16 @@
std::vector<dbus::ObjectProxy::WaitForServiceToBeAvailableCallback>
callbacks_;
bool service_is_available_ = true;
-
- DISALLOW_COPY_AND_ASSIGN(TestConciergeClient);
};
class ConciergeHelperServiceTest : public testing::Test {
public:
ConciergeHelperServiceTest() = default;
+
+ ConciergeHelperServiceTest(const ConciergeHelperServiceTest&) = delete;
+ ConciergeHelperServiceTest& operator=(const ConciergeHelperServiceTest&) =
+ delete;
+
~ConciergeHelperServiceTest() override = default;
// testing::Test:
@@ -101,8 +108,6 @@
content::BrowserTaskEnvironment task_environment_;
TestingProfile profile_;
ConciergeHelperService* service_;
-
- DISALLOW_COPY_AND_ASSIGN(ConciergeHelperServiceTest);
};
// Tests that ConciergeHelperService makes cpu restriction requests correctly.
diff --git a/chrome/browser/chromeos/cryptauth/client_app_metadata_provider_service.h b/chrome/browser/chromeos/cryptauth/client_app_metadata_provider_service.h
index 5cbd663..e84ffa6 100644
--- a/chrome/browser/chromeos/cryptauth/client_app_metadata_provider_service.h
+++ b/chrome/browser/chromeos/cryptauth/client_app_metadata_provider_service.h
@@ -48,6 +48,12 @@
PrefService* pref_service,
NetworkStateHandler* network_state_handler,
instance_id::InstanceIDProfileService* instance_id_profile_service);
+
+ ClientAppMetadataProviderService(const ClientAppMetadataProviderService&) =
+ delete;
+ ClientAppMetadataProviderService& operator=(
+ const ClientAppMetadataProviderService&) = delete;
+
~ClientAppMetadataProviderService() override;
// device_sync::ClientAppMetadataProvider:
@@ -103,8 +109,6 @@
std::list<GetMetadataCallback> pending_callbacks_;
base::WeakPtrFactory<ClientAppMetadataProviderService> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(ClientAppMetadataProviderService);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/eol_notification.h b/chrome/browser/chromeos/eol_notification.h
index a4ea179e..23192ad 100644
--- a/chrome/browser/chromeos/eol_notification.h
+++ b/chrome/browser/chromeos/eol_notification.h
@@ -29,6 +29,10 @@
static bool ShouldShowEolNotification();
explicit EolNotification(Profile* profile);
+
+ EolNotification(const EolNotification&) = delete;
+ EolNotification& operator=(const EolNotification&) = delete;
+
~EolNotification();
// Check Eol info from update engine.
@@ -72,8 +76,6 @@
// Factory of callbacks.
base::WeakPtrFactory<EolNotification> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EolNotification);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/extensions/active_tab_permission_granter_delegate_chromeos.h b/chrome/browser/chromeos/extensions/active_tab_permission_granter_delegate_chromeos.h
index 3b51bb9..9a1fe01 100644
--- a/chrome/browser/chromeos/extensions/active_tab_permission_granter_delegate_chromeos.h
+++ b/chrome/browser/chromeos/extensions/active_tab_permission_granter_delegate_chromeos.h
@@ -25,6 +25,12 @@
: public ActiveTabPermissionGranter::Delegate {
public:
ActiveTabPermissionGranterDelegateChromeOS();
+
+ ActiveTabPermissionGranterDelegateChromeOS(
+ const ActiveTabPermissionGranterDelegateChromeOS&) = delete;
+ ActiveTabPermissionGranterDelegateChromeOS& operator=(
+ const ActiveTabPermissionGranterDelegateChromeOS&) = delete;
+
~ActiveTabPermissionGranterDelegateChromeOS() override;
static void SetRequestResolvedCallbackForTesting(
@@ -34,9 +40,6 @@
bool ShouldGrantActiveTabOrPrompt(
const Extension* extension,
content::WebContents* web_contents) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ActiveTabPermissionGranterDelegateChromeOS);
};
} // namespace extensions
diff --git a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
index fd55f560..616db36e 100644
--- a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
+++ b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
@@ -881,6 +881,11 @@
expected_type_);
scoped_observation_.Observe(window);
}
+
+ WindowStateChangeObserver(const WindowStateChangeObserver&) = delete;
+ WindowStateChangeObserver& operator=(const WindowStateChangeObserver&) =
+ delete;
+
~WindowStateChangeObserver() override {}
// aura::WindowObserver:
@@ -906,8 +911,6 @@
base::ScopedObservation<aura::Window, aura::WindowObserver>
scoped_observation_{this};
base::OnceCallback<void(bool)> callback_;
-
- DISALLOW_COPY_AND_ASSIGN(WindowStateChangeObserver);
};
class WindowBoundsChangeObserver : public aura::WindowObserver {
@@ -2834,6 +2837,10 @@
AssistantInteractionHelper()
: query_status_(std::make_unique<base::DictionaryValue>()) {}
+ AssistantInteractionHelper(const AssistantInteractionHelper&) = delete;
+ AssistantInteractionHelper& operator=(const AssistantInteractionHelper&) =
+ delete;
+
~AssistantInteractionHelper() override {
if (GetAssistant()) {
GetAssistant()->RemoveAssistantInteractionSubscriber(this);
@@ -2956,8 +2963,6 @@
// Callback triggered when interaction finished with non-empty response.
OnInteractionFinishedCallback on_interaction_finished_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(AssistantInteractionHelper);
};
///////////////////////////////////////////////////////////////////////////////
@@ -4104,6 +4109,10 @@
std::move(callback_).Run();
}
}
+
+ PWABannerObserver(const PWABannerObserver&) = delete;
+ PWABannerObserver& operator=(const PWABannerObserver&) = delete;
+
~PWABannerObserver() override {}
void OnInstallableWebAppStatusUpdated() override {
@@ -4136,8 +4145,6 @@
observation_{this};
base::OnceCallback<void()> callback_;
webapps::AppBannerManager* app_banner_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(PWABannerObserver);
};
// Used to notify when a WPA is installed.
@@ -4150,6 +4157,10 @@
observation_.Observe(
&web_app::WebAppProvider::GetForTest(profile)->registrar());
}
+
+ PWARegistrarObserver(const PWARegistrarObserver&) = delete;
+ PWARegistrarObserver& operator=(const PWARegistrarObserver&) = delete;
+
~PWARegistrarObserver() override {}
void OnWebAppInstalled(const web_app::AppId& app_id) override {
@@ -4162,8 +4173,6 @@
web_app::AppRegistrarObserver>
observation_{this};
base::OnceCallback<void(const web_app::AppId&)> callback_;
-
- DISALLOW_COPY_AND_ASSIGN(PWARegistrarObserver);
};
AutotestPrivateInstallPWAForCurrentURLFunction::
diff --git a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_apitest.cc b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_apitest.cc
index 885bfba..a35ca3f7 100644
--- a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_apitest.cc
@@ -58,6 +58,10 @@
// pinned app sync. https://crbug.com/1085597
SkipPinnedAppsFromSyncForTest();
}
+
+ AutotestPrivateApiTest(const AutotestPrivateApiTest&) = delete;
+ AutotestPrivateApiTest& operator=(const AutotestPrivateApiTest&) = delete;
+
~AutotestPrivateApiTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -80,9 +84,6 @@
}
ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AutotestPrivateApiTest);
};
IN_PROC_BROWSER_TEST_F(AutotestPrivateApiTest, AutotestPrivate) {
@@ -281,6 +282,12 @@
class AutotestPrivateArcPerformanceTracing : public AutotestPrivateApiTest {
public:
AutotestPrivateArcPerformanceTracing() = default;
+
+ AutotestPrivateArcPerformanceTracing(
+ const AutotestPrivateArcPerformanceTracing&) = delete;
+ AutotestPrivateArcPerformanceTracing& operator=(
+ const AutotestPrivateArcPerformanceTracing&) = delete;
+
~AutotestPrivateArcPerformanceTracing() override = default;
protected:
@@ -311,8 +318,6 @@
private:
arc::ArcAppPerformanceTracingTestHelper tracing_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(AutotestPrivateArcPerformanceTracing);
};
IN_PROC_BROWSER_TEST_F(AutotestPrivateArcPerformanceTracing, Basic) {
diff --git a/chrome/browser/chromeos/extensions/default_app_order.h b/chrome/browser/chromeos/extensions/default_app_order.h
index c1ce439..faf19c4 100644
--- a/chrome/browser/chromeos/extensions/default_app_order.h
+++ b/chrome/browser/chromeos/extensions/default_app_order.h
@@ -26,6 +26,10 @@
// Constructs an ExternalLoader and starts file loading. |async| is true to
// load the file asynchronously on the blocking pool.
explicit ExternalLoader(bool async);
+
+ ExternalLoader(const ExternalLoader&) = delete;
+ ExternalLoader& operator=(const ExternalLoader&) = delete;
+
~ExternalLoader();
const std::vector<std::string>& GetAppIds();
@@ -40,8 +44,6 @@
std::string oem_apps_folder_name_;
base::WaitableEvent loaded_;
-
- DISALLOW_COPY_AND_ASSIGN(ExternalLoader);
};
// Gets the ordered list of app ids.
diff --git a/chrome/browser/chromeos/extensions/default_app_order_unittest.cc b/chrome/browser/chromeos/extensions/default_app_order_unittest.cc
index 9d626bf..f0a1776 100644
--- a/chrome/browser/chromeos/extensions/default_app_order_unittest.cc
+++ b/chrome/browser/chromeos/extensions/default_app_order_unittest.cc
@@ -30,6 +30,10 @@
class DefaultAppOrderTest : public testing::Test {
public:
DefaultAppOrderTest() {}
+
+ DefaultAppOrderTest(const DefaultAppOrderTest&) = delete;
+ DefaultAppOrderTest& operator=(const DefaultAppOrderTest&) = delete;
+
~DefaultAppOrderTest() override {}
// testing::Test overrides:
@@ -65,8 +69,6 @@
base::ScopedTempDir temp_dir_;
std::unique_ptr<base::ScopedPathOverride> path_override_;
-
- DISALLOW_COPY_AND_ASSIGN(DefaultAppOrderTest);
};
// Tests that the built-in default order is returned when ExternalLoader is not
diff --git a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc
index 492f06e2..6c550024 100644
--- a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc
+++ b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc
@@ -76,6 +76,12 @@
: public extensions::ExternalProviderInterface::VisitorInterface {
public:
MockExternalPolicyProviderVisitor();
+
+ MockExternalPolicyProviderVisitor(const MockExternalPolicyProviderVisitor&) =
+ delete;
+ MockExternalPolicyProviderVisitor& operator=(
+ const MockExternalPolicyProviderVisitor&) = delete;
+
virtual ~MockExternalPolicyProviderVisitor();
MOCK_METHOD1(OnExternalExtensionFileFound,
@@ -89,9 +95,6 @@
const std::vector<ExternalInstallInfoUpdateUrl>&,
const std::vector<ExternalInstallInfoFile>&,
const std::set<std::string>& removed_extensions));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockExternalPolicyProviderVisitor);
};
MockExternalPolicyProviderVisitor::MockExternalPolicyProviderVisitor() {
diff --git a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h
index 1c67a11..36cb8610 100644
--- a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h
+++ b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h
@@ -25,6 +25,12 @@
public:
explicit DeviceLocalAccountManagementPolicyProvider(
policy::DeviceLocalAccount::Type account_type);
+
+ DeviceLocalAccountManagementPolicyProvider(
+ const DeviceLocalAccountManagementPolicyProvider&) = delete;
+ DeviceLocalAccountManagementPolicyProvider& operator=(
+ const DeviceLocalAccountManagementPolicyProvider&) = delete;
+
~DeviceLocalAccountManagementPolicyProvider() override;
// Used to check whether an extension is explicitly whitelisted.
@@ -37,8 +43,6 @@
private:
const policy::DeviceLocalAccount::Type account_type_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountManagementPolicyProvider);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/extensions/dictionary_event_router.h b/chrome/browser/chromeos/extensions/dictionary_event_router.h
index 7d43ab8..b58a1dc 100644
--- a/chrome/browser/chromeos/extensions/dictionary_event_router.h
+++ b/chrome/browser/chromeos/extensions/dictionary_event_router.h
@@ -22,6 +22,12 @@
: public SpellcheckCustomDictionary::Observer {
public:
explicit ExtensionDictionaryEventRouter(content::BrowserContext* context);
+
+ ExtensionDictionaryEventRouter(const ExtensionDictionaryEventRouter&) =
+ delete;
+ ExtensionDictionaryEventRouter& operator=(
+ const ExtensionDictionaryEventRouter&) = delete;
+
virtual ~ExtensionDictionaryEventRouter();
// SpellcheckCustomDictionary::Observer implementation.
@@ -35,8 +41,6 @@
content::BrowserContext* context_;
base::WeakPtr<SpellcheckService> service_;
bool loaded_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionDictionaryEventRouter);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/extensions/extension_tab_util_delegate_chromeos.h b/chrome/browser/chromeos/extensions/extension_tab_util_delegate_chromeos.h
index d2c81ae..7c9f951 100644
--- a/chrome/browser/chromeos/extensions/extension_tab_util_delegate_chromeos.h
+++ b/chrome/browser/chromeos/extensions/extension_tab_util_delegate_chromeos.h
@@ -19,14 +19,17 @@
class ExtensionTabUtilDelegateChromeOS : public ExtensionTabUtil::Delegate {
public:
ExtensionTabUtilDelegateChromeOS();
+
+ ExtensionTabUtilDelegateChromeOS(const ExtensionTabUtilDelegateChromeOS&) =
+ delete;
+ ExtensionTabUtilDelegateChromeOS& operator=(
+ const ExtensionTabUtilDelegateChromeOS&) = delete;
+
~ExtensionTabUtilDelegateChromeOS() override;
// ExtensionTabUtil::Delegate
ExtensionTabUtil::ScrubTabBehaviorType GetScrubTabBehavior(
const Extension* extension) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ExtensionTabUtilDelegateChromeOS);
};
} // namespace extensions
diff --git a/chrome/browser/chromeos/extensions/external_cache_impl.h b/chrome/browser/chromeos/extensions/external_cache_impl.h
index 543c1c8..2beab3cd7 100644
--- a/chrome/browser/chromeos/extensions/external_cache_impl.h
+++ b/chrome/browser/chromeos/extensions/external_cache_impl.h
@@ -57,6 +57,10 @@
ExternalCacheDelegate* delegate,
bool always_check_updates,
bool wait_for_cache_initialization);
+
+ ExternalCacheImpl(const ExternalCacheImpl&) = delete;
+ ExternalCacheImpl& operator=(const ExternalCacheImpl&) = delete;
+
~ExternalCacheImpl() override;
// Implementation of ExternalCache:
@@ -159,8 +163,6 @@
// Weak factory for callbacks.
base::WeakPtrFactory<ExternalCacheImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExternalCacheImpl);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/extensions/external_cache_impl_unittest.cc b/chrome/browser/chromeos/extensions/external_cache_impl_unittest.cc
index d149d86f..e5d6471 100644
--- a/chrome/browser/chromeos/extensions/external_cache_impl_unittest.cc
+++ b/chrome/browser/chromeos/extensions/external_cache_impl_unittest.cc
@@ -53,6 +53,10 @@
test_shared_loader_factory_(
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
&test_url_loader_factory_)) {}
+
+ ExternalCacheImplTest(const ExternalCacheImplTest&) = delete;
+ ExternalCacheImplTest& operator=(const ExternalCacheImplTest&) = delete;
+
~ExternalCacheImplTest() override = default;
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory() {
@@ -137,8 +141,6 @@
std::set<extensions::ExtensionId> deleted_extension_files_;
ScopedCrosSettingsTestHelper cros_settings_test_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(ExternalCacheImplTest);
};
TEST_F(ExternalCacheImplTest, Basic) {
diff --git a/chrome/browser/chromeos/extensions/file_manager/device_event_router.h b/chrome/browser/chromeos/extensions/file_manager/device_event_router.h
index eb9713a..62b11c6 100644
--- a/chrome/browser/chromeos/extensions/file_manager/device_event_router.h
+++ b/chrome/browser/chromeos/extensions/file_manager/device_event_router.h
@@ -38,6 +38,9 @@
DeviceEventRouter(SystemNotificationManager* notificaton_manager,
base::TimeDelta overriding_time_delta);
+ DeviceEventRouter(const DeviceEventRouter&) = delete;
+ DeviceEventRouter& operator=(const DeviceEventRouter&) = delete;
+
~DeviceEventRouter() override;
// Turns the startup flag on, and then turns it off after few seconds.
@@ -122,7 +125,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate the weak pointers before any other members are destroyed.
base::WeakPtrFactory<DeviceEventRouter> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(DeviceEventRouter);
};
} // namespace file_manager
diff --git a/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc b/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc
index 7bfdbe7..dd62c5b 100644
--- a/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc
@@ -37,6 +37,10 @@
: DeviceEventRouter(notification_manager,
base::TimeDelta::FromSeconds(0)),
external_storage_disabled(false) {}
+
+ DeviceEventRouterImpl(const DeviceEventRouterImpl&) = delete;
+ DeviceEventRouterImpl& operator=(const DeviceEventRouterImpl&) = delete;
+
~DeviceEventRouterImpl() override = default;
// DeviceEventRouter overrides.
@@ -60,9 +64,6 @@
// Flag returned by |IsExternalStorageDisabled|.
bool external_storage_disabled;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DeviceEventRouterImpl);
};
} // namespace
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.h b/chrome/browser/chromeos/extensions/file_manager/event_router.h
index 4e42a70..2df7722d7 100644
--- a/chrome/browser/chromeos/extensions/file_manager/event_router.h
+++ b/chrome/browser/chromeos/extensions/file_manager/event_router.h
@@ -65,6 +65,10 @@
const std::vector<url::Origin>& listeners)>;
explicit EventRouter(Profile* profile);
+
+ EventRouter(const EventRouter&) = delete;
+ EventRouter& operator=(const EventRouter&) = delete;
+
~EventRouter() override;
// arc::ArcIntentHelperObserver overrides.
@@ -273,8 +277,6 @@
// Note: This should remain the last member so it'll be destroyed and
// invalidate the weak pointers before any other members are destroyed.
base::WeakPtrFactory<EventRouter> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EventRouter);
};
} // namespace file_manager
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc
index 24ba0ead..6b0436f36 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc
@@ -106,6 +106,10 @@
public ui::SelectFileDialog::Listener {
public:
FileSelectorImpl();
+
+ FileSelectorImpl(const FileSelectorImpl&) = delete;
+ FileSelectorImpl& operator=(const FileSelectorImpl&) = delete;
+
~FileSelectorImpl() override;
protected:
@@ -158,8 +162,6 @@
// Extension function that uses the selector.
scoped_refptr<FileBrowserHandlerInternalSelectFileFunction> function_;
-
- DISALLOW_COPY_AND_ASSIGN(FileSelectorImpl);
};
FileSelectorImpl::FileSelectorImpl() = default;
@@ -258,6 +260,10 @@
class FileSelectorFactoryImpl : public FileSelectorFactory {
public:
FileSelectorFactoryImpl() = default;
+
+ FileSelectorFactoryImpl(const FileSelectorFactoryImpl&) = delete;
+ FileSelectorFactoryImpl& operator=(const FileSelectorFactoryImpl&) = delete;
+
~FileSelectorFactoryImpl() override = default;
// FileSelectorFactory implementation.
@@ -265,9 +271,6 @@
FileSelector* CreateFileSelector() const override {
return new FileSelectorImpl();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FileSelectorFactoryImpl);
};
} // namespace
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc
index 53a43d0..8fcbb2c 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc
@@ -87,6 +87,10 @@
success_(success),
selected_path_(selected_path) {
}
+
+ MockFileSelector(const MockFileSelector&) = delete;
+ MockFileSelector& operator=(const MockFileSelector&) = delete;
+
~MockFileSelector() override = default;
// file_manager::FileSelector implementation.
@@ -127,8 +131,6 @@
bool success_;
// File path that should be returned to the function.
base::FilePath selected_path_;
-
- DISALLOW_COPY_AND_ASSIGN(MockFileSelector);
};
// Mocks file selector factory for the test.
@@ -142,6 +144,10 @@
success_(test_case.success),
selected_path_(test_case.selected_path) {
}
+
+ MockFileSelectorFactory(const MockFileSelectorFactory&) = delete;
+ MockFileSelectorFactory& operator=(const MockFileSelectorFactory&) = delete;
+
~MockFileSelectorFactory() override = default;
// file_manager::FileSelectorFactory implementation.
@@ -161,8 +167,6 @@
bool success_;
// File path that should be returned to the function.
base::FilePath selected_path_;
-
- DISALLOW_COPY_AND_ASSIGN(MockFileSelectorFactory);
};
// Extension api test for the fileBrowserHandler extension API.
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_stream_md5_digester.h b/chrome/browser/chromeos/extensions/file_manager/file_stream_md5_digester.h
index a0c5c6b..dd0dd43 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_stream_md5_digester.h
+++ b/chrome/browser/chromeos/extensions/file_manager/file_stream_md5_digester.h
@@ -27,6 +27,10 @@
using ResultCallback = base::OnceCallback<void(std::string)>;
FileStreamMd5Digester();
+
+ FileStreamMd5Digester(const FileStreamMd5Digester&) = delete;
+ FileStreamMd5Digester& operator=(const FileStreamMd5Digester&) = delete;
+
~FileStreamMd5Digester();
// Computes an MD5 digest of data read from the given |streamReader|. The
@@ -48,8 +52,6 @@
scoped_refptr<net::IOBuffer> buffer_;
base::MD5Context md5_context_;
ResultCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(FileStreamMd5Digester);
};
} // namespace util
diff --git a/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc b/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc
index 308a72dd..8248ae4 100644
--- a/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc
+++ b/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc
@@ -45,6 +45,11 @@
explicit NotificationButtonClicker(
const ProvidedFileSystemInfo& file_system_info)
: file_system_info_(file_system_info) {}
+
+ NotificationButtonClicker(const NotificationButtonClicker&) = delete;
+ NotificationButtonClicker& operator=(const NotificationButtonClicker&) =
+ delete;
+
~NotificationButtonClicker() override {}
// RequestManager::Observer overrides.
@@ -74,8 +79,6 @@
}
ProvidedFileSystemInfo file_system_info_;
-
- DISALLOW_COPY_AND_ASSIGN(NotificationButtonClicker);
};
// Simulates clicking on the unresponsive notification's abort button. Also,
@@ -89,6 +92,10 @@
service_->AddObserver(this);
}
+ AbortOnUnresponsivePerformer(const AbortOnUnresponsivePerformer&) = delete;
+ AbortOnUnresponsivePerformer& operator=(const AbortOnUnresponsivePerformer&) =
+ delete;
+
~AbortOnUnresponsivePerformer() override { service_->RemoveObserver(this); }
// Observer overrides.
@@ -118,8 +125,6 @@
private:
Service* service_; // Not owned.
std::vector<std::unique_ptr<NotificationButtonClicker>> clickers_;
-
- DISALLOW_COPY_AND_ASSIGN(AbortOnUnresponsivePerformer);
};
} // namespace
diff --git a/chrome/browser/chromeos/extensions/gfx_utils_unittest.cc b/chrome/browser/chromeos/extensions/gfx_utils_unittest.cc
index 5909305..e30b486 100644
--- a/chrome/browser/chromeos/extensions/gfx_utils_unittest.cc
+++ b/chrome/browser/chromeos/extensions/gfx_utils_unittest.cc
@@ -33,6 +33,10 @@
class DualBadgeMapTest : public ExtensionServiceTestBase {
public:
DualBadgeMapTest() {}
+
+ DualBadgeMapTest(const DualBadgeMapTest&) = delete;
+ DualBadgeMapTest& operator=(const DualBadgeMapTest&) = delete;
+
~DualBadgeMapTest() override { profile_.reset(); }
void SetUp() override {
@@ -95,8 +99,6 @@
private:
ArcAppTest arc_test_;
-
- DISALLOW_COPY_AND_ASSIGN(DualBadgeMapTest);
};
TEST_F(DualBadgeMapTest, ExtensionToArcAppMapTest) {
diff --git a/chrome/browser/chromeos/extensions/ime_menu_event_router.h b/chrome/browser/chromeos/extensions/ime_menu_event_router.h
index ff2a7bd..125dd10 100644
--- a/chrome/browser/chromeos/extensions/ime_menu_event_router.h
+++ b/chrome/browser/chromeos/extensions/ime_menu_event_router.h
@@ -21,6 +21,11 @@
: public input_method::InputMethodManager::ImeMenuObserver {
public:
explicit ExtensionImeMenuEventRouter(content::BrowserContext* context);
+
+ ExtensionImeMenuEventRouter(const ExtensionImeMenuEventRouter&) = delete;
+ ExtensionImeMenuEventRouter& operator=(const ExtensionImeMenuEventRouter&) =
+ delete;
+
~ExtensionImeMenuEventRouter() override;
// input_method::InputMethodManager::ImeMenuObserver:
@@ -33,8 +38,6 @@
private:
content::BrowserContext* context_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionImeMenuEventRouter);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/extensions/info_private_apitest.cc b/chrome/browser/chromeos/extensions/info_private_apitest.cc
index fffbc46..261f1b5 100644
--- a/chrome/browser/chromeos/extensions/info_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/info_private_apitest.cc
@@ -221,15 +221,18 @@
class ChromeOSInfoPrivateInternalStylusTest : public ChromeOSInfoPrivateTest {
public:
ChromeOSInfoPrivateInternalStylusTest() = default;
+
+ ChromeOSInfoPrivateInternalStylusTest(
+ const ChromeOSInfoPrivateInternalStylusTest&) = delete;
+ ChromeOSInfoPrivateInternalStylusTest& operator=(
+ const ChromeOSInfoPrivateInternalStylusTest&) = delete;
+
~ChromeOSInfoPrivateInternalStylusTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
ChromeOSInfoPrivateTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(ash::switches::kHasInternalStylus);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeOSInfoPrivateInternalStylusTest);
};
IN_PROC_BROWSER_TEST_F(ChromeOSInfoPrivateInternalStylusTest,
@@ -244,6 +247,11 @@
class ChromeOSArcInfoPrivateTest : public ChromeOSInfoPrivateTest {
public:
ChromeOSArcInfoPrivateTest() = default;
+
+ ChromeOSArcInfoPrivateTest(const ChromeOSArcInfoPrivateTest&) = delete;
+ ChromeOSArcInfoPrivateTest& operator=(const ChromeOSArcInfoPrivateTest&) =
+ delete;
+
~ChromeOSArcInfoPrivateTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -251,9 +259,6 @@
// Make ARC enabled for ArcAvailable/ArcEnabled tests.
arc::SetArcAvailableCommandLineForTesting(command_line);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeOSArcInfoPrivateTest);
};
IN_PROC_BROWSER_TEST_F(ChromeOSArcInfoPrivateTest, ArcEnabled) {
@@ -279,14 +284,18 @@
class ChromeOSManagedDeviceInfoPrivateTest : public ChromeOSInfoPrivateTest {
public:
ChromeOSManagedDeviceInfoPrivateTest() = default;
+
+ ChromeOSManagedDeviceInfoPrivateTest(
+ const ChromeOSManagedDeviceInfoPrivateTest&) = delete;
+ ChromeOSManagedDeviceInfoPrivateTest& operator=(
+ const ChromeOSManagedDeviceInfoPrivateTest&) = delete;
+
~ChromeOSManagedDeviceInfoPrivateTest() override = default;
private:
chromeos::ScopedStubInstallAttributes test_install_attributes_{
chromeos::StubInstallAttributes::CreateCloudManaged("fake-domain",
"fake-id")};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeOSManagedDeviceInfoPrivateTest);
};
IN_PROC_BROWSER_TEST_F(ChromeOSManagedDeviceInfoPrivateTest, Managed) {
diff --git a/chrome/browser/chromeos/extensions/input_method_api.h b/chrome/browser/chromeos/extensions/input_method_api.h
index 2f794ac..6283209 100644
--- a/chrome/browser/chromeos/extensions/input_method_api.h
+++ b/chrome/browser/chromeos/extensions/input_method_api.h
@@ -391,6 +391,10 @@
public extensions::EventRouter::Observer {
public:
explicit InputMethodAPI(content::BrowserContext* context);
+
+ InputMethodAPI(const InputMethodAPI&) = delete;
+ InputMethodAPI& operator=(const InputMethodAPI&) = delete;
+
~InputMethodAPI() override;
// Returns input method name for the given XKB (X keyboard extensions in X
@@ -423,8 +427,6 @@
std::unique_ptr<chromeos::ExtensionDictionaryEventRouter>
dictionary_event_router_;
std::unique_ptr<chromeos::ExtensionImeMenuEventRouter> ime_menu_event_router_;
-
- DISALLOW_COPY_AND_ASSIGN(InputMethodAPI);
};
} // namespace extensions
diff --git a/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc b/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc
index f4ceee0..4b045be 100644
--- a/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc
+++ b/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc
@@ -50,6 +50,11 @@
class ExtensionInputMethodApiTest : public extensions::ExtensionApiTest {
public:
ExtensionInputMethodApiTest() {}
+
+ ExtensionInputMethodApiTest(const ExtensionInputMethodApiTest&) = delete;
+ ExtensionInputMethodApiTest& operator=(const ExtensionInputMethodApiTest&) =
+ delete;
+
~ExtensionInputMethodApiTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -61,8 +66,6 @@
private:
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionInputMethodApiTest);
};
} // namespace
diff --git a/chrome/browser/chromeos/extensions/input_method_event_router.h b/chrome/browser/chromeos/extensions/input_method_event_router.h
index 3bec10c1..e3a3933 100644
--- a/chrome/browser/chromeos/extensions/input_method_event_router.h
+++ b/chrome/browser/chromeos/extensions/input_method_event_router.h
@@ -20,6 +20,12 @@
: public input_method::InputMethodManager::Observer {
public:
explicit ExtensionInputMethodEventRouter(content::BrowserContext* context);
+
+ ExtensionInputMethodEventRouter(const ExtensionInputMethodEventRouter&) =
+ delete;
+ ExtensionInputMethodEventRouter& operator=(
+ const ExtensionInputMethodEventRouter&) = delete;
+
~ExtensionInputMethodEventRouter() override;
// Implements input_method::InputMethodManager::Observer:
@@ -29,8 +35,6 @@
private:
content::BrowserContext* context_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionInputMethodEventRouter);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/extensions/install_limiter.h b/chrome/browser/chromeos/extensions/install_limiter.h
index 9134b6f..7757596 100644
--- a/chrome/browser/chromeos/extensions/install_limiter.h
+++ b/chrome/browser/chromeos/extensions/install_limiter.h
@@ -42,6 +42,10 @@
static bool ShouldDeferInstall(int64_t app_size, const std::string& app_id);
InstallLimiter();
+
+ InstallLimiter(const InstallLimiter&) = delete;
+ InstallLimiter& operator=(const InstallLimiter&) = delete;
+
~InstallLimiter() override;
void DisableForTest();
@@ -106,8 +110,6 @@
bool all_external_providers_ready_ = false;
int num_installs_waiting_for_file_size_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(InstallLimiter);
};
} // namespace extensions
diff --git a/chrome/browser/chromeos/extensions/install_limiter_unittest.cc b/chrome/browser/chromeos/extensions/install_limiter_unittest.cc
index b9ddda9..3e739bf 100644
--- a/chrome/browser/chromeos/extensions/install_limiter_unittest.cc
+++ b/chrome/browser/chromeos/extensions/install_limiter_unittest.cc
@@ -29,14 +29,16 @@
public:
InstallLimiterTest()
: scoped_user_manager_(std::make_unique<ash::FakeChromeUserManager>()) {}
+
+ InstallLimiterTest(const InstallLimiterTest&) = delete;
+ InstallLimiterTest& operator=(const InstallLimiterTest&) = delete;
+
~InstallLimiterTest() override = default;
private:
content::BrowserTaskEnvironment task_environment_;
chromeos::ScopedStubInstallAttributes test_install_attributes_;
user_manager::ScopedUserManager scoped_user_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(InstallLimiterTest);
};
TEST_P(InstallLimiterTest, ShouldDeferInstall) {
diff --git a/chrome/browser/chromeos/extensions/login_screen/login_screen_ui/login_screen_ui_apitest.cc b/chrome/browser/chromeos/extensions/login_screen/login_screen_ui/login_screen_ui_apitest.cc
index 894de64d..5c6a83d 100644
--- a/chrome/browser/chromeos/extensions/login_screen/login_screen_ui/login_screen_ui_apitest.cc
+++ b/chrome/browser/chromeos/extensions/login_screen/login_screen_ui/login_screen_ui_apitest.cc
@@ -35,6 +35,9 @@
public:
LoginScreenUiApitest() : LoginScreenApitestBase(version_info::Channel::DEV) {}
+ LoginScreenUiApitest(const LoginScreenUiApitest&) = delete;
+ LoginScreenUiApitest& operator=(const LoginScreenUiApitest&) = delete;
+
~LoginScreenUiApitest() override = default;
bool HasOpenWindow() const {
@@ -62,9 +65,6 @@
->GetDialogWidgetForTesting()
->movement_disabled();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LoginScreenUiApitest);
};
IN_PROC_BROWSER_TEST_F(LoginScreenUiApitest, ExtensionCanOpenWindow) {
diff --git a/chrome/browser/chromeos/extensions/login_screen/login_screen_ui/ui_handler.h b/chrome/browser/chromeos/extensions/login_screen/login_screen_ui/ui_handler.h
index 2094bce6..4c52d3d 100644
--- a/chrome/browser/chromeos/extensions/login_screen/login_screen_ui/ui_handler.h
+++ b/chrome/browser/chromeos/extensions/login_screen/login_screen_ui/ui_handler.h
@@ -52,6 +52,10 @@
static void Shutdown();
explicit UiHandler(std::unique_ptr<WindowFactory> window_factory);
+
+ UiHandler(const UiHandler&) = delete;
+ UiHandler& operator=(const UiHandler&) = delete;
+
~UiHandler() override;
// Endpoint for calls to the chrome.loginScreenUi.show() API. If an error
@@ -114,8 +118,6 @@
extension_registry_observation_{this};
base::WeakPtrFactory<UiHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UiHandler);
};
} // namespace login_screen_extension_ui
diff --git a/chrome/browser/chromeos/extensions/login_screen/login_screen_ui/ui_handler_unittest.cc b/chrome/browser/chromeos/extensions/login_screen/login_screen_ui/ui_handler_unittest.cc
index d0bac6f..3768639 100644
--- a/chrome/browser/chromeos/extensions/login_screen/login_screen_ui/ui_handler_unittest.cc
+++ b/chrome/browser/chromeos/extensions/login_screen/login_screen_ui/ui_handler_unittest.cc
@@ -54,6 +54,10 @@
class FakeWindowFactory : public WindowFactory {
public:
FakeWindowFactory() = default;
+
+ FakeWindowFactory(const FakeWindowFactory&) = delete;
+ FakeWindowFactory& operator=(const FakeWindowFactory&) = delete;
+
~FakeWindowFactory() override = default;
std::unique_ptr<Window> Create(CreateOptions* create_options) override {
@@ -90,8 +94,6 @@
bool last_can_be_closed_by_user_;
base::OnceClosure last_close_callback_;
bool create_was_called_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(FakeWindowFactory);
};
class LoginScreenExtensionUiHandlerUnittest : public testing::Test {
@@ -99,6 +101,12 @@
LoginScreenExtensionUiHandlerUnittest()
: scoped_current_channel_(version_info::Channel::DEV),
profile_manager_(TestingBrowserProcess::GetGlobal()) {}
+
+ LoginScreenExtensionUiHandlerUnittest(
+ const LoginScreenExtensionUiHandlerUnittest&) = delete;
+ LoginScreenExtensionUiHandlerUnittest& operator=(
+ const LoginScreenExtensionUiHandlerUnittest&) = delete;
+
~LoginScreenExtensionUiHandlerUnittest() override = default;
void SetUp() override {
@@ -211,8 +219,6 @@
FakeWindowFactory* fake_window_factory_ = nullptr;
std::unique_ptr<UiHandler> ui_handler_;
-
- DISALLOW_COPY_AND_ASSIGN(LoginScreenExtensionUiHandlerUnittest);
};
using LoginScreenExtensionUiHandlerDeathUnittest =
diff --git a/chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api_unittest.cc b/chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api_unittest.cc
index a761866e..0ee75ad 100644
--- a/chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api_unittest.cc
@@ -31,6 +31,10 @@
class LoginStateApiUnittest : public ExtensionApiUnittest {
public:
LoginStateApiUnittest() {}
+
+ LoginStateApiUnittest(const LoginStateApiUnittest&) = delete;
+ LoginStateApiUnittest& operator=(const LoginStateApiUnittest&) = delete;
+
~LoginStateApiUnittest() override = default;
void SetUp() override {
@@ -49,9 +53,6 @@
protected:
std::unique_ptr<session_manager::SessionManager> session_manager_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LoginStateApiUnittest);
};
// Test that calling |loginState.getSessionState()| returns the correctly mapped
diff --git a/chrome/browser/chromeos/extensions/login_screen/login_state/session_state_changed_event_dispatcher.h b/chrome/browser/chromeos/extensions/login_screen/login_state/session_state_changed_event_dispatcher.h
index bf5d3af..70e83dd 100644
--- a/chrome/browser/chromeos/extensions/login_screen/login_state/session_state_changed_event_dispatcher.h
+++ b/chrome/browser/chromeos/extensions/login_screen/login_state/session_state_changed_event_dispatcher.h
@@ -35,6 +35,12 @@
explicit SessionStateChangedEventDispatcher(
content::BrowserContext* browser_context_);
+
+ SessionStateChangedEventDispatcher(
+ const SessionStateChangedEventDispatcher&) = delete;
+ SessionStateChangedEventDispatcher& operator=(
+ const SessionStateChangedEventDispatcher&) = delete;
+
~SessionStateChangedEventDispatcher() override;
// SessionManagerObserver implementation.
@@ -59,8 +65,6 @@
content::BrowserContext* browser_context_;
EventRouter* event_router_;
api::login_state::SessionState session_state_;
-
- DISALLOW_COPY_AND_ASSIGN(SessionStateChangedEventDispatcher);
};
template <>
diff --git a/chrome/browser/chromeos/extensions/login_screen/login_state/session_state_changed_event_dispatcher_unittest.cc b/chrome/browser/chromeos/extensions/login_screen/login_state/session_state_changed_event_dispatcher_unittest.cc
index dc81d09..8444df93 100644
--- a/chrome/browser/chromeos/extensions/login_screen/login_state/session_state_changed_event_dispatcher_unittest.cc
+++ b/chrome/browser/chromeos/extensions/login_screen/login_state/session_state_changed_event_dispatcher_unittest.cc
@@ -47,6 +47,12 @@
class SessionStateChangedEventDispatcherUnittest : public testing::Test {
public:
SessionStateChangedEventDispatcherUnittest() {}
+
+ SessionStateChangedEventDispatcherUnittest(
+ const SessionStateChangedEventDispatcherUnittest&) = delete;
+ SessionStateChangedEventDispatcherUnittest& operator=(
+ const SessionStateChangedEventDispatcherUnittest&) = delete;
+
~SessionStateChangedEventDispatcherUnittest() override = default;
void SetUp() override {
@@ -82,9 +88,6 @@
std::unique_ptr<TestingProfileManager> profile_manager_;
std::unique_ptr<EventRouter> event_router_;
std::unique_ptr<TestEventRouterObserver> observer_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SessionStateChangedEventDispatcherUnittest);
};
// Test that |OnSessionStateChanged| is dispatched when the session state
diff --git a/chrome/browser/chromeos/extensions/login_screen/storage_apitest.cc b/chrome/browser/chromeos/extensions/login_screen/storage_apitest.cc
index 4622ea8..1b98c1bb 100644
--- a/chrome/browser/chromeos/extensions/login_screen/storage_apitest.cc
+++ b/chrome/browser/chromeos/extensions/login_screen/storage_apitest.cc
@@ -22,10 +22,11 @@
class StorageApitest : public LoginScreenApitestBase {
public:
StorageApitest() : LoginScreenApitestBase(version_info::Channel::DEV) {}
- ~StorageApitest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(StorageApitest);
+ StorageApitest(const StorageApitest&) = delete;
+ StorageApitest& operator=(const StorageApitest&) = delete;
+
+ ~StorageApitest() override = default;
};
IN_PROC_BROWSER_TEST_F(StorageApitest, CannotAccessLocalStorage) {
diff --git a/chrome/browser/chromeos/extensions/media_player_api.h b/chrome/browser/chromeos/extensions/media_player_api.h
index a87b525..ccdf914a 100644
--- a/chrome/browser/chromeos/extensions/media_player_api.h
+++ b/chrome/browser/chromeos/extensions/media_player_api.h
@@ -23,6 +23,10 @@
class MediaPlayerAPI : public BrowserContextKeyedAPI {
public:
explicit MediaPlayerAPI(content::BrowserContext* context);
+
+ MediaPlayerAPI(const MediaPlayerAPI&) = delete;
+ MediaPlayerAPI& operator=(const MediaPlayerAPI&) = delete;
+
~MediaPlayerAPI() override;
// Convenience method to get the MediaPlayerAPI for a profile.
@@ -46,8 +50,6 @@
static const bool kServiceIsNULLWhileTesting = true;
std::unique_ptr<MediaPlayerEventRouter> media_player_event_router_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaPlayerAPI);
};
} // namespace extensions
diff --git a/chrome/browser/chromeos/extensions/media_player_event_router.h b/chrome/browser/chromeos/extensions/media_player_event_router.h
index 10e9e5a..077d4249 100644
--- a/chrome/browser/chromeos/extensions/media_player_event_router.h
+++ b/chrome/browser/chromeos/extensions/media_player_event_router.h
@@ -17,6 +17,10 @@
class MediaPlayerEventRouter {
public:
explicit MediaPlayerEventRouter(content::BrowserContext* context);
+
+ MediaPlayerEventRouter(const MediaPlayerEventRouter&) = delete;
+ MediaPlayerEventRouter& operator=(const MediaPlayerEventRouter&) = delete;
+
virtual ~MediaPlayerEventRouter();
// Send notification that next-track shortcut key was pressed.
@@ -30,8 +34,6 @@
private:
content::BrowserContext* browser_context_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaPlayerEventRouter);
};
} // namespace extensions
diff --git a/chrome/browser/chromeos/extensions/permissions_updater_delegate_chromeos.h b/chrome/browser/chromeos/extensions/permissions_updater_delegate_chromeos.h
index 45526b3..8a8af14e 100644
--- a/chrome/browser/chromeos/extensions/permissions_updater_delegate_chromeos.h
+++ b/chrome/browser/chromeos/extensions/permissions_updater_delegate_chromeos.h
@@ -23,15 +23,18 @@
class PermissionsUpdaterDelegateChromeOS : public PermissionsUpdater::Delegate {
public:
PermissionsUpdaterDelegateChromeOS();
+
+ PermissionsUpdaterDelegateChromeOS(
+ const PermissionsUpdaterDelegateChromeOS&) = delete;
+ PermissionsUpdaterDelegateChromeOS& operator=(
+ const PermissionsUpdaterDelegateChromeOS&) = delete;
+
~PermissionsUpdaterDelegateChromeOS() override;
// PermissionsUpdater::Delegate
void InitializePermissions(
const Extension* extension,
std::unique_ptr<const PermissionSet>* granted_permissions) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PermissionsUpdaterDelegateChromeOS);
};
} // namespace extensions
diff --git a/chrome/browser/chromeos/extensions/printing_metrics/print_job_finished_event_dispatcher.h b/chrome/browser/chromeos/extensions/printing_metrics/print_job_finished_event_dispatcher.h
index 937f73f..26de0a9 100644
--- a/chrome/browser/chromeos/extensions/printing_metrics/print_job_finished_event_dispatcher.h
+++ b/chrome/browser/chromeos/extensions/printing_metrics/print_job_finished_event_dispatcher.h
@@ -29,6 +29,12 @@
public:
explicit PrintJobFinishedEventDispatcher(
content::BrowserContext* browser_context);
+
+ PrintJobFinishedEventDispatcher(const PrintJobFinishedEventDispatcher&) =
+ delete;
+ PrintJobFinishedEventDispatcher& operator=(
+ const PrintJobFinishedEventDispatcher&) = delete;
+
~PrintJobFinishedEventDispatcher() override;
// BrowserContextKeyedAPI:
@@ -54,8 +60,6 @@
base::ScopedObservation<ash::PrintJobHistoryService,
ash::PrintJobHistoryService::Observer>
print_job_history_service_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PrintJobFinishedEventDispatcher);
};
template <>
diff --git a/chrome/browser/chromeos/extensions/printing_metrics/print_job_finished_event_dispatcher_apitest.cc b/chrome/browser/chromeos/extensions/printing_metrics/print_job_finished_event_dispatcher_apitest.cc
index c3e72e7..f1388c6a 100644
--- a/chrome/browser/chromeos/extensions/printing_metrics/print_job_finished_event_dispatcher_apitest.cc
+++ b/chrome/browser/chromeos/extensions/printing_metrics/print_job_finished_event_dispatcher_apitest.cc
@@ -40,6 +40,12 @@
class PrintJobFinishedEventDispatcherApiTest : public ExtensionApiTest {
public:
PrintJobFinishedEventDispatcherApiTest() {}
+
+ PrintJobFinishedEventDispatcherApiTest(
+ const PrintJobFinishedEventDispatcherApiTest&) = delete;
+ PrintJobFinishedEventDispatcherApiTest& operator=(
+ const PrintJobFinishedEventDispatcherApiTest&) = delete;
+
~PrintJobFinishedEventDispatcherApiTest() override = default;
protected:
@@ -69,8 +75,6 @@
}
base::CallbackListSubscription create_services_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(PrintJobFinishedEventDispatcherApiTest);
};
IN_PROC_BROWSER_TEST_F(PrintJobFinishedEventDispatcherApiTest,
diff --git a/chrome/browser/chromeos/extensions/printing_metrics/print_job_finished_event_dispatcher_unittest.cc b/chrome/browser/chromeos/extensions/printing_metrics/print_job_finished_event_dispatcher_unittest.cc
index 1c2283a..adb74dc0 100644
--- a/chrome/browser/chromeos/extensions/printing_metrics/print_job_finished_event_dispatcher_unittest.cc
+++ b/chrome/browser/chromeos/extensions/printing_metrics/print_job_finished_event_dispatcher_unittest.cc
@@ -64,6 +64,12 @@
class PrintJobFinishedEventDispatcherUnittest : public testing::Test {
public:
PrintJobFinishedEventDispatcherUnittest() {}
+
+ PrintJobFinishedEventDispatcherUnittest(
+ const PrintJobFinishedEventDispatcherUnittest&) = delete;
+ PrintJobFinishedEventDispatcherUnittest& operator=(
+ const PrintJobFinishedEventDispatcherUnittest&) = delete;
+
~PrintJobFinishedEventDispatcherUnittest() override = default;
void SetUp() override {
@@ -101,8 +107,6 @@
private:
std::unique_ptr<TestingProfileManager> profile_manager_;
std::unique_ptr<PrintJobFinishedEventDispatcher> dispatcher_;
-
- DISALLOW_COPY_AND_ASSIGN(PrintJobFinishedEventDispatcherUnittest);
};
// Test that |OnPrintJobFinished| is dispatched when the print job is saved by
diff --git a/chrome/browser/chromeos/extensions/printing_metrics/printing_metrics_api_unittest.cc b/chrome/browser/chromeos/extensions/printing_metrics/printing_metrics_api_unittest.cc
index ece3be323..027faf73 100644
--- a/chrome/browser/chromeos/extensions/printing_metrics/printing_metrics_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/printing_metrics/printing_metrics_api_unittest.cc
@@ -64,6 +64,11 @@
class PrintingMetricsApiUnittest : public ExtensionApiUnittest {
public:
PrintingMetricsApiUnittest() {}
+
+ PrintingMetricsApiUnittest(const PrintingMetricsApiUnittest&) = delete;
+ PrintingMetricsApiUnittest& operator=(const PrintingMetricsApiUnittest&) =
+ delete;
+
~PrintingMetricsApiUnittest() override = default;
void SetUp() override {
@@ -91,9 +96,6 @@
EXPECT_CALL(*print_job_history_service, GetPrintJobs(testing::_))
.WillOnce(testing::Invoke(callback));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PrintingMetricsApiUnittest);
};
// Test that calling |printingMetrics.getPrintJobs()| returns no print jobs.
diff --git a/chrome/browser/chromeos/extensions/printing_metrics/printing_metrics_apitest.cc b/chrome/browser/chromeos/extensions/printing_metrics/printing_metrics_apitest.cc
index 3709485a..e81cabf 100644
--- a/chrome/browser/chromeos/extensions/printing_metrics/printing_metrics_apitest.cc
+++ b/chrome/browser/chromeos/extensions/printing_metrics/printing_metrics_apitest.cc
@@ -43,6 +43,10 @@
class PrintingMetricsApiTest : public ExtensionApiTest {
public:
PrintingMetricsApiTest() {}
+
+ PrintingMetricsApiTest(const PrintingMetricsApiTest&) = delete;
+ PrintingMetricsApiTest& operator=(const PrintingMetricsApiTest&) = delete;
+
~PrintingMetricsApiTest() override = default;
protected:
@@ -71,8 +75,6 @@
}
base::CallbackListSubscription create_services_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(PrintingMetricsApiTest);
};
IN_PROC_BROWSER_TEST_F(PrintingMetricsApiTest, GetPrintJobs) {
diff --git a/chrome/browser/chromeos/extensions/public_session_permission_helper.cc b/chrome/browser/chromeos/extensions/public_session_permission_helper.cc
index f1164a0..935f4213 100644
--- a/chrome/browser/chromeos/extensions/public_session_permission_helper.cc
+++ b/chrome/browser/chromeos/extensions/public_session_permission_helper.cc
@@ -53,6 +53,11 @@
public:
PublicSessionPermissionHelper();
PublicSessionPermissionHelper(PublicSessionPermissionHelper&& other);
+
+ PublicSessionPermissionHelper(const PublicSessionPermissionHelper&) = delete;
+ PublicSessionPermissionHelper& operator=(
+ const PublicSessionPermissionHelper&) = delete;
+
~PublicSessionPermissionHelper();
bool HandlePermissionRequestImpl(const Extension& extension,
@@ -89,8 +94,6 @@
PermissionIDSet allowed_permission_set_;
PermissionIDSet denied_permission_set_;
RequestCallbackList callbacks_;
-
- DISALLOW_COPY_AND_ASSIGN(PublicSessionPermissionHelper);
};
PublicSessionPermissionHelper::PublicSessionPermissionHelper() {}
diff --git a/chrome/browser/chromeos/extensions/public_session_permission_helper_unittest.cc b/chrome/browser/chromeos/extensions/public_session_permission_helper_unittest.cc
index 9a75d60..b4d1177 100644
--- a/chrome/browser/chromeos/extensions/public_session_permission_helper_unittest.cc
+++ b/chrome/browser/chromeos/extensions/public_session_permission_helper_unittest.cc
@@ -74,6 +74,10 @@
explicit ProgrammableInstallPrompt(WebContents* contents)
: ExtensionInstallPrompt(contents) {}
+ ProgrammableInstallPrompt(const ProgrammableInstallPrompt&) = delete;
+ ProgrammableInstallPrompt& operator=(const ProgrammableInstallPrompt&) =
+ delete;
+
~ProgrammableInstallPrompt() override {}
void ShowDialog(
@@ -93,8 +97,6 @@
private:
ExtensionInstallPrompt::DoneCallback done_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ProgrammableInstallPrompt);
};
} // namespace
@@ -103,6 +105,12 @@
: public ChromeRenderViewHostTestHarness {
public:
PublicSessionPermissionHelperTest() {}
+
+ PublicSessionPermissionHelperTest(const PublicSessionPermissionHelperTest&) =
+ delete;
+ PublicSessionPermissionHelperTest& operator=(
+ const PublicSessionPermissionHelperTest&) = delete;
+
~PublicSessionPermissionHelperTest() override {}
// testing::Test
@@ -125,9 +133,6 @@
std::vector<PermissionIDSet> allowed_permissions_;
std::unique_ptr<chromeos::ScopedTestPublicSessionLoginState> login_state_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PublicSessionPermissionHelperTest);
};
void PublicSessionPermissionHelperTest::SetUp() {
diff --git a/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc b/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc
index d5e538c..098a6d23 100644
--- a/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc
@@ -96,14 +96,15 @@
fake_secure_channel_client,
fake_device_sync_client,
fake_multidevice_setup_client) {}
+
+ FakeEasyUnlockService(const FakeEasyUnlockService&) = delete;
+ FakeEasyUnlockService& operator=(const FakeEasyUnlockService&) = delete;
+
~FakeEasyUnlockService() override {}
// ash::EasyUnlockServiceRegular:
void InitializeInternal() override {}
void ShutdownInternal() override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FakeEasyUnlockService);
};
std::unique_ptr<KeyedService> CreateEasyUnlockServiceForTest(
@@ -161,6 +162,11 @@
}
QuickUnlockPrivateUnitTest() = default;
+
+ QuickUnlockPrivateUnitTest(const QuickUnlockPrivateUnitTest&) = delete;
+ QuickUnlockPrivateUnitTest& operator=(const QuickUnlockPrivateUnitTest&) =
+ delete;
+
~QuickUnlockPrivateUnitTest() override = default;
protected:
@@ -653,8 +659,6 @@
bool expect_modes_changed_ = false;
chromeos::UserContext auth_token_user_context_;
std::string token_;
-
- DISALLOW_COPY_AND_ASSIGN(QuickUnlockPrivateUnitTest);
};
// Verifies that GetAuthTokenValid succeeds when a valid password is provided.
diff --git a/chrome/browser/chromeos/extensions/signin_screen_policy_provider.h b/chrome/browser/chromeos/extensions/signin_screen_policy_provider.h
index f10d0f3..907e0ad 100644
--- a/chrome/browser/chromeos/extensions/signin_screen_policy_provider.h
+++ b/chrome/browser/chromeos/extensions/signin_screen_policy_provider.h
@@ -20,15 +20,17 @@
: public extensions::ManagementPolicy::Provider {
public:
SigninScreenPolicyProvider();
+
+ SigninScreenPolicyProvider(const SigninScreenPolicyProvider&) = delete;
+ SigninScreenPolicyProvider& operator=(const SigninScreenPolicyProvider&) =
+ delete;
+
~SigninScreenPolicyProvider() override;
// extensions::ManagementPolicy::Provider:
std::string GetDebugPolicyProviderName() const override;
bool UserMayLoad(const extensions::Extension* extension,
std::u16string* error) const override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SigninScreenPolicyProvider);
};
std::unique_ptr<base::AutoReset<bool>>
diff --git a/chrome/browser/chromeos/extensions/test_external_cache.h b/chrome/browser/chromeos/extensions/test_external_cache.h
index 5c649e61..d080dba 100644
--- a/chrome/browser/chromeos/extensions/test_external_cache.h
+++ b/chrome/browser/chromeos/extensions/test_external_cache.h
@@ -26,6 +26,10 @@
public:
TestExternalCache(ExternalCacheDelegate* delegate,
bool always_check_for_updates);
+
+ TestExternalCache(const TestExternalCache&) = delete;
+ TestExternalCache& operator=(const TestExternalCache&) = delete;
+
~TestExternalCache() override;
// ExternalCache:
@@ -100,8 +104,6 @@
std::set<std::string> pending_downloads_;
std::map<std::string, CrxCacheEntry> crx_cache_;
-
- DISALLOW_COPY_AND_ASSIGN(TestExternalCache);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/extensions/users_private/users_private_apitest.cc b/chrome/browser/chromeos/extensions/users_private/users_private_apitest.cc
index 319b8ed..4b197a5 100644
--- a/chrome/browser/chromeos/extensions/users_private/users_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/users_private/users_private_apitest.cc
@@ -99,6 +99,10 @@
profile_ = profile;
prefs_util_ = nullptr;
}
+
+ TestDelegate(const TestDelegate&) = delete;
+ TestDelegate& operator=(const TestDelegate&) = delete;
+
~TestDelegate() override = default;
PrefsUtil* GetPrefsUtil() override {
@@ -111,8 +115,6 @@
private:
Profile* profile_; // weak
std::unique_ptr<TestPrefsUtil> prefs_util_;
-
- DISALLOW_COPY_AND_ASSIGN(TestDelegate);
};
class UsersPrivateApiTest : public ExtensionApiTest {
@@ -130,6 +132,10 @@
scoped_testing_cros_settings_.device_settings()->Set(
chromeos::kDeviceOwner, base::Value("[email protected]"));
}
+
+ UsersPrivateApiTest(const UsersPrivateApiTest&) = delete;
+ UsersPrivateApiTest& operator=(const UsersPrivateApiTest&) = delete;
+
~UsersPrivateApiTest() override = default;
static std::unique_ptr<KeyedService> GetUsersPrivateDelegate(
@@ -163,8 +169,6 @@
private:
chromeos::ScopedStubInstallAttributes scoped_stub_install_attributes_;
ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
-
- DISALLOW_COPY_AND_ASSIGN(UsersPrivateApiTest);
};
// static
diff --git a/chrome/browser/chromeos/extensions/users_private/users_private_delegate.h b/chrome/browser/chromeos/extensions/users_private/users_private_delegate.h
index 89fa9bc..0fd654a 100644
--- a/chrome/browser/chromeos/extensions/users_private/users_private_delegate.h
+++ b/chrome/browser/chromeos/extensions/users_private/users_private_delegate.h
@@ -23,6 +23,10 @@
class UsersPrivateDelegate : public KeyedService {
public:
explicit UsersPrivateDelegate(Profile* profile);
+
+ UsersPrivateDelegate(const UsersPrivateDelegate&) = delete;
+ UsersPrivateDelegate& operator=(const UsersPrivateDelegate&) = delete;
+
~UsersPrivateDelegate() override;
// Gets a PrefsUtil object used for persisting settings.
@@ -32,9 +36,6 @@
protected:
Profile* profile_; // weak; not owned by us
std::unique_ptr<PrefsUtil> prefs_util_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(UsersPrivateDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
index f6724ce..27b36bb 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
@@ -34,6 +34,10 @@
fake_user_manager_(new ash::FakeChromeUserManager()),
scoped_user_manager_(base::WrapUnique(fake_user_manager_)) {}
+ WallpaperPrivateApiUnittest(const WallpaperPrivateApiUnittest&) = delete;
+ WallpaperPrivateApiUnittest& operator=(const WallpaperPrivateApiUnittest&) =
+ delete;
+
~WallpaperPrivateApiUnittest() override = default;
void SetUp() override {
@@ -56,8 +60,6 @@
ash::FakeChromeUserManager* fake_user_manager_;
user_manager::ScopedUserManager scoped_user_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(WallpaperPrivateApiUnittest);
};
// Test wallpaperPrivate.resetWallpaper() function. Regression test for
@@ -82,4 +84,3 @@
// Expect SetDefaultWallpaper() to be called exactly once.
EXPECT_EQ(1, test_controller.set_default_wallpaper_count());
}
-
diff --git a/chrome/browser/chromeos/external_protocol_dialog.h b/chrome/browser/chromeos/external_protocol_dialog.h
index c71c128..46727973 100644
--- a/chrome/browser/chromeos/external_protocol_dialog.h
+++ b/chrome/browser/chromeos/external_protocol_dialog.h
@@ -26,6 +26,12 @@
public:
ExternalProtocolNoHandlersDialog(content::WebContents* web_contents,
const GURL& url);
+
+ ExternalProtocolNoHandlersDialog(const ExternalProtocolNoHandlersDialog&) =
+ delete;
+ ExternalProtocolNoHandlersDialog& operator=(
+ const ExternalProtocolNoHandlersDialog&) = delete;
+
~ExternalProtocolNoHandlersDialog() override;
// views::DialogDelegate:
@@ -43,8 +49,6 @@
// The scheme of the url.
std::string scheme_;
-
- DISALLOW_COPY_AND_ASSIGN(ExternalProtocolNoHandlersDialog);
};
#endif // CHROME_BROWSER_CHROMEOS_EXTERNAL_PROTOCOL_DIALOG_H_
diff --git a/chrome/browser/chromeos/fileapi/external_file_resolver.h b/chrome/browser/chromeos/fileapi/external_file_resolver.h
index 9f18885..1adf8b0 100644
--- a/chrome/browser/chromeos/fileapi/external_file_resolver.h
+++ b/chrome/browser/chromeos/fileapi/external_file_resolver.h
@@ -43,6 +43,10 @@
int64_t size)>;
explicit ExternalFileResolver(void* profile_id);
+
+ ExternalFileResolver(const ExternalFileResolver&) = delete;
+ ExternalFileResolver& operator=(const ExternalFileResolver&) = delete;
+
virtual ~ExternalFileResolver();
// Extracts any extra information needed to open the URL from the request's
@@ -81,8 +85,6 @@
file_manager::util::FileSystemURLAndHandle isolated_file_system_;
std::string mime_type_;
base::WeakPtrFactory<ExternalFileResolver> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExternalFileResolver);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/fileapi/file_access_permissions.h b/chrome/browser/chromeos/fileapi/file_access_permissions.h
index aacf7524..cff6db7 100644
--- a/chrome/browser/chromeos/fileapi/file_access_permissions.h
+++ b/chrome/browser/chromeos/fileapi/file_access_permissions.h
@@ -20,6 +20,10 @@
class FileAccessPermissions {
public:
FileAccessPermissions();
+
+ FileAccessPermissions(const FileAccessPermissions&) = delete;
+ FileAccessPermissions& operator=(const FileAccessPermissions&) = delete;
+
virtual ~FileAccessPermissions();
// Grants |origin| access to |path|.
@@ -37,8 +41,6 @@
mutable base::Lock lock_; // Synchronize all access to path_map_.
PathAccessMap path_map_;
-
- DISALLOW_COPY_AND_ASSIGN(FileAccessPermissions);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/fileapi/file_system_backend.h b/chrome/browser/chromeos/fileapi/file_system_backend.h
index 4bc1e52..1921fd6 100644
--- a/chrome/browser/chromeos/fileapi/file_system_backend.h
+++ b/chrome/browser/chromeos/fileapi/file_system_backend.h
@@ -87,6 +87,10 @@
std::unique_ptr<FileSystemBackendDelegate> smbfs_delegate,
scoped_refptr<storage::ExternalMountPoints> mount_points,
storage::ExternalMountPoints* system_mount_points);
+
+ FileSystemBackend(const FileSystemBackend&) = delete;
+ FileSystemBackend& operator=(const FileSystemBackend&) = delete;
+
~FileSystemBackend() override;
// Adds system mount points, such as "archive", and "removable". This
@@ -190,8 +194,6 @@
// Globally visible mount points. System MountPonts instance should outlive
// all FileSystemBackend instances, so raw pointer is safe.
storage::ExternalMountPoints* system_mount_points_;
-
- DISALLOW_COPY_AND_ASSIGN(FileSystemBackend);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h b/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h
index 562f6ae..5db162d 100644
--- a/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h
+++ b/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h
@@ -36,6 +36,11 @@
public:
explicit MTPFileSystemBackendDelegate(
const base::FilePath& storage_partition_path);
+
+ MTPFileSystemBackendDelegate(const MTPFileSystemBackendDelegate&) = delete;
+ MTPFileSystemBackendDelegate& operator=(const MTPFileSystemBackendDelegate&) =
+ delete;
+
~MTPFileSystemBackendDelegate() override;
// FileSystemBackendDelegate overrides.
@@ -59,8 +64,6 @@
private:
std::unique_ptr<DeviceMediaAsyncFileUtil> device_media_async_file_util_;
std::unique_ptr<MTPWatcherManager> mtp_watcher_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(MTPFileSystemBackendDelegate);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/fileapi/recent_arc_media_source.cc b/chrome/browser/chromeos/fileapi/recent_arc_media_source.cc
index efe8060..31de6d3 100644
--- a/chrome/browser/chromeos/fileapi/recent_arc_media_source.cc
+++ b/chrome/browser/chromeos/fileapi/recent_arc_media_source.cc
@@ -95,6 +95,10 @@
class RecentArcMediaSource::MediaRoot {
public:
MediaRoot(const std::string& root_id, Profile* profile);
+
+ MediaRoot(const MediaRoot&) = delete;
+ MediaRoot& operator=(const MediaRoot&) = delete;
+
~MediaRoot();
void GetRecentFiles(Params params);
@@ -134,8 +138,6 @@
std::map<std::string, absl::optional<RecentFile>> document_id_to_file_;
base::WeakPtrFactory<MediaRoot> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MediaRoot);
};
RecentArcMediaSource::MediaRoot::MediaRoot(const std::string& root_id,
diff --git a/chrome/browser/chromeos/fileapi/recent_arc_media_source.h b/chrome/browser/chromeos/fileapi/recent_arc_media_source.h
index 7d0813d2..b636d7f 100644
--- a/chrome/browser/chromeos/fileapi/recent_arc_media_source.h
+++ b/chrome/browser/chromeos/fileapi/recent_arc_media_source.h
@@ -27,6 +27,10 @@
class RecentArcMediaSource : public RecentSource {
public:
explicit RecentArcMediaSource(Profile* profile);
+
+ RecentArcMediaSource(const RecentArcMediaSource&) = delete;
+ RecentArcMediaSource& operator=(const RecentArcMediaSource&) = delete;
+
~RecentArcMediaSource() override;
// RecentSource overrides:
@@ -57,8 +61,6 @@
std::vector<RecentFile> files_;
base::WeakPtrFactory<RecentArcMediaSource> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(RecentArcMediaSource);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/fileapi/recent_disk_source.h b/chrome/browser/chromeos/fileapi/recent_disk_source.h
index 96d38db..748022c 100644
--- a/chrome/browser/chromeos/fileapi/recent_disk_source.h
+++ b/chrome/browser/chromeos/fileapi/recent_disk_source.h
@@ -38,6 +38,10 @@
bool ignore_dotfiles,
int max_depth,
std::string uma_histogram_name);
+
+ RecentDiskSource(const RecentDiskSource&) = delete;
+ RecentDiskSource& operator=(const RecentDiskSource&) = delete;
+
~RecentDiskSource() override;
// RecentSource overrides:
@@ -80,8 +84,6 @@
recent_files_;
base::WeakPtrFactory<RecentDiskSource> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(RecentDiskSource);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/fileapi/recent_drive_source.h b/chrome/browser/chromeos/fileapi/recent_drive_source.h
index ad57231..a2da5ce 100644
--- a/chrome/browser/chromeos/fileapi/recent_drive_source.h
+++ b/chrome/browser/chromeos/fileapi/recent_drive_source.h
@@ -32,6 +32,10 @@
class RecentDriveSource : public RecentSource {
public:
explicit RecentDriveSource(Profile* profile);
+
+ RecentDriveSource(const RecentDriveSource&) = delete;
+ RecentDriveSource& operator=(const RecentDriveSource&) = delete;
+
~RecentDriveSource() override;
// RecentSource overrides:
@@ -58,8 +62,6 @@
mojo::Remote<drivefs::mojom::SearchQuery> search_query_;
base::WeakPtrFactory<RecentDriveSource> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(RecentDriveSource);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/fileapi/recent_model.h b/chrome/browser/chromeos/fileapi/recent_model.h
index a3e94b17..f0c9dab 100644
--- a/chrome/browser/chromeos/fileapi/recent_model.h
+++ b/chrome/browser/chromeos/fileapi/recent_model.h
@@ -43,6 +43,9 @@
base::OnceCallback<void(const std::vector<RecentFile>& files)>;
using FileType = RecentSource::FileType;
+ RecentModel(const RecentModel&) = delete;
+ RecentModel& operator=(const RecentModel&) = delete;
+
~RecentModel() override;
// Returns an instance for the given profile.
@@ -117,8 +120,6 @@
intermediate_files_;
base::WeakPtrFactory<RecentModel> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(RecentModel);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/fileapi/test/fake_recent_source.h b/chrome/browser/chromeos/fileapi/test/fake_recent_source.h
index df504300..d41460d 100644
--- a/chrome/browser/chromeos/fileapi/test/fake_recent_source.h
+++ b/chrome/browser/chromeos/fileapi/test/fake_recent_source.h
@@ -20,6 +20,10 @@
class FakeRecentSource : public RecentSource {
public:
FakeRecentSource();
+
+ FakeRecentSource(const FakeRecentSource&) = delete;
+ FakeRecentSource& operator=(const FakeRecentSource&) = delete;
+
~FakeRecentSource() override;
// Add a file to the canned set.
@@ -34,8 +38,6 @@
RecentSource::FileType file_type) const;
std::vector<RecentFile> canned_files_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeRecentSource);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/idle_detector.h b/chrome/browser/chromeos/idle_detector.h
index a3b44d6..78542ca 100644
--- a/chrome/browser/chromeos/idle_detector.h
+++ b/chrome/browser/chromeos/idle_detector.h
@@ -19,6 +19,9 @@
IdleDetector(const base::RepeatingClosure& on_idle_callback,
const base::TickClock* tick_clock);
+ IdleDetector(const IdleDetector&) = delete;
+ IdleDetector& operator=(const IdleDetector&) = delete;
+
~IdleDetector() override;
void Start(const base::TimeDelta& timeout);
@@ -35,8 +38,6 @@
base::RepeatingClosure idle_callback_;
base::TimeDelta timeout_;
-
- DISALLOW_COPY_AND_ASSIGN(IdleDetector);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/locale_change_guard.h b/chrome/browser/chromeos/locale_change_guard.h
index a6bf563..71238dd 100644
--- a/chrome/browser/chromeos/locale_change_guard.h
+++ b/chrome/browser/chromeos/locale_change_guard.h
@@ -36,6 +36,10 @@
public base::SupportsWeakPtr<LocaleChangeGuard> {
public:
explicit LocaleChangeGuard(Profile* profile);
+
+ LocaleChangeGuard(const LocaleChangeGuard&) = delete;
+ LocaleChangeGuard& operator=(const LocaleChangeGuard&) = delete;
+
~LocaleChangeGuard() override;
// Called just before changing locale.
@@ -100,8 +104,6 @@
base::ScopedObservation<session_manager::SessionManager,
session_manager::SessionManagerObserver>
session_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LocaleChangeGuard);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/multidevice_setup/auth_token_validator_impl.h b/chrome/browser/chromeos/multidevice_setup/auth_token_validator_impl.h
index 754de12..a31d8ccd 100644
--- a/chrome/browser/chromeos/multidevice_setup/auth_token_validator_impl.h
+++ b/chrome/browser/chromeos/multidevice_setup/auth_token_validator_impl.h
@@ -22,6 +22,10 @@
public:
AuthTokenValidatorImpl(
quick_unlock::QuickUnlockStorage* quick_unlock_storage);
+
+ AuthTokenValidatorImpl(const AuthTokenValidatorImpl&) = delete;
+ AuthTokenValidatorImpl& operator=(const AuthTokenValidatorImpl&) = delete;
+
~AuthTokenValidatorImpl() override;
bool IsAuthTokenValid(const std::string& auth_token) override;
@@ -31,8 +35,6 @@
void Shutdown() override;
quick_unlock::QuickUnlockStorage* quick_unlock_storage_;
-
- DISALLOW_COPY_AND_ASSIGN(AuthTokenValidatorImpl);
};
} // namespace multidevice_setup
diff --git a/chrome/browser/chromeos/net/client_cert_store_chromeos.h b/chrome/browser/chromeos/net/client_cert_store_chromeos.h
index 706cd197..9b7753e 100644
--- a/chrome/browser/chromeos/net/client_cert_store_chromeos.h
+++ b/chrome/browser/chromeos/net/client_cert_store_chromeos.h
@@ -33,6 +33,10 @@
bool use_system_slot,
const std::string& username_hash,
const PasswordDelegateFactory& password_delegate_factory);
+
+ ClientCertStoreChromeOS(const ClientCertStoreChromeOS&) = delete;
+ ClientCertStoreChromeOS& operator=(const ClientCertStoreChromeOS&) = delete;
+
~ClientCertStoreChromeOS() override;
// net::ClientCertStore:
@@ -56,8 +60,6 @@
// The factory for creating the delegate for requesting a password to a
// PKCS#11 token. May be null.
PasswordDelegateFactory password_delegate_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(ClientCertStoreChromeOS);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/net/dhcp_wpad_url_client.h b/chrome/browser/chromeos/net/dhcp_wpad_url_client.h
index 876ec91..fcd2cad 100644
--- a/chrome/browser/chromeos/net/dhcp_wpad_url_client.h
+++ b/chrome/browser/chromeos/net/dhcp_wpad_url_client.h
@@ -20,6 +20,10 @@
class DhcpWpadUrlClient : public network::mojom::DhcpWpadUrlClient {
public:
DhcpWpadUrlClient() = default;
+
+ DhcpWpadUrlClient(const DhcpWpadUrlClient&) = delete;
+ DhcpWpadUrlClient& operator=(const DhcpWpadUrlClient&) = delete;
+
~DhcpWpadUrlClient() override {}
// Gets the PAC script URL from the DefaultNetwork and calls |callback| with
@@ -39,9 +43,6 @@
// end of the test.
static void SetPacUrlForTesting(const GURL& url);
static void ClearPacUrlForTesting();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DhcpWpadUrlClient);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl.h b/chrome/browser/chromeos/net/network_portal_detector_impl.h
index 2531f7d..df340bb 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl.h
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl.h
@@ -53,6 +53,11 @@
public:
explicit NetworkPortalDetectorImpl(
network::mojom::URLLoaderFactory* loader_factory_for_testing = nullptr);
+
+ NetworkPortalDetectorImpl(const NetworkPortalDetectorImpl&) = delete;
+ NetworkPortalDetectorImpl& operator=(const NetworkPortalDetectorImpl&) =
+ delete;
+
~NetworkPortalDetectorImpl() override;
private:
@@ -227,8 +232,6 @@
base::TimeTicks time_ticks_for_testing_;
base::WeakPtrFactory<NetworkPortalDetectorImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorImpl);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc b/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
index 647288d..f054ce54 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
@@ -77,6 +77,11 @@
AccountId::FromUserEmailGaiaId(kTestUser, kTestUserGaiaId)),
network_portal_detector_(nullptr) {}
+ NetworkPortalDetectorImplBrowserTest(
+ const NetworkPortalDetectorImplBrowserTest&) = delete;
+ NetworkPortalDetectorImplBrowserTest& operator=(
+ const NetworkPortalDetectorImplBrowserTest&) = delete;
+
~NetworkPortalDetectorImplBrowserTest() override {}
void SetUpOnMainThread() override {
@@ -145,8 +150,6 @@
NetworkPortalDetectorImpl* network_portal_detector_;
std::unique_ptr<NetworkPortalNotificationController>
network_portal_notification_controller_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorImplBrowserTest);
};
IN_PROC_BROWSER_TEST_F(NetworkPortalDetectorImplBrowserTest,
diff --git a/chrome/browser/chromeos/net/network_portal_detector_test_impl.h b/chrome/browser/chromeos/net/network_portal_detector_test_impl.h
index 8dea0b9..479f575 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_test_impl.h
+++ b/chrome/browser/chromeos/net/network_portal_detector_test_impl.h
@@ -21,6 +21,11 @@
class NetworkPortalDetectorTestImpl : public NetworkPortalDetector {
public:
NetworkPortalDetectorTestImpl();
+
+ NetworkPortalDetectorTestImpl(const NetworkPortalDetectorTestImpl&) = delete;
+ NetworkPortalDetectorTestImpl& operator=(
+ const NetworkPortalDetectorTestImpl&) = delete;
+
~NetworkPortalDetectorTestImpl() override;
void SetDefaultNetworkForTesting(const std::string& guid);
@@ -65,8 +70,6 @@
bool portal_detection_in_progress_ = false;
std::vector<base::OnceClosure> start_detection_callbacks_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorTestImpl);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/net/network_portal_detector_test_utils.h b/chrome/browser/chromeos/net/network_portal_detector_test_utils.h
index e1a753b..319d8d96 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_test_utils.h
+++ b/chrome/browser/chromeos/net/network_portal_detector_test_utils.h
@@ -21,6 +21,10 @@
public:
EnumHistogramChecker(const std::string& histogram, int count,
base::HistogramSamples* base);
+
+ EnumHistogramChecker(const EnumHistogramChecker&) = delete;
+ EnumHistogramChecker& operator=(const EnumHistogramChecker&) = delete;
+
~EnumHistogramChecker();
// Sets expectation for a given enum key. |key| must be between 0
@@ -40,8 +44,6 @@
// When not NULL, expected values are compared with actual values
// minus base.
base::HistogramSamples* base_;
-
- DISALLOW_COPY_AND_ASSIGN(EnumHistogramChecker);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/net/network_portal_web_dialog.h b/chrome/browser/chromeos/net/network_portal_web_dialog.h
index 2b4e999..7d779c5 100644
--- a/chrome/browser/chromeos/net/network_portal_web_dialog.h
+++ b/chrome/browser/chromeos/net/network_portal_web_dialog.h
@@ -22,6 +22,10 @@
public:
explicit NetworkPortalWebDialog(
base::WeakPtr<NetworkPortalNotificationController> controller);
+
+ NetworkPortalWebDialog(const NetworkPortalWebDialog&) = delete;
+ NetworkPortalWebDialog& operator=(const NetworkPortalWebDialog&) = delete;
+
~NetworkPortalWebDialog() override;
void SetWidget(views::Widget* widget);
@@ -44,8 +48,6 @@
base::WeakPtr<NetworkPortalNotificationController> controller_;
views::Widget* widget_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkPortalWebDialog);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/net/network_pref_state_observer.h b/chrome/browser/chromeos/net/network_pref_state_observer.h
index 1b83dc6..1ebaa9b 100644
--- a/chrome/browser/chromeos/net/network_pref_state_observer.h
+++ b/chrome/browser/chromeos/net/network_pref_state_observer.h
@@ -21,6 +21,10 @@
: public session_manager::SessionManagerObserver {
public:
NetworkPrefStateObserver();
+
+ NetworkPrefStateObserver(const NetworkPrefStateObserver&) = delete;
+ NetworkPrefStateObserver& operator=(const NetworkPrefStateObserver&) = delete;
+
~NetworkPrefStateObserver() override;
// session_manager::SessionManagerObserver:
@@ -32,8 +36,6 @@
base::ScopedObservation<session_manager::SessionManager,
session_manager::SessionManagerObserver>
session_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NetworkPrefStateObserver);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/net/network_pref_state_observer_unittest.cc b/chrome/browser/chromeos/net/network_pref_state_observer_unittest.cc
index e2c97cef..da0e87d 100644
--- a/chrome/browser/chromeos/net/network_pref_state_observer_unittest.cc
+++ b/chrome/browser/chromeos/net/network_pref_state_observer_unittest.cc
@@ -39,6 +39,11 @@
: fake_user_manager_(new FakeChromeUserManager),
user_manager_enabler_(base::WrapUnique(fake_user_manager_)),
profile_manager_(TestingBrowserProcess::GetGlobal()) {}
+
+ NetworkPrefStateObserverTest(const NetworkPrefStateObserverTest&) = delete;
+ NetworkPrefStateObserverTest& operator=(const NetworkPrefStateObserverTest&) =
+ delete;
+
~NetworkPrefStateObserverTest() override {}
void SetUp() override {
@@ -70,9 +75,6 @@
TestingProfileManager profile_manager_;
session_manager::SessionManager session_manager_;
std::unique_ptr<NetworkPrefStateObserver> network_pref_state_observer_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NetworkPrefStateObserverTest);
};
TEST_F(NetworkPrefStateObserverTest, LoginUser) {
diff --git a/chrome/browser/chromeos/net/network_throttling_observer.h b/chrome/browser/chromeos/net/network_throttling_observer.h
index d1b1e81..e20f3299 100644
--- a/chrome/browser/chromeos/net/network_throttling_observer.h
+++ b/chrome/browser/chromeos/net/network_throttling_observer.h
@@ -22,6 +22,11 @@
class NetworkThrottlingObserver {
public:
explicit NetworkThrottlingObserver(PrefService* local_state);
+
+ NetworkThrottlingObserver(const NetworkThrottlingObserver&) = delete;
+ NetworkThrottlingObserver& operator=(const NetworkThrottlingObserver&) =
+ delete;
+
~NetworkThrottlingObserver();
static void RegisterPrefs(PrefRegistrySimple* registry);
@@ -32,8 +37,6 @@
PrefService* local_state_;
PrefChangeRegistrar pref_change_registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkThrottlingObserver);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/net/network_throttling_observer_unittest.cc b/chrome/browser/chromeos/net/network_throttling_observer_unittest.cc
index ff24fd7..2188dfd 100644
--- a/chrome/browser/chromeos/net/network_throttling_observer_unittest.cc
+++ b/chrome/browser/chromeos/net/network_throttling_observer_unittest.cc
@@ -26,6 +26,10 @@
observer_ = std::make_unique<NetworkThrottlingObserver>(local_state_.get());
}
+ NetworkThrottlingObserverTest(const NetworkThrottlingObserverTest&) = delete;
+ NetworkThrottlingObserverTest& operator=(
+ const NetworkThrottlingObserverTest&) = delete;
+
~NetworkThrottlingObserverTest() override {
observer_.reset();
local_state_.reset();
@@ -44,8 +48,6 @@
NetworkHandlerTestHelper network_handler_test_helper_;
std::unique_ptr<TestingPrefServiceSimple> local_state_;
std::unique_ptr<NetworkThrottlingObserver> observer_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkThrottlingObserverTest);
};
TEST_F(NetworkThrottlingObserverTest, ThrottlingChangeCallsShill) {
diff --git a/chrome/browser/chromeos/network_change_manager_client.h b/chrome/browser/chromeos/network_change_manager_client.h
index e2634cb..2e65f0c4 100644
--- a/chrome/browser/chromeos/network_change_manager_client.h
+++ b/chrome/browser/chromeos/network_change_manager_client.h
@@ -30,6 +30,11 @@
public:
NetworkChangeManagerClient(
net::NetworkChangeNotifierPosix* network_change_notifier);
+
+ NetworkChangeManagerClient(const NetworkChangeManagerClient&) = delete;
+ NetworkChangeManagerClient& operator=(const NetworkChangeManagerClient&) =
+ delete;
+
~NetworkChangeManagerClient() override;
// PowerManagerClient::Observer overrides.
@@ -89,8 +94,6 @@
net::NetworkChangeNotifierPosix* network_change_notifier_;
mojo::Remote<network::mojom::NetworkChangeManager> network_change_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkChangeManagerClient);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/note_taking_controller_client.h b/chrome/browser/chromeos/note_taking_controller_client.h
index 2dbcf3e..db546a7 100644
--- a/chrome/browser/chromeos/note_taking_controller_client.h
+++ b/chrome/browser/chromeos/note_taking_controller_client.h
@@ -22,6 +22,11 @@
public ProfileObserver {
public:
explicit NoteTakingControllerClient(NoteTakingHelper* helper);
+
+ NoteTakingControllerClient(const NoteTakingControllerClient&) = delete;
+ NoteTakingControllerClient& operator=(const NoteTakingControllerClient&) =
+ delete;
+
~NoteTakingControllerClient() override;
// ash::NoteTakingClient:
@@ -47,8 +52,6 @@
base::ScopedObservation<Profile, ProfileObserver> profile_observation_{this};
base::WeakPtrFactory<NoteTakingControllerClient> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NoteTakingControllerClient);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/note_taking_helper_unittest.cc b/chrome/browser/chromeos/note_taking_helper_unittest.cc
index 45051ef..76a664b 100644
--- a/chrome/browser/chromeos/note_taking_helper_unittest.cc
+++ b/chrome/browser/chromeos/note_taking_helper_unittest.cc
@@ -112,6 +112,10 @@
class TestObserver : public NoteTakingHelper::Observer {
public:
TestObserver() { NoteTakingHelper::Get()->AddObserver(this); }
+
+ TestObserver(const TestObserver&) = delete;
+ TestObserver& operator=(const TestObserver&) = delete;
+
~TestObserver() override { NoteTakingHelper::Get()->RemoveObserver(this); }
int num_updates() const { return num_updates_; }
@@ -135,8 +139,6 @@
// Profiles for which OnPreferredNoteTakingAppUpdated was called.
std::vector<Profile*> preferred_app_updates_;
-
- DISALLOW_COPY_AND_ASSIGN(TestObserver);
};
} // namespace
@@ -144,6 +146,10 @@
class NoteTakingHelperTest : public BrowserWithTestWindowTest {
public:
NoteTakingHelperTest() = default;
+
+ NoteTakingHelperTest(const NoteTakingHelperTest&) = delete;
+ NoteTakingHelperTest& operator=(const NoteTakingHelperTest&) = delete;
+
~NoteTakingHelperTest() override = default;
void SetUp() override {
@@ -454,8 +460,6 @@
ArcAppTest arc_test_;
std::unique_ptr<arc::ArcIntentHelperBridge> intent_helper_bridge_;
-
- DISALLOW_COPY_AND_ASSIGN(NoteTakingHelperTest);
};
TEST_F(NoteTakingHelperTest, PaletteNotEnabled) {
diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_service_nss.cc b/chrome/browser/chromeos/platform_keys/platform_keys_service_nss.cc
index 6ac9be5..48466331 100644
--- a/chrome/browser/chromeos/platform_keys/platform_keys_service_nss.cc
+++ b/chrome/browser/chromeos/platform_keys/platform_keys_service_nss.cc
@@ -78,6 +78,9 @@
explicit NSSOperationState(ServiceWeakPtr weak_ptr)
: service_weak_ptr_(weak_ptr) {}
+ NSSOperationState(const NSSOperationState&) = delete;
+ NSSOperationState& operator=(const NSSOperationState&) = delete;
+
virtual ~NSSOperationState() = default;
// Called if an error occurred during the execution of the NSS operation
@@ -95,9 +98,6 @@
// Weak pointer to the PlatformKeysServiceImpl that created this state. Used
// to check if the callback should be still called.
ServiceWeakPtr service_weak_ptr_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NSSOperationState);
};
using GetCertDBCallback =
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h
index 7226c07..0960f23 100644
--- a/chrome/browser/chromeos/preferences.h
+++ b/chrome/browser/chromeos/preferences.h
@@ -52,6 +52,10 @@
Preferences();
explicit Preferences(
input_method::InputMethodManager* input_method_manager); // for testing
+
+ Preferences(const Preferences&) = delete;
+ Preferences& operator=(const Preferences&) = delete;
+
~Preferences() override;
// These method will register the prefs associated with Chrome OS settings.
@@ -185,8 +189,6 @@
std::unique_ptr<ash::input_method::InputMethodSyncer> input_method_syncer_;
mojo::Remote<ash::mojom::CrosDisplayConfigController> cros_display_config_;
-
- DISALLOW_COPY_AND_ASSIGN(Preferences);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/preferences_unittest.cc b/chrome/browser/chromeos/preferences_unittest.cc
index 0f1fd41..3319c9ef 100644
--- a/chrome/browser/chromeos/preferences_unittest.cc
+++ b/chrome/browser/chromeos/preferences_unittest.cc
@@ -142,6 +142,10 @@
class PreferencesTest : public testing::Test {
public:
PreferencesTest() {}
+
+ PreferencesTest(const PreferencesTest&) = delete;
+ PreferencesTest& operator=(const PreferencesTest&) = delete;
+
~PreferencesTest() override {}
void SetUp() override {
@@ -203,9 +207,6 @@
TestingProfile* test_profile_;
sync_preferences::TestingPrefServiceSyncable* pref_service_;
input_method::MyMockInputMethodManager* mock_manager_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PreferencesTest);
};
TEST_F(PreferencesTest, TestUpdatePrefOnBrowserScreenDetails) {
@@ -229,6 +230,11 @@
ash::features::kSyncSettingsCategorization);
}
}
+
+ InputMethodPreferencesTest(const InputMethodPreferencesTest&) = delete;
+ InputMethodPreferencesTest& operator=(const InputMethodPreferencesTest&) =
+ delete;
+
~InputMethodPreferencesTest() override = default;
void SetUp() override {
@@ -400,9 +406,6 @@
StringPrefMember enabled_imes_syncable_;
base::test::ScopedFeatureList feature_list_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(InputMethodPreferencesTest);
};
// Tests that the server values are added to the values chosen at OOBE.
diff --git a/chrome/browser/chromeos/printing/cups_print_job.h b/chrome/browser/chromeos/printing/cups_print_job.h
index bcd952e..bb19c4d 100644
--- a/chrome/browser/chromeos/printing/cups_print_job.h
+++ b/chrome/browser/chromeos/printing/cups_print_job.h
@@ -38,6 +38,10 @@
::printing::PrintJob::Source source,
const std::string& source_id,
const printing::proto::PrintSettings& settings);
+
+ CupsPrintJob(const CupsPrintJob&) = delete;
+ CupsPrintJob& operator=(const CupsPrintJob&) = delete;
+
~CupsPrintJob();
// Create a unique id for a print job using the |printer_id| and |job_id|.
@@ -94,8 +98,6 @@
PrinterErrorCode error_code_ = PrinterErrorCode::NO_ERROR;
base::WeakPtrFactory<CupsPrintJob> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CupsPrintJob);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/printing/cups_print_job_manager_impl.cc b/chrome/browser/chromeos/printing/cups_print_job_manager_impl.cc
index 622a07a5..2327833 100644
--- a/chrome/browser/chromeos/printing/cups_print_job_manager_impl.cc
+++ b/chrome/browser/chromeos/printing/cups_print_job_manager_impl.cc
@@ -96,6 +96,9 @@
content::NotificationService::AllSources());
}
+ CupsPrintJobManagerImpl(const CupsPrintJobManagerImpl&) = delete;
+ CupsPrintJobManagerImpl& operator=(const CupsPrintJobManagerImpl&) = delete;
+
~CupsPrintJobManagerImpl() override = default;
// CupsPrintJobManager overrides:
@@ -375,8 +378,6 @@
content::NotificationRegistrar registrar_;
std::unique_ptr<CupsWrapper> cups_wrapper_;
base::WeakPtrFactory<CupsPrintJobManagerImpl> weak_ptr_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(CupsPrintJobManagerImpl);
};
// static
diff --git a/chrome/browser/chromeos/printing/cups_print_job_notification.h b/chrome/browser/chromeos/printing/cups_print_job_notification.h
index 431a028..b76fd809 100644
--- a/chrome/browser/chromeos/printing/cups_print_job_notification.h
+++ b/chrome/browser/chromeos/printing/cups_print_job_notification.h
@@ -33,6 +33,10 @@
CupsPrintJobNotification(CupsPrintJobNotificationManager* manager,
base::WeakPtr<CupsPrintJob> print_job,
Profile* profile);
+
+ CupsPrintJobNotification(const CupsPrintJobNotification&) = delete;
+ CupsPrintJobNotification& operator=(const CupsPrintJobNotification&) = delete;
+
virtual ~CupsPrintJobNotification();
void OnPrintJobStatusUpdated();
@@ -67,8 +71,6 @@
std::unique_ptr<base::OneShotTimer> success_timer_;
base::WeakPtrFactory<CupsPrintJobNotification> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CupsPrintJobNotification);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/printing/cups_print_job_notification_manager.h b/chrome/browser/chromeos/printing/cups_print_job_notification_manager.h
index d467441..eda575b 100644
--- a/chrome/browser/chromeos/printing/cups_print_job_notification_manager.h
+++ b/chrome/browser/chromeos/printing/cups_print_job_notification_manager.h
@@ -26,6 +26,12 @@
CupsPrintJobNotificationManager(Profile* profile,
CupsPrintJobManager* print_job_manager);
+
+ CupsPrintJobNotificationManager(const CupsPrintJobNotificationManager&) =
+ delete;
+ CupsPrintJobNotificationManager& operator=(
+ const CupsPrintJobNotificationManager&) = delete;
+
~CupsPrintJobNotificationManager() override;
// CupsPrintJobManager::Observer overrides:
@@ -46,8 +52,6 @@
PrintJobNotificationMap notification_map_;
CupsPrintJobManager* print_job_manager_;
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(CupsPrintJobNotificationManager);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/printing/cups_proxy_service_manager.h b/chrome/browser/chromeos/printing/cups_proxy_service_manager.h
index 5042793..983b0b1 100644
--- a/chrome/browser/chromeos/printing/cups_proxy_service_manager.h
+++ b/chrome/browser/chromeos/printing/cups_proxy_service_manager.h
@@ -25,13 +25,16 @@
class CupsProxyServiceManager : public KeyedService {
public:
CupsProxyServiceManager();
+
+ CupsProxyServiceManager(const CupsProxyServiceManager&) = delete;
+ CupsProxyServiceManager& operator=(const CupsProxyServiceManager&) = delete;
+
~CupsProxyServiceManager() override;
private:
void OnDaemonAvailable(bool daemon_available);
base::WeakPtrFactory<CupsProxyServiceManager> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(CupsProxyServiceManager);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/printing/print_servers_provider.cc b/chrome/browser/chromeos/printing/print_servers_provider.cc
index 45ec044..0e17397 100644
--- a/chrome/browser/chromeos/printing/print_servers_provider.cc
+++ b/chrome/browser/chromeos/printing/print_servers_provider.cc
@@ -152,6 +152,9 @@
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
}
+ PrintServersProviderImpl(const PrintServersProviderImpl&) = delete;
+ PrintServersProviderImpl& operator=(const PrintServersProviderImpl&) = delete;
+
~PrintServersProviderImpl() override {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
}
@@ -331,8 +334,6 @@
base::ObserverList<PrintServersProvider::Observer>::Unchecked observers_;
base::WeakPtrFactory<PrintServersProviderImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PrintServersProviderImpl);
};
} // namespace
diff --git a/chrome/browser/chromeos/printing/print_servers_provider.h b/chrome/browser/chromeos/printing/print_servers_provider.h
index f305ab20..e216e5f 100644
--- a/chrome/browser/chromeos/printing/print_servers_provider.h
+++ b/chrome/browser/chromeos/printing/print_servers_provider.h
@@ -48,6 +48,10 @@
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
static void RegisterLocalStatePrefs(PrefRegistrySimple* registry);
static std::unique_ptr<PrintServersProvider> Create();
+
+ PrintServersProvider(const PrintServersProvider&) = delete;
+ PrintServersProvider& operator=(const PrintServersProvider&) = delete;
+
virtual ~PrintServersProvider() = default;
// This method sets the allowlist to calculate resultant list of servers.
@@ -70,9 +74,6 @@
protected:
PrintServersProvider() = default;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PrintServersProvider);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/printing/printer_configurer.cc b/chrome/browser/chromeos/printing/printer_configurer.cc
index bc0c711..9017214 100644
--- a/chrome/browser/chromeos/printing/printer_configurer.cc
+++ b/chrome/browser/chromeos/printing/printer_configurer.cc
@@ -110,6 +110,9 @@
explicit PrinterConfigurerImpl(Profile* profile)
: ppd_provider_(ash::CreatePpdProvider(profile)) {}
+ PrinterConfigurerImpl(const PrinterConfigurerImpl&) = delete;
+ PrinterConfigurerImpl& operator=(const PrinterConfigurerImpl&) = delete;
+
~PrinterConfigurerImpl() override {}
void SetUpPrinter(const Printer& printer,
@@ -198,8 +201,6 @@
scoped_refptr<PpdProvider> ppd_provider_;
base::WeakPtrFactory<PrinterConfigurerImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PrinterConfigurerImpl);
};
} // namespace
diff --git a/chrome/browser/chromeos/printing/printer_configurer.h b/chrome/browser/chromeos/printing/printer_configurer.h
index 7ec39ff..797aaa3 100644
--- a/chrome/browser/chromeos/printing/printer_configurer.h
+++ b/chrome/browser/chromeos/printing/printer_configurer.h
@@ -69,6 +69,9 @@
public:
static std::unique_ptr<PrinterConfigurer> Create(Profile* profile);
+ PrinterConfigurer(const PrinterConfigurer&) = delete;
+ PrinterConfigurer& operator=(const PrinterConfigurer&) = delete;
+
virtual ~PrinterConfigurer() = default;
// Set up |printer| retrieving the appropriate PPD and registering the printer
@@ -97,8 +100,6 @@
protected:
PrinterConfigurer() = default;
-
- DISALLOW_COPY_AND_ASSIGN(PrinterConfigurer);
};
// Return a message for |result| that can be used in device-log.
diff --git a/chrome/browser/chromeos/printing/printers_map.h b/chrome/browser/chromeos/printing/printers_map.h
index 1ea36439..f7bccb3 100644
--- a/chrome/browser/chromeos/printing/printers_map.h
+++ b/chrome/browser/chromeos/printing/printers_map.h
@@ -22,6 +22,10 @@
class PrintersMap {
public:
PrintersMap();
+
+ PrintersMap(const PrintersMap&) = delete;
+ PrintersMap& operator=(const PrintersMap&) = delete;
+
~PrintersMap();
// Returns printer matching |printer_id| if found in any PrinterClass.
@@ -95,8 +99,6 @@
// This map is used to persist the printer statuses so when |printers_| map is
// rebuilt, all the statuses aren't lost. Key for this map is a printer id.
base::flat_map<std::string, CupsPrinterStatus> printer_statuses_;
-
- DISALLOW_COPY_AND_ASSIGN(PrintersMap);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/printing/printers_map_unittest.cc b/chrome/browser/chromeos/printing/printers_map_unittest.cc
index 8cc83fd..7b6f157 100644
--- a/chrome/browser/chromeos/printing/printers_map_unittest.cc
+++ b/chrome/browser/chromeos/printing/printers_map_unittest.cc
@@ -52,9 +52,11 @@
class PrintersMapTest : public testing::Test {
public:
PrintersMapTest() = default;
- ~PrintersMapTest() override = default;
- DISALLOW_COPY_AND_ASSIGN(PrintersMapTest);
+ PrintersMapTest(const PrintersMapTest&) = delete;
+ PrintersMapTest& operator=(const PrintersMapTest&) = delete;
+
+ ~PrintersMapTest() override = default;
};
TEST_F(PrintersMapTest, GetAllReturnsEmptyVector) {
diff --git a/chrome/browser/chromeos/scheduler_configuration_manager.h b/chrome/browser/chromeos/scheduler_configuration_manager.h
index e096f70..f5e93ab0 100644
--- a/chrome/browser/chromeos/scheduler_configuration_manager.h
+++ b/chrome/browser/chromeos/scheduler_configuration_manager.h
@@ -33,6 +33,11 @@
public:
SchedulerConfigurationManager(DebugDaemonClient* debug_daemon_client,
PrefService* local_state);
+
+ SchedulerConfigurationManager(const SchedulerConfigurationManager&) = delete;
+ SchedulerConfigurationManager& operator=(
+ const SchedulerConfigurationManager&) = delete;
+
~SchedulerConfigurationManager() override;
static void RegisterLocalStatePrefs(PrefRegistrySimple* registry);
@@ -51,8 +56,6 @@
absl::optional<std::pair<bool, size_t>> last_reply_;
base::WeakPtrFactory<SchedulerConfigurationManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SchedulerConfigurationManager);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/session_length_limiter.cc b/chrome/browser/chromeos/session_length_limiter.cc
index 0aeb0764..49ffe6f 100644
--- a/chrome/browser/chromeos/session_length_limiter.cc
+++ b/chrome/browser/chromeos/session_length_limiter.cc
@@ -37,13 +37,16 @@
class SessionLengthLimiterDelegateImpl : public SessionLengthLimiter::Delegate {
public:
SessionLengthLimiterDelegateImpl();
+
+ SessionLengthLimiterDelegateImpl(const SessionLengthLimiterDelegateImpl&) =
+ delete;
+ SessionLengthLimiterDelegateImpl& operator=(
+ const SessionLengthLimiterDelegateImpl&) = delete;
+
~SessionLengthLimiterDelegateImpl() override;
const base::Clock* GetClock() const override;
void StopSession() override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SessionLengthLimiterDelegateImpl);
};
SessionLengthLimiterDelegateImpl::SessionLengthLimiterDelegateImpl() {
diff --git a/chrome/browser/chromeos/session_length_limiter.h b/chrome/browser/chromeos/session_length_limiter.h
index f95ea25..03400a9 100644
--- a/chrome/browser/chromeos/session_length_limiter.h
+++ b/chrome/browser/chromeos/session_length_limiter.h
@@ -36,6 +36,10 @@
static void RegisterPrefs(PrefRegistrySimple* registry);
SessionLengthLimiter(Delegate* delegate, bool browser_restarted);
+
+ SessionLengthLimiter(const SessionLengthLimiter&) = delete;
+ SessionLengthLimiter& operator=(const SessionLengthLimiter&) = delete;
+
~SessionLengthLimiter() override;
// Returns the duration between |session_start_time_| and now if there is a
@@ -71,8 +75,6 @@
std::unique_ptr<base::WallClockTimer> timer_;
base::Time session_start_time_;
bool user_activity_seen_;
-
- DISALLOW_COPY_AND_ASSIGN(SessionLengthLimiter);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/system_token_cert_db_initializer.h b/chrome/browser/chromeos/system_token_cert_db_initializer.h
index 7ee9125..3128e5c8 100644
--- a/chrome/browser/chromeos/system_token_cert_db_initializer.h
+++ b/chrome/browser/chromeos/system_token_cert_db_initializer.h
@@ -38,6 +38,11 @@
// initialize the system token certificate database. Use
// SystemTokenCertDbStorage to retrieve the database.
SystemTokenCertDBInitializer();
+
+ SystemTokenCertDBInitializer(const SystemTokenCertDBInitializer&) = delete;
+ SystemTokenCertDBInitializer& operator=(const SystemTokenCertDBInitializer&) =
+ delete;
+
~SystemTokenCertDBInitializer() override;
// TpmManagerClient::Observer overrides.
@@ -93,8 +98,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<SystemTokenCertDBInitializer> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SystemTokenCertDBInitializer);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/tether/tether_service.h b/chrome/browser/chromeos/tether/tether_service.h
index 5b6b48f..56941660 100644
--- a/chrome/browser/chromeos/tether/tether_service.h
+++ b/chrome/browser/chromeos/tether/tether_service.h
@@ -68,6 +68,10 @@
multidevice_setup_client,
chromeos::NetworkStateHandler* network_state_handler,
session_manager::SessionManager* session_manager);
+
+ TetherService(const TetherService&) = delete;
+ TetherService& operator=(const TetherService&) = delete;
+
~TetherService() override;
// Gets TetherService instance.
@@ -280,8 +284,6 @@
std::unique_ptr<base::OneShotTimer> timer_;
base::WeakPtrFactory<TetherService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TetherService);
};
#endif // CHROME_BROWSER_CHROMEOS_TETHER_TETHER_SERVICE_H_
diff --git a/chrome/browser/chromeos/throttle_observer.h b/chrome/browser/chromeos/throttle_observer.h
index bae57afd..ceab02ee 100644
--- a/chrome/browser/chromeos/throttle_observer.h
+++ b/chrome/browser/chromeos/throttle_observer.h
@@ -26,6 +26,10 @@
enum class PriorityLevel { UNKNOWN, LOW, NORMAL, IMPORTANT, CRITICAL };
ThrottleObserver(PriorityLevel level, const std::string& name);
+
+ ThrottleObserver(const ThrottleObserver&) = delete;
+ ThrottleObserver& operator=(const ThrottleObserver&) = delete;
+
virtual ~ThrottleObserver();
// Starts observing. This is overridden in derived classes to register self as
@@ -58,8 +62,6 @@
private:
content::BrowserContext* context_;
-
- DISALLOW_COPY_AND_ASSIGN(ThrottleObserver);
};
std::ostream& operator<<(std::ostream& os,
diff --git a/chrome/browser/chromeos/throttle_service.h b/chrome/browser/chromeos/throttle_service.h
index 49396b1e..5a4713c 100644
--- a/chrome/browser/chromeos/throttle_service.h
+++ b/chrome/browser/chromeos/throttle_service.h
@@ -35,6 +35,10 @@
};
explicit ThrottleService(content::BrowserContext* context);
+
+ ThrottleService(const ThrottleService&) = delete;
+ ThrottleService& operator=(const ThrottleService&) = delete;
+
virtual ~ThrottleService();
void AddServiceObserver(ServiceObserver* observer);
@@ -91,8 +95,6 @@
base::TimeTicks last_throttle_transition_;
base::ObserverList<ServiceObserver> service_observers_;
base::WeakPtrFactory<ThrottleService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ThrottleService);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/tpm_firmware_update.cc b/chrome/browser/chromeos/tpm_firmware_update.cc
index 2760b53..2303cfe 100644
--- a/chrome/browser/chromeos/tpm_firmware_update.cc
+++ b/chrome/browser/chromeos/tpm_firmware_update.cc
@@ -103,6 +103,9 @@
};
using ResponseCallback = base::OnceCallback<void(const Status&)>;
+ AvailabilityChecker(const AvailabilityChecker&) = delete;
+ AvailabilityChecker& operator=(const AvailabilityChecker&) = delete;
+
~AvailabilityChecker() { Cancel(); }
static void Start(ResponseCallback callback, base::TimeDelta timeout) {
@@ -210,8 +213,6 @@
scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
std::unique_ptr<base::FilePathWatcher> watcher_;
base::WeakPtrFactory<AvailabilityChecker> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AvailabilityChecker);
};
void GetAvailableUpdateModes(
diff --git a/chrome/browser/chromeos/u2f_notification.h b/chrome/browser/chromeos/u2f_notification.h
index fe4cee9..6c9f137 100644
--- a/chrome/browser/chromeos/u2f_notification.h
+++ b/chrome/browser/chromeos/u2f_notification.h
@@ -19,6 +19,10 @@
class U2FNotification {
public:
U2FNotification();
+
+ U2FNotification(const U2FNotification&) = delete;
+ U2FNotification& operator=(const U2FNotification&) = delete;
+
~U2FNotification();
// Asynchronously checks whether the legacy implementation is enabled and if
@@ -36,8 +40,6 @@
void OnNotificationClick(const absl::optional<int> button_index);
base::WeakPtrFactory<U2FNotification> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(U2FNotification);
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/window_throttle_observer_base.h b/chrome/browser/chromeos/window_throttle_observer_base.h
index abad75a..5585197b 100644
--- a/chrome/browser/chromeos/window_throttle_observer_base.h
+++ b/chrome/browser/chromeos/window_throttle_observer_base.h
@@ -25,6 +25,11 @@
public:
WindowThrottleObserverBase(ThrottleObserver::PriorityLevel level,
std::string name);
+
+ WindowThrottleObserverBase(const WindowThrottleObserverBase&) = delete;
+ WindowThrottleObserverBase& operator=(const WindowThrottleObserverBase&) =
+ delete;
+
~WindowThrottleObserverBase() override = default;
// ThrottleObserver:
@@ -43,9 +48,6 @@
virtual bool ProcessWindowActivation(ActivationReason reason,
aura::Window* gained_active,
aura::Window* lost_active) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WindowThrottleObserverBase);
};
} // namespace chromeos
diff --git a/chrome/browser/client_hints/client_hints_browsertest.cc b/chrome/browser/client_hints/client_hints_browsertest.cc
index de8c7a7..e61c730 100644
--- a/chrome/browser/client_hints/client_hints_browsertest.cc
+++ b/chrome/browser/client_hints/client_hints_browsertest.cc
@@ -86,6 +86,11 @@
&ThirdPartyURLLoaderInterceptor::InterceptURLRequest,
base::Unretained(this))) {}
+ ThirdPartyURLLoaderInterceptor(const ThirdPartyURLLoaderInterceptor&) =
+ delete;
+ ThirdPartyURLLoaderInterceptor& operator=(
+ const ThirdPartyURLLoaderInterceptor&) = delete;
+
~ThirdPartyURLLoaderInterceptor() = default;
size_t request_count_seen() const { return request_count_seen_; }
@@ -113,8 +118,6 @@
size_t client_hints_count_seen_ = 0u;
URLLoaderInterceptor interceptor_;
-
- DISALLOW_COPY_AND_ASSIGN(ThirdPartyURLLoaderInterceptor);
};
// Returns true only if |header_value| satisfies ABNF: 1*DIGIT [ "." 1*DIGIT ]
@@ -271,6 +274,9 @@
https_server_.GetURL("/http_equiv_accept_ch_merge.html");
}
+ ClientHintsBrowserTest(const ClientHintsBrowserTest&) = delete;
+ ClientHintsBrowserTest& operator=(const ClientHintsBrowserTest&) = delete;
+
~ClientHintsBrowserTest() override {}
virtual std::unique_ptr<base::FeatureList> EnabledFeatures() {
@@ -835,8 +841,6 @@
// Set to 2G in SetUpCommandLine().
net::EffectiveConnectionType expected_ect = net::EFFECTIVE_CONNECTION_TYPE_2G;
-
- DISALLOW_COPY_AND_ASSIGN(ClientHintsBrowserTest);
};
// True if testing for http-equiv correctness. When set to true, the tests
@@ -2443,6 +2447,11 @@
test_url_ = https_server_.GetURL("/accept_ch_without_lifetime.html");
}
+ ClientHintsBrowserTestWithEmulatedMedia(
+ const ClientHintsBrowserTestWithEmulatedMedia&) = delete;
+ ClientHintsBrowserTestWithEmulatedMedia& operator=(
+ const ClientHintsBrowserTestWithEmulatedMedia&) = delete;
+
~ClientHintsBrowserTestWithEmulatedMedia() override = default;
void MonitorResourceRequest(const net::test_server::HttpRequest& request) {
@@ -2475,8 +2484,6 @@
net::EmbeddedTestServer https_server_;
GURL test_url_;
std::string prefers_color_scheme_observed_;
-
- DISALLOW_COPY_AND_ASSIGN(ClientHintsBrowserTestWithEmulatedMedia);
};
IN_PROC_BROWSER_TEST_F(ClientHintsBrowserTestWithEmulatedMedia,
diff --git a/chrome/browser/command_updater_impl.h b/chrome/browser/command_updater_impl.h
index 1671de3..3aaaa7f 100644
--- a/chrome/browser/command_updater_impl.h
+++ b/chrome/browser/command_updater_impl.h
@@ -29,6 +29,10 @@
// Create a CommandUpdaterImpl with |delegate| to handle the execution of
// specific commands.
explicit CommandUpdaterImpl(CommandUpdaterDelegate* delegate);
+
+ CommandUpdaterImpl(const CommandUpdaterImpl&) = delete;
+ CommandUpdaterImpl& operator=(const CommandUpdaterImpl&) = delete;
+
~CommandUpdaterImpl() override;
// Overriden from CommandUpdater:
@@ -63,8 +67,6 @@
// This is a map of command IDs to states and observer lists
std::unordered_map<int, std::unique_ptr<Command>> commands_;
-
- DISALLOW_COPY_AND_ASSIGN(CommandUpdaterImpl);
};
#endif // CHROME_BROWSER_COMMAND_UPDATER_IMPL_H_
diff --git a/chrome/browser/complex_tasks/task_tab_helper.h b/chrome/browser/complex_tasks/task_tab_helper.h
index b0f4bf0..7490951e6 100644
--- a/chrome/browser/complex_tasks/task_tab_helper.h
+++ b/chrome/browser/complex_tasks/task_tab_helper.h
@@ -27,6 +27,9 @@
class TaskTabHelper : public content::WebContentsObserver,
public content::WebContentsUserData<TaskTabHelper> {
public:
+ TaskTabHelper(const TaskTabHelper&) = delete;
+ TaskTabHelper& operator=(const TaskTabHelper&) = delete;
+
~TaskTabHelper() override;
// WebContentsObserver
@@ -71,8 +74,6 @@
local_navigation_task_id_map_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(TaskTabHelper);
};
} // namespace tasks
diff --git a/chrome/browser/component_updater/chrome_component_updater_configurator_unittest.cc b/chrome/browser/component_updater/chrome_component_updater_configurator_unittest.cc
index 4c15573..04e3aba0 100644
--- a/chrome/browser/component_updater/chrome_component_updater_configurator_unittest.cc
+++ b/chrome/browser/component_updater/chrome_component_updater_configurator_unittest.cc
@@ -24,6 +24,12 @@
class ChromeComponentUpdaterConfiguratorTest : public testing::Test {
public:
ChromeComponentUpdaterConfiguratorTest() = default;
+
+ ChromeComponentUpdaterConfiguratorTest(
+ const ChromeComponentUpdaterConfiguratorTest&) = delete;
+ ChromeComponentUpdaterConfiguratorTest& operator=(
+ const ChromeComponentUpdaterConfiguratorTest&) = delete;
+
~ChromeComponentUpdaterConfiguratorTest() override = default;
// Overrides from testing::Test.
@@ -34,8 +40,6 @@
private:
std::unique_ptr<TestingPrefServiceSimple> pref_service_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeComponentUpdaterConfiguratorTest);
};
void ChromeComponentUpdaterConfiguratorTest::SetUp() {
diff --git a/chrome/browser/component_updater/cros_component_installer_chromeos.h b/chrome/browser/component_updater/cros_component_installer_chromeos.h
index 737c607d..bcf087c 100644
--- a/chrome/browser/component_updater/cros_component_installer_chromeos.h
+++ b/chrome/browser/component_updater/cros_component_installer_chromeos.h
@@ -52,6 +52,11 @@
CrOSComponentInstallerPolicy(
const ComponentConfig& config,
CrOSComponentInstaller* cros_component_installer);
+
+ CrOSComponentInstallerPolicy(const CrOSComponentInstallerPolicy&) = delete;
+ CrOSComponentInstallerPolicy& operator=(const CrOSComponentInstallerPolicy&) =
+ delete;
+
~CrOSComponentInstallerPolicy() override;
// ComponentInstallerPolicy:
@@ -73,8 +78,6 @@
private:
const std::string name_;
std::vector<uint8_t> sha2_hash_;
-
- DISALLOW_COPY_AND_ASSIGN(CrOSComponentInstallerPolicy);
};
// An installer policy that does ABI compatibility checks based on
diff --git a/chrome/browser/component_updater/cros_component_installer_chromeos_unittest.cc b/chrome/browser/component_updater/cros_component_installer_chromeos_unittest.cc
index 31d55d8..2732bf0 100644
--- a/chrome/browser/component_updater/cros_component_installer_chromeos_unittest.cc
+++ b/chrome/browser/component_updater/cros_component_installer_chromeos_unittest.cc
@@ -73,6 +73,10 @@
class TestUpdater : public OnDemandUpdater {
public:
TestUpdater() = default;
+
+ TestUpdater(const TestUpdater&) = delete;
+ TestUpdater& operator=(const TestUpdater&) = delete;
+
~TestUpdater() override = default;
// Whether has a pending update request (either foreground or background).
@@ -174,8 +178,6 @@
component_installers_;
// Maps a registered component ID to the component name.
std::map<std::string, std::string> component_id_to_name_;
-
- DISALLOW_COPY_AND_ASSIGN(TestUpdater);
};
} // namespace
diff --git a/chrome/browser/component_updater/crowd_deny_component_installer.h b/chrome/browser/component_updater/crowd_deny_component_installer.h
index 67015604..4b0ec7b 100644
--- a/chrome/browser/component_updater/crowd_deny_component_installer.h
+++ b/chrome/browser/component_updater/crowd_deny_component_installer.h
@@ -23,6 +23,12 @@
class CrowdDenyComponentInstallerPolicy : public ComponentInstallerPolicy {
public:
CrowdDenyComponentInstallerPolicy() = default;
+
+ CrowdDenyComponentInstallerPolicy(const CrowdDenyComponentInstallerPolicy&) =
+ delete;
+ CrowdDenyComponentInstallerPolicy& operator=(
+ const CrowdDenyComponentInstallerPolicy&) = delete;
+
~CrowdDenyComponentInstallerPolicy() override = default;
private:
@@ -44,8 +50,6 @@
void GetHash(std::vector<uint8_t>* hash) const override;
std::string GetName() const override;
update_client::InstallerAttributes GetInstallerAttributes() const override;
-
- DISALLOW_COPY_AND_ASSIGN(CrowdDenyComponentInstallerPolicy);
};
// Call once during startup to make the component update service aware of the
diff --git a/chrome/browser/component_updater/metadata_table_chromeos.h b/chrome/browser/component_updater/metadata_table_chromeos.h
index 2fa2f6e..1617a6cf 100644
--- a/chrome/browser/component_updater/metadata_table_chromeos.h
+++ b/chrome/browser/component_updater/metadata_table_chromeos.h
@@ -23,6 +23,10 @@
class MetadataTable {
public:
explicit MetadataTable(PrefService* pref_service);
+
+ MetadataTable(const MetadataTable&) = delete;
+ MetadataTable& operator=(const MetadataTable&) = delete;
+
~MetadataTable();
// Create and return a MetadataTable instance for testing purpose.
@@ -76,8 +80,6 @@
// Local state PrefService.
PrefService* const pref_service_;
-
- DISALLOW_COPY_AND_ASSIGN(MetadataTable);
};
} // namespace component_updater
diff --git a/chrome/browser/component_updater/metadata_table_chromeos_unittest.cc b/chrome/browser/component_updater/metadata_table_chromeos_unittest.cc
index 83773432..40795f9 100644
--- a/chrome/browser/component_updater/metadata_table_chromeos_unittest.cc
+++ b/chrome/browser/component_updater/metadata_table_chromeos_unittest.cc
@@ -20,13 +20,16 @@
class CrOSComponentInstallerMetadataTest : public testing::Test {
public:
CrOSComponentInstallerMetadataTest() = default;
+
+ CrOSComponentInstallerMetadataTest(
+ const CrOSComponentInstallerMetadataTest&) = delete;
+ CrOSComponentInstallerMetadataTest& operator=(
+ const CrOSComponentInstallerMetadataTest&) = delete;
+
~CrOSComponentInstallerMetadataTest() override = default;
protected:
content::BrowserTaskEnvironment task_environment_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CrOSComponentInstallerMetadataTest);
};
TEST_F(CrOSComponentInstallerMetadataTest, Add) {
diff --git a/chrome/browser/component_updater/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl_component_installer.cc
index 69f8825..ff51689 100644
--- a/chrome/browser/component_updater/pnacl_component_installer.cc
+++ b/chrome/browser/component_updater/pnacl_component_installer.cc
@@ -165,6 +165,11 @@
class PnaclComponentInstallerPolicy : public ComponentInstallerPolicy {
public:
PnaclComponentInstallerPolicy();
+
+ PnaclComponentInstallerPolicy(const PnaclComponentInstallerPolicy&) = delete;
+ PnaclComponentInstallerPolicy& operator=(
+ const PnaclComponentInstallerPolicy&) = delete;
+
~PnaclComponentInstallerPolicy() override;
private:
@@ -184,8 +189,6 @@
void GetHash(std::vector<uint8_t>* hash) const override;
std::string GetName() const override;
update_client::InstallerAttributes GetInstallerAttributes() const override;
-
- DISALLOW_COPY_AND_ASSIGN(PnaclComponentInstallerPolicy);
};
PnaclComponentInstallerPolicy::PnaclComponentInstallerPolicy() = default;
diff --git a/chrome/browser/component_updater/smart_dim_component_installer.h b/chrome/browser/component_updater/smart_dim_component_installer.h
index 0aec8e1..294bb8d 100644
--- a/chrome/browser/component_updater/smart_dim_component_installer.h
+++ b/chrome/browser/component_updater/smart_dim_component_installer.h
@@ -27,6 +27,12 @@
class SmartDimComponentInstallerPolicy : public ComponentInstallerPolicy {
public:
explicit SmartDimComponentInstallerPolicy(std::string expected_version);
+
+ SmartDimComponentInstallerPolicy(const SmartDimComponentInstallerPolicy&) =
+ delete;
+ SmartDimComponentInstallerPolicy& operator=(
+ const SmartDimComponentInstallerPolicy&) = delete;
+
~SmartDimComponentInstallerPolicy() override;
private:
@@ -51,8 +57,6 @@
// Only expected_version_ can pass VerifyInstallation and be fed to
// SmartDimMlAgent.
std::string expected_version_;
-
- DISALLOW_COPY_AND_ASSIGN(SmartDimComponentInstallerPolicy);
};
// Call once during startup to make the component update service aware of
diff --git a/chrome/browser/component_updater/soda_component_installer_unittest.cc b/chrome/browser/component_updater/soda_component_installer_unittest.cc
index 7aaf075..d9cb515 100644
--- a/chrome/browser/component_updater/soda_component_installer_unittest.cc
+++ b/chrome/browser/component_updater/soda_component_installer_unittest.cc
@@ -25,10 +25,13 @@
: public component_updater::MockComponentUpdateService {
public:
SodaComponentMockComponentUpdateService() = default;
- ~SodaComponentMockComponentUpdateService() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(SodaComponentMockComponentUpdateService);
+ SodaComponentMockComponentUpdateService(
+ const SodaComponentMockComponentUpdateService&) = delete;
+ SodaComponentMockComponentUpdateService& operator=(
+ const SodaComponentMockComponentUpdateService&) = delete;
+
+ ~SodaComponentMockComponentUpdateService() override = default;
};
} // namespace
diff --git a/chrome/browser/component_updater/subresource_filter_component_installer.h b/chrome/browser/component_updater/subresource_filter_component_installer.h
index e110783e3..86a522c6 100644
--- a/chrome/browser/component_updater/subresource_filter_component_installer.h
+++ b/chrome/browser/component_updater/subresource_filter_component_installer.h
@@ -28,6 +28,12 @@
static const int kCurrentRulesetFormat;
SubresourceFilterComponentInstallerPolicy();
+
+ SubresourceFilterComponentInstallerPolicy(
+ const SubresourceFilterComponentInstallerPolicy&) = delete;
+ SubresourceFilterComponentInstallerPolicy& operator=(
+ const SubresourceFilterComponentInstallerPolicy&) = delete;
+
~SubresourceFilterComponentInstallerPolicy() override;
private:
@@ -53,8 +59,6 @@
void GetHash(std::vector<uint8_t>* hash) const override;
std::string GetName() const override;
update_client::InstallerAttributes GetInstallerAttributes() const override;
-
- DISALLOW_COPY_AND_ASSIGN(SubresourceFilterComponentInstallerPolicy);
};
void RegisterSubresourceFilterComponent(ComponentUpdateService* cus);
diff --git a/chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc b/chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc
index 5a4f8f4..25cce496 100644
--- a/chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc
+++ b/chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc
@@ -48,6 +48,9 @@
base_dir,
blocking_task_runner) {}
+ TestRulesetService(const TestRulesetService&) = delete;
+ TestRulesetService& operator=(const TestRulesetService&) = delete;
+
~TestRulesetService() override = default;
using UnindexedRulesetInfo = subresource_filter::UnindexedRulesetInfo;
@@ -70,18 +73,19 @@
private:
UnindexedRulesetInfo unindexed_ruleset_info_;
-
- DISALLOW_COPY_AND_ASSIGN(TestRulesetService);
};
class SubresourceFilterMockComponentUpdateService
: public component_updater::MockComponentUpdateService {
public:
SubresourceFilterMockComponentUpdateService() = default;
- ~SubresourceFilterMockComponentUpdateService() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(SubresourceFilterMockComponentUpdateService);
+ SubresourceFilterMockComponentUpdateService(
+ const SubresourceFilterMockComponentUpdateService&) = delete;
+ SubresourceFilterMockComponentUpdateService& operator=(
+ const SubresourceFilterMockComponentUpdateService&) = delete;
+
+ ~SubresourceFilterMockComponentUpdateService() override = default;
};
subresource_filter::Configuration CreateConfigUsingRulesetFlavor(
diff --git a/chrome/browser/component_updater/sw_reporter_installer_win.h b/chrome/browser/component_updater/sw_reporter_installer_win.h
index 0c48c2a..09057a6 100644
--- a/chrome/browser/component_updater/sw_reporter_installer_win.h
+++ b/chrome/browser/component_updater/sw_reporter_installer_win.h
@@ -52,6 +52,11 @@
class SwReporterInstallerPolicy : public ComponentInstallerPolicy {
public:
explicit SwReporterInstallerPolicy(OnComponentReadyCallback callback);
+
+ SwReporterInstallerPolicy(const SwReporterInstallerPolicy&) = delete;
+ SwReporterInstallerPolicy& operator=(const SwReporterInstallerPolicy&) =
+ delete;
+
~SwReporterInstallerPolicy() override;
// ComponentInstallerPolicy implementation.
@@ -75,8 +80,6 @@
friend class SwReporterInstallerTest;
OnComponentReadyCallback on_component_ready_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(SwReporterInstallerPolicy);
};
// Forces an update of the reporter component.
@@ -89,6 +92,11 @@
public:
SwReporterOnDemandFetcher(ComponentUpdateService* cus,
base::OnceClosure on_error_callback);
+
+ SwReporterOnDemandFetcher(const SwReporterOnDemandFetcher&) = delete;
+ SwReporterOnDemandFetcher& operator=(const SwReporterOnDemandFetcher&) =
+ delete;
+
~SwReporterOnDemandFetcher() override;
// ServiceObserver implementation.
@@ -98,8 +106,6 @@
// Will outlive this object.
ComponentUpdateService* cus_;
base::OnceClosure on_error_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(SwReporterOnDemandFetcher);
};
// Call once during startup to make the component update service aware of the
diff --git a/chrome/browser/component_updater/third_party_module_list_component_installer_win.h b/chrome/browser/component_updater/third_party_module_list_component_installer_win.h
index e77d76e..70a619d7 100644
--- a/chrome/browser/component_updater/third_party_module_list_component_installer_win.h
+++ b/chrome/browser/component_updater/third_party_module_list_component_installer_win.h
@@ -29,6 +29,12 @@
: public ComponentInstallerPolicy {
public:
ThirdPartyModuleListComponentInstallerPolicy();
+
+ ThirdPartyModuleListComponentInstallerPolicy(
+ const ThirdPartyModuleListComponentInstallerPolicy&) = delete;
+ ThirdPartyModuleListComponentInstallerPolicy& operator=(
+ const ThirdPartyModuleListComponentInstallerPolicy&) = delete;
+
~ThirdPartyModuleListComponentInstallerPolicy() override;
private:
@@ -51,8 +57,6 @@
// Returns the path to the proto file for the given |install_dir|.
static base::FilePath GetModuleListPath(const base::FilePath& install_dir);
-
- DISALLOW_COPY_AND_ASSIGN(ThirdPartyModuleListComponentInstallerPolicy);
};
void RegisterThirdPartyModuleListComponent(
diff --git a/chrome/browser/component_updater/vr_assets_component_installer.h b/chrome/browser/component_updater/vr_assets_component_installer.h
index 8b88f1f..40b7bdf 100644
--- a/chrome/browser/component_updater/vr_assets_component_installer.h
+++ b/chrome/browser/component_updater/vr_assets_component_installer.h
@@ -27,6 +27,12 @@
class VrAssetsComponentInstallerPolicy : public ComponentInstallerPolicy {
public:
VrAssetsComponentInstallerPolicy() = default;
+
+ VrAssetsComponentInstallerPolicy(const VrAssetsComponentInstallerPolicy&) =
+ delete;
+ VrAssetsComponentInstallerPolicy& operator=(
+ const VrAssetsComponentInstallerPolicy&) = delete;
+
~VrAssetsComponentInstallerPolicy() override = default;
private:
@@ -59,8 +65,6 @@
friend bool ShouldRegisterVrAssetsComponentOnStartup();
friend void RegisterVrAssetsComponent(ComponentUpdateService* cus);
friend void UpdateVrAssetsComponent(ComponentUpdateService* cus);
-
- DISALLOW_COPY_AND_ASSIGN(VrAssetsComponentInstallerPolicy);
};
// Returns true if the assets component should be registered at startup.
diff --git a/chrome/browser/component_updater/widevine_cdm_component_installer.cc b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
index 421b5f1..a5bb502 100644
--- a/chrome/browser/component_updater/widevine_cdm_component_installer.cc
+++ b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
@@ -143,6 +143,12 @@
class WidevineCdmComponentInstallerPolicy : public ComponentInstallerPolicy {
public:
WidevineCdmComponentInstallerPolicy();
+
+ WidevineCdmComponentInstallerPolicy(
+ const WidevineCdmComponentInstallerPolicy&) = delete;
+ WidevineCdmComponentInstallerPolicy& operator=(
+ const WidevineCdmComponentInstallerPolicy&) = delete;
+
~WidevineCdmComponentInstallerPolicy() override = default;
private:
@@ -167,8 +173,6 @@
void UpdateCdmPath(const base::Version& cdm_version,
const base::FilePath& cdm_install_dir,
base::Value manifest);
-
- DISALLOW_COPY_AND_ASSIGN(WidevineCdmComponentInstallerPolicy);
};
WidevineCdmComponentInstallerPolicy::WidevineCdmComponentInstallerPolicy() =
diff --git a/chrome/browser/content_index/content_index_metrics.h b/chrome/browser/content_index/content_index_metrics.h
index 71ce379..3fcd23b 100644
--- a/chrome/browser/content_index/content_index_metrics.h
+++ b/chrome/browser/content_index/content_index_metrics.h
@@ -24,6 +24,10 @@
public:
explicit ContentIndexMetrics(
ukm::UkmBackgroundRecorderService* ukm_background_service);
+
+ ContentIndexMetrics(const ContentIndexMetrics&) = delete;
+ ContentIndexMetrics& operator=(const ContentIndexMetrics&) = delete;
+
~ContentIndexMetrics();
// Records the category of the Content Index entry after registration.
@@ -42,8 +46,6 @@
private:
ukm::UkmBackgroundRecorderService* ukm_background_service_;
-
- DISALLOW_COPY_AND_ASSIGN(ContentIndexMetrics);
};
#endif // CHROME_BROWSER_CONTENT_INDEX_CONTENT_INDEX_METRICS_H_
diff --git a/chrome/browser/content_index/content_index_provider_impl.h b/chrome/browser/content_index/content_index_provider_impl.h
index 9d97070c..7bd849c21 100644
--- a/chrome/browser/content_index/content_index_provider_impl.h
+++ b/chrome/browser/content_index/content_index_provider_impl.h
@@ -38,6 +38,10 @@
static const char kProviderNamespace[];
explicit ContentIndexProviderImpl(Profile* profile);
+
+ ContentIndexProviderImpl(const ContentIndexProviderImpl&) = delete;
+ ContentIndexProviderImpl& operator=(const ContentIndexProviderImpl&) = delete;
+
~ContentIndexProviderImpl() override;
// KeyedService implementation.
@@ -104,8 +108,6 @@
site_engagement::SiteEngagementService* site_engagement_service_;
absl::optional<std::vector<gfx::Size>> icon_sizes_for_testing_;
base::WeakPtrFactory<ContentIndexProviderImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ContentIndexProviderImpl);
};
#endif // CHROME_BROWSER_CONTENT_INDEX_CONTENT_INDEX_PROVIDER_IMPL_H_
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc
index d487d41c..ca27f2d 100644
--- a/chrome/browser/content_settings/content_settings_browsertest.cc
+++ b/chrome/browser/content_settings/content_settings_browsertest.cc
@@ -1099,6 +1099,12 @@
class ContentSettingsWorkerModulesBrowserTest : public ContentSettingsTest {
public:
ContentSettingsWorkerModulesBrowserTest() = default;
+
+ ContentSettingsWorkerModulesBrowserTest(
+ const ContentSettingsWorkerModulesBrowserTest&) = delete;
+ ContentSettingsWorkerModulesBrowserTest& operator=(
+ const ContentSettingsWorkerModulesBrowserTest&) = delete;
+
~ContentSettingsWorkerModulesBrowserTest() override = default;
protected:
@@ -1126,8 +1132,6 @@
http_response->set_content_type(content_type);
return std::move(http_response);
}
-
- DISALLOW_COPY_AND_ASSIGN(ContentSettingsWorkerModulesBrowserTest);
};
IN_PROC_BROWSER_TEST_F(ContentSettingsWorkerModulesBrowserTest,
diff --git a/chrome/browser/content_settings/content_settings_mock_observer.h b/chrome/browser/content_settings/content_settings_mock_observer.h
index c5b2c0a..d7329d0a 100644
--- a/chrome/browser/content_settings/content_settings_mock_observer.h
+++ b/chrome/browser/content_settings/content_settings_mock_observer.h
@@ -14,15 +14,16 @@
class MockObserver : public Observer {
public:
MockObserver();
+
+ MockObserver(const MockObserver&) = delete;
+ MockObserver& operator=(const MockObserver&) = delete;
+
~MockObserver() override;
MOCK_METHOD3(OnContentSettingChanged,
void(const ContentSettingsPattern& primary_pattern,
const ContentSettingsPattern& secondary_pattern,
ContentSettingsType content_type));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockObserver);
};
} // namespace content_settings
diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
index 8a539f9..7ce750f0 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
@@ -77,6 +77,10 @@
base::Unretained(this), base::Unretained(pref)));
}
}
+
+ DeadlockCheckerObserver(const DeadlockCheckerObserver&) = delete;
+ DeadlockCheckerObserver& operator=(const DeadlockCheckerObserver&) = delete;
+
virtual ~DeadlockCheckerObserver() {}
bool notification_received() const { return notification_received_; }
@@ -95,7 +99,6 @@
PrefProvider* provider_;
PrefChangeRegistrar pref_change_registrar_;
bool notification_received_;
- DISALLOW_COPY_AND_ASSIGN(DeadlockCheckerObserver);
};
class PrefProviderTest : public testing::Test {
diff --git a/chrome/browser/content_settings/content_settings_supervised_provider.h b/chrome/browser/content_settings/content_settings_supervised_provider.h
index ad61692b..c5b7ef94 100644
--- a/chrome/browser/content_settings/content_settings_supervised_provider.h
+++ b/chrome/browser/content_settings/content_settings_supervised_provider.h
@@ -23,6 +23,10 @@
public:
explicit SupervisedProvider(
SupervisedUserSettingsService* supervised_user_settings_service);
+
+ SupervisedProvider(const SupervisedProvider&) = delete;
+ SupervisedProvider& operator=(const SupervisedProvider&) = delete;
+
~SupervisedProvider() override;
// ProviderInterface implementations.
@@ -52,8 +56,6 @@
mutable base::Lock lock_;
base::CallbackListSubscription user_settings_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(SupervisedProvider);
};
} // namespace content_settings
diff --git a/chrome/browser/content_settings/mixed_content_settings_tab_helper.h b/chrome/browser/content_settings/mixed_content_settings_tab_helper.h
index 3569e9a..d8714bb 100644
--- a/chrome/browser/content_settings/mixed_content_settings_tab_helper.h
+++ b/chrome/browser/content_settings/mixed_content_settings_tab_helper.h
@@ -18,6 +18,10 @@
: public content::WebContentsObserver,
public content::WebContentsUserData<MixedContentSettingsTabHelper> {
public:
+ MixedContentSettingsTabHelper(const MixedContentSettingsTabHelper&) = delete;
+ MixedContentSettingsTabHelper& operator=(
+ const MixedContentSettingsTabHelper&) = delete;
+
~MixedContentSettingsTabHelper() override;
// Enables running active mixed content resources in the associated
@@ -60,8 +64,6 @@
std::map<content::RenderFrameHost*, std::unique_ptr<PageSettings>> settings_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(MixedContentSettingsTabHelper);
};
#endif // CHROME_BROWSER_CONTENT_SETTINGS_MIXED_CONTENT_SETTINGS_TAB_HELPER_H_
diff --git a/chrome/browser/content_settings/mock_settings_observer.h b/chrome/browser/content_settings/mock_settings_observer.h
index f034443..07022fa 100644
--- a/chrome/browser/content_settings/mock_settings_observer.h
+++ b/chrome/browser/content_settings/mock_settings_observer.h
@@ -17,6 +17,10 @@
class MockSettingsObserver : public content_settings::Observer {
public:
explicit MockSettingsObserver(HostContentSettingsMap* map);
+
+ MockSettingsObserver(const MockSettingsObserver&) = delete;
+ MockSettingsObserver& operator=(const MockSettingsObserver&) = delete;
+
~MockSettingsObserver() override;
void OnContentSettingChanged(const ContentSettingsPattern& primary_pattern,
@@ -37,8 +41,6 @@
base::ScopedObservation<HostContentSettingsMap, content_settings::Observer>
observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MockSettingsObserver);
};
#endif // CHROME_BROWSER_CONTENT_SETTINGS_MOCK_SETTINGS_OBSERVER_H_
diff --git a/chrome/browser/content_settings/sound_content_setting_observer.h b/chrome/browser/content_settings/sound_content_setting_observer.h
index 0ad7dad..f3cdc4c1 100644
--- a/chrome/browser/content_settings/sound_content_setting_observer.h
+++ b/chrome/browser/content_settings/sound_content_setting_observer.h
@@ -27,6 +27,10 @@
// block.
};
+ SoundContentSettingObserver(const SoundContentSettingObserver&) = delete;
+ SoundContentSettingObserver& operator=(const SoundContentSettingObserver&) =
+ delete;
+
~SoundContentSettingObserver() override;
// content::WebContentsObserver implementation.
@@ -76,8 +80,6 @@
observation_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(SoundContentSettingObserver);
};
#endif // CHROME_BROWSER_CONTENT_SETTINGS_SOUND_CONTENT_SETTING_OBSERVER_H_
diff --git a/chrome/browser/content_settings/sound_content_setting_observer_unittest.cc b/chrome/browser/content_settings/sound_content_setting_observer_unittest.cc
index f2b8c645..5355acb 100644
--- a/chrome/browser/content_settings/sound_content_setting_observer_unittest.cc
+++ b/chrome/browser/content_settings/sound_content_setting_observer_unittest.cc
@@ -38,6 +38,12 @@
class SoundContentSettingObserverTest : public ChromeRenderViewHostTestHarness {
public:
SoundContentSettingObserverTest() = default;
+
+ SoundContentSettingObserverTest(const SoundContentSettingObserverTest&) =
+ delete;
+ SoundContentSettingObserverTest& operator=(
+ const SoundContentSettingObserverTest&) = delete;
+
~SoundContentSettingObserverTest() override = default;
void SetUp() override {
@@ -99,8 +105,6 @@
private:
HostContentSettingsMap* host_content_settings_map_;
std::unique_ptr<ukm::TestUkmRecorder> test_ukm_recorder_;
-
- DISALLOW_COPY_AND_ASSIGN(SoundContentSettingObserverTest);
};
TEST_F(SoundContentSettingObserverTest, AudioMutingUpdatesWithContentSetting) {
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.h b/chrome/browser/custom_handlers/protocol_handler_registry.h
index dc866aa..b118c6ba 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry.h
+++ b/chrome/browser/custom_handlers/protocol_handler_registry.h
@@ -68,6 +68,10 @@
// Creates a new instance.
ProtocolHandlerRegistry(content::BrowserContext* context,
std::unique_ptr<Delegate> delegate);
+
+ ProtocolHandlerRegistry(const ProtocolHandlerRegistry&) = delete;
+ ProtocolHandlerRegistry& operator=(const ProtocolHandlerRegistry&) = delete;
+
~ProtocolHandlerRegistry() override;
void AddObserver(Observer* observer);
@@ -344,7 +348,5 @@
// Makes it possible to invalidate the callback for the
// DefaultProtocolClientWorker.
base::WeakPtrFactory<ProtocolHandlerRegistry> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ProtocolHandlerRegistry);
};
#endif // CHROME_BROWSER_CUSTOM_HANDLERS_PROTOCOL_HANDLER_REGISTRY_H_
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
index 38e6ebe1..8c5ffecf 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
@@ -112,6 +112,11 @@
explicit ProtocolHandlerChangeListener(ProtocolHandlerRegistry* registry) {
registry_observation_.Observe(registry);
}
+
+ ProtocolHandlerChangeListener(const ProtocolHandlerChangeListener&) = delete;
+ ProtocolHandlerChangeListener& operator=(
+ const ProtocolHandlerChangeListener&) = delete;
+
~ProtocolHandlerChangeListener() override = default;
int events() { return events_; }
@@ -127,8 +132,6 @@
base::ScopedObservation<ProtocolHandlerRegistry,
ProtocolHandlerRegistry::Observer>
registry_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ProtocolHandlerChangeListener);
};
class QueryProtocolHandlerOnChange : public ProtocolHandlerRegistry::Observer {
diff --git a/chrome/browser/custom_handlers/register_protocol_handler_permission_request.h b/chrome/browser/custom_handlers/register_protocol_handler_permission_request.h
index 0422f0c..1c69e1b 100644
--- a/chrome/browser/custom_handlers/register_protocol_handler_permission_request.h
+++ b/chrome/browser/custom_handlers/register_protocol_handler_permission_request.h
@@ -29,6 +29,12 @@
const ProtocolHandler& handler,
GURL url,
base::ScopedClosureRunner fullscreen_block);
+
+ RegisterProtocolHandlerPermissionRequest(
+ const RegisterProtocolHandlerPermissionRequest&) = delete;
+ RegisterProtocolHandlerPermissionRequest& operator=(
+ const RegisterProtocolHandlerPermissionRequest&) = delete;
+
~RegisterProtocolHandlerPermissionRequest() override;
private:
@@ -46,8 +52,6 @@
// TODO(avi): Move to either permissions::PermissionRequest or the
// PermissionRequestManager?
base::ScopedClosureRunner fullscreen_block_;
-
- DISALLOW_COPY_AND_ASSIGN(RegisterProtocolHandlerPermissionRequest);
};
#endif // CHROME_BROWSER_CUSTOM_HANDLERS_REGISTER_PROTOCOL_HANDLER_PERMISSION_REQUEST_H_
diff --git a/chrome/browser/data_reduction_proxy/data_reduction_promo_infobar_delegate_android.h b/chrome/browser/data_reduction_proxy/data_reduction_promo_infobar_delegate_android.h
index c5dae14..7ae1445 100644
--- a/chrome/browser/data_reduction_proxy/data_reduction_promo_infobar_delegate_android.h
+++ b/chrome/browser/data_reduction_proxy/data_reduction_promo_infobar_delegate_android.h
@@ -28,6 +28,12 @@
static void Create(content::WebContents* web_contents);
DataReductionPromoInfoBarDelegateAndroid();
+
+ DataReductionPromoInfoBarDelegateAndroid(
+ const DataReductionPromoInfoBarDelegateAndroid&) = delete;
+ DataReductionPromoInfoBarDelegateAndroid& operator=(
+ const DataReductionPromoInfoBarDelegateAndroid&) = delete;
+
~DataReductionPromoInfoBarDelegateAndroid() override;
static void Launch(JNIEnv* env,
@@ -45,8 +51,6 @@
infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
std::u16string GetMessageText() const override;
bool Accept() override;
-
- DISALLOW_COPY_AND_ASSIGN(DataReductionPromoInfoBarDelegateAndroid);
};
#endif // CHROME_BROWSER_DATA_REDUCTION_PROXY_DATA_REDUCTION_PROMO_INFOBAR_DELEGATE_ANDROID_H_
diff --git a/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.h b/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.h
index fd512390a..8fa1797 100644
--- a/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.h
+++ b/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.h
@@ -54,6 +54,11 @@
// the UI thread.
explicit DataReductionProxyChromeSettings(bool is_off_the_record_profile);
+ DataReductionProxyChromeSettings(const DataReductionProxyChromeSettings&) =
+ delete;
+ DataReductionProxyChromeSettings& operator=(
+ const DataReductionProxyChromeSettings&) = delete;
+
// Destructs the settings object.
~DataReductionProxyChromeSettings() override;
@@ -107,8 +112,6 @@
// Null before InitDataReductionProxySettings is called.
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(DataReductionProxyChromeSettings);
};
#endif // CHROME_BROWSER_DATA_REDUCTION_PROXY_DATA_REDUCTION_PROXY_CHROME_SETTINGS_H_
diff --git a/chrome/browser/data_reduction_proxy/data_reduction_proxy_settings_android.h b/chrome/browser/data_reduction_proxy/data_reduction_proxy_settings_android.h
index 12e78ee..8c2b827 100644
--- a/chrome/browser/data_reduction_proxy/data_reduction_proxy_settings_android.h
+++ b/chrome/browser/data_reduction_proxy/data_reduction_proxy_settings_android.h
@@ -33,6 +33,11 @@
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj);
+ DataReductionProxySettingsAndroid(const DataReductionProxySettingsAndroid&) =
+ delete;
+ DataReductionProxySettingsAndroid& operator=(
+ const DataReductionProxySettingsAndroid&) = delete;
+
virtual ~DataReductionProxySettingsAndroid();
void InitDataReductionProxySettings(Profile* profile);
@@ -116,8 +121,6 @@
virtual data_reduction_proxy::DataReductionProxySettings* Settings();
base::WeakPtrFactory<DataReductionProxySettingsAndroid> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DataReductionProxySettingsAndroid);
};
#endif // CHROME_BROWSER_DATA_REDUCTION_PROXY_DATA_REDUCTION_PROXY_SETTINGS_ANDROID_H_
diff --git a/chrome/browser/data_reduction_proxy/data_reduction_proxy_tab_helper.h b/chrome/browser/data_reduction_proxy/data_reduction_proxy_tab_helper.h
index 9dd9568..8f313e4 100644
--- a/chrome/browser/data_reduction_proxy/data_reduction_proxy_tab_helper.h
+++ b/chrome/browser/data_reduction_proxy/data_reduction_proxy_tab_helper.h
@@ -16,6 +16,10 @@
: public content::WebContentsUserData<DataReductionProxyTabHelper>,
public data_reduction_proxy::DataReductionProxySettingsObserver {
public:
+ DataReductionProxyTabHelper(const DataReductionProxyTabHelper&) = delete;
+ DataReductionProxyTabHelper& operator=(const DataReductionProxyTabHelper&) =
+ delete;
+
~DataReductionProxyTabHelper() override;
// data_reduction_proxy::DataReductionProxySettingsObserver:
@@ -40,8 +44,6 @@
base::WeakPtrFactory<DataReductionProxyTabHelper> weak_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(DataReductionProxyTabHelper);
};
#endif // CHROME_BROWSER_DATA_REDUCTION_PROXY_DATA_REDUCTION_PROXY_TAB_HELPER_H_
diff --git a/chrome/browser/data_saver/data_saver_browsertest.cc b/chrome/browser/data_saver/data_saver_browsertest.cc
index c27b366..1032589a 100644
--- a/chrome/browser/data_saver/data_saver_browsertest.cc
+++ b/chrome/browser/data_saver/data_saver_browsertest.cc
@@ -77,6 +77,11 @@
tracker_->AddEffectiveConnectionTypeObserver(this);
}
+ TestEffectiveConnectionTypeObserver(
+ const TestEffectiveConnectionTypeObserver&) = delete;
+ TestEffectiveConnectionTypeObserver& operator=(
+ const TestEffectiveConnectionTypeObserver&) = delete;
+
~TestEffectiveConnectionTypeObserver() override {
tracker_->RemoveEffectiveConnectionTypeObserver(this);
}
@@ -113,8 +118,6 @@
std::unique_ptr<base::RunLoop> run_loop_;
network::NetworkQualityTracker* tracker_;
net::EffectiveConnectionType effective_connection_type_;
-
- DISALLOW_COPY_AND_ASSIGN(TestEffectiveConnectionTypeObserver);
};
// Test version of the observer. Used to wait for the event when the network
@@ -129,6 +132,11 @@
tracker_->AddRTTAndThroughputEstimatesObserver(this);
}
+ TestRTTAndThroughputEstimatesObserver(
+ const TestRTTAndThroughputEstimatesObserver&) = delete;
+ TestRTTAndThroughputEstimatesObserver& operator=(
+ const TestRTTAndThroughputEstimatesObserver&) = delete;
+
~TestRTTAndThroughputEstimatesObserver() override {
tracker_->RemoveRTTAndThroughputEstimatesObserver(this);
}
@@ -173,8 +181,6 @@
base::TimeDelta http_rtt_;
int32_t downstream_throughput_kbps_;
base::TimeDelta http_rtt_notification_wait_;
-
- DISALLOW_COPY_AND_ASSIGN(TestRTTAndThroughputEstimatesObserver);
};
} // namespace
diff --git a/chrome/browser/data_saver/lite_video_browsertest.cc b/chrome/browser/data_saver/lite_video_browsertest.cc
index 23a6700..3e90cdb 100644
--- a/chrome/browser/data_saver/lite_video_browsertest.cc
+++ b/chrome/browser/data_saver/lite_video_browsertest.cc
@@ -104,6 +104,9 @@
disabled_features);
}
+ LiteVideoBrowserTest(const LiteVideoBrowserTest&) = delete;
+ LiteVideoBrowserTest& operator=(const LiteVideoBrowserTest&) = delete;
+
~LiteVideoBrowserTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -173,8 +176,6 @@
GURL media_url_;
base::test::ScopedFeatureList scoped_feature_list_;
base::HistogramTester histogram_tester_;
-
- DISALLOW_COPY_AND_ASSIGN(LiteVideoBrowserTest);
};
// Fails occasionally on ChromeOS, MacOS, Win, Linux. http://crbug.com/1111570
// Need to make tests more reliable but feature only targeted
diff --git a/chrome/browser/device_identity/device_identity_provider.cc b/chrome/browser/device_identity/device_identity_provider.cc
index ed6420e..905ae85 100644
--- a/chrome/browser/device_identity/device_identity_provider.cc
+++ b/chrome/browser/device_identity/device_identity_provider.cc
@@ -21,6 +21,12 @@
DeviceOAuth2TokenService* token_service,
const OAuth2AccessTokenManager::ScopeSet& scopes,
invalidation::ActiveAccountAccessTokenCallback callback);
+
+ ActiveAccountAccessTokenFetcherImpl(
+ const ActiveAccountAccessTokenFetcherImpl&) = delete;
+ ActiveAccountAccessTokenFetcherImpl& operator=(
+ const ActiveAccountAccessTokenFetcherImpl&) = delete;
+
~ActiveAccountAccessTokenFetcherImpl() override;
private:
@@ -39,8 +45,6 @@
invalidation::ActiveAccountAccessTokenCallback callback_;
std::unique_ptr<OAuth2AccessTokenManager::Request> access_token_request_;
-
- DISALLOW_COPY_AND_ASSIGN(ActiveAccountAccessTokenFetcherImpl);
};
} // namespace
diff --git a/chrome/browser/device_identity/device_identity_provider.h b/chrome/browser/device_identity/device_identity_provider.h
index dde3f51..4167d21 100644
--- a/chrome/browser/device_identity/device_identity_provider.h
+++ b/chrome/browser/device_identity/device_identity_provider.h
@@ -14,6 +14,10 @@
class DeviceIdentityProvider : public invalidation::IdentityProvider {
public:
explicit DeviceIdentityProvider(DeviceOAuth2TokenService* token_service);
+
+ DeviceIdentityProvider(const DeviceIdentityProvider&) = delete;
+ DeviceIdentityProvider& operator=(const DeviceIdentityProvider&) = delete;
+
~DeviceIdentityProvider() override;
// IdentityProvider:
@@ -31,8 +35,6 @@
void OnRefreshTokenAvailable();
DeviceOAuth2TokenService* token_service_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceIdentityProvider);
};
#endif // CHROME_BROWSER_DEVICE_IDENTITY_DEVICE_IDENTITY_PROVIDER_H_
diff --git a/chrome/browser/devtools/chrome_devtools_manager_delegate.h b/chrome/browser/devtools/chrome_devtools_manager_delegate.h
index 8df5f4c..b6cfe17 100644
--- a/chrome/browser/devtools/chrome_devtools_manager_delegate.h
+++ b/chrome/browser/devtools/chrome_devtools_manager_delegate.h
@@ -33,6 +33,11 @@
static const char kTypeBackgroundPage[];
ChromeDevToolsManagerDelegate();
+
+ ChromeDevToolsManagerDelegate(const ChromeDevToolsManagerDelegate&) = delete;
+ ChromeDevToolsManagerDelegate& operator=(
+ const ChromeDevToolsManagerDelegate&) = delete;
+
~ChromeDevToolsManagerDelegate() override;
static ChromeDevToolsManagerDelegate* GetInstance();
@@ -94,8 +99,6 @@
content::DevToolsAgentHost::List remote_agent_hosts_;
RemoteLocations remote_locations_;
std::unique_ptr<ScopedKeepAlive> keep_alive_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeDevToolsManagerDelegate);
};
#endif // CHROME_BROWSER_DEVTOOLS_CHROME_DEVTOOLS_MANAGER_DELEGATE_H_
diff --git a/chrome/browser/devtools/chrome_devtools_session.h b/chrome/browser/devtools/chrome_devtools_session.h
index 7f4072fee..756d84ed 100644
--- a/chrome/browser/devtools/chrome_devtools_session.h
+++ b/chrome/browser/devtools/chrome_devtools_session.h
@@ -29,6 +29,10 @@
public:
explicit ChromeDevToolsSession(
content::DevToolsAgentHostClientChannel* channel);
+
+ ChromeDevToolsSession(const ChromeDevToolsSession&) = delete;
+ ChromeDevToolsSession& operator=(const ChromeDevToolsSession&) = delete;
+
~ChromeDevToolsSession() override;
void HandleCommand(
@@ -62,8 +66,6 @@
std::unique_ptr<WindowManagerHandler> window_manager_handler_;
#endif
content::DevToolsAgentHostClientChannel* client_channel_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeDevToolsSession);
};
#endif // CHROME_BROWSER_DEVTOOLS_CHROME_DEVTOOLS_SESSION_H_
diff --git a/chrome/browser/devtools/device/adb/mock_adb_server.cc b/chrome/browser/devtools/device/adb/mock_adb_server.cc
index 9aeb3350..16d1133 100644
--- a/chrome/browser/devtools/device/adb/mock_adb_server.cc
+++ b/chrome/browser/devtools/device/adb/mock_adb_server.cc
@@ -216,12 +216,20 @@
using ParserFactory = base::RepeatingCallback<Parser*(const SendCallback&)>;
SimpleHttpServer(const ParserFactory& factory, net::IPEndPoint endpoint);
+
+ SimpleHttpServer(const SimpleHttpServer&) = delete;
+ SimpleHttpServer& operator=(const SimpleHttpServer&) = delete;
+
virtual ~SimpleHttpServer();
private:
class Connection {
public:
Connection(net::StreamSocket* socket, const ParserFactory& factory);
+
+ Connection(const Connection&) = delete;
+ Connection& operator=(const Connection&) = delete;
+
virtual ~Connection();
private:
@@ -241,8 +249,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<Connection> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(Connection);
};
void OnConnect();
@@ -255,8 +261,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<SimpleHttpServer> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SimpleHttpServer);
};
SimpleHttpServer::SimpleHttpServer(const ParserFactory& factory,
diff --git a/chrome/browser/devtools/device/devtools_device_discovery.cc b/chrome/browser/devtools/device/devtools_device_discovery.cc
index 76575a5..c94bf73 100644
--- a/chrome/browser/devtools/device/devtools_device_discovery.cc
+++ b/chrome/browser/devtools/device/devtools_device_discovery.cc
@@ -153,6 +153,10 @@
const std::string& target_path,
const std::string& type,
base::Value* value);
+
+ AgentHostDelegate(const AgentHostDelegate&) = delete;
+ AgentHostDelegate& operator=(const AgentHostDelegate&) = delete;
+
~AgentHostDelegate() override;
private:
@@ -194,7 +198,6 @@
std::map<content::DevToolsExternalAgentProxy*,
std::unique_ptr<WebSocketProxy>>
proxies_;
- DISALLOW_COPY_AND_ASSIGN(AgentHostDelegate);
};
static std::string GetStringProperty(const base::Value& value,
diff --git a/chrome/browser/devtools/device/port_forwarding_controller.cc b/chrome/browser/devtools/device/port_forwarding_controller.cc
index ffeacd78..f016535 100644
--- a/chrome/browser/devtools/device/port_forwarding_controller.cc
+++ b/chrome/browser/devtools/device/port_forwarding_controller.cc
@@ -221,6 +221,9 @@
new SocketTunnel(profile, std::move(socket), host, port);
}
+ SocketTunnel(const SocketTunnel&) = delete;
+ SocketTunnel& operator=(const SocketTunnel&) = delete;
+
~SocketTunnel() { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); }
private:
@@ -368,8 +371,6 @@
scoped_refptr<base::SingleThreadTaskRunner> adb_thread_runner_;
THREAD_CHECKER(thread_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(SocketTunnel);
};
} // namespace
@@ -382,6 +383,10 @@
scoped_refptr<AndroidDeviceManager::Device> device,
scoped_refptr<DevToolsAndroidBridge::RemoteBrowser> browser,
const ForwardingMap& forwarding_map);
+
+ Connection(const Connection&) = delete;
+ Connection& operator=(const Connection&) = delete;
+
~Connection() override;
const PortStatusMap& GetPortStatusMap();
@@ -426,8 +431,6 @@
ForwardingMap forwarding_map_;
CommandCallbackMap pending_responses_;
PortStatusMap port_status_;
-
- DISALLOW_COPY_AND_ASSIGN(Connection);
};
PortForwardingController::Connection::Connection(
diff --git a/chrome/browser/devtools/device/port_forwarding_controller.h b/chrome/browser/devtools/device/port_forwarding_controller.h
index 765b190..d205b569 100644
--- a/chrome/browser/devtools/device/port_forwarding_controller.h
+++ b/chrome/browser/devtools/device/port_forwarding_controller.h
@@ -26,6 +26,9 @@
explicit PortForwardingController(Profile* profile);
+ PortForwardingController(const PortForwardingController&) = delete;
+ PortForwardingController& operator=(const PortForwardingController&) = delete;
+
virtual ~PortForwardingController();
ForwardingStatus DeviceListChanged(
@@ -47,8 +50,6 @@
typedef std::map<int, std::string> ForwardingMap;
ForwardingMap forwarding_map_;
-
- DISALLOW_COPY_AND_ASSIGN(PortForwardingController);
};
#endif // CHROME_BROWSER_DEVTOOLS_DEVICE_PORT_FORWARDING_CONTROLLER_H_
diff --git a/chrome/browser/devtools/device/usb/android_usb_device.h b/chrome/browser/devtools/device/usb/android_usb_device.h
index a93dd6b1..b3601da8 100644
--- a/chrome/browser/devtools/device/usb/android_usb_device.h
+++ b/chrome/browser/devtools/device/usb/android_usb_device.h
@@ -59,15 +59,16 @@
uint32_t arg0,
uint32_t arg1,
const std::string& body);
+
+ AdbMessage(const AdbMessage&) = delete;
+ AdbMessage& operator=(const AdbMessage&) = delete;
+
~AdbMessage();
uint32_t command;
uint32_t arg0;
uint32_t arg1;
std::string body;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AdbMessage);
};
class AndroidUsbDevice;
diff --git a/chrome/browser/devtools/device/usb/android_usb_socket.h b/chrome/browser/devtools/device/usb/android_usb_socket.h
index 9f88a4290..f148dff2 100644
--- a/chrome/browser/devtools/device/usb/android_usb_socket.h
+++ b/chrome/browser/devtools/device/usb/android_usb_socket.h
@@ -25,6 +25,10 @@
uint32_t socket_id,
const std::string& command,
base::OnceClosure delete_callback);
+
+ AndroidUsbSocket(const AndroidUsbSocket&) = delete;
+ AndroidUsbSocket& operator=(const AndroidUsbSocket&) = delete;
+
~AndroidUsbSocket() override;
void HandleIncoming(std::unique_ptr<AdbMessage> message);
@@ -82,8 +86,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<AndroidUsbSocket> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AndroidUsbSocket);
};
#endif // CHROME_BROWSER_DEVTOOLS_DEVICE_USB_ANDROID_USB_SOCKET_H_
diff --git a/chrome/browser/devtools/device/usb/usb_device_manager_helper.h b/chrome/browser/devtools/device/usb/usb_device_manager_helper.h
index fbeeab9..b228f09 100644
--- a/chrome/browser/devtools/device/usb/usb_device_manager_helper.h
+++ b/chrome/browser/devtools/device/usb/usb_device_manager_helper.h
@@ -57,6 +57,10 @@
// Please do not create UsbDeviceManagerHelper instance from this constructor
// directly, use static method GetInstance() instead.
UsbDeviceManagerHelper();
+
+ UsbDeviceManagerHelper(const UsbDeviceManagerHelper&) = delete;
+ UsbDeviceManagerHelper& operator=(const UsbDeviceManagerHelper&) = delete;
+
virtual ~UsbDeviceManagerHelper();
void GetAndroidDevices(AndroidDeviceInfoListCallback callback);
@@ -79,8 +83,6 @@
THREAD_CHECKER(thread_checker_);
base::WeakPtrFactory<UsbDeviceManagerHelper> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UsbDeviceManagerHelper);
};
#endif // CHROME_BROWSER_DEVTOOLS_DEVICE_USB_USB_DEVICE_MANAGER_HELPER_H_
diff --git a/chrome/browser/devtools/devtools_auto_opener.h b/chrome/browser/devtools/devtools_auto_opener.h
index 05a5246..4cd4e9b 100644
--- a/chrome/browser/devtools/devtools_auto_opener.h
+++ b/chrome/browser/devtools/devtools_auto_opener.h
@@ -11,6 +11,10 @@
class DevToolsAutoOpener : public TabStripModelObserver {
public:
DevToolsAutoOpener();
+
+ DevToolsAutoOpener(const DevToolsAutoOpener&) = delete;
+ DevToolsAutoOpener& operator=(const DevToolsAutoOpener&) = delete;
+
~DevToolsAutoOpener() override;
private:
@@ -21,8 +25,6 @@
const TabStripSelectionChange& selection) override;
BrowserTabStripTracker browser_tab_strip_tracker_;
-
- DISALLOW_COPY_AND_ASSIGN(DevToolsAutoOpener);
};
#endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_AUTO_OPENER_H_
diff --git a/chrome/browser/devtools/devtools_browsertest.cc b/chrome/browser/devtools/devtools_browsertest.cc
index 52b627e..ff77b2d 100644
--- a/chrome/browser/devtools/devtools_browsertest.cc
+++ b/chrome/browser/devtools/devtools_browsertest.cc
@@ -1814,6 +1814,12 @@
explicit BrowserAutofillManagerTestDelegateDevtoolsImpl(
WebContents* inspectedContents)
: inspected_contents_(inspectedContents) {}
+
+ BrowserAutofillManagerTestDelegateDevtoolsImpl(
+ const BrowserAutofillManagerTestDelegateDevtoolsImpl&) = delete;
+ BrowserAutofillManagerTestDelegateDevtoolsImpl& operator=(
+ const BrowserAutofillManagerTestDelegateDevtoolsImpl&) = delete;
+
~BrowserAutofillManagerTestDelegateDevtoolsImpl() override {}
void DidPreviewFormData() override {}
@@ -1829,8 +1835,6 @@
private:
WebContents* inspected_contents_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserAutofillManagerTestDelegateDevtoolsImpl);
};
// Disabled. Failing on MacOS MSAN. See https://crbug.com/849129.
@@ -2333,6 +2337,10 @@
public:
StaticURLDataSource(const std::string& source, const std::string& content)
: source_(source), content_(content) {}
+
+ StaticURLDataSource(const StaticURLDataSource&) = delete;
+ StaticURLDataSource& operator=(const StaticURLDataSource&) = delete;
+
~StaticURLDataSource() override = default;
// content::URLDataSource:
@@ -2351,8 +2359,6 @@
private:
const std::string source_;
const std::string content_;
-
- DISALLOW_COPY_AND_ASSIGN(StaticURLDataSource);
};
class MockWebUIProvider
@@ -2360,6 +2366,10 @@
public:
MockWebUIProvider(const std::string& source, const std::string& content)
: source_(source), content_(content) {}
+
+ MockWebUIProvider(const MockWebUIProvider&) = delete;
+ MockWebUIProvider& operator=(const MockWebUIProvider&) = delete;
+
~MockWebUIProvider() override = default;
std::unique_ptr<content::WebUIController> NewWebUI(content::WebUI* web_ui,
@@ -2373,7 +2383,6 @@
private:
std::string source_;
std::string content_;
- DISALLOW_COPY_AND_ASSIGN(MockWebUIProvider);
};
// This tests checks that window is correctly initialized when DevTools is
diff --git a/chrome/browser/devtools/devtools_eye_dropper.h b/chrome/browser/devtools/devtools_eye_dropper.h
index 18b5662..306ad70 100644
--- a/chrome/browser/devtools/devtools_eye_dropper.h
+++ b/chrome/browser/devtools/devtools_eye_dropper.h
@@ -26,6 +26,10 @@
DevToolsEyeDropper(content::WebContents* web_contents,
EyeDropperCallback callback);
+
+ DevToolsEyeDropper(const DevToolsEyeDropper&) = delete;
+ DevToolsEyeDropper& operator=(const DevToolsEyeDropper&) = delete;
+
~DevToolsEyeDropper() override;
private:
@@ -61,8 +65,6 @@
content::RenderWidgetHost* host_ = nullptr;
std::unique_ptr<viz::ClientFrameSinkVideoCapturer> video_capturer_;
base::WeakPtrFactory<DevToolsEyeDropper> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DevToolsEyeDropper);
};
#endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_EYE_DROPPER_H_
diff --git a/chrome/browser/devtools/devtools_file_helper.h b/chrome/browser/devtools/devtools_file_helper.h
index 9b37a11..953ed88 100644
--- a/chrome/browser/devtools/devtools_file_helper.h
+++ b/chrome/browser/devtools/devtools_file_helper.h
@@ -61,6 +61,10 @@
DevToolsFileHelper(content::WebContents* web_contents, Profile* profile,
Delegate* delegate);
+
+ DevToolsFileHelper(const DevToolsFileHelper&) = delete;
+ DevToolsFileHelper& operator=(const DevToolsFileHelper&) = delete;
+
~DevToolsFileHelper();
using SaveCallback = base::OnceCallback<void(const std::string&)>;
@@ -153,7 +157,6 @@
file_watcher_;
scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
base::WeakPtrFactory<DevToolsFileHelper> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(DevToolsFileHelper);
};
#endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_FILE_HELPER_H_
diff --git a/chrome/browser/devtools/devtools_file_system_indexer.cc b/chrome/browser/devtools/devtools_file_system_indexer.cc
index 49baa38..9652ff54 100644
--- a/chrome/browser/devtools/devtools_file_system_indexer.cc
+++ b/chrome/browser/devtools/devtools_file_system_indexer.cc
@@ -65,6 +65,10 @@
class Index {
public:
Index();
+
+ Index(const Index&) = delete;
+ Index& operator=(const Index&) = delete;
+
// Index is only instantiated as a leak LazyInstance, so the destructor is
// never called.
~Index() = delete;
@@ -90,8 +94,6 @@
IndexedFilesMap index_times_;
vector<bool> is_normalized_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(Index);
};
base::LazyInstance<Index>::Leaky g_trigram_index = LAZY_INSTANCE_INITIALIZER;
diff --git a/chrome/browser/devtools/devtools_interactive_browsertest.cc b/chrome/browser/devtools/devtools_interactive_browsertest.cc
index 7b4eb49..b904a33 100644
--- a/chrome/browser/devtools/devtools_interactive_browsertest.cc
+++ b/chrome/browser/devtools/devtools_interactive_browsertest.cc
@@ -31,6 +31,10 @@
expected_(expected),
timeout_(base::Time::NowFromSystemTime() +
base::TimeDelta::FromSeconds(1)) {}
+
+ CheckWaiter(const CheckWaiter&) = delete;
+ CheckWaiter& operator=(const CheckWaiter&) = delete;
+
~CheckWaiter() = default;
// Blocks until the browser window becomes maximized.
@@ -64,8 +68,6 @@
base::Time timeout_;
// The waiter's RunLoop quit closure.
base::RepeatingClosure quit_;
-
- DISALLOW_COPY_AND_ASSIGN(CheckWaiter);
};
class DevToolsManagerDelegateTest : public InProcessBrowserTest {
diff --git a/chrome/browser/devtools/devtools_targets_ui.h b/chrome/browser/devtools/devtools_targets_ui.h
index 8db43747..47b503a 100644
--- a/chrome/browser/devtools/devtools_targets_ui.h
+++ b/chrome/browser/devtools/devtools_targets_ui.h
@@ -25,6 +25,10 @@
base::RepeatingCallback<void(const std::string&, const base::Value&)>;
DevToolsTargetsUIHandler(const std::string& source_id, Callback callback);
+
+ DevToolsTargetsUIHandler(const DevToolsTargetsUIHandler&) = delete;
+ DevToolsTargetsUIHandler& operator=(const DevToolsTargetsUIHandler&) = delete;
+
virtual ~DevToolsTargetsUIHandler();
std::string source_id() const { return source_id_; }
@@ -58,8 +62,6 @@
private:
const std::string source_id_;
Callback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(DevToolsTargetsUIHandler);
};
class PortForwardingStatusSerializer
diff --git a/chrome/browser/devtools/devtools_ui_bindings.cc b/chrome/browser/devtools/devtools_ui_bindings.cc
index 22afaa0..1a17e66f 100644
--- a/chrome/browser/devtools/devtools_ui_bindings.cc
+++ b/chrome/browser/devtools/devtools_ui_bindings.cc
@@ -577,6 +577,11 @@
: public content::WebContentsObserver {
public:
explicit FrontendWebContentsObserver(DevToolsUIBindings* ui_bindings);
+
+ FrontendWebContentsObserver(const FrontendWebContentsObserver&) = delete;
+ FrontendWebContentsObserver& operator=(const FrontendWebContentsObserver&) =
+ delete;
+
~FrontendWebContentsObserver() override;
private:
@@ -590,7 +595,6 @@
content::NavigationHandle* navigation_handle) override;
DevToolsUIBindings* devtools_bindings_;
- DISALLOW_COPY_AND_ASSIGN(FrontendWebContentsObserver);
};
DevToolsUIBindings::FrontendWebContentsObserver::FrontendWebContentsObserver(
diff --git a/chrome/browser/devtools/devtools_ui_bindings.h b/chrome/browser/devtools/devtools_ui_bindings.h
index c458657..6d4b674 100644
--- a/chrome/browser/devtools/devtools_ui_bindings.h
+++ b/chrome/browser/devtools/devtools_ui_bindings.h
@@ -75,6 +75,10 @@
static bool IsValidRemoteFrontendURL(const GURL& url);
explicit DevToolsUIBindings(content::WebContents* web_contents);
+
+ DevToolsUIBindings(const DevToolsUIBindings&) = delete;
+ DevToolsUIBindings& operator=(const DevToolsUIBindings&) = delete;
+
~DevToolsUIBindings() override;
content::WebContents* web_contents() { return web_contents_; }
@@ -275,8 +279,6 @@
DevToolsSettings settings_;
base::WeakPtrFactory<DevToolsUIBindings> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DevToolsUIBindings);
};
#endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_UI_BINDINGS_H_
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 185f235..690bb6d 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -146,6 +146,10 @@
DevToolsToolboxDelegate(
WebContents* toolbox_contents,
DevToolsWindow::ObserverWithAccessor* web_contents_observer);
+
+ DevToolsToolboxDelegate(const DevToolsToolboxDelegate&) = delete;
+ DevToolsToolboxDelegate& operator=(const DevToolsToolboxDelegate&) = delete;
+
~DevToolsToolboxDelegate() override;
content::WebContents* OpenURLFromTab(
@@ -162,7 +166,6 @@
private:
BrowserWindow* GetInspectedBrowserWindow();
DevToolsWindow::ObserverWithAccessor* inspected_contents_observer_;
- DISALLOW_COPY_AND_ASSIGN(DevToolsToolboxDelegate);
};
DevToolsToolboxDelegate::DevToolsToolboxDelegate(
@@ -366,6 +369,9 @@
devtools_window_->throttle_ = this;
}
+ Throttle(const Throttle&) = delete;
+ Throttle& operator=(const Throttle&) = delete;
+
~Throttle() override {
if (devtools_window_)
devtools_window_->throttle_ = nullptr;
@@ -388,8 +394,6 @@
private:
DevToolsWindow* devtools_window_;
-
- DISALLOW_COPY_AND_ASSIGN(Throttle);
};
// Helper class that holds the owned main WebContents for the docked
diff --git a/chrome/browser/devtools/devtools_window.h b/chrome/browser/devtools/devtools_window.h
index be07f9af..805278db 100644
--- a/chrome/browser/devtools/devtools_window.h
+++ b/chrome/browser/devtools/devtools_window.h
@@ -60,14 +60,18 @@
class ObserverWithAccessor : public content::WebContentsObserver {
public:
explicit ObserverWithAccessor(content::WebContents* web_contents);
- ~ObserverWithAccessor() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(ObserverWithAccessor);
+ ObserverWithAccessor(const ObserverWithAccessor&) = delete;
+ ObserverWithAccessor& operator=(const ObserverWithAccessor&) = delete;
+
+ ~ObserverWithAccessor() override;
};
static const char kDevToolsApp[];
+ DevToolsWindow(const DevToolsWindow&) = delete;
+ DevToolsWindow& operator=(const DevToolsWindow&) = delete;
+
~DevToolsWindow() override;
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
@@ -478,7 +482,6 @@
base::ScopedClosureRunner capture_handle_;
friend class DevToolsEventForwarder;
- DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
};
#endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
diff --git a/chrome/browser/devtools/devtools_window_testing.h b/chrome/browser/devtools/devtools_window_testing.h
index e8b81b5..967622d 100644
--- a/chrome/browser/devtools/devtools_window_testing.h
+++ b/chrome/browser/devtools/devtools_window_testing.h
@@ -21,6 +21,9 @@
class DevToolsWindowTesting {
public:
+ DevToolsWindowTesting(const DevToolsWindowTesting&) = delete;
+ DevToolsWindowTesting& operator=(const DevToolsWindowTesting&) = delete;
+
virtual ~DevToolsWindowTesting();
// The following methods block until DevToolsWindow is completely loaded.
@@ -59,13 +62,17 @@
DevToolsWindow* devtools_window_;
base::OnceClosure close_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(DevToolsWindowTesting);
};
class DevToolsWindowCreationObserver {
public:
DevToolsWindowCreationObserver();
+
+ DevToolsWindowCreationObserver(const DevToolsWindowCreationObserver&) =
+ delete;
+ DevToolsWindowCreationObserver& operator=(
+ const DevToolsWindowCreationObserver&) = delete;
+
~DevToolsWindowCreationObserver();
using DevToolsWindows = std::vector<DevToolsWindow*>;
@@ -84,8 +91,6 @@
base::RepeatingCallback<void(DevToolsWindow*)> creation_callback_;
DevToolsWindows devtools_windows_;
scoped_refptr<content::MessageLoopRunner> runner_;
-
- DISALLOW_COPY_AND_ASSIGN(DevToolsWindowCreationObserver);
};
#endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_TESTING_H_
diff --git a/chrome/browser/devtools/global_confirm_info_bar.cc b/chrome/browser/devtools/global_confirm_info_bar.cc
index 184ea6d..7225aec 100644
--- a/chrome/browser/devtools/global_confirm_info_bar.cc
+++ b/chrome/browser/devtools/global_confirm_info_bar.cc
@@ -19,6 +19,10 @@
class GlobalConfirmInfoBar::DelegateProxy : public ConfirmInfoBarDelegate {
public:
explicit DelegateProxy(base::WeakPtr<GlobalConfirmInfoBar> global_info_bar);
+
+ DelegateProxy(const DelegateProxy&) = delete;
+ DelegateProxy& operator=(const DelegateProxy&) = delete;
+
~DelegateProxy() override;
void Detach();
@@ -40,8 +44,6 @@
infobars::InfoBar* info_bar_ = nullptr;
base::WeakPtr<GlobalConfirmInfoBar> global_info_bar_;
-
- DISALLOW_COPY_AND_ASSIGN(DelegateProxy);
};
GlobalConfirmInfoBar::DelegateProxy::DelegateProxy(
diff --git a/chrome/browser/devtools/global_confirm_info_bar_browsertest.cc b/chrome/browser/devtools/global_confirm_info_bar_browsertest.cc
index dcbb9180..778f73c 100644
--- a/chrome/browser/devtools/global_confirm_info_bar_browsertest.cc
+++ b/chrome/browser/devtools/global_confirm_info_bar_browsertest.cc
@@ -22,6 +22,11 @@
class TestConfirmInfoBarDelegate : public ConfirmInfoBarDelegate {
public:
TestConfirmInfoBarDelegate() = default;
+
+ TestConfirmInfoBarDelegate(const TestConfirmInfoBarDelegate&) = delete;
+ TestConfirmInfoBarDelegate& operator=(const TestConfirmInfoBarDelegate&) =
+ delete;
+
~TestConfirmInfoBarDelegate() override = default;
InfoBarIdentifier GetIdentifier() const override { return TEST_INFOBAR; }
@@ -29,14 +34,15 @@
std::u16string GetMessageText() const override {
return u"GlobalConfirmInfoBar browser tests delegate.";
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestConfirmInfoBarDelegate);
};
class GlobalConfirmInfoBarTest : public InProcessBrowserTest {
public:
GlobalConfirmInfoBarTest() = default;
+
+ GlobalConfirmInfoBarTest(const GlobalConfirmInfoBarTest&) = delete;
+ GlobalConfirmInfoBarTest& operator=(const GlobalConfirmInfoBarTest&) = delete;
+
~GlobalConfirmInfoBarTest() override = default;
protected:
@@ -50,9 +56,6 @@
void AddTab() {
AddTabAtIndex(0, GURL("chrome://blank/"), ui::PAGE_TRANSITION_LINK);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(GlobalConfirmInfoBarTest);
};
} // namespace
diff --git a/chrome/browser/devtools/protocol/browser_handler.h b/chrome/browser/devtools/protocol/browser_handler.h
index 125e435f..71ec2fa 100644
--- a/chrome/browser/devtools/protocol/browser_handler.h
+++ b/chrome/browser/devtools/protocol/browser_handler.h
@@ -12,6 +12,10 @@
public:
BrowserHandler(protocol::UberDispatcher* dispatcher,
const std::string& target_id);
+
+ BrowserHandler(const BrowserHandler&) = delete;
+ BrowserHandler& operator=(const BrowserHandler&) = delete;
+
~BrowserHandler() override;
// Browser::Backend:
@@ -35,8 +39,6 @@
private:
base::flat_set<std::string> contexts_with_overridden_permissions_;
std::string target_id_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserHandler);
};
#endif // CHROME_BROWSER_DEVTOOLS_PROTOCOL_BROWSER_HANDLER_H_
diff --git a/chrome/browser/devtools/protocol/cast_handler.h b/chrome/browser/devtools/protocol/cast_handler.h
index 6728fa68..8d5cbf7 100644
--- a/chrome/browser/devtools/protocol/cast_handler.h
+++ b/chrome/browser/devtools/protocol/cast_handler.h
@@ -30,6 +30,10 @@
public:
CastHandler(content::WebContents* web_contents,
protocol::UberDispatcher* dispatcher);
+
+ CastHandler(const CastHandler&) = delete;
+ CastHandler& operator=(const CastHandler&) = delete;
+
~CastHandler() override;
// protocol::Cast::Backend:
@@ -103,8 +107,6 @@
std::unique_ptr<protocol::Cast::Frontend> frontend_;
base::WeakPtrFactory<CastHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CastHandler);
};
#endif // CHROME_BROWSER_DEVTOOLS_PROTOCOL_CAST_HANDLER_H_
diff --git a/chrome/browser/devtools/protocol/page_handler.h b/chrome/browser/devtools/protocol/page_handler.h
index ef168942..98f840b 100644
--- a/chrome/browser/devtools/protocol/page_handler.h
+++ b/chrome/browser/devtools/protocol/page_handler.h
@@ -32,6 +32,10 @@
PageHandler(scoped_refptr<content::DevToolsAgentHost> agent_host,
content::WebContents* web_contents,
protocol::UberDispatcher* dispatcher);
+
+ PageHandler(const PageHandler&) = delete;
+ PageHandler& operator=(const PageHandler&) = delete;
+
~PageHandler() override;
void ToggleAdBlocking(bool enabled);
@@ -91,8 +95,6 @@
bool enabled_ = false;
base::WeakPtrFactory<PageHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PageHandler);
};
#endif // CHROME_BROWSER_DEVTOOLS_PROTOCOL_PAGE_HANDLER_H_
diff --git a/chrome/browser/devtools/protocol/security_handler.h b/chrome/browser/devtools/protocol/security_handler.h
index e4f3c88..e2efc2d 100644
--- a/chrome/browser/devtools/protocol/security_handler.h
+++ b/chrome/browser/devtools/protocol/security_handler.h
@@ -18,6 +18,10 @@
public:
SecurityHandler(content::WebContents* web_contents,
protocol::UberDispatcher* dispatcher);
+
+ SecurityHandler(const SecurityHandler&) = delete;
+ SecurityHandler& operator=(const SecurityHandler&) = delete;
+
~SecurityHandler() override;
// Security::Backend:
@@ -30,8 +34,6 @@
bool enabled_ = false;
std::unique_ptr<protocol::Security::Frontend> frontend_;
-
- DISALLOW_COPY_AND_ASSIGN(SecurityHandler);
};
#endif // CHROME_BROWSER_DEVTOOLS_PROTOCOL_SECURITY_HANDLER_H_
diff --git a/chrome/browser/devtools/protocol/target_handler.h b/chrome/browser/devtools/protocol/target_handler.h
index ce9c6272..e607a16 100644
--- a/chrome/browser/devtools/protocol/target_handler.h
+++ b/chrome/browser/devtools/protocol/target_handler.h
@@ -19,6 +19,10 @@
class TargetHandler : public protocol::Target::Backend {
public:
explicit TargetHandler(protocol::UberDispatcher* dispatcher);
+
+ TargetHandler(const TargetHandler&) = delete;
+ TargetHandler& operator=(const TargetHandler&) = delete;
+
~TargetHandler() override;
RemoteLocations& remote_locations() { return remote_locations_; }
@@ -39,8 +43,6 @@
private:
RemoteLocations remote_locations_;
-
- DISALLOW_COPY_AND_ASSIGN(TargetHandler);
};
#endif // CHROME_BROWSER_DEVTOOLS_PROTOCOL_TARGET_HANDLER_H_
diff --git a/chrome/browser/devtools/protocol/window_manager_handler.h b/chrome/browser/devtools/protocol/window_manager_handler.h
index 4df11d4..cb1f1894 100644
--- a/chrome/browser/devtools/protocol/window_manager_handler.h
+++ b/chrome/browser/devtools/protocol/window_manager_handler.h
@@ -10,14 +10,15 @@
class WindowManagerHandler : public protocol::WindowManager::Backend {
public:
explicit WindowManagerHandler(protocol::UberDispatcher* dispatcher);
+
+ WindowManagerHandler(const WindowManagerHandler&) = delete;
+ WindowManagerHandler& operator=(const WindowManagerHandler&) = delete;
+
~WindowManagerHandler() override;
// WindowManager::Backend:
protocol::Response EnterOverviewMode() override;
protocol::Response ExitOverviewMode() override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WindowManagerHandler);
};
#endif // CHROME_BROWSER_DEVTOOLS_PROTOCOL_WINDOW_MANAGER_HANDLER_H_
diff --git a/chrome/browser/devtools/remote_debugging_server.h b/chrome/browser/devtools/remote_debugging_server.h
index 7a5e4b60..5d2fdab 100644
--- a/chrome/browser/devtools/remote_debugging_server.h
+++ b/chrome/browser/devtools/remote_debugging_server.h
@@ -14,10 +14,11 @@
static void EnableTetheringForDebug();
RemoteDebuggingServer();
- virtual ~RemoteDebuggingServer();
- private:
- DISALLOW_COPY_AND_ASSIGN(RemoteDebuggingServer);
+ RemoteDebuggingServer(const RemoteDebuggingServer&) = delete;
+ RemoteDebuggingServer& operator=(const RemoteDebuggingServer&) = delete;
+
+ virtual ~RemoteDebuggingServer();
};
#endif // CHROME_BROWSER_DEVTOOLS_REMOTE_DEBUGGING_SERVER_H_
diff --git a/chrome/browser/diagnostics/diagnostics_model.cc b/chrome/browser/diagnostics/diagnostics_model.cc
index 55baf2b..9768575 100644
--- a/chrome/browser/diagnostics/diagnostics_model.cc
+++ b/chrome/browser/diagnostics/diagnostics_model.cc
@@ -53,6 +53,9 @@
public:
DiagnosticsModelImpl() : tests_run_(0) {}
+ DiagnosticsModelImpl(const DiagnosticsModelImpl&) = delete;
+ DiagnosticsModelImpl& operator=(const DiagnosticsModelImpl&) = delete;
+
~DiagnosticsModelImpl() override {}
int GetTestRunCount() const override { return tests_run_; }
@@ -141,9 +144,6 @@
std::vector<std::unique_ptr<DiagnosticsTest>> tests_;
int tests_run_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DiagnosticsModelImpl);
};
// Each platform can have their own tests. For the time being there is only
diff --git a/chrome/browser/diagnostics/diagnostics_writer.cc b/chrome/browser/diagnostics/diagnostics_writer.cc
index 2ca12715..443843a0 100644
--- a/chrome/browser/diagnostics/diagnostics_writer.cc
+++ b/chrome/browser/diagnostics/diagnostics_writer.cc
@@ -71,6 +71,9 @@
::AllocConsole();
}
+ WinConsole(const WinConsole&) = delete;
+ WinConsole& operator=(const WinConsole&) = delete;
+
~WinConsole() override { ::FreeConsole(); }
bool Init() override { return SetIOHandles(); }
@@ -123,8 +126,6 @@
// implemented as pipes but they have non-documented protocol.
HANDLE std_out_;
HANDLE std_in_;
-
- DISALLOW_COPY_AND_ASSIGN(WinConsole);
};
} // namespace
diff --git a/chrome/browser/diagnostics/diagnostics_writer.h b/chrome/browser/diagnostics/diagnostics_writer.h
index 094ae64..6b43869 100644
--- a/chrome/browser/diagnostics/diagnostics_writer.h
+++ b/chrome/browser/diagnostics/diagnostics_writer.h
@@ -25,6 +25,10 @@
};
explicit DiagnosticsWriter(FormatType format);
+
+ DiagnosticsWriter(const DiagnosticsWriter&) = delete;
+ DiagnosticsWriter& operator=(const DiagnosticsWriter&) = delete;
+
~DiagnosticsWriter() override;
// How many tests reported failure.
@@ -60,8 +64,6 @@
// Keeps track of how many tests reported failure.
int failures_;
FormatType format_;
-
- DISALLOW_COPY_AND_ASSIGN(DiagnosticsWriter);
};
} // namespace diagnostics
diff --git a/chrome/browser/dom_distiller/dom_distiller_service_factory.h b/chrome/browser/dom_distiller/dom_distiller_service_factory.h
index e51ccd87..098d4ff4 100644
--- a/chrome/browser/dom_distiller/dom_distiller_service_factory.h
+++ b/chrome/browser/dom_distiller/dom_distiller_service_factory.h
@@ -29,10 +29,13 @@
std::unique_ptr<DistillerPageFactory> distiller_page_factory,
std::unique_ptr<DistilledPagePrefs> distilled_page_prefs,
std::unique_ptr<DistillerUIHandle> distiller_ui_handle);
- ~DomDistillerContextKeyedService() override {}
- private:
- DISALLOW_COPY_AND_ASSIGN(DomDistillerContextKeyedService);
+ DomDistillerContextKeyedService(const DomDistillerContextKeyedService&) =
+ delete;
+ DomDistillerContextKeyedService& operator=(
+ const DomDistillerContextKeyedService&) = delete;
+
+ ~DomDistillerContextKeyedService() override {}
};
class DomDistillerServiceFactory : public BrowserContextKeyedServiceFactory {
diff --git a/chrome/browser/dom_distiller/lazy_dom_distiller_service.h b/chrome/browser/dom_distiller/lazy_dom_distiller_service.h
index d605f9b5..b97d606 100644
--- a/chrome/browser/dom_distiller/lazy_dom_distiller_service.h
+++ b/chrome/browser/dom_distiller/lazy_dom_distiller_service.h
@@ -25,6 +25,9 @@
// of the returned pointer.
static LazyDomDistillerService* Create(Profile* profile);
+ LazyDomDistillerService(const LazyDomDistillerService&) = delete;
+ LazyDomDistillerService& operator=(const LazyDomDistillerService&) = delete;
+
~LazyDomDistillerService() override;
// DomDistillerServiceInterface implementation:
@@ -48,8 +51,6 @@
// The Profile to use when retrieving the DomDistillerService and also the
// profile to listen for destruction of.
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(LazyDomDistillerService);
};
} // namespace dom_distiller
diff --git a/chrome/browser/dom_distiller/tab_utils_browsertest.cc b/chrome/browser/dom_distiller/tab_utils_browsertest.cc
index 7946a26..a1801ed2 100644
--- a/chrome/browser/dom_distiller/tab_utils_browsertest.cc
+++ b/chrome/browser/dom_distiller/tab_utils_browsertest.cc
@@ -92,6 +92,10 @@
scoped_observation_.Observe(
favicon::ContentFaviconDriver::FromWebContents(web_contents));
}
+
+ FaviconUpdateWaiter(const FaviconUpdateWaiter&) = delete;
+ FaviconUpdateWaiter& operator=(const FaviconUpdateWaiter&) = delete;
+
~FaviconUpdateWaiter() override = default;
void Wait() {
@@ -121,8 +125,6 @@
favicon::FaviconDriverObserver>
scoped_observation_{this};
base::OnceClosure quit_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(FaviconUpdateWaiter);
};
class DomDistillerTabUtilsBrowserTest : public InProcessBrowserTest {
diff --git a/chrome/browser/domain_reliability/browsertest.cc b/chrome/browser/domain_reliability/browsertest.cc
index 2383868e..5edcadb5 100644
--- a/chrome/browser/domain_reliability/browsertest.cc
+++ b/chrome/browser/domain_reliability/browsertest.cc
@@ -36,6 +36,10 @@
net::URLRequestFailedJob::AddUrlHandler();
}
+ DomainReliabilityBrowserTest(const DomainReliabilityBrowserTest&) = delete;
+ DomainReliabilityBrowserTest& operator=(const DomainReliabilityBrowserTest&) =
+ delete;
+
~DomainReliabilityBrowserTest() override {}
// Note: In an ideal world, instead of appending the command-line switch and
@@ -69,8 +73,6 @@
private:
net::EmbeddedTestServer test_server_;
-
- DISALLOW_COPY_AND_ASSIGN(DomainReliabilityBrowserTest);
};
class DomainReliabilityDisabledBrowserTest
diff --git a/chrome/browser/download/android/available_offline_content_provider.h b/chrome/browser/download/android/available_offline_content_provider.h
index f6d354e..3c7d2cf 100644
--- a/chrome/browser/download/android/available_offline_content_provider.h
+++ b/chrome/browser/download/android/available_offline_content_provider.h
@@ -29,6 +29,12 @@
public:
// Public for testing.
explicit AvailableOfflineContentProvider(int render_process_host_id);
+
+ AvailableOfflineContentProvider(const AvailableOfflineContentProvider&) =
+ delete;
+ AvailableOfflineContentProvider& operator=(
+ const AvailableOfflineContentProvider&) = delete;
+
~AvailableOfflineContentProvider() override;
// chrome::mojom::AvailableOfflineContentProvider methods.
@@ -61,8 +67,6 @@
provider_self_owned_receiver_;
base::WeakPtrFactory<AvailableOfflineContentProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AvailableOfflineContentProvider);
};
} // namespace android
diff --git a/chrome/browser/download/android/chrome_duplicate_download_infobar_delegate.h b/chrome/browser/download/android/chrome_duplicate_download_infobar_delegate.h
index 8f39b1e..f39e0fb 100644
--- a/chrome/browser/download/android/chrome_duplicate_download_infobar_delegate.h
+++ b/chrome/browser/download/android/chrome_duplicate_download_infobar_delegate.h
@@ -24,6 +24,11 @@
: public DuplicateDownloadInfoBarDelegate,
public download::DownloadItem::Observer {
public:
+ ChromeDuplicateDownloadInfoBarDelegate(
+ const ChromeDuplicateDownloadInfoBarDelegate&) = delete;
+ ChromeDuplicateDownloadInfoBarDelegate& operator=(
+ const ChromeDuplicateDownloadInfoBarDelegate&) = delete;
+
~ChromeDuplicateDownloadInfoBarDelegate() override;
static void Create(infobars::ContentInfoBarManager* infobar_manager,
@@ -61,8 +66,6 @@
// is made (or cancelled).
DownloadTargetDeterminerDelegate::ConfirmationCallback
file_selected_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeDuplicateDownloadInfoBarDelegate);
};
} // namespace android
diff --git a/chrome/browser/download/android/dangerous_download_infobar_delegate.h b/chrome/browser/download/android/dangerous_download_infobar_delegate.h
index 5edf4b20..c0fad9c 100644
--- a/chrome/browser/download/android/dangerous_download_infobar_delegate.h
+++ b/chrome/browser/download/android/dangerous_download_infobar_delegate.h
@@ -23,6 +23,11 @@
static void Create(infobars::ContentInfoBarManager* infobar_manager,
download::DownloadItem* download_item);
+ DangerousDownloadInfoBarDelegate(const DangerousDownloadInfoBarDelegate&) =
+ delete;
+ DangerousDownloadInfoBarDelegate& operator=(
+ const DangerousDownloadInfoBarDelegate&) = delete;
+
~DangerousDownloadInfoBarDelegate() override;
// download::DownloadItem::Observer:
@@ -45,8 +50,6 @@
// the infobar is showing.
download::DownloadItem* download_item_;
std::u16string message_text_;
-
- DISALLOW_COPY_AND_ASSIGN(DangerousDownloadInfoBarDelegate);
};
#endif // CHROME_BROWSER_DOWNLOAD_ANDROID_DANGEROUS_DOWNLOAD_INFOBAR_DELEGATE_H_
diff --git a/chrome/browser/download/android/download_controller.cc b/chrome/browser/download/android/download_controller.cc
index a264f5c..c20efd0f 100644
--- a/chrome/browser/download/android/download_controller.cc
+++ b/chrome/browser/download/android/download_controller.cc
@@ -94,6 +94,9 @@
manager_->AddObserver(this);
}
+ DownloadManagerGetter(const DownloadManagerGetter&) = delete;
+ DownloadManagerGetter& operator=(const DownloadManagerGetter&) = delete;
+
~DownloadManagerGetter() override {
if (manager_)
manager_->RemoveObserver(this);
@@ -107,7 +110,6 @@
private:
DownloadManager* manager_;
- DISALLOW_COPY_AND_ASSIGN(DownloadManagerGetter);
};
void RemoveDownloadItem(std::unique_ptr<DownloadManagerGetter> getter,
diff --git a/chrome/browser/download/android/download_manager_service.h b/chrome/browser/download/android/download_manager_service.h
index 38ff71b6..4f27d71a 100644
--- a/chrome/browser/download/android/download_manager_service.h
+++ b/chrome/browser/download/android/download_manager_service.h
@@ -49,6 +49,10 @@
download::DownloadItem* item);
DownloadManagerService();
+
+ DownloadManagerService(const DownloadManagerService&) = delete;
+ DownloadManagerService& operator=(const DownloadManagerService&) = delete;
+
~DownloadManagerService() override;
// Called to Initialize this object. If |is_profile_added| is false,
@@ -299,8 +303,6 @@
std::map<ProfileKey*, download::SimpleDownloadManagerCoordinator*>
coordinators_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadManagerService);
};
#endif // CHROME_BROWSER_DOWNLOAD_ANDROID_DOWNLOAD_MANAGER_SERVICE_H_
diff --git a/chrome/browser/download/android/intercept_oma_download_navigation_throttle.h b/chrome/browser/download/android/intercept_oma_download_navigation_throttle.h
index 17ea79b..521b40dd 100644
--- a/chrome/browser/download/android/intercept_oma_download_navigation_throttle.h
+++ b/chrome/browser/download/android/intercept_oma_download_navigation_throttle.h
@@ -15,6 +15,12 @@
public:
static std::unique_ptr<content::NavigationThrottle> Create(
content::NavigationHandle* handle);
+
+ InterceptOMADownloadNavigationThrottle(
+ const InterceptOMADownloadNavigationThrottle&) = delete;
+ InterceptOMADownloadNavigationThrottle& operator=(
+ const InterceptOMADownloadNavigationThrottle&) = delete;
+
~InterceptOMADownloadNavigationThrottle() override;
// content::NavigationThrottle:
@@ -28,8 +34,6 @@
// Helper method to intercept the download.
void InterceptDownload();
-
- DISALLOW_COPY_AND_ASSIGN(InterceptOMADownloadNavigationThrottle);
};
#endif // CHROME_BROWSER_DOWNLOAD_ANDROID_INTERCEPT_OMA_DOWNLOAD_NAVIGATION_THROTTLE_H_
diff --git a/chrome/browser/download/android/mixed_content_download_infobar_delegate.h b/chrome/browser/download/android/mixed_content_download_infobar_delegate.h
index d25b3c2..83736ce4 100644
--- a/chrome/browser/download/android/mixed_content_download_infobar_delegate.h
+++ b/chrome/browser/download/android/mixed_content_download_infobar_delegate.h
@@ -29,6 +29,11 @@
download::DownloadItem::MixedContentStatus mixed_content_status,
ResultCallback callback);
+ MixedContentDownloadInfoBarDelegate(
+ const MixedContentDownloadInfoBarDelegate&) = delete;
+ MixedContentDownloadInfoBarDelegate& operator=(
+ const MixedContentDownloadInfoBarDelegate&) = delete;
+
~MixedContentDownloadInfoBarDelegate() override;
private:
@@ -53,8 +58,6 @@
std::u16string message_text_;
download::DownloadItem::MixedContentStatus mixed_content_status_;
ResultCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(MixedContentDownloadInfoBarDelegate);
};
#endif // CHROME_BROWSER_DOWNLOAD_ANDROID_MIXED_CONTENT_DOWNLOAD_INFOBAR_DELEGATE_H_
diff --git a/chrome/browser/download/android/mock_download_controller.h b/chrome/browser/download/android/mock_download_controller.h
index 39e82c6..f54fef9 100644
--- a/chrome/browser/download/android/mock_download_controller.h
+++ b/chrome/browser/download/android/mock_download_controller.h
@@ -17,6 +17,10 @@
class MockDownloadController : public DownloadControllerBase {
public:
MockDownloadController();
+
+ MockDownloadController(const MockDownloadController&) = delete;
+ MockDownloadController& operator=(const MockDownloadController&) = delete;
+
~MockDownloadController() override;
// DownloadControllerBase implementation.
@@ -34,7 +38,6 @@
private:
bool approve_file_access_request_;
- DISALLOW_COPY_AND_ASSIGN(MockDownloadController);
};
} // namespace android
diff --git a/chrome/browser/download/android/service/download_task_scheduler.h b/chrome/browser/download/android/service/download_task_scheduler.h
index f19e40fca..a3d01d54 100644
--- a/chrome/browser/download/android/service/download_task_scheduler.h
+++ b/chrome/browser/download/android/service/download_task_scheduler.h
@@ -19,6 +19,10 @@
class DownloadTaskScheduler : public TaskScheduler {
public:
DownloadTaskScheduler();
+
+ DownloadTaskScheduler(const DownloadTaskScheduler&) = delete;
+ DownloadTaskScheduler& operator=(const DownloadTaskScheduler&) = delete;
+
~DownloadTaskScheduler() override;
// TaskScheduler implementation.
@@ -29,9 +33,6 @@
int64_t window_start_time_seconds,
int64_t window_end_time_seconds) override;
void CancelTask(DownloadTaskType task_type) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DownloadTaskScheduler);
};
} // namespace android
diff --git a/chrome/browser/download/background_download_service_factory.cc b/chrome/browser/download/background_download_service_factory.cc
index bd116262..fd69a19 100644
--- a/chrome/browser/download/background_download_service_factory.cc
+++ b/chrome/browser/download/background_download_service_factory.cc
@@ -90,6 +90,12 @@
explicit DownloadBlobContextGetterFactory(SimpleFactoryKey* key) : key_(key) {
DCHECK(key_);
}
+
+ DownloadBlobContextGetterFactory(const DownloadBlobContextGetterFactory&) =
+ delete;
+ DownloadBlobContextGetterFactory& operator=(
+ const DownloadBlobContextGetterFactory&) = delete;
+
~DownloadBlobContextGetterFactory() override = default;
private:
@@ -101,7 +107,6 @@
}
SimpleFactoryKey* key_;
- DISALLOW_COPY_AND_ASSIGN(DownloadBlobContextGetterFactory);
};
} // namespace
diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h
index 2bd165a0..7f31f420 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.h
+++ b/chrome/browser/download/chrome_download_manager_delegate.h
@@ -56,6 +56,11 @@
public DownloadTargetDeterminerDelegate {
public:
explicit ChromeDownloadManagerDelegate(Profile* profile);
+
+ ChromeDownloadManagerDelegate(const ChromeDownloadManagerDelegate&) = delete;
+ ChromeDownloadManagerDelegate& operator=(
+ const ChromeDownloadManagerDelegate&) = delete;
+
~ChromeDownloadManagerDelegate() override;
// Should be called before the first call to ShouldCompleteDownload() to
@@ -146,14 +151,15 @@
class SafeBrowsingState : public DownloadCompletionBlocker {
public:
SafeBrowsingState() = default;
+
+ SafeBrowsingState(const SafeBrowsingState&) = delete;
+ SafeBrowsingState& operator=(const SafeBrowsingState&) = delete;
+
~SafeBrowsingState() override;
// String pointer used for identifying safebrowing data associated with
// a download item.
static const char kSafeBrowsingUserDataKey[];
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SafeBrowsingState);
};
#endif // FULL_SAFE_BROWSING
@@ -327,8 +333,6 @@
content::NotificationRegistrar registrar_;
base::WeakPtrFactory<ChromeDownloadManagerDelegate> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeDownloadManagerDelegate);
};
#endif // CHROME_BROWSER_DOWNLOAD_CHROME_DOWNLOAD_MANAGER_DELEGATE_H_
diff --git a/chrome/browser/download/default_download_dir_policy_handler.h b/chrome/browser/download/default_download_dir_policy_handler.h
index ee7ec678..5779076c 100644
--- a/chrome/browser/download/default_download_dir_policy_handler.h
+++ b/chrome/browser/download/default_download_dir_policy_handler.h
@@ -13,6 +13,12 @@
: public policy::TypeCheckingPolicyHandler {
public:
DefaultDownloadDirPolicyHandler();
+
+ DefaultDownloadDirPolicyHandler(const DefaultDownloadDirPolicyHandler&) =
+ delete;
+ DefaultDownloadDirPolicyHandler& operator=(
+ const DefaultDownloadDirPolicyHandler&) = delete;
+
~DefaultDownloadDirPolicyHandler() override;
// ConfigurationPolicyHandler:
@@ -27,9 +33,6 @@
protected:
void ApplyPolicySettings(const policy::PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DefaultDownloadDirPolicyHandler);
};
#endif // CHROME_BROWSER_DOWNLOAD_DEFAULT_DOWNLOAD_DIR_POLICY_HANDLER_H_
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 3ce8f80..9d57b4c 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -221,6 +221,10 @@
waiting_(false) {
manager->AddObserver(this);
}
+
+ CreatedObserver(const CreatedObserver&) = delete;
+ CreatedObserver& operator=(const CreatedObserver&) = delete;
+
~CreatedObserver() override {
if (manager_)
manager_->RemoveObserver(this);
@@ -246,8 +250,6 @@
content::DownloadManager* manager_;
bool waiting_;
-
- DISALLOW_COPY_AND_ASSIGN(CreatedObserver);
};
class OnCanDownloadDecidedObserver {
@@ -293,6 +295,10 @@
explicit PercentWaiter(DownloadItem* item) : item_(item) {
item_->AddObserver(this);
}
+
+ PercentWaiter(const PercentWaiter&) = delete;
+ PercentWaiter& operator=(const PercentWaiter&) = delete;
+
~PercentWaiter() override {
if (item_)
item_->RemoveObserver(this);
@@ -333,8 +339,6 @@
bool waiting_ = false;
bool error_ = false;
int prev_percent_ = -1;
-
- DISALLOW_COPY_AND_ASSIGN(PercentWaiter);
};
// DownloadTestObserver subclass that observes one download until it transitions
@@ -352,6 +356,11 @@
transitions_left_(transition_count) {
Init();
}
+
+ DownloadTestObserverResumable(const DownloadTestObserverResumable&) = delete;
+ DownloadTestObserverResumable& operator=(
+ const DownloadTestObserverResumable&) = delete;
+
~DownloadTestObserverResumable() override {}
private:
@@ -365,8 +374,6 @@
bool was_previously_resumable_;
size_t transitions_left_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadTestObserverResumable);
};
// IDs and paths of CRX files used in tests.
@@ -539,6 +546,9 @@
->AddObserver(this);
}
+ HistoryObserver(const HistoryObserver&) = delete;
+ HistoryObserver& operator=(const HistoryObserver&) = delete;
+
~HistoryObserver() override {
DownloadCoreService* service =
DownloadCoreServiceFactory::GetForBrowserContext(profile_);
@@ -571,8 +581,6 @@
Profile* profile_;
bool waiting_ = false;
bool seen_stored_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(HistoryObserver);
};
class DownloadTest : public InProcessBrowserTest {
diff --git a/chrome/browser/download/download_browsertest.h b/chrome/browser/download/download_browsertest.h
index 5e12cb81..34688ff 100644
--- a/chrome/browser/download/download_browsertest.h
+++ b/chrome/browser/download/download_browsertest.h
@@ -16,6 +16,12 @@
public:
DownloadTestObserverNotInProgress(content::DownloadManager* download_manager,
size_t count);
+
+ DownloadTestObserverNotInProgress(const DownloadTestObserverNotInProgress&) =
+ delete;
+ DownloadTestObserverNotInProgress& operator=(
+ const DownloadTestObserverNotInProgress&) = delete;
+
~DownloadTestObserverNotInProgress() override;
void StartObserving();
@@ -24,8 +30,6 @@
bool IsDownloadInFinalState(download::DownloadItem* download) override;
bool started_observing_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadTestObserverNotInProgress);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_BROWSERTEST_H_
diff --git a/chrome/browser/download/download_commands.h b/chrome/browser/download/download_commands.h
index 78739a04..b936110 100644
--- a/chrome/browser/download/download_commands.h
+++ b/chrome/browser/download/download_commands.h
@@ -41,6 +41,10 @@
// |model| must outlive DownloadCommands.
// TODO(shaktisahu): Investigate if model lifetime is shorter than |this|.
explicit DownloadCommands(base::WeakPtr<DownloadUIModel> model);
+
+ DownloadCommands(const DownloadCommands&) = delete;
+ DownloadCommands& operator=(const DownloadCommands&) = delete;
+
virtual ~DownloadCommands();
bool IsCommandEnabled(Command command) const;
@@ -67,8 +71,6 @@
base::WeakPtr<DownloadUIModel> model_;
scoped_refptr<base::SequencedTaskRunner> task_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadCommands);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_COMMANDS_H_
diff --git a/chrome/browser/download/download_completion_blocker.h b/chrome/browser/download/download_completion_blocker.h
index feb4ee27..faf6587 100644
--- a/chrome/browser/download/download_completion_blocker.h
+++ b/chrome/browser/download/download_completion_blocker.h
@@ -17,6 +17,11 @@
class DownloadCompletionBlocker : public base::SupportsUserData::Data {
public:
DownloadCompletionBlocker();
+
+ DownloadCompletionBlocker(const DownloadCompletionBlocker&) = delete;
+ DownloadCompletionBlocker& operator=(const DownloadCompletionBlocker&) =
+ delete;
+
~DownloadCompletionBlocker() override;
bool is_complete() const { return is_complete_; }
@@ -35,8 +40,6 @@
private:
bool is_complete_;
base::OnceClosure callback_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadCompletionBlocker);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_COMPLETION_BLOCKER_H_
diff --git a/chrome/browser/download/download_core_service.h b/chrome/browser/download/download_core_service.h
index d4845d2b..607adc28 100644
--- a/chrome/browser/download/download_core_service.h
+++ b/chrome/browser/download/download_core_service.h
@@ -28,6 +28,10 @@
class DownloadCoreService : public KeyedService {
public:
DownloadCoreService();
+
+ DownloadCoreService(const DownloadCoreService&) = delete;
+ DownloadCoreService& operator=(const DownloadCoreService&) = delete;
+
~DownloadCoreService() override;
// Get the download manager delegate, creating it if it doesn't already exist.
@@ -74,9 +78,6 @@
// Returns false if at least one extension has disabled the shelf, true
// otherwise.
virtual bool IsShelfEnabled() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DownloadCoreService);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_CORE_SERVICE_H_
diff --git a/chrome/browser/download/download_core_service_impl.h b/chrome/browser/download/download_core_service_impl.h
index 782e3964..c878c82 100644
--- a/chrome/browser/download/download_core_service_impl.h
+++ b/chrome/browser/download/download_core_service_impl.h
@@ -34,6 +34,10 @@
class DownloadCoreServiceImpl : public DownloadCoreService {
public:
explicit DownloadCoreServiceImpl(Profile* profile);
+
+ DownloadCoreServiceImpl(const DownloadCoreServiceImpl&) = delete;
+ DownloadCoreServiceImpl& operator=(const DownloadCoreServiceImpl&) = delete;
+
~DownloadCoreServiceImpl() override;
// DownloadCoreService
@@ -90,8 +94,6 @@
std::unique_ptr<extensions::ExtensionDownloadsEventRouter>
extension_event_router_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(DownloadCoreServiceImpl);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_CORE_SERVICE_IMPL_H_
diff --git a/chrome/browser/download/download_danger_prompt_browsertest.cc b/chrome/browser/download/download_danger_prompt_browsertest.cc
index 932e1a4..c32902a1 100644
--- a/chrome/browser/download/download_danger_prompt_browsertest.cc
+++ b/chrome/browser/download/download_danger_prompt_browsertest.cc
@@ -52,6 +52,9 @@
test_safe_browsing_factory_(
std::make_unique<TestSafeBrowsingServiceFactory>()) {}
+ DownloadDangerPromptTest(const DownloadDangerPromptTest&) = delete;
+ DownloadDangerPromptTest& operator=(const DownloadDangerPromptTest&) = delete;
+
~DownloadDangerPromptTest() override {}
void SetUp() override {
@@ -174,8 +177,6 @@
bool did_receive_callback_;
std::unique_ptr<TestSafeBrowsingServiceFactory> test_safe_browsing_factory_;
std::string expected_serialized_report_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadDangerPromptTest);
};
// Disabled for flaky timeouts on Windows. crbug.com/446696
diff --git a/chrome/browser/download/download_dir_policy_handler.h b/chrome/browser/download/download_dir_policy_handler.h
index 5f26aa2..e9933dc1 100644
--- a/chrome/browser/download/download_dir_policy_handler.h
+++ b/chrome/browser/download/download_dir_policy_handler.h
@@ -19,6 +19,10 @@
class DownloadDirPolicyHandler : public policy::TypeCheckingPolicyHandler {
public:
DownloadDirPolicyHandler();
+
+ DownloadDirPolicyHandler(const DownloadDirPolicyHandler&) = delete;
+ DownloadDirPolicyHandler& operator=(const DownloadDirPolicyHandler&) = delete;
+
~DownloadDirPolicyHandler() override;
// ConfigurationPolicyHandler methods:
@@ -33,9 +37,6 @@
protected:
void ApplyPolicySettings(const policy::PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DownloadDirPolicyHandler);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_DIR_POLICY_HANDLER_H_
diff --git a/chrome/browser/download/download_history.cc b/chrome/browser/download/download_history.cc
index 1c5574c6..6b7d5a2 100644
--- a/chrome/browser/download/download_history.cc
+++ b/chrome/browser/download/download_history.cc
@@ -106,6 +106,9 @@
item->SetUserData(kKey, base::WrapUnique(this));
}
+ DownloadHistoryData(const DownloadHistoryData&) = delete;
+ DownloadHistoryData& operator=(const DownloadHistoryData&) = delete;
+
~DownloadHistoryData() override {}
PersistenceState state() const { return state_; }
@@ -129,8 +132,6 @@
PersistenceState state_ = NOT_PERSISTED;
std::unique_ptr<history::DownloadRow> info_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadHistoryData);
};
const char DownloadHistoryData::kKey[] =
diff --git a/chrome/browser/download/download_history.h b/chrome/browser/download/download_history.h
index 8607906..9d56440d 100644
--- a/chrome/browser/download/download_history.h
+++ b/chrome/browser/download/download_history.h
@@ -33,6 +33,10 @@
class HistoryAdapter {
public:
explicit HistoryAdapter(history::HistoryService* history);
+
+ HistoryAdapter(const HistoryAdapter&) = delete;
+ HistoryAdapter& operator=(const HistoryAdapter&) = delete;
+
virtual ~HistoryAdapter();
virtual void QueryDownloads(
@@ -49,7 +53,6 @@
private:
history::HistoryService* history_;
- DISALLOW_COPY_AND_ASSIGN(HistoryAdapter);
};
class Observer {
@@ -88,6 +91,9 @@
DownloadHistory(content::DownloadManager* manager,
std::unique_ptr<HistoryAdapter> history);
+ DownloadHistory(const DownloadHistory&) = delete;
+ DownloadHistory& operator=(const DownloadHistory&) = delete;
+
~DownloadHistory() override;
void AddObserver(Observer* observer);
@@ -156,8 +162,6 @@
base::ObserverList<Observer>::Unchecked observers_;
base::WeakPtrFactory<DownloadHistory> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DownloadHistory);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_HISTORY_H_
diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h
index c194f9c3..4cfb2f0e 100644
--- a/chrome/browser/download/download_item_model.h
+++ b/chrome/browser/download/download_item_model.h
@@ -29,6 +29,10 @@
// Constructs a DownloadItemModel. The caller must ensure that |download|
// outlives this object.
explicit DownloadItemModel(download::DownloadItem* download);
+
+ DownloadItemModel(const DownloadItemModel&) = delete;
+ DownloadItemModel& operator=(const DownloadItemModel&) = delete;
+
~DownloadItemModel() override;
// DownloadUIModel implementation.
@@ -117,8 +121,6 @@
// itself shouldn't maintain any state since there can be more than one
// DownloadItemModel in use with the same DownloadItem.
download::DownloadItem* download_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadItemModel);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_MODEL_H_
diff --git a/chrome/browser/download/download_offline_content_provider.cc b/chrome/browser/download/download_offline_content_provider.cc
index b67ce6ee..d658fac8 100644
--- a/chrome/browser/download/download_offline_content_provider.cc
+++ b/chrome/browser/download/download_offline_content_provider.cc
@@ -82,6 +82,10 @@
: public download::AllDownloadEventNotifier::Observer {
public:
explicit AllDownloadObserver(DownloadOfflineContentProvider* provider);
+
+ AllDownloadObserver(const AllDownloadObserver&) = delete;
+ AllDownloadObserver& operator=(const AllDownloadObserver&) = delete;
+
~AllDownloadObserver() override;
void OnDownloadUpdated(SimpleDownloadManagerCoordinator* manager,
@@ -95,8 +99,6 @@
DownloadOfflineContentProvider* provider_;
base::WeakPtrFactory<AllDownloadObserver> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AllDownloadObserver);
};
AllDownloadObserver::AllDownloadObserver(
diff --git a/chrome/browser/download/download_offline_content_provider.h b/chrome/browser/download/download_offline_content_provider.h
index 3b8d090..2bcb5f2 100644
--- a/chrome/browser/download/download_offline_content_provider.h
+++ b/chrome/browser/download/download_offline_content_provider.h
@@ -48,6 +48,12 @@
public:
explicit DownloadOfflineContentProvider(OfflineContentAggregator* aggregator,
const std::string& name_space);
+
+ DownloadOfflineContentProvider(const DownloadOfflineContentProvider&) =
+ delete;
+ DownloadOfflineContentProvider& operator=(
+ const DownloadOfflineContentProvider&) = delete;
+
~DownloadOfflineContentProvider() override;
// Should be called when a DownloadManager is available.
@@ -145,8 +151,6 @@
Profile* profile_;
base::WeakPtrFactory<DownloadOfflineContentProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DownloadOfflineContentProvider);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_OFFLINE_CONTENT_PROVIDER_H_
diff --git a/chrome/browser/download/download_offline_content_provider_unittest.cc b/chrome/browser/download/download_offline_content_provider_unittest.cc
index a636229..0e86258 100644
--- a/chrome/browser/download/download_offline_content_provider_unittest.cc
+++ b/chrome/browser/download/download_offline_content_provider_unittest.cc
@@ -33,6 +33,11 @@
provider_(&aggregator_, kTestDownloadNamespace),
coordinator_(base::NullCallback(), false) {}
+ DownloadOfflineContentProviderTest(
+ const DownloadOfflineContentProviderTest&) = delete;
+ DownloadOfflineContentProviderTest& operator=(
+ const DownloadOfflineContentProviderTest&) = delete;
+
~DownloadOfflineContentProviderTest() override {}
void InitializeDownloads(bool full_browser) {
@@ -48,8 +53,6 @@
DownloadOfflineContentProvider provider_;
SimpleDownloadManagerCoordinator coordinator_;
NiceMock<download::MockSimpleDownloadManager> mock_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadOfflineContentProviderTest);
};
TEST_F(DownloadOfflineContentProviderTest, PauseDownloadBeforeInit) {
diff --git a/chrome/browser/download/download_open_prompt.cc b/chrome/browser/download/download_open_prompt.cc
index a83d39b..903dc1b 100644
--- a/chrome/browser/download/download_open_prompt.cc
+++ b/chrome/browser/download/download_open_prompt.cc
@@ -27,6 +27,12 @@
const std::string& extension_name,
const base::FilePath& file_path,
DownloadOpenPrompt::OpenCallback open_callback);
+
+ DownloadOpenConfirmationDialog(const DownloadOpenConfirmationDialog&) =
+ delete;
+ DownloadOpenConfirmationDialog& operator=(
+ const DownloadOpenConfirmationDialog&) = delete;
+
~DownloadOpenConfirmationDialog() override;
std::u16string GetTitle() override;
@@ -44,8 +50,6 @@
std::string extension_name_;
base::FilePath file_path_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadOpenConfirmationDialog);
};
DownloadOpenConfirmationDialog::DownloadOpenConfirmationDialog(
diff --git a/chrome/browser/download/download_permission_request.h b/chrome/browser/download/download_permission_request.h
index 92e23bf..616e1b4 100644
--- a/chrome/browser/download/download_permission_request.h
+++ b/chrome/browser/download/download_permission_request.h
@@ -20,6 +20,11 @@
DownloadPermissionRequest(
base::WeakPtr<DownloadRequestLimiter::TabDownloadState> host,
const url::Origin& requesting_origin);
+
+ DownloadPermissionRequest(const DownloadPermissionRequest&) = delete;
+ DownloadPermissionRequest& operator=(const DownloadPermissionRequest&) =
+ delete;
+
~DownloadPermissionRequest() override;
private:
@@ -28,8 +33,6 @@
base::WeakPtr<DownloadRequestLimiter::TabDownloadState> host_;
url::Origin requesting_origin_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadPermissionRequest);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_PERMISSION_REQUEST_H_
diff --git a/chrome/browser/download/download_prefs.h b/chrome/browser/download/download_prefs.h
index fae08f32..dabbb420 100644
--- a/chrome/browser/download/download_prefs.h
+++ b/chrome/browser/download/download_prefs.h
@@ -48,6 +48,10 @@
MALICIOUS_FILES = 4,
};
explicit DownloadPrefs(Profile* profile);
+
+ DownloadPrefs(const DownloadPrefs&) = delete;
+ DownloadPrefs& operator=(const DownloadPrefs&) = delete;
+
~DownloadPrefs();
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
@@ -184,8 +188,6 @@
// If this is true, SanitizeDownloadTargetPath will always return the passed
// path verbatim.
bool skip_sanitize_download_target_path_for_testing_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadPrefs);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_PREFS_H_
diff --git a/chrome/browser/download/download_query.h b/chrome/browser/download/download_query.h
index 3cb19dc..3b9665c 100644
--- a/chrome/browser/download/download_query.h
+++ b/chrome/browser/download/download_query.h
@@ -100,6 +100,10 @@
const download::DownloadItem& item);
DownloadQuery();
+
+ DownloadQuery(const DownloadQuery&) = delete;
+ DownloadQuery& operator=(const DownloadQuery&) = delete;
+
~DownloadQuery();
// Adds a new filter of type |type| with value |value| and returns true if
@@ -158,8 +162,6 @@
FilterCallbackVector filters_;
SorterVector sorters_;
size_t limit_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadQuery);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_QUERY_H_
diff --git a/chrome/browser/download/download_query_unittest.cc b/chrome/browser/download/download_query_unittest.cc
index 10d6a19a..ac4fe89a 100644
--- a/chrome/browser/download/download_query_unittest.cc
+++ b/chrome/browser/download/download_query_unittest.cc
@@ -56,6 +56,9 @@
public:
DownloadQueryTest() {}
+ DownloadQueryTest(const DownloadQueryTest&) = delete;
+ DownloadQueryTest& operator=(const DownloadQueryTest&) = delete;
+
~DownloadQueryTest() override {}
void TearDown() override {}
@@ -109,8 +112,6 @@
std::vector<std::unique_ptr<download::MockDownloadItem>> owned_mocks_;
DownloadQuery query_;
DownloadVector results_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadQueryTest);
};
template<> void DownloadQueryTest::AddFilter(
diff --git a/chrome/browser/download/download_request_limiter.h b/chrome/browser/download/download_request_limiter.h
index 44999af6..3ed75f5 100644
--- a/chrome/browser/download/download_request_limiter.h
+++ b/chrome/browser/download/download_request_limiter.h
@@ -95,6 +95,10 @@
// download status.
TabDownloadState(DownloadRequestLimiter* host,
content::WebContents* web_contents);
+
+ TabDownloadState(const TabDownloadState&) = delete;
+ TabDownloadState& operator=(const TabDownloadState&) = delete;
+
~TabDownloadState() override;
// Sets the current limiter state and the underlying automatic downloads
@@ -221,8 +225,6 @@
// becomes moot.
base::WeakPtrFactory<DownloadRequestLimiter::TabDownloadState> factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(TabDownloadState);
};
DownloadRequestLimiter();
diff --git a/chrome/browser/download/download_shelf_context_menu.h b/chrome/browser/download/download_shelf_context_menu.h
index 76c8cef..d7080c7 100644
--- a/chrome/browser/download/download_shelf_context_menu.h
+++ b/chrome/browser/download/download_shelf_context_menu.h
@@ -29,6 +29,9 @@
// Only show a context menu for a dangerous download if it is malicious.
static bool WantsContextMenu(DownloadUIModel* download_model);
+ DownloadShelfContextMenu(const DownloadShelfContextMenu&) = delete;
+ DownloadShelfContextMenu& operator=(const DownloadShelfContextMenu&) = delete;
+
~DownloadShelfContextMenu() override;
protected:
@@ -84,8 +87,6 @@
// Use WeakPtr because the context menu may outlive |download_|.
base::WeakPtr<DownloadUIModel> download_;
std::unique_ptr<DownloadCommands> download_commands_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadShelfContextMenu);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_SHELF_CONTEXT_MENU_H_
diff --git a/chrome/browser/download/download_shelf_controller.h b/chrome/browser/download/download_shelf_controller.h
index 8b75e1c..4379407 100644
--- a/chrome/browser/download/download_shelf_controller.h
+++ b/chrome/browser/download/download_shelf_controller.h
@@ -24,6 +24,10 @@
class DownloadShelfController : public OfflineContentProvider::Observer {
public:
explicit DownloadShelfController(Profile* profile);
+
+ DownloadShelfController(const DownloadShelfController&) = delete;
+ DownloadShelfController& operator=(const DownloadShelfController&) = delete;
+
~DownloadShelfController() override;
private:
@@ -43,8 +47,6 @@
base::ScopedObservation<OfflineContentProvider,
OfflineContentProvider::Observer>
observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DownloadShelfController);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_SHELF_CONTROLLER_H_
diff --git a/chrome/browser/download/download_status_updater.h b/chrome/browser/download/download_status_updater.h
index a0f4448..11b4912d 100644
--- a/chrome/browser/download/download_status_updater.h
+++ b/chrome/browser/download/download_status_updater.h
@@ -21,6 +21,10 @@
: public download::AllDownloadItemNotifier::Observer {
public:
DownloadStatusUpdater();
+
+ DownloadStatusUpdater(const DownloadStatusUpdater&) = delete;
+ DownloadStatusUpdater& operator=(const DownloadStatusUpdater&) = delete;
+
~DownloadStatusUpdater() override;
// Fills in |*download_count| with the number of currently active downloads.
@@ -62,8 +66,6 @@
std::vector<std::unique_ptr<download::AllDownloadItemNotifier>> notifiers_;
std::map<Profile*, std::unique_ptr<ScopedProfileKeepAlive>>
profile_keep_alives_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadStatusUpdater);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_STATUS_UPDATER_H_
diff --git a/chrome/browser/download/download_ui_controller.h b/chrome/browser/download/download_ui_controller.h
index e590dea..339fdc3 100644
--- a/chrome/browser/download/download_ui_controller.h
+++ b/chrome/browser/download/download_ui_controller.h
@@ -38,6 +38,9 @@
DownloadUIController(content::DownloadManager* manager,
std::unique_ptr<Delegate> delegate);
+ DownloadUIController(const DownloadUIController&) = delete;
+ DownloadUIController& operator=(const DownloadUIController&) = delete;
+
~DownloadUIController() override;
private:
@@ -49,8 +52,6 @@
download::AllDownloadItemNotifier download_notifier_;
std::unique_ptr<Delegate> delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadUIController);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_UI_CONTROLLER_H_
diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/download/download_ui_model.h
index 19664a4..bc01d2c 100644
--- a/chrome/browser/download/download_ui_model.h
+++ b/chrome/browser/download/download_ui_model.h
@@ -35,6 +35,10 @@
std::unique_ptr<DownloadUIModel, base::OnTaskRunnerDeleter>;
DownloadUIModel();
+
+ DownloadUIModel(const DownloadUIModel&) = delete;
+ DownloadUIModel& operator=(const DownloadUIModel&) = delete;
+
virtual ~DownloadUIModel();
// Observer for a single DownloadUIModel.
@@ -358,8 +362,6 @@
offline_items_collection::FailState fail_state) const;
base::WeakPtrFactory<DownloadUIModel> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DownloadUIModel);
};
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_UI_MODEL_H_
diff --git a/chrome/browser/download/notification/download_item_notification.h b/chrome/browser/download/notification/download_item_notification.h
index 8eacdfa..6d9562d6 100644
--- a/chrome/browser/download/notification/download_item_notification.h
+++ b/chrome/browser/download/notification/download_item_notification.h
@@ -40,6 +40,10 @@
DownloadItemNotification(Profile* profile,
DownloadUIModel::DownloadUIModelPtr item);
+
+ DownloadItemNotification(const DownloadItemNotification&) = delete;
+ DownloadItemNotification& operator=(const DownloadItemNotification&) = delete;
+
~DownloadItemNotification() override;
// Observer for this notification.
@@ -158,8 +162,6 @@
ImageDecodeStatus image_decode_status_ = NOT_STARTED;
base::WeakPtrFactory<DownloadItemNotification> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DownloadItemNotification);
};
#endif // CHROME_BROWSER_DOWNLOAD_NOTIFICATION_DOWNLOAD_ITEM_NOTIFICATION_H_
diff --git a/chrome/browser/download/notification/download_notification_browsertest.cc b/chrome/browser/download/notification/download_notification_browsertest.cc
index 30a8fbf..d217883 100644
--- a/chrome/browser/download/notification/download_notification_browsertest.cc
+++ b/chrome/browser/download/notification/download_notification_browsertest.cc
@@ -288,6 +288,10 @@
IsHoldingSpaceInProgressDownloadsIntegrationEnabled());
}
+ DownloadNotificationTestBase(const DownloadNotificationTestBase&) = delete;
+ DownloadNotificationTestBase& operator=(const DownloadNotificationTestBase&) =
+ delete;
+
~DownloadNotificationTestBase() override = default;
void SetUpOnMainThread() override {
@@ -330,9 +334,6 @@
std::unique_ptr<NotificationDisplayServiceTester> incognito_display_service_;
std::unique_ptr<SlowDownloadInterceptor> interceptor_;
- private:
- DISALLOW_COPY_AND_ASSIGN(DownloadNotificationTestBase);
-
base::test::ScopedFeatureList scoped_feature_list_;
};
@@ -343,6 +344,10 @@
class DownloadNotificationTest : public DownloadNotificationTestBase {
public:
DownloadNotificationTest() = default;
+
+ DownloadNotificationTest(const DownloadNotificationTest&) = delete;
+ DownloadNotificationTest& operator=(const DownloadNotificationTest&) = delete;
+
~DownloadNotificationTest() override = default;
void SetUpOnMainThread() override {
@@ -506,8 +511,6 @@
download::DownloadItem* download_item_ = nullptr;
Browser* incognito_browser_ = nullptr;
std::string notification_id_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadNotificationTest);
};
INSTANTIATE_TEST_SUITE_P(
@@ -1135,6 +1138,12 @@
: public DownloadNotificationTestBase {
public:
MultiProfileDownloadNotificationTest() = default;
+
+ MultiProfileDownloadNotificationTest(
+ const MultiProfileDownloadNotificationTest&) = delete;
+ MultiProfileDownloadNotificationTest& operator=(
+ const MultiProfileDownloadNotificationTest&) = delete;
+
~MultiProfileDownloadNotificationTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -1200,9 +1209,6 @@
std::unique_ptr<NotificationDisplayServiceTester> display_service1_;
std::unique_ptr<NotificationDisplayServiceTester> display_service2_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MultiProfileDownloadNotificationTest);
};
INSTANTIATE_TEST_SUITE_P(
diff --git a/chrome/browser/download/notification/download_notification_manager.h b/chrome/browser/download/notification/download_notification_manager.h
index 683b1d37..004b79a 100644
--- a/chrome/browser/download/notification/download_notification_manager.h
+++ b/chrome/browser/download/notification/download_notification_manager.h
@@ -21,6 +21,11 @@
public DownloadItemNotification::Observer {
public:
explicit DownloadNotificationManager(Profile* profile);
+
+ DownloadNotificationManager(const DownloadNotificationManager&) = delete;
+ DownloadNotificationManager& operator=(const DownloadNotificationManager&) =
+ delete;
+
~DownloadNotificationManager() override;
// DownloadUIController::Delegate overrides.
@@ -35,8 +40,6 @@
Profile* profile_;
std::map<ContentId, DownloadItemNotification::DownloadItemNotificationPtr>
items_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadNotificationManager);
};
#endif // CHROME_BROWSER_DOWNLOAD_NOTIFICATION_DOWNLOAD_NOTIFICATION_MANAGER_H_
diff --git a/chrome/browser/download/offline_item_model.h b/chrome/browser/download/offline_item_model.h
index d2b261d..88983d6 100644
--- a/chrome/browser/download/offline_item_model.h
+++ b/chrome/browser/download/offline_item_model.h
@@ -30,6 +30,10 @@
// Constructs a OfflineItemModel.
OfflineItemModel(OfflineItemModelManager* manager,
const OfflineItem& offline_item);
+
+ OfflineItemModel(const OfflineItemModel&) = delete;
+ OfflineItemModel& operator=(const OfflineItemModel&) = delete;
+
~OfflineItemModel() override;
// DownloadUIModel implementation.
@@ -85,8 +89,6 @@
std::unique_ptr<FilteredOfflineItemObserver> offline_item_observer_;
std::unique_ptr<OfflineItem> offline_item_;
-
- DISALLOW_COPY_AND_ASSIGN(OfflineItemModel);
};
#endif // CHROME_BROWSER_DOWNLOAD_OFFLINE_ITEM_MODEL_H_
diff --git a/chrome/browser/download/offline_item_model_manager.h b/chrome/browser/download/offline_item_model_manager.h
index 60338fc..87ecd38 100644
--- a/chrome/browser/download/offline_item_model_manager.h
+++ b/chrome/browser/download/offline_item_model_manager.h
@@ -22,6 +22,10 @@
public:
// Constructs a OfflineItemModelManager.
explicit OfflineItemModelManager(content::BrowserContext* browser_context);
+
+ OfflineItemModelManager(const OfflineItemModelManager&) = delete;
+ OfflineItemModelManager& operator=(const OfflineItemModelManager&) = delete;
+
~OfflineItemModelManager() override;
// Returns the OfflineItemModel for the ContentId, if not found, an empty
@@ -36,8 +40,6 @@
content::BrowserContext* browser_context_;
std::map<ContentId, std::unique_ptr<OfflineItemModelData>>
offline_item_model_data_;
-
- DISALLOW_COPY_AND_ASSIGN(OfflineItemModelManager);
};
#endif // CHROME_BROWSER_DOWNLOAD_OFFLINE_ITEM_MODEL_MANAGER_H_
diff --git a/chrome/browser/download/save_package_file_picker.h b/chrome/browser/download/save_package_file_picker.h
index c14bb35..816ca52 100644
--- a/chrome/browser/download/save_package_file_picker.h
+++ b/chrome/browser/download/save_package_file_picker.h
@@ -24,6 +24,10 @@
bool can_save_as_complete,
DownloadPrefs* download_prefs,
content::SavePackagePathPickedCallback callback);
+
+ SavePackageFilePicker(const SavePackageFilePicker&) = delete;
+ SavePackageFilePicker& operator=(const SavePackageFilePicker&) = delete;
+
~SavePackageFilePicker() override;
// Used to disable prompting the user for a directory/filename of the saved
@@ -54,8 +58,6 @@
// For managing select file dialogs.
scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
-
- DISALLOW_COPY_AND_ASSIGN(SavePackageFilePicker);
};
#endif // CHROME_BROWSER_DOWNLOAD_SAVE_PACKAGE_FILE_PICKER_H_
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index a0bc096..21e69eb 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -120,6 +120,10 @@
->AddObserver(this);
}
+ DownloadPersistedObserver(const DownloadPersistedObserver&) = delete;
+ DownloadPersistedObserver& operator=(const DownloadPersistedObserver&) =
+ delete;
+
~DownloadPersistedObserver() override {
DownloadCoreService* service =
DownloadCoreServiceFactory::GetForBrowserContext(profile_);
@@ -148,8 +152,6 @@
PersistedFilter filter_;
base::OnceClosure quit_waiting_callback_;
bool persisted_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadPersistedObserver);
};
// Waits for an item record to be removed from the downloads database.
@@ -159,6 +161,10 @@
: DownloadPersistedObserver(profile, PersistedFilter()),
removed_(false),
download_id_(download_id) {}
+
+ DownloadRemovedObserver(const DownloadRemovedObserver&) = delete;
+ DownloadRemovedObserver& operator=(const DownloadRemovedObserver&) = delete;
+
~DownloadRemovedObserver() override {}
bool WaitForRemoved() {
@@ -183,8 +189,6 @@
bool removed_;
base::OnceClosure quit_waiting_callback_;
int32_t download_id_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadRemovedObserver);
};
bool DownloadStoredProperly(const GURL& expected_url,
@@ -232,6 +236,10 @@
manager->AddObserver(this);
}
+ DownloadItemCreatedObserver(const DownloadItemCreatedObserver&) = delete;
+ DownloadItemCreatedObserver& operator=(const DownloadItemCreatedObserver&) =
+ delete;
+
~DownloadItemCreatedObserver() override {
if (manager_)
manager_->RemoveObserver(this);
@@ -280,8 +288,6 @@
base::OnceClosure quit_waiting_callback_;
DownloadManager* manager_;
std::vector<DownloadItem*> items_seen_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadItemCreatedObserver);
};
class SavePageBrowserTest : public InProcessBrowserTest {
@@ -525,6 +531,12 @@
explicit DelayingDownloadManagerDelegate(Profile* profile)
: ChromeDownloadManagerDelegate(profile) {
}
+
+ DelayingDownloadManagerDelegate(const DelayingDownloadManagerDelegate&) =
+ delete;
+ DelayingDownloadManagerDelegate& operator=(
+ const DelayingDownloadManagerDelegate&) = delete;
+
~DelayingDownloadManagerDelegate() override {}
bool ShouldCompleteDownload(
@@ -532,9 +544,6 @@
base::OnceClosure user_complete_callback) override {
return false;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DelayingDownloadManagerDelegate);
};
// Disabled on multiple platforms due to flakiness. crbug.com/580766
diff --git a/chrome/browser/download/trusted_sources_manager.h b/chrome/browser/download/trusted_sources_manager.h
index 52b4c22d..8468e1ebf 100644
--- a/chrome/browser/download/trusted_sources_manager.h
+++ b/chrome/browser/download/trusted_sources_manager.h
@@ -15,6 +15,9 @@
// Identifies if a URL is from a trusted source.
class TrustedSourcesManager {
public:
+ TrustedSourcesManager(const TrustedSourcesManager&) = delete;
+ TrustedSourcesManager& operator=(const TrustedSourcesManager&) = delete;
+
virtual ~TrustedSourcesManager();
// Creates a platform-dependent instance of TrustedSourcesManager.
@@ -42,8 +45,6 @@
private:
net::SchemeHostPortMatcher matcher_;
-
- DISALLOW_COPY_AND_ASSIGN(TrustedSourcesManager);
};
#endif // CHROME_BROWSER_DOWNLOAD_TRUSTED_SOURCES_MANAGER_H_
diff --git a/chrome/browser/engagement/important_sites_util_browsertest.cc b/chrome/browser/engagement/important_sites_util_browsertest.cc
index f1b9dee..6ec8ac1 100644
--- a/chrome/browser/engagement/important_sites_util_browsertest.cc
+++ b/chrome/browser/engagement/important_sites_util_browsertest.cc
@@ -24,6 +24,11 @@
class ImportantSitesUtilBrowserTest : public AndroidBrowserTest {
public:
ImportantSitesUtilBrowserTest() = default;
+
+ ImportantSitesUtilBrowserTest(const ImportantSitesUtilBrowserTest&) = delete;
+ ImportantSitesUtilBrowserTest& operator=(
+ const ImportantSitesUtilBrowserTest&) = delete;
+
~ImportantSitesUtilBrowserTest() override = default;
protected:
@@ -82,8 +87,6 @@
private:
GURL default_search_url_;
base::test::ScopedFeatureList features_;
-
- DISALLOW_COPY_AND_ASSIGN(ImportantSitesUtilBrowserTest);
};
// An origin with notification permission should be considered important, unless
diff --git a/chrome/browser/engagement/site_engagement_service_unittest.cc b/chrome/browser/engagement/site_engagement_service_unittest.cc
index aad5a01f..96c0c1c 100644
--- a/chrome/browser/engagement/site_engagement_service_unittest.cc
+++ b/chrome/browser/engagement/site_engagement_service_unittest.cc
@@ -62,6 +62,11 @@
explicit SiteEngagementChangeWaiter(Profile* profile) : profile_(profile) {
HostContentSettingsMapFactory::GetForProfile(profile)->AddObserver(this);
}
+
+ SiteEngagementChangeWaiter(const SiteEngagementChangeWaiter&) = delete;
+ SiteEngagementChangeWaiter& operator=(const SiteEngagementChangeWaiter&) =
+ delete;
+
~SiteEngagementChangeWaiter() override {
HostContentSettingsMapFactory::GetForProfile(profile_)->RemoveObserver(
this);
@@ -82,8 +87,6 @@
Profile* profile_;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(SiteEngagementChangeWaiter);
};
base::Time GetReferenceTime() {
diff --git a/chrome/browser/enterprise/reporting/browser_report_generator_unittest.cc b/chrome/browser/enterprise/reporting/browser_report_generator_unittest.cc
index 421d15f..22738dd 100644
--- a/chrome/browser/enterprise/reporting/browser_report_generator_unittest.cc
+++ b/chrome/browser/enterprise/reporting/browser_report_generator_unittest.cc
@@ -152,6 +152,11 @@
: profile_manager_(TestingBrowserProcess::GetGlobal()),
generator_(&delegate_factory_) {
}
+
+ BrowserReportGeneratorTest(const BrowserReportGeneratorTest&) = delete;
+ BrowserReportGeneratorTest& operator=(const BrowserReportGeneratorTest&) =
+ delete;
+
~BrowserReportGeneratorTest() override = default;
void SetUp() override {
@@ -275,8 +280,6 @@
#if !defined(OS_ANDROID)
ScopedExtensionRequestReportThrottler throttler_;
#endif // !defined(OS_ANDROID)
-
- DISALLOW_COPY_AND_ASSIGN(BrowserReportGeneratorTest);
};
TEST_F(BrowserReportGeneratorTest, GenerateBasicReport) {
diff --git a/chrome/browser/enterprise/reporting/report_generator_unittest.cc b/chrome/browser/enterprise/reporting/report_generator_unittest.cc
index 77a6ce7..8ecdd60 100644
--- a/chrome/browser/enterprise/reporting/report_generator_unittest.cc
+++ b/chrome/browser/enterprise/reporting/report_generator_unittest.cc
@@ -159,6 +159,10 @@
ReportGeneratorTest()
: generator_(&delegate_factory_),
profile_manager_(TestingBrowserProcess::GetGlobal()) {}
+
+ ReportGeneratorTest(const ReportGeneratorTest&) = delete;
+ ReportGeneratorTest& operator=(const ReportGeneratorTest&) = delete;
+
~ReportGeneratorTest() override = default;
void SetUp() override {
@@ -315,8 +319,6 @@
content::BrowserTaskEnvironment task_environment_;
TestingProfileManager profile_manager_;
std::unique_ptr<base::HistogramTester> histogram_tester_;
-
- DISALLOW_COPY_AND_ASSIGN(ReportGeneratorTest);
};
#if defined(OS_ANDROID)
diff --git a/chrome/browser/enterprise/reporting/report_request_queue_generator_unittest.cc b/chrome/browser/enterprise/reporting/report_request_queue_generator_unittest.cc
index 068a6770..5105faa9 100644
--- a/chrome/browser/enterprise/reporting/report_request_queue_generator_unittest.cc
+++ b/chrome/browser/enterprise/reporting/report_request_queue_generator_unittest.cc
@@ -56,6 +56,11 @@
report_request_queue_generator_(&reporting_delegate_factory_) {
}
+ ReportRequestQueueGeneratorTest(const ReportRequestQueueGeneratorTest&) =
+ delete;
+ ReportRequestQueueGeneratorTest& operator=(
+ const ReportRequestQueueGeneratorTest&) = delete;
+
~ReportRequestQueueGeneratorTest() override = default;
void SetUp() override {
@@ -216,8 +221,6 @@
BrowserReportGenerator browser_report_generator_;
ReportRequestQueueGenerator report_request_queue_generator_;
std::unique_ptr<base::HistogramTester> histogram_tester_;
-
- DISALLOW_COPY_AND_ASSIGN(ReportRequestQueueGeneratorTest);
};
TEST_F(ReportRequestQueueGeneratorTest, GenerateReport) {
diff --git a/chrome/browser/enterprise/reporting/report_scheduler_desktop_unittest.cc b/chrome/browser/enterprise/reporting/report_scheduler_desktop_unittest.cc
index ddd4bb4..e85660dc 100644
--- a/chrome/browser/enterprise/reporting/report_scheduler_desktop_unittest.cc
+++ b/chrome/browser/enterprise/reporting/report_scheduler_desktop_unittest.cc
@@ -87,11 +87,12 @@
class MockReportUploader : public ReportUploader {
public:
MockReportUploader() : ReportUploader(nullptr, 0) {}
+
+ MockReportUploader(const MockReportUploader&) = delete;
+ MockReportUploader& operator=(const MockReportUploader&) = delete;
+
~MockReportUploader() override = default;
MOCK_METHOD2(SetRequestAndUpload, void(ReportRequests, ReportCallback));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockReportUploader);
};
class MockRealTimeReportGenerator : public RealTimeReportGenerator {
@@ -125,6 +126,10 @@
: task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME),
local_state_(TestingBrowserProcess::GetGlobal()),
profile_manager_(TestingBrowserProcess::GetGlobal(), &local_state_) {}
+
+ ReportSchedulerTest(const ReportSchedulerTest&) = delete;
+ ReportSchedulerTest& operator=(const ReportSchedulerTest&) = delete;
+
~ReportSchedulerTest() override = default;
void SetUp() override {
@@ -261,7 +266,6 @@
std::unique_ptr<MockReportUploader> uploader_ptr_;
std::unique_ptr<MockRealTimeReportGenerator> real_time_generator_ptr_;
std::unique_ptr<MockRealTimeUploader> extension_request_uploader_ptr_;
- DISALLOW_COPY_AND_ASSIGN(ReportSchedulerTest);
};
class ReportSchedulerFeatureTest : public ::testing::WithParamInterface<bool>,
diff --git a/chrome/browser/exo_parts.h b/chrome/browser/exo_parts.h
index 26a9de57..8ba9d0a 100644
--- a/chrome/browser/exo_parts.h
+++ b/chrome/browser/exo_parts.h
@@ -22,6 +22,9 @@
// Creates ExoParts. Returns null if exo should not be created.
static std::unique_ptr<ExoParts> CreateIfNecessary();
+ ExoParts(const ExoParts&) = delete;
+ ExoParts& operator=(const ExoParts&) = delete;
+
~ExoParts();
private:
@@ -29,8 +32,6 @@
std::unique_ptr<ash::ArcOverlayManager> arc_overlay_manager_;
std::unique_ptr<exo::WaylandServerController> wayland_server_;
-
- DISALLOW_COPY_AND_ASSIGN(ExoParts);
};
#endif // CHROME_BROWSER_EXO_PARTS_H_
diff --git a/chrome/browser/extensions/active_tab_permission_granter.h b/chrome/browser/extensions/active_tab_permission_granter.h
index 5a90e550..0cc8821 100644
--- a/chrome/browser/extensions/active_tab_permission_granter.h
+++ b/chrome/browser/extensions/active_tab_permission_granter.h
@@ -45,6 +45,11 @@
ActiveTabPermissionGranter(content::WebContents* web_contents,
int tab_id,
Profile* profile);
+
+ ActiveTabPermissionGranter(const ActiveTabPermissionGranter&) = delete;
+ ActiveTabPermissionGranter& operator=(const ActiveTabPermissionGranter&) =
+ delete;
+
~ActiveTabPermissionGranter() override;
// Platform specific delegate should be set during startup.
@@ -82,8 +87,6 @@
// Listen to extension unloaded notifications.
base::ScopedObservation<ExtensionRegistry, ExtensionRegistryObserver>
extension_registry_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ActiveTabPermissionGranter);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc
index d12482bd..0220049 100644
--- a/chrome/browser/extensions/active_tab_unittest.cc
+++ b/chrome/browser/extensions/active_tab_unittest.cc
@@ -98,6 +98,12 @@
: public ActiveTabPermissionGranter::Delegate {
public:
ActiveTabPermissionGranterTestDelegate() {}
+
+ ActiveTabPermissionGranterTestDelegate(
+ const ActiveTabPermissionGranterTestDelegate&) = delete;
+ ActiveTabPermissionGranterTestDelegate& operator=(
+ const ActiveTabPermissionGranterTestDelegate&) = delete;
+
~ActiveTabPermissionGranterTestDelegate() override {}
// ActiveTabPermissionGranterTestDelegate::Delegate
@@ -116,8 +122,6 @@
private:
bool should_grant_ = false;
int should_grant_call_count_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(ActiveTabPermissionGranterTestDelegate);
};
class ActiveTabTest : public ChromeRenderViewHostTestHarness {
diff --git a/chrome/browser/extensions/activity_log/database_string_table.h b/chrome/browser/extensions/activity_log/database_string_table.h
index 32e4bf6f..c9f6d92d 100644
--- a/chrome/browser/extensions/activity_log/database_string_table.h
+++ b/chrome/browser/extensions/activity_log/database_string_table.h
@@ -34,6 +34,9 @@
public:
explicit DatabaseStringTable(const std::string& table);
+ DatabaseStringTable(const DatabaseStringTable&) = delete;
+ DatabaseStringTable& operator=(const DatabaseStringTable&) = delete;
+
~DatabaseStringTable();
// Initialize the database table. This will create the table if it does not
@@ -70,8 +73,6 @@
std::string table_;
FRIEND_TEST_ALL_PREFIXES(DatabaseStringTableTest, Prune);
-
- DISALLOW_COPY_AND_ASSIGN(DatabaseStringTable);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client.h b/chrome/browser/extensions/api/chrome_extensions_api_client.h
index 0103b33..3a83108 100644
--- a/chrome/browser/extensions/api/chrome_extensions_api_client.h
+++ b/chrome/browser/extensions/api/chrome_extensions_api_client.h
@@ -20,6 +20,11 @@
class ChromeExtensionsAPIClient : public ExtensionsAPIClient {
public:
ChromeExtensionsAPIClient();
+
+ ChromeExtensionsAPIClient(const ChromeExtensionsAPIClient&) = delete;
+ ChromeExtensionsAPIClient& operator=(const ChromeExtensionsAPIClient&) =
+ delete;
+
~ChromeExtensionsAPIClient() override;
// ExtensionsApiClient implementation.
@@ -113,8 +118,6 @@
#endif
std::unique_ptr<extensions::ChromeAutomationInternalApiDelegate>
extensions_automation_api_delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeExtensionsAPIClient);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_custom_extension_provider.h b/chrome/browser/extensions/api/content_settings/content_settings_custom_extension_provider.h
index 0d0f698..83bbe5e5 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_custom_extension_provider.h
+++ b/chrome/browser/extensions/api/content_settings/content_settings_custom_extension_provider.h
@@ -22,6 +22,9 @@
extensions_settings,
bool incognito);
+ CustomExtensionProvider(const CustomExtensionProvider&) = delete;
+ CustomExtensionProvider& operator=(const CustomExtensionProvider&) = delete;
+
~CustomExtensionProvider() override;
// ProviderInterface methods:
@@ -52,8 +55,6 @@
// The backend storing content setting rules defined by extensions.
scoped_refptr<extensions::ContentSettingsStore> extensions_settings_;
-
- DISALLOW_COPY_AND_ASSIGN(CustomExtensionProvider);
};
} // namespace content_settings
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_service.h b/chrome/browser/extensions/api/content_settings/content_settings_service.h
index ce32761a..366b166 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_service.h
+++ b/chrome/browser/extensions/api/content_settings/content_settings_service.h
@@ -24,6 +24,10 @@
public EarlyExtensionPrefsObserver {
public:
explicit ContentSettingsService(content::BrowserContext* context);
+
+ ContentSettingsService(const ContentSettingsService&) = delete;
+ ContentSettingsService& operator=(const ContentSettingsService&) = delete;
+
~ContentSettingsService() override;
scoped_refptr<ContentSettingsStore> content_settings_store() const {
@@ -61,8 +65,6 @@
scoped_refptr<ContentSettingsStore> content_settings_store_;
base::ScopedObservation<ExtensionPrefs, ExtensionPrefsObserver>
scoped_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ContentSettingsService);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/cookies/cookies_api.h b/chrome/browser/extensions/api/cookies/cookies_api.h
index e2debea..b358e2c8 100644
--- a/chrome/browser/extensions/api/cookies/cookies_api.h
+++ b/chrome/browser/extensions/api/cookies/cookies_api.h
@@ -36,6 +36,10 @@
class CookiesEventRouter : public BrowserListObserver {
public:
explicit CookiesEventRouter(content::BrowserContext* context);
+
+ CookiesEventRouter(const CookiesEventRouter&) = delete;
+ CookiesEventRouter& operator=(const CookiesEventRouter&) = delete;
+
~CookiesEventRouter() override;
// BrowserListObserver:
@@ -50,6 +54,10 @@
class CookieChangeListener : public network::mojom::CookieChangeListener {
public:
CookieChangeListener(CookiesEventRouter* router, bool otr);
+
+ CookieChangeListener(const CookieChangeListener&) = delete;
+ CookieChangeListener& operator=(const CookieChangeListener&) = delete;
+
~CookieChangeListener() override;
// network::mojom::CookieChangeListener:
@@ -58,8 +66,6 @@
private:
CookiesEventRouter* router_;
bool otr_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieChangeListener);
};
void MaybeStartListening();
@@ -88,8 +94,6 @@
CookieChangeListener otr_listener_{this, true};
mojo::Receiver<network::mojom::CookieChangeListener> otr_receiver_{
&otr_listener_};
-
- DISALLOW_COPY_AND_ASSIGN(CookiesEventRouter);
};
// Implements the cookies.get() extension function.
@@ -202,6 +206,10 @@
class CookiesAPI : public BrowserContextKeyedAPI, public EventRouter::Observer {
public:
explicit CookiesAPI(content::BrowserContext* context);
+
+ CookiesAPI(const CookiesAPI&) = delete;
+ CookiesAPI& operator=(const CookiesAPI&) = delete;
+
~CookiesAPI() override;
// KeyedService implementation.
@@ -226,8 +234,6 @@
// Created lazily upon OnListenerAdded.
std::unique_ptr<CookiesEventRouter> cookies_event_router_;
-
- DISALLOW_COPY_AND_ASSIGN(CookiesAPI);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/crash_report_private/crash_report_private_apitest.cc b/chrome/browser/extensions/api/crash_report_private/crash_report_private_apitest.cc
index 8ffaeb0..39fb263 100644
--- a/chrome/browser/extensions/api/crash_report_private/crash_report_private_apitest.cc
+++ b/chrome/browser/extensions/api/crash_report_private/crash_report_private_apitest.cc
@@ -40,6 +40,11 @@
class CrashReportPrivateApiTest : public ExtensionApiTest {
public:
CrashReportPrivateApiTest() = default;
+
+ CrashReportPrivateApiTest(const CrashReportPrivateApiTest&) = delete;
+ CrashReportPrivateApiTest& operator=(const CrashReportPrivateApiTest&) =
+ delete;
+
~CrashReportPrivateApiTest() override = default;
void SetUpOnMainThread() override {
@@ -88,9 +93,6 @@
const Extension* extension_;
std::unique_ptr<MockCrashEndpoint> crash_endpoint_;
std::unique_ptr<ScopedMockChromeJsErrorReportProcessor> processor_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CrashReportPrivateApiTest);
};
IN_PROC_BROWSER_TEST_F(CrashReportPrivateApiTest, Basic) {
diff --git a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api_unittest.cc b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api_unittest.cc
index 3d55ee4eb..0426cd91 100644
--- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api_unittest.cc
+++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api_unittest.cc
@@ -217,6 +217,11 @@
class CryptoTokenPermissionTest : public ExtensionApiUnittest {
public:
CryptoTokenPermissionTest() = default;
+
+ CryptoTokenPermissionTest(const CryptoTokenPermissionTest&) = delete;
+ CryptoTokenPermissionTest& operator=(const CryptoTokenPermissionTest&) =
+ delete;
+
~CryptoTokenPermissionTest() override = default;
void SetUp() override {
@@ -313,8 +318,6 @@
private:
int tab_id_ = -1;
std::unique_ptr<permissions::MockPermissionPromptFactory> prompt_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(CryptoTokenPermissionTest);
};
TEST_F(CryptoTokenPermissionTest, AttestationPrompt) {
diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc
index c70a6678..4e4693f 100644
--- a/chrome/browser/extensions/api/debugger/debugger_api.cc
+++ b/chrome/browser/extensions/api/debugger/debugger_api.cc
@@ -173,6 +173,10 @@
scoped_refptr<const Extension> extension,
const Debuggee& debuggee);
+ ExtensionDevToolsClientHost(const ExtensionDevToolsClientHost&) = delete;
+ ExtensionDevToolsClientHost& operator=(const ExtensionDevToolsClientHost&) =
+ delete;
+
~ExtensionDevToolsClientHost() override;
bool Attach();
@@ -226,8 +230,6 @@
// Listen to extension unloaded notification.
base::ScopedObservation<ExtensionRegistry, ExtensionRegistryObserver>
extension_registry_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionDevToolsClientHost);
};
ExtensionDevToolsClientHost::ExtensionDevToolsClientHost(
diff --git a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc
index 82fa40c9..16922a2a 100644
--- a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc
+++ b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc
@@ -39,13 +39,15 @@
explicit EvaluationScope(ChromeContentRulesRegistry* registry);
EvaluationScope(ChromeContentRulesRegistry* registry,
EvaluationDisposition disposition);
+
+ EvaluationScope(const EvaluationScope&) = delete;
+ EvaluationScope& operator=(const EvaluationScope&) = delete;
+
~EvaluationScope();
private:
ChromeContentRulesRegistry* const registry_;
const EvaluationDisposition previous_disposition_;
-
- DISALLOW_COPY_AND_ASSIGN(EvaluationScope);
};
ChromeContentRulesRegistry::EvaluationScope::EvaluationScope(
diff --git a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h
index 21dfbfe..22d9e6e 100644
--- a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h
+++ b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h
@@ -98,15 +98,16 @@
std::vector<std::unique_ptr<const ContentCondition>> conditions,
std::vector<std::unique_ptr<const ContentAction>> actions,
int priority);
+
+ ContentRule(const ContentRule&) = delete;
+ ContentRule& operator=(const ContentRule&) = delete;
+
~ContentRule();
const Extension* extension;
std::vector<std::unique_ptr<const ContentCondition>> conditions;
std::vector<std::unique_ptr<const ContentAction>> actions;
int priority;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ContentRule);
};
// Specifies what to do with evaluation requests.
diff --git a/chrome/browser/extensions/api/declarative_content/content_action.cc b/chrome/browser/extensions/api/declarative_content/content_action.cc
index d3c3735..4f8c177 100644
--- a/chrome/browser/extensions/api/declarative_content/content_action.cc
+++ b/chrome/browser/extensions/api/declarative_content/content_action.cc
@@ -70,6 +70,10 @@
class ShowExtensionAction : public ContentAction {
public:
ShowExtensionAction() {}
+
+ ShowExtensionAction(const ShowExtensionAction&) = delete;
+ ShowExtensionAction& operator=(const ShowExtensionAction&) = delete;
+
~ShowExtensionAction() override {}
static std::unique_ptr<ContentAction> Create(
@@ -115,14 +119,16 @@
return ExtensionActionManager::Get(browser_context)
->GetExtensionAction(*extension);
}
-
- DISALLOW_COPY_AND_ASSIGN(ShowExtensionAction);
};
// Action that sets an extension's action icon.
class SetIcon : public ContentAction {
public:
explicit SetIcon(const gfx::Image& icon) : icon_(icon) {}
+
+ SetIcon(const SetIcon&) = delete;
+ SetIcon& operator=(const SetIcon&) = delete;
+
~SetIcon() override {}
static std::unique_ptr<ContentAction> Create(
@@ -168,8 +174,6 @@
}
gfx::Image icon_;
-
- DISALLOW_COPY_AND_ASSIGN(SetIcon);
};
// Helper for getting JS collections into C++.
diff --git a/chrome/browser/extensions/api/declarative_content/content_action.h b/chrome/browser/extensions/api/declarative_content/content_action.h
index c41375f..acc68f0 100644
--- a/chrome/browser/extensions/api/declarative_content/content_action.h
+++ b/chrome/browser/extensions/api/declarative_content/content_action.h
@@ -79,6 +79,9 @@
const Extension* extension,
const ScriptData& script_data);
+ RequestContentScript(const RequestContentScript&) = delete;
+ RequestContentScript& operator=(const RequestContentScript&) = delete;
+
~RequestContentScript() override;
static std::unique_ptr<ContentAction> Create(
@@ -115,8 +118,6 @@
ExtensionUserScriptLoader* script_loader_ = nullptr;
base::ScopedObservation<UserScriptLoader, UserScriptLoader::Observer>
scoped_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(RequestContentScript);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/declarative_content/content_condition.h b/chrome/browser/extensions/api/declarative_content/content_condition.h
index c9bf571..2b323199 100644
--- a/chrome/browser/extensions/api/declarative_content/content_condition.h
+++ b/chrome/browser/extensions/api/declarative_content/content_condition.h
@@ -32,12 +32,13 @@
public:
explicit ContentCondition(
std::vector<std::unique_ptr<const ContentPredicate>> predicates);
+
+ ContentCondition(const ContentCondition&) = delete;
+ ContentCondition& operator=(const ContentCondition&) = delete;
+
~ContentCondition();
std::vector<std::unique_ptr<const ContentPredicate>> predicates;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ContentCondition);
};
// Factory function that instantiates a ContentCondition according to the
diff --git a/chrome/browser/extensions/api/declarative_content/content_predicate.h b/chrome/browser/extensions/api/declarative_content/content_predicate.h
index 1237ddf..7e14ed3d 100644
--- a/chrome/browser/extensions/api/declarative_content/content_predicate.h
+++ b/chrome/browser/extensions/api/declarative_content/content_predicate.h
@@ -30,6 +30,9 @@
// subclasses.
class ContentPredicate {
public:
+ ContentPredicate(const ContentPredicate&) = delete;
+ ContentPredicate& operator=(const ContentPredicate&) = delete;
+
virtual ~ContentPredicate();
// Returns true if this predicate should be ignored during evaluation. By
@@ -41,9 +44,6 @@
protected:
ContentPredicate();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ContentPredicate);
};
// Defines the interface for objects that create predicates.
@@ -55,6 +55,9 @@
// ["input[type='password']"] JSON entities encoded in |value|.
class ContentPredicateFactory {
public:
+ ContentPredicateFactory(const ContentPredicateFactory&) = delete;
+ ContentPredicateFactory& operator=(const ContentPredicateFactory&) = delete;
+
virtual ~ContentPredicateFactory();
// Creates a new predicate from |value|, as specified in the declarative
@@ -66,9 +69,6 @@
protected:
ContentPredicateFactory();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ContentPredicateFactory);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/declarative_content/content_predicate_evaluator.h b/chrome/browser/extensions/api/declarative_content/content_predicate_evaluator.h
index 1b58e512..4921610 100644
--- a/chrome/browser/extensions/api/declarative_content/content_predicate_evaluator.h
+++ b/chrome/browser/extensions/api/declarative_content/content_predicate_evaluator.h
@@ -60,6 +60,10 @@
public:
class Delegate;
+ ContentPredicateEvaluator(const ContentPredicateEvaluator&) = delete;
+ ContentPredicateEvaluator& operator=(const ContentPredicateEvaluator&) =
+ delete;
+
~ContentPredicateEvaluator() override;
// Returns the attribute name in the API for this evaluator's predicates.
@@ -109,9 +113,6 @@
protected:
ContentPredicateEvaluator();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ContentPredicateEvaluator);
};
// Allows an evaluator to notify that predicate evaluation state has been
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
index bdd66af..2e15c2a5 100644
--- a/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
+++ b/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
@@ -440,12 +440,15 @@
public testing::WithParamInterface<const char*> {
public:
ParameterizedShowActionDeclarativeContentApiTest() {}
+
+ ParameterizedShowActionDeclarativeContentApiTest(
+ const ParameterizedShowActionDeclarativeContentApiTest&) = delete;
+ ParameterizedShowActionDeclarativeContentApiTest& operator=(
+ const ParameterizedShowActionDeclarativeContentApiTest&) = delete;
+
~ParameterizedShowActionDeclarativeContentApiTest() override {}
void TestShowAction(absl::optional<ActionInfo::Type> action_type);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ParameterizedShowActionDeclarativeContentApiTest);
};
void ParameterizedShowActionDeclarativeContentApiTest::TestShowAction(
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_condition_tracker_test.h b/chrome/browser/extensions/api/declarative_content/declarative_content_condition_tracker_test.h
index 305e041f..a7b73d7 100644
--- a/chrome/browser/extensions/api/declarative_content/declarative_content_condition_tracker_test.h
+++ b/chrome/browser/extensions/api/declarative_content/declarative_content_condition_tracker_test.h
@@ -30,6 +30,12 @@
class DeclarativeContentConditionTrackerTest : public testing::Test {
public:
DeclarativeContentConditionTrackerTest();
+
+ DeclarativeContentConditionTrackerTest(
+ const DeclarativeContentConditionTrackerTest&) = delete;
+ DeclarativeContentConditionTrackerTest& operator=(
+ const DeclarativeContentConditionTrackerTest&) = delete;
+
~DeclarativeContentConditionTrackerTest() override;
protected:
@@ -62,8 +68,6 @@
std::unique_ptr<TestingProfile> profile_;
uintptr_t next_predicate_group_id_;
-
- DISALLOW_COPY_AND_ASSIGN(DeclarativeContentConditionTrackerTest);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.h b/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.h
index 6a9c2361..d704437 100644
--- a/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.h
+++ b/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.h
@@ -30,6 +30,11 @@
// Tests whether all the specified CSS selectors match on the page.
class DeclarativeContentCssPredicate : public ContentPredicate {
public:
+ DeclarativeContentCssPredicate(const DeclarativeContentCssPredicate&) =
+ delete;
+ DeclarativeContentCssPredicate& operator=(
+ const DeclarativeContentCssPredicate&) = delete;
+
~DeclarativeContentCssPredicate() override;
const std::vector<std::string>& css_selectors() const {
@@ -51,8 +56,6 @@
// Weak.
ContentPredicateEvaluator* const evaluator_;
std::vector<std::string> css_selectors_;
-
- DISALLOW_COPY_AND_ASSIGN(DeclarativeContentCssPredicate);
};
// Supports watching of CSS selectors to across tab contents in a browser
@@ -62,6 +65,12 @@
public content::NotificationObserver {
public:
explicit DeclarativeContentCssConditionTracker(Delegate* delegate);
+
+ DeclarativeContentCssConditionTracker(
+ const DeclarativeContentCssConditionTracker&) = delete;
+ DeclarativeContentCssConditionTracker& operator=(
+ const DeclarativeContentCssConditionTracker&) = delete;
+
~DeclarativeContentCssConditionTracker() override;
// ContentPredicateEvaluator:
@@ -97,6 +106,10 @@
PerWebContentsTracker(content::WebContents* contents,
RequestEvaluationCallback request_evaluation,
WebContentsDestroyedCallback web_contents_destroyed);
+
+ PerWebContentsTracker(const PerWebContentsTracker&) = delete;
+ PerWebContentsTracker& operator=(const PerWebContentsTracker&) = delete;
+
~PerWebContentsTracker() override;
void OnWebContentsNavigation(content::NavigationHandle* navigation_handle);
@@ -116,8 +129,6 @@
// We use a hash_set for maximally efficient lookup.
std::unordered_set<std::string> matching_css_selectors_;
-
- DISALLOW_COPY_AND_ASSIGN(PerWebContentsTracker);
};
// content::NotificationObserver implementation.
@@ -158,8 +169,6 @@
// Manages our notification registrations.
content::NotificationRegistrar registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(DeclarativeContentCssConditionTracker);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.h b/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.h
index 139c144..592eb5473 100644
--- a/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.h
+++ b/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.h
@@ -27,6 +27,11 @@
// Tests the bookmarked state of the page.
class DeclarativeContentIsBookmarkedPredicate : public ContentPredicate {
public:
+ DeclarativeContentIsBookmarkedPredicate(
+ const DeclarativeContentIsBookmarkedPredicate&) = delete;
+ DeclarativeContentIsBookmarkedPredicate& operator=(
+ const DeclarativeContentIsBookmarkedPredicate&) = delete;
+
~DeclarativeContentIsBookmarkedPredicate() override;
bool IsIgnored() const override;
@@ -53,8 +58,6 @@
scoped_refptr<const Extension> extension_;
bool is_bookmarked_;
-
- DISALLOW_COPY_AND_ASSIGN(DeclarativeContentIsBookmarkedPredicate);
};
// Supports tracking of URL matches across tab contents in a browser context,
@@ -66,6 +69,12 @@
DeclarativeContentIsBookmarkedConditionTracker(
content::BrowserContext* context,
Delegate* delegate);
+
+ DeclarativeContentIsBookmarkedConditionTracker(
+ const DeclarativeContentIsBookmarkedConditionTracker&) = delete;
+ DeclarativeContentIsBookmarkedConditionTracker& operator=(
+ const DeclarativeContentIsBookmarkedConditionTracker&) = delete;
+
~DeclarativeContentIsBookmarkedConditionTracker() override;
// ContentPredicateEvaluator:
@@ -100,6 +109,10 @@
PerWebContentsTracker(content::WebContents* contents,
RequestEvaluationCallback request_evaluation,
WebContentsDestroyedCallback web_contents_destroyed);
+
+ PerWebContentsTracker(const PerWebContentsTracker&) = delete;
+ PerWebContentsTracker& operator=(const PerWebContentsTracker&) = delete;
+
~PerWebContentsTracker() override;
void BookmarkAddedForUrl(const GURL& url);
@@ -119,8 +132,6 @@
bool is_url_bookmarked_;
const RequestEvaluationCallback request_evaluation_;
WebContentsDestroyedCallback web_contents_destroyed_;
-
- DISALLOW_COPY_AND_ASSIGN(PerWebContentsTracker);
};
// bookmarks::BookmarkModelObserver implementation.
@@ -163,8 +174,6 @@
base::ScopedObservation<bookmarks::BookmarkModel,
bookmarks::BookmarkModelObserver>
scoped_bookmarks_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeclarativeContentIsBookmarkedConditionTracker);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.h b/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.h
index deb52e8..38d6fa4 100644
--- a/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.h
+++ b/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.h
@@ -27,6 +27,11 @@
// URLMatcherConditionSet.
class DeclarativeContentPageUrlPredicate : public ContentPredicate {
public:
+ DeclarativeContentPageUrlPredicate(
+ const DeclarativeContentPageUrlPredicate&) = delete;
+ DeclarativeContentPageUrlPredicate& operator=(
+ const DeclarativeContentPageUrlPredicate&) = delete;
+
~DeclarativeContentPageUrlPredicate() override;
url_matcher::URLMatcherConditionSet* url_matcher_condition_set() const {
@@ -52,8 +57,6 @@
ContentPredicateEvaluator* const evaluator_;
scoped_refptr<url_matcher::URLMatcherConditionSet> url_matcher_condition_set_;
-
- DISALLOW_COPY_AND_ASSIGN(DeclarativeContentPageUrlPredicate);
};
// Supports tracking of URL matches across tab contents in a browser context,
@@ -62,6 +65,12 @@
: public ContentPredicateEvaluator {
public:
explicit DeclarativeContentPageUrlConditionTracker(Delegate* delegate);
+
+ DeclarativeContentPageUrlConditionTracker(
+ const DeclarativeContentPageUrlConditionTracker&) = delete;
+ DeclarativeContentPageUrlConditionTracker& operator=(
+ const DeclarativeContentPageUrlConditionTracker&) = delete;
+
~DeclarativeContentPageUrlConditionTracker() override;
// ContentPredicateEvaluator:
@@ -100,6 +109,10 @@
url_matcher::URLMatcher* url_matcher,
RequestEvaluationCallback request_evaluation,
WebContentsDestroyedCallback web_contents_destroyed);
+
+ PerWebContentsTracker(const PerWebContentsTracker&) = delete;
+ PerWebContentsTracker& operator=(const PerWebContentsTracker&) = delete;
+
~PerWebContentsTracker() override;
void UpdateMatchesForCurrentUrl(bool request_evaluation_if_unchanged);
@@ -117,8 +130,6 @@
WebContentsDestroyedCallback web_contents_destroyed_;
std::set<url_matcher::URLMatcherConditionSet::ID> matches_;
-
- DISALLOW_COPY_AND_ASSIGN(PerWebContentsTracker);
};
// Called by PerWebContentsTracker on web contents destruction.
@@ -139,8 +150,6 @@
// Maps WebContents to the tracker for that WebContents state.
std::map<content::WebContents*, std::unique_ptr<PerWebContentsTracker>>
per_web_contents_tracker_;
-
- DISALLOW_COPY_AND_ASSIGN(DeclarativeContentPageUrlConditionTracker);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h
index 93f450a..2e7a394 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h
@@ -76,6 +76,12 @@
class DesktopCaptureRequestsRegistry {
public:
DesktopCaptureRequestsRegistry();
+
+ DesktopCaptureRequestsRegistry(const DesktopCaptureRequestsRegistry&) =
+ delete;
+ DesktopCaptureRequestsRegistry& operator=(
+ const DesktopCaptureRequestsRegistry&) = delete;
+
~DesktopCaptureRequestsRegistry();
static DesktopCaptureRequestsRegistry* GetInstance();
@@ -103,8 +109,6 @@
std::map<RequestId, DesktopCaptureChooseDesktopMediaFunctionBase*>;
RequestsMap requests_;
-
- DISALLOW_COPY_AND_ASSIGN(DesktopCaptureRequestsRegistry);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h
index b8b7fcf..c2d0900 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.h
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h
@@ -74,6 +74,11 @@
public content::NotificationObserver {
public:
explicit DeveloperPrivateEventRouter(Profile* profile);
+
+ DeveloperPrivateEventRouter(const DeveloperPrivateEventRouter&) = delete;
+ DeveloperPrivateEventRouter& operator=(const DeveloperPrivateEventRouter&) =
+ delete;
+
~DeveloperPrivateEventRouter() override;
// Add or remove an ID to the list of extensions subscribed to events.
@@ -188,8 +193,6 @@
content::NotificationRegistrar notification_registrar_;
base::WeakPtrFactory<DeveloperPrivateEventRouter> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeveloperPrivateEventRouter);
};
// The profile-keyed service that manages the DeveloperPrivate API.
@@ -208,6 +211,10 @@
static DeveloperPrivateAPI* Get(content::BrowserContext* context);
explicit DeveloperPrivateAPI(content::BrowserContext* context);
+
+ DeveloperPrivateAPI(const DeveloperPrivateAPI&) = delete;
+ DeveloperPrivateAPI& operator=(const DeveloperPrivateAPI&) = delete;
+
~DeveloperPrivateAPI() override;
// Adds a path to the list of allowed unpacked paths for the given
@@ -296,8 +303,6 @@
std::unique_ptr<DeveloperPrivateEventRouter> developer_private_event_router_;
base::WeakPtrFactory<DeveloperPrivateAPI> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeveloperPrivateAPI);
};
template <>
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc b/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc
index f9e8445..84edcae 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc
@@ -1858,12 +1858,15 @@
: public DeveloperPrivateApiUnitTest {
public:
DeveloperPrivateApiSupervisedUserUnitTest() = default;
+
+ DeveloperPrivateApiSupervisedUserUnitTest(
+ const DeveloperPrivateApiSupervisedUserUnitTest&) = delete;
+ DeveloperPrivateApiSupervisedUserUnitTest& operator=(
+ const DeveloperPrivateApiSupervisedUserUnitTest&) = delete;
+
~DeveloperPrivateApiSupervisedUserUnitTest() override = default;
bool ProfileIsSupervised() const override { return true; }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DeveloperPrivateApiSupervisedUserUnitTest);
};
// Tests trying to call loadUnpacked when the profile shouldn't be allowed to.
diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.h b/chrome/browser/extensions/api/developer_private/extension_info_generator.h
index 812128f..5db74095 100644
--- a/chrome/browser/extensions/api/developer_private/extension_info_generator.h
+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.h
@@ -46,6 +46,10 @@
using ExtensionInfosCallback = base::OnceCallback<void(ExtensionInfoList)>;
explicit ExtensionInfoGenerator(content::BrowserContext* context);
+
+ ExtensionInfoGenerator(const ExtensionInfoGenerator&) = delete;
+ ExtensionInfoGenerator& operator=(const ExtensionInfoGenerator&) = delete;
+
~ExtensionInfoGenerator();
// Creates and asynchronously returns an ExtensionInfo for the given
@@ -100,8 +104,6 @@
ExtensionInfosCallback callback_;
base::WeakPtrFactory<ExtensionInfoGenerator> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionInfoGenerator);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc
index 0365ae62..8142e5cb 100644
--- a/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc
+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc
@@ -103,6 +103,12 @@
class ExtensionInfoGeneratorUnitTest : public ExtensionServiceTestWithInstall {
public:
ExtensionInfoGeneratorUnitTest() {}
+
+ ExtensionInfoGeneratorUnitTest(const ExtensionInfoGeneratorUnitTest&) =
+ delete;
+ ExtensionInfoGeneratorUnitTest& operator=(
+ const ExtensionInfoGeneratorUnitTest&) = delete;
+
~ExtensionInfoGeneratorUnitTest() override {}
protected:
@@ -243,8 +249,6 @@
private:
base::OnceClosure quit_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionInfoGeneratorUnitTest);
};
// Test some of the basic fields.
diff --git a/chrome/browser/extensions/api/developer_private/inspectable_views_finder.h b/chrome/browser/extensions/api/developer_private/inspectable_views_finder.h
index c09f31c2..eb3657d1 100644
--- a/chrome/browser/extensions/api/developer_private/inspectable_views_finder.h
+++ b/chrome/browser/extensions/api/developer_private/inspectable_views_finder.h
@@ -31,6 +31,10 @@
using ViewList = std::vector<View>;
explicit InspectableViewsFinder(Profile* profile);
+
+ InspectableViewsFinder(const InspectableViewsFinder&) = delete;
+ InspectableViewsFinder& operator=(const InspectableViewsFinder&) = delete;
+
~InspectableViewsFinder();
// Construct a view from the given parameters.
@@ -64,8 +68,6 @@
ViewList* result);
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(InspectableViewsFinder);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc
index 9146b9f..1dac86c4 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
@@ -659,6 +659,11 @@
download_item->SetUserData(kKey, base::WrapUnique(this));
}
+ ExtensionDownloadsEventRouterData(const ExtensionDownloadsEventRouterData&) =
+ delete;
+ ExtensionDownloadsEventRouterData& operator=(
+ const ExtensionDownloadsEventRouterData&) = delete;
+
~ExtensionDownloadsEventRouterData() override = default;
void set_is_download_completed(bool is_download_completed) {
@@ -887,8 +892,6 @@
std::unique_ptr<base::WeakPtrFactory<ExtensionDownloadsEventRouterData>>
weak_ptr_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionDownloadsEventRouterData);
};
int ExtensionDownloadsEventRouterData::determine_filename_timeout_s_ = 15;
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/browser/extensions/api/downloads/downloads_api.h
index 38fdac1f..85aeeaa 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api.h
+++ b/chrome/browser/extensions/api/downloads/downloads_api.h
@@ -337,6 +337,11 @@
explicit ExtensionDownloadsEventRouter(
Profile* profile, content::DownloadManager* manager);
+
+ ExtensionDownloadsEventRouter(const ExtensionDownloadsEventRouter&) = delete;
+ ExtensionDownloadsEventRouter& operator=(
+ const ExtensionDownloadsEventRouter&) = delete;
+
~ExtensionDownloadsEventRouter() override;
void SetShelfEnabled(const extensions::Extension* extension, bool enabled);
@@ -389,8 +394,6 @@
base::ScopedObservation<extensions::ExtensionRegistry,
extensions::ExtensionRegistryObserver>
extension_registry_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionDownloadsEventRouter);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
index 7067c0d..b65dd2b5 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
@@ -120,6 +120,9 @@
explicit DownloadsEventsListener(Profile* profile)
: waiting_(false), profile_(profile) {}
+ DownloadsEventsListener(const DownloadsEventsListener&) = delete;
+ DownloadsEventsListener& operator=(const DownloadsEventsListener&) = delete;
+
~DownloadsEventsListener() override = default;
void ClearEvents() { events_.clear(); }
@@ -252,8 +255,6 @@
std::unique_ptr<Event> waiting_for_;
base::circular_deque<std::unique_ptr<Event>> events_;
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadsEventsListener);
};
// Object waiting for a download open event.
@@ -263,6 +264,9 @@
open_observation_.Observe(item);
}
+ DownloadOpenObserver(const DownloadOpenObserver&) = delete;
+ DownloadOpenObserver& operator=(const DownloadOpenObserver&) = delete;
+
~DownloadOpenObserver() override = default;
void WaitForEvent() {
@@ -291,8 +295,6 @@
open_observation_{this};
download::DownloadItem* item_;
base::OnceClosure completion_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadOpenObserver);
};
} // namespace
@@ -747,6 +749,10 @@
class ScopedCancellingItem {
public:
explicit ScopedCancellingItem(DownloadItem* item) : item_(item) {}
+
+ ScopedCancellingItem(const ScopedCancellingItem&) = delete;
+ ScopedCancellingItem& operator=(const ScopedCancellingItem&) = delete;
+
~ScopedCancellingItem() {
item_->Cancel(true);
content::DownloadUpdatedObserver observer(
@@ -756,7 +762,6 @@
DownloadItem* get() { return item_; }
private:
DownloadItem* item_;
- DISALLOW_COPY_AND_ASSIGN(ScopedCancellingItem);
};
// Cancels all the underlying DownloadItems when the ScopedItemVectorCanceller
@@ -767,6 +772,11 @@
explicit ScopedItemVectorCanceller(DownloadManager::DownloadVector* items)
: items_(items) {
}
+
+ ScopedItemVectorCanceller(const ScopedItemVectorCanceller&) = delete;
+ ScopedItemVectorCanceller& operator=(const ScopedItemVectorCanceller&) =
+ delete;
+
~ScopedItemVectorCanceller() {
for (DownloadManager::DownloadVector::const_iterator item = items_->begin();
item != items_->end(); ++item) {
@@ -780,7 +790,6 @@
private:
DownloadManager::DownloadVector* items_;
- DISALLOW_COPY_AND_ASSIGN(ScopedItemVectorCanceller);
};
// Writes an HTML5 file so that it can be downloaded.
@@ -844,14 +853,17 @@
: content::DownloadTestObserverInProgress(download_manager, wait_count) {
}
+ JustInProgressDownloadObserver(const JustInProgressDownloadObserver&) =
+ delete;
+ JustInProgressDownloadObserver& operator=(
+ const JustInProgressDownloadObserver&) = delete;
+
~JustInProgressDownloadObserver() override {}
private:
bool IsDownloadInFinalState(DownloadItem* item) override {
return item->GetState() == DownloadItem::IN_PROGRESS;
}
-
- DISALLOW_COPY_AND_ASSIGN(JustInProgressDownloadObserver);
};
bool ItemIsInterrupted(DownloadItem* item) {
@@ -1779,6 +1791,10 @@
: callback_(callback),
task_runner_(task_runner),
first_request_(first_request) {}
+
+ CustomResponse(const CustomResponse&) = delete;
+ CustomResponse& operator=(const CustomResponse&) = delete;
+
~CustomResponse() override {}
void SendResponse(const net::test_server::SendBytesCallback& send,
@@ -1803,8 +1819,6 @@
net::test_server::SendCompleteCallback* callback_;
base::TaskRunner** task_runner_;
bool first_request_;
-
- DISALLOW_COPY_AND_ASSIGN(CustomResponse);
};
} // namespace
@@ -4627,10 +4641,11 @@
class DownloadsApiTest : public ExtensionApiTest {
public:
DownloadsApiTest() {}
- ~DownloadsApiTest() override {}
- private:
- DISALLOW_COPY_AND_ASSIGN(DownloadsApiTest);
+ DownloadsApiTest(const DownloadsApiTest&) = delete;
+ DownloadsApiTest& operator=(const DownloadsApiTest&) = delete;
+
+ ~DownloadsApiTest() override {}
};
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
index 34fcfe5..5729094 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
@@ -29,6 +29,10 @@
public:
explicit TestDownloadCoreService(Profile* profile)
: DownloadCoreServiceImpl(profile), profile_(profile) {}
+
+ TestDownloadCoreService(const TestDownloadCoreService&) = delete;
+ TestDownloadCoreService& operator=(const TestDownloadCoreService&) = delete;
+
~TestDownloadCoreService() override {}
void Shutdown() override {
@@ -57,8 +61,6 @@
std::unique_ptr<DownloadHistory> download_history_;
std::unique_ptr<ExtensionDownloadsEventRouter> router_;
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(TestDownloadCoreService);
};
} // namespace
@@ -66,6 +68,10 @@
class DownloadsApiUnitTest : public ExtensionApiUnittest {
public:
DownloadsApiUnitTest() {}
+
+ DownloadsApiUnitTest(const DownloadsApiUnitTest&) = delete;
+ DownloadsApiUnitTest& operator=(const DownloadsApiUnitTest&) = delete;
+
~DownloadsApiUnitTest() override {}
void SetUp() override {
ExtensionApiUnittest::SetUp();
@@ -111,8 +117,6 @@
std::unique_ptr<MockDownloadManager> manager_;
content::DownloadManager::Observer* download_history_manager_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadsApiUnitTest);
};
// static
diff --git a/chrome/browser/extensions/api/enterprise_hardware_platform/enterprise_hardware_platform_api_unittest.cc b/chrome/browser/extensions/api/enterprise_hardware_platform/enterprise_hardware_platform_api_unittest.cc
index 5c9bb05..0cb04d4 100644
--- a/chrome/browser/extensions/api/enterprise_hardware_platform/enterprise_hardware_platform_api_unittest.cc
+++ b/chrome/browser/extensions/api/enterprise_hardware_platform/enterprise_hardware_platform_api_unittest.cc
@@ -21,6 +21,12 @@
: public ExtensionServiceTestWithInstall {
public:
EnterpriseHardwarePlatformAPITest() = default;
+
+ EnterpriseHardwarePlatformAPITest(const EnterpriseHardwarePlatformAPITest&) =
+ delete;
+ EnterpriseHardwarePlatformAPITest& operator=(
+ const EnterpriseHardwarePlatformAPITest&) = delete;
+
~EnterpriseHardwarePlatformAPITest() override = default;
protected:
@@ -48,8 +54,6 @@
scoped_refptr<const Extension> extension_;
scoped_refptr<EnterpriseHardwarePlatformGetHardwarePlatformInfoFunction>
function_;
-
- DISALLOW_COPY_AND_ASSIGN(EnterpriseHardwarePlatformAPITest);
};
TEST_F(EnterpriseHardwarePlatformAPITest, GetHardwarePlatformInfoAllowed) {
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
index 146b1582..b03cf18 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
@@ -117,6 +117,11 @@
class BrowserActionInteractiveTest : public ExtensionApiTest {
public:
BrowserActionInteractiveTest() {}
+
+ BrowserActionInteractiveTest(const BrowserActionInteractiveTest&) = delete;
+ BrowserActionInteractiveTest& operator=(const BrowserActionInteractiveTest&) =
+ delete;
+
~BrowserActionInteractiveTest() override {}
// BrowserTestBase:
@@ -221,8 +226,6 @@
private:
std::unique_ptr<PopupHostWatcher> host_watcher_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserActionInteractiveTest);
};
// Tests opening a popup using the chrome.browserAction.openPopup API. This test
@@ -492,10 +495,13 @@
class BrowserActionInteractiveViewsTest : public BrowserActionInteractiveTest {
public:
BrowserActionInteractiveViewsTest() = default;
- ~BrowserActionInteractiveViewsTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(BrowserActionInteractiveViewsTest);
+ BrowserActionInteractiveViewsTest(const BrowserActionInteractiveViewsTest&) =
+ delete;
+ BrowserActionInteractiveViewsTest& operator=(
+ const BrowserActionInteractiveViewsTest&) = delete;
+
+ ~BrowserActionInteractiveViewsTest() override = default;
};
// Test closing the browser while inspecting an extension popup with dev tools.
diff --git a/chrome/browser/extensions/api/extension_action/extension_action_apitest.cc b/chrome/browser/extensions/api/extension_action/extension_action_apitest.cc
index 85ecc73..f5fba6b2 100644
--- a/chrome/browser/extensions/api/extension_action/extension_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/extension_action_apitest.cc
@@ -74,6 +74,10 @@
: extension_id_(extension_id) {
scoped_observation_.Observe(ExtensionSystem::Get(context)->state_store());
}
+
+ TestStateStoreObserver(const TestStateStoreObserver&) = delete;
+ TestStateStoreObserver& operator=(const TestStateStoreObserver&) = delete;
+
~TestStateStoreObserver() override {}
void WillSetExtensionValue(const std::string& extension_id,
@@ -93,8 +97,6 @@
base::ScopedObservation<StateStore, StateStore::TestObserver>
scoped_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TestStateStoreObserver);
};
// A helper class to handle setting or getting the values for an action from JS.
@@ -110,6 +112,10 @@
get_method_name_(get_method_name),
js_property_key_(js_property_key),
web_contents_(web_contents) {}
+
+ ActionTestHelper(const ActionTestHelper&) = delete;
+ ActionTestHelper& operator=(const ActionTestHelper&) = delete;
+
~ActionTestHelper() = default;
// Checks the value for the given |tab_id|.
@@ -176,8 +182,6 @@
const char* const js_property_key_;
// The WebContents to use to execute API calls.
content::WebContents* const web_contents_;
-
- DISALLOW_COPY_AND_ASSIGN(ActionTestHelper);
};
// Forces a flush of the StateStore, where action state is persisted.
diff --git a/chrome/browser/extensions/api/extension_action/test_extension_action_api_observer.h b/chrome/browser/extensions/api/extension_action/test_extension_action_api_observer.h
index e242344..e55d1afe 100644
--- a/chrome/browser/extensions/api/extension_action/test_extension_action_api_observer.h
+++ b/chrome/browser/extensions/api/extension_action/test_extension_action_api_observer.h
@@ -29,6 +29,12 @@
content::BrowserContext* context,
const ExtensionId& extension_id,
const std::set<content::WebContents*>& contents_to_observe);
+
+ TestExtensionActionAPIObserver(const TestExtensionActionAPIObserver&) =
+ delete;
+ TestExtensionActionAPIObserver& operator=(
+ const TestExtensionActionAPIObserver&) = delete;
+
~TestExtensionActionAPIObserver() override;
// Waits until the extension action is updated and the update is seen for all
@@ -57,8 +63,6 @@
// An optional set of web contents to observe for extension action updates.
std::set<content::WebContents*> contents_to_observe_;
-
- DISALLOW_COPY_AND_ASSIGN(TestExtensionActionAPIObserver);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/extension_action/test_icon_image_observer.h b/chrome/browser/extensions/api/extension_action/test_icon_image_observer.h
index 310eef3..172f11e6 100644
--- a/chrome/browser/extensions/api/extension_action/test_icon_image_observer.h
+++ b/chrome/browser/extensions/api/extension_action/test_icon_image_observer.h
@@ -19,6 +19,10 @@
class TestIconImageObserver : public IconImage::Observer {
public:
TestIconImageObserver();
+
+ TestIconImageObserver(const TestIconImageObserver&) = delete;
+ TestIconImageObserver& operator=(const TestIconImageObserver&) = delete;
+
~TestIconImageObserver() override;
void Wait(IconImage* icon);
@@ -33,8 +37,6 @@
base::RunLoop run_loop_;
base::ScopedObservation<IconImage, IconImage::Observer> observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TestIconImageObserver);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/feedback_private/chrome_feedback_private_delegate.h b/chrome/browser/extensions/api/feedback_private/chrome_feedback_private_delegate.h
index 8507c8f..eb802bf 100644
--- a/chrome/browser/extensions/api/feedback_private/chrome_feedback_private_delegate.h
+++ b/chrome/browser/extensions/api/feedback_private/chrome_feedback_private_delegate.h
@@ -16,6 +16,11 @@
class ChromeFeedbackPrivateDelegate : public FeedbackPrivateDelegate {
public:
ChromeFeedbackPrivateDelegate();
+
+ ChromeFeedbackPrivateDelegate(const ChromeFeedbackPrivateDelegate&) = delete;
+ ChromeFeedbackPrivateDelegate& operator=(
+ const ChromeFeedbackPrivateDelegate&) = delete;
+
~ChromeFeedbackPrivateDelegate() override;
// FeedbackPrivateDelegate:
@@ -40,9 +45,6 @@
void NotifyFeedbackDelayed() const override;
feedback::FeedbackUploader* GetFeedbackUploaderForContext(
content::BrowserContext* context) const override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeFeedbackPrivateDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/file_handlers/non_native_file_system_delegate_chromeos.h b/chrome/browser/extensions/api/file_handlers/non_native_file_system_delegate_chromeos.h
index f7fadf80..7621d214 100644
--- a/chrome/browser/extensions/api/file_handlers/non_native_file_system_delegate_chromeos.h
+++ b/chrome/browser/extensions/api/file_handlers/non_native_file_system_delegate_chromeos.h
@@ -22,6 +22,12 @@
: public extensions::NonNativeFileSystemDelegate {
public:
NonNativeFileSystemDelegateChromeOS();
+
+ NonNativeFileSystemDelegateChromeOS(
+ const NonNativeFileSystemDelegateChromeOS&) = delete;
+ NonNativeFileSystemDelegateChromeOS& operator=(
+ const NonNativeFileSystemDelegateChromeOS&) = delete;
+
~NonNativeFileSystemDelegateChromeOS() override;
// extensions::NonNativeFileSystemDelegate:
@@ -42,9 +48,6 @@
content::BrowserContext* context,
const base::FilePath& path,
base::OnceCallback<void(bool)> callback) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NonNativeFileSystemDelegateChromeOS);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.h b/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.h
index 721d206..25f7a96 100644
--- a/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.h
+++ b/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.h
@@ -28,6 +28,10 @@
class ChromeFileSystemDelegate : public FileSystemDelegate {
public:
ChromeFileSystemDelegate();
+
+ ChromeFileSystemDelegate(const ChromeFileSystemDelegate&) = delete;
+ ChromeFileSystemDelegate& operator=(const ChromeFileSystemDelegate&) = delete;
+
~ChromeFileSystemDelegate() override;
// FileSystemDelegate:
@@ -64,9 +68,6 @@
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
SavedFilesServiceInterface* GetSavedFilesService(
content::BrowserContext* browser_context) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeFileSystemDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/file_system/consent_provider.h b/chrome/browser/extensions/api/file_system/consent_provider.h
index 722aacf..501bd25 100644
--- a/chrome/browser/extensions/api/file_system/consent_provider.h
+++ b/chrome/browser/extensions/api/file_system/consent_provider.h
@@ -69,6 +69,10 @@
};
explicit ConsentProvider(DelegateInterface* delegate);
+
+ ConsentProvider(const ConsentProvider&) = delete;
+ ConsentProvider& operator=(const ConsentProvider&) = delete;
+
~ConsentProvider();
// Requests consent for granting |writable| permissions to the |volume|
@@ -91,8 +95,6 @@
private:
DelegateInterface* const delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(ConsentProvider);
};
// Handles interaction with user as well as environment checks (allowlists,
@@ -100,6 +102,10 @@
class ConsentProviderDelegate : public ConsentProvider::DelegateInterface {
public:
explicit ConsentProviderDelegate(Profile* profile);
+
+ ConsentProviderDelegate(const ConsentProviderDelegate&) = delete;
+ ConsentProviderDelegate& operator=(const ConsentProviderDelegate&) = delete;
+
~ConsentProviderDelegate();
private:
@@ -124,8 +130,6 @@
bool HasRequestDownloadsPermission(const Extension& extension) override;
Profile* const profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ConsentProviderDelegate);
};
} // namespace file_system_api
diff --git a/chrome/browser/extensions/api/file_system/consent_provider_unittest.cc b/chrome/browser/extensions/api/file_system/consent_provider_unittest.cc
index 13071ac..d31c5dd8 100644
--- a/chrome/browser/extensions/api/file_system/consent_provider_unittest.cc
+++ b/chrome/browser/extensions/api/file_system/consent_provider_unittest.cc
@@ -44,6 +44,11 @@
dialog_button_(ui::DIALOG_BUTTON_NONE),
is_auto_launched_(false) {}
+ TestingConsentProviderDelegate(const TestingConsentProviderDelegate&) =
+ delete;
+ TestingConsentProviderDelegate& operator=(
+ const TestingConsentProviderDelegate&) = delete;
+
~TestingConsentProviderDelegate() {}
// Sets a fake dialog response.
@@ -97,8 +102,6 @@
ui::DialogButton dialog_button_;
bool is_auto_launched_;
std::string allowlisted_component_id_;
-
- DISALLOW_COPY_AND_ASSIGN(TestingConsentProviderDelegate);
};
// Rewrites result of a consent request from |result| to |log|.
diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
index 88f4353..f18a78e2 100644
--- a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
+++ b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
@@ -61,13 +61,16 @@
file_system_api::ConsentProviderDelegate::SetAutoDialogButtonForTest(
button);
}
+
+ ScopedSkipRequestFileSystemDialog(const ScopedSkipRequestFileSystemDialog&) =
+ delete;
+ ScopedSkipRequestFileSystemDialog& operator=(
+ const ScopedSkipRequestFileSystemDialog&) = delete;
+
~ScopedSkipRequestFileSystemDialog() {
file_system_api::ConsentProviderDelegate::SetAutoDialogButtonForTest(
ui::DIALOG_BUTTON_NONE);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ScopedSkipRequestFileSystemDialog);
};
// Observers adding a listener to the |event_name| event by |extension|, and
@@ -85,6 +88,10 @@
event_router_->RegisterObserver(this, event_name);
}
+ ScopedAddListenerObserver(const ScopedAddListenerObserver&) = delete;
+ ScopedAddListenerObserver& operator=(const ScopedAddListenerObserver&) =
+ delete;
+
~ScopedAddListenerObserver() override {
event_router_->UnregisterObserver(this);
}
@@ -103,8 +110,6 @@
const std::string extension_id_;
base::OnceClosure callback_;
EventRouter* const event_router_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedAddListenerObserver);
};
// This class contains chrome.filesystem API test specific to Chrome OS, namely,
diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.h b/chrome/browser/extensions/api/font_settings/font_settings_api.h
index c4d9224..58d5914 100644
--- a/chrome/browser/extensions/api/font_settings/font_settings_api.h
+++ b/chrome/browser/extensions/api/font_settings/font_settings_api.h
@@ -36,6 +36,10 @@
// pointer to |profile| but does not take ownership. |profile| must be
// non-NULL and remain alive for the lifetime of the instance.
explicit FontSettingsEventRouter(Profile* profile);
+
+ FontSettingsEventRouter(const FontSettingsEventRouter&) = delete;
+ FontSettingsEventRouter& operator=(const FontSettingsEventRouter&) = delete;
+
virtual ~FontSettingsEventRouter();
private:
@@ -73,8 +77,6 @@
// Weak, owns us (transitively via ExtensionService).
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(FontSettingsEventRouter);
};
// The profile-keyed service that manages the font_settings extension API.
diff --git a/chrome/browser/extensions/api/history/history_api.h b/chrome/browser/extensions/api/history/history_api.h
index 93a3ace9..fdfb1f4 100644
--- a/chrome/browser/extensions/api/history/history_api.h
+++ b/chrome/browser/extensions/api/history/history_api.h
@@ -30,6 +30,10 @@
public:
HistoryEventRouter(Profile* profile,
history::HistoryService* history_service);
+
+ HistoryEventRouter(const HistoryEventRouter&) = delete;
+ HistoryEventRouter& operator=(const HistoryEventRouter&) = delete;
+
~HistoryEventRouter() override;
private:
@@ -51,8 +55,6 @@
base::ScopedObservation<history::HistoryService,
history::HistoryServiceObserver>
history_service_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(HistoryEventRouter);
};
class HistoryAPI : public BrowserContextKeyedAPI, public EventRouter::Observer {
diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.cc b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.cc
index 0606da4d..c13396a 100644
--- a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.cc
+++ b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.cc
@@ -46,6 +46,11 @@
image_writer_utility_client_));
}
+ RemovableStorageWriterClientImpl(const RemovableStorageWriterClientImpl&) =
+ delete;
+ RemovableStorageWriterClientImpl& operator=(
+ const RemovableStorageWriterClientImpl&) = delete;
+
~RemovableStorageWriterClientImpl() override = default;
private:
@@ -65,8 +70,6 @@
// |image_writer_utility_client_| owns |this|.
ImageWriterUtilityClient* const image_writer_utility_client_;
-
- DISALLOW_COPY_AND_ASSIGN(RemovableStorageWriterClientImpl);
};
ImageWriterUtilityClient::ImageWriterUtilityClient(
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager.h b/chrome/browser/extensions/api/image_writer_private/operation_manager.h
index 7265d5b..3a0aad4 100644
--- a/chrome/browser/extensions/api/image_writer_private/operation_manager.h
+++ b/chrome/browser/extensions/api/image_writer_private/operation_manager.h
@@ -44,6 +44,10 @@
public base::SupportsWeakPtr<OperationManager> {
public:
explicit OperationManager(content::BrowserContext* context);
+
+ OperationManager(const OperationManager&) = delete;
+ OperationManager& operator=(const OperationManager&) = delete;
+
~OperationManager() override;
void Shutdown() override;
@@ -124,8 +128,6 @@
process_manager_observation_{this};
base::WeakPtrFactory<OperationManager> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(OperationManager);
};
} // namespace image_writer
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.h b/chrome/browser/extensions/api/input_ime/input_ime_api.h
index 9868421..72e5b86 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api.h
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api.h
@@ -43,6 +43,9 @@
public:
ImeObserver(const std::string& extension_id, Profile* profile);
+ ImeObserver(const ImeObserver&) = delete;
+ ImeObserver& operator=(const ImeObserver&) = delete;
+
~ImeObserver() override = default;
// InputMethodEngineBase::Observer overrides.
@@ -104,8 +107,6 @@
extensions::api::input_ime::AutoCapitalizeType
ConvertInputContextAutoCapitalize(
IMEEngineHandlerInterface::InputContext input_context);
-
- DISALLOW_COPY_AND_ASSIGN(ImeObserver);
};
} // namespace ui
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
index 57503e9..4884af7 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
@@ -158,6 +158,9 @@
ImeObserverChromeOS(const std::string& extension_id, Profile* profile)
: ImeObserver(extension_id, profile) {}
+ ImeObserverChromeOS(const ImeObserverChromeOS&) = delete;
+ ImeObserverChromeOS& operator=(const ImeObserverChromeOS&) = delete;
+
~ImeObserverChromeOS() override = default;
// chromeos::InputMethodEngineBase::Observer overrides.
@@ -489,8 +492,6 @@
}
return input_mode_type;
}
-
- DISALLOW_COPY_AND_ASSIGN(ImeObserverChromeOS);
};
} // namespace
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h
index 76c06be..3d2006a 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h
@@ -192,6 +192,10 @@
class InputImeEventRouter : public InputImeEventRouterBase {
public:
explicit InputImeEventRouter(Profile* profile);
+
+ InputImeEventRouter(const InputImeEventRouter&) = delete;
+ InputImeEventRouter& operator=(const InputImeEventRouter&) = delete;
+
~InputImeEventRouter() override;
bool RegisterImeExtension(
@@ -219,8 +223,6 @@
engine_map_;
// The first party ime extension which is unloaded unexpectedly.
std::string unloaded_component_extension_id_;
-
- DISALLOW_COPY_AND_ASSIGN(InputImeEventRouter);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_event_router_base.h b/chrome/browser/extensions/api/input_ime/input_ime_event_router_base.h
index 7f9ed0e2..b60575d 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_event_router_base.h
+++ b/chrome/browser/extensions/api/input_ime/input_ime_event_router_base.h
@@ -19,6 +19,10 @@
class InputImeEventRouterBase {
public:
explicit InputImeEventRouterBase(Profile* profile);
+
+ InputImeEventRouterBase(const InputImeEventRouterBase&) = delete;
+ InputImeEventRouterBase& operator=(const InputImeEventRouterBase&) = delete;
+
virtual ~InputImeEventRouterBase();
// Gets the input method engine if the extension is active.
@@ -30,8 +34,6 @@
private:
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(InputImeEventRouterBase);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate.h b/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate.h
index 3f98b950..cadb118 100644
--- a/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate.h
+++ b/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate.h
@@ -44,6 +44,12 @@
public:
static LanguageSettingsPrivateDelegate* Create(
content::BrowserContext* browser_context);
+
+ LanguageSettingsPrivateDelegate(const LanguageSettingsPrivateDelegate&) =
+ delete;
+ LanguageSettingsPrivateDelegate& operator=(
+ const LanguageSettingsPrivateDelegate&) = delete;
+
~LanguageSettingsPrivateDelegate() override;
// Returns the languages and statuses of the enabled spellcheck dictionaries.
@@ -144,8 +150,6 @@
content::NotificationRegistrar notification_registrar_;
PrefChangeRegistrar pref_change_registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(LanguageSettingsPrivateDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
index 665c1f6..c2f13fd 100644
--- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
+++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -143,6 +143,12 @@
std::make_unique<ExtensionInstallPrompt::Prompt>(type),
ExtensionInstallPrompt::GetDefaultShowDialogCallback());
}
+
+ ManagementSetEnabledFunctionInstallPromptDelegate(
+ const ManagementSetEnabledFunctionInstallPromptDelegate&) = delete;
+ ManagementSetEnabledFunctionInstallPromptDelegate& operator=(
+ const ManagementSetEnabledFunctionInstallPromptDelegate&) = delete;
+
~ManagementSetEnabledFunctionInstallPromptDelegate() override {}
private:
@@ -159,8 +165,6 @@
base::WeakPtrFactory<ManagementSetEnabledFunctionInstallPromptDelegate>
weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ManagementSetEnabledFunctionInstallPromptDelegate);
};
class ManagementUninstallFunctionUninstallDialogDelegate
@@ -203,6 +207,11 @@
}
}
+ ManagementUninstallFunctionUninstallDialogDelegate(
+ const ManagementUninstallFunctionUninstallDialogDelegate&) = delete;
+ ManagementUninstallFunctionUninstallDialogDelegate& operator=(
+ const ManagementUninstallFunctionUninstallDialogDelegate&) = delete;
+
~ManagementUninstallFunctionUninstallDialogDelegate() override {}
// ExtensionUninstallDialog::Delegate implementation.
@@ -215,8 +224,6 @@
extensions::ManagementUninstallFunctionBase* function_;
std::unique_ptr<extensions::ExtensionUninstallDialog>
extension_uninstall_dialog_;
-
- DISALLOW_COPY_AND_ASSIGN(ManagementUninstallFunctionUninstallDialogDelegate);
};
void OnGenerateAppForLinkCompleted(
@@ -231,6 +238,10 @@
class ChromeAppForLinkDelegate : public extensions::AppForLinkDelegate {
public:
ChromeAppForLinkDelegate() {}
+
+ ChromeAppForLinkDelegate(const ChromeAppForLinkDelegate&) = delete;
+ ChromeAppForLinkDelegate& operator=(const ChromeAppForLinkDelegate&) = delete;
+
~ChromeAppForLinkDelegate() override {}
void OnFaviconForApp(
@@ -330,9 +341,6 @@
// Used for favicon loading tasks.
base::CancelableTaskTracker cancelable_task_tracker_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeAppForLinkDelegate);
};
void LaunchWebApp(const web_app::AppId& app_id, Profile* profile) {
diff --git a/chrome/browser/extensions/api/mdns/mdns_api.h b/chrome/browser/extensions/api/mdns/mdns_api.h
index dbfe3b4..e2dc71fd 100644
--- a/chrome/browser/extensions/api/mdns/mdns_api.h
+++ b/chrome/browser/extensions/api/mdns/mdns_api.h
@@ -34,6 +34,10 @@
public media_router::DnsSdRegistry::DnsSdObserver {
public:
explicit MDnsAPI(content::BrowserContext* context);
+
+ MDnsAPI(const MDnsAPI&) = delete;
+ MDnsAPI& operator=(const MDnsAPI&) = delete;
+
~MDnsAPI() override;
static MDnsAPI* Get(content::BrowserContext* context);
@@ -114,8 +118,6 @@
// Count of active listeners per service type, saved from the previous
// invocation of UpdateMDnsListeners().
ServiceTypeCounts prev_service_counts_;
-
- DISALLOW_COPY_AND_ASSIGN(MDnsAPI);
};
class MdnsForceDiscoveryFunction : public ExtensionFunction {
diff --git a/chrome/browser/extensions/api/media_perception_private/media_perception_api_delegate_chromeos.h b/chrome/browser/extensions/api/media_perception_private/media_perception_api_delegate_chromeos.h
index 9d00f31..30003a5 100644
--- a/chrome/browser/extensions/api/media_perception_private/media_perception_api_delegate_chromeos.h
+++ b/chrome/browser/extensions/api/media_perception_private/media_perception_api_delegate_chromeos.h
@@ -15,6 +15,12 @@
: public extensions::MediaPerceptionAPIDelegate {
public:
MediaPerceptionAPIDelegateChromeOS();
+
+ MediaPerceptionAPIDelegateChromeOS(
+ const MediaPerceptionAPIDelegateChromeOS&) = delete;
+ MediaPerceptionAPIDelegateChromeOS& operator=(
+ const MediaPerceptionAPIDelegateChromeOS&) = delete;
+
~MediaPerceptionAPIDelegateChromeOS() override;
// extensions::MediaPerceptionAPIDelegate:
@@ -33,8 +39,6 @@
private:
MediaPerceptionRequestHandler handler_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaPerceptionAPIDelegateChromeOS);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/messaging/chrome_messaging_delegate.h b/chrome/browser/extensions/api/messaging/chrome_messaging_delegate.h
index 83108e8..b5942ac 100644
--- a/chrome/browser/extensions/api/messaging/chrome_messaging_delegate.h
+++ b/chrome/browser/extensions/api/messaging/chrome_messaging_delegate.h
@@ -13,6 +13,10 @@
class ChromeMessagingDelegate : public MessagingDelegate {
public:
ChromeMessagingDelegate();
+
+ ChromeMessagingDelegate(const ChromeMessagingDelegate&) = delete;
+ ChromeMessagingDelegate& operator=(const ChromeMessagingDelegate&) = delete;
+
~ChromeMessagingDelegate() override;
// MessagingDelegate:
@@ -45,9 +49,6 @@
content::WebContents* web_contents,
const GURL& url,
base::OnceCallback<void(bool)> callback) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeMessagingDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host.h b/chrome/browser/extensions/api/messaging/native_message_process_host.h
index 1fb358f..3588f94 100644
--- a/chrome/browser/extensions/api/messaging/native_message_process_host.h
+++ b/chrome/browser/extensions/api/messaging/native_message_process_host.h
@@ -42,6 +42,9 @@
// thread.
class NativeMessageProcessHost : public NativeMessageHost {
public:
+ NativeMessageProcessHost(const NativeMessageProcessHost&) = delete;
+ NativeMessageProcessHost& operator=(const NativeMessageProcessHost&) = delete;
+
~NativeMessageProcessHost() override;
// Create using specified |launcher|. Used in tests.
@@ -135,8 +138,6 @@
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
base::WeakPtrFactory<NativeMessageProcessHost> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NativeMessageProcessHost);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc b/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc
index 02225cc..7556f57 100644
--- a/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc
+++ b/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc
@@ -102,6 +102,11 @@
class TestProcessManagerObserver : public ProcessManagerObserver {
public:
TestProcessManagerObserver() = default;
+
+ TestProcessManagerObserver(const TestProcessManagerObserver&) = delete;
+ TestProcessManagerObserver& operator=(const TestProcessManagerObserver&) =
+ delete;
+
~TestProcessManagerObserver() override = default;
void WaitForProcessShutdown(ProcessManager* process_manager,
@@ -129,8 +134,6 @@
base::ScopedObservation<ProcessManager, ProcessManagerObserver> observation_{
this};
base::OnceClosure quit_;
-
- DISALLOW_COPY_AND_ASSIGN(TestProcessManagerObserver);
};
base::CommandLine CreateNativeMessagingConnectCommandLine(
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest.h b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest.h
index d31c3db..b8a7321 100644
--- a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest.h
+++ b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest.h
@@ -24,6 +24,10 @@
HOST_INTERFACE_STDIO,
};
+ NativeMessagingHostManifest(const NativeMessagingHostManifest&) = delete;
+ NativeMessagingHostManifest& operator=(const NativeMessagingHostManifest&) =
+ delete;
+
~NativeMessagingHostManifest();
// Verifies that the name is valid. Valid names must match regular expression
@@ -57,8 +61,6 @@
base::FilePath path_;
URLPatternSet allowed_origins_;
bool supports_native_initiated_connections_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(NativeMessagingHostManifest);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_launch_from_native.h b/chrome/browser/extensions/api/messaging/native_messaging_launch_from_native.h
index af341c8..423e863f 100644
--- a/chrome/browser/extensions/api/messaging/native_messaging_launch_from_native.h
+++ b/chrome/browser/extensions/api/messaging/native_messaging_launch_from_native.h
@@ -31,28 +31,36 @@
class ScopedAllowNativeAppConnectionForTest {
public:
explicit ScopedAllowNativeAppConnectionForTest(bool allow);
+
+ ScopedAllowNativeAppConnectionForTest(
+ const ScopedAllowNativeAppConnectionForTest&) = delete;
+ ScopedAllowNativeAppConnectionForTest& operator=(
+ const ScopedAllowNativeAppConnectionForTest&) = delete;
+
~ScopedAllowNativeAppConnectionForTest();
bool allow() const { return allow_; }
private:
const bool allow_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedAllowNativeAppConnectionForTest);
};
class ScopedNativeMessagingErrorTimeoutOverrideForTest {
public:
explicit ScopedNativeMessagingErrorTimeoutOverrideForTest(
base::TimeDelta timeout);
+
+ ScopedNativeMessagingErrorTimeoutOverrideForTest(
+ const ScopedNativeMessagingErrorTimeoutOverrideForTest&) = delete;
+ ScopedNativeMessagingErrorTimeoutOverrideForTest& operator=(
+ const ScopedNativeMessagingErrorTimeoutOverrideForTest&) = delete;
+
~ScopedNativeMessagingErrorTimeoutOverrideForTest();
base::TimeDelta timeout() const { return timeout_; }
private:
const base::TimeDelta timeout_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedNativeMessagingErrorTimeoutOverrideForTest);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h b/chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h
index e4b0fbf..373404a 100644
--- a/chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h
+++ b/chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h
@@ -18,6 +18,12 @@
NativeMessagingHostListPolicyHandler(const char* policy_name,
const char* pref_path,
bool allow_wildcards);
+
+ NativeMessagingHostListPolicyHandler(
+ const NativeMessagingHostListPolicyHandler&) = delete;
+ NativeMessagingHostListPolicyHandler& operator=(
+ const NativeMessagingHostListPolicyHandler&) = delete;
+
~NativeMessagingHostListPolicyHandler() override;
protected:
@@ -32,8 +38,6 @@
private:
const char* pref_path_;
bool allow_wildcards_;
-
- DISALLOW_COPY_AND_ASSIGN(NativeMessagingHostListPolicyHandler);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_test_util.h b/chrome/browser/extensions/api/messaging/native_messaging_test_util.h
index d854ace..662a8e4 100644
--- a/chrome/browser/extensions/api/messaging/native_messaging_test_util.h
+++ b/chrome/browser/extensions/api/messaging/native_messaging_test_util.h
@@ -34,6 +34,11 @@
static const char kExtensionId[];
ScopedTestNativeMessagingHost();
+
+ ScopedTestNativeMessagingHost(const ScopedTestNativeMessagingHost&) = delete;
+ ScopedTestNativeMessagingHost& operator=(
+ const ScopedTestNativeMessagingHost&) = delete;
+
~ScopedTestNativeMessagingHost();
void RegisterTestHost(bool user_level);
@@ -48,8 +53,6 @@
#else
std::unique_ptr<base::ScopedPathOverride> path_override_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(ScopedTestNativeMessagingHost);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher.cc b/chrome/browser/extensions/api/messaging/native_process_launcher.cc
index 2a1d6647..1e2dc81 100644
--- a/chrome/browser/extensions/api/messaging/native_process_launcher.cc
+++ b/chrome/browser/extensions/api/messaging/native_process_launcher.cc
@@ -52,6 +52,11 @@
bool require_native_initiated_connections,
const std::string& connect_id,
const std::string& error_arg);
+
+ NativeProcessLauncherImpl(const NativeProcessLauncherImpl&) = delete;
+ NativeProcessLauncherImpl& operator=(const NativeProcessLauncherImpl&) =
+ delete;
+
~NativeProcessLauncherImpl() override;
void Launch(const GURL& origin,
@@ -110,8 +115,6 @@
};
scoped_refptr<Core> core_;
-
- DISALLOW_COPY_AND_ASSIGN(NativeProcessLauncherImpl);
};
NativeProcessLauncherImpl::Core::Core(bool allow_user_level_hosts,
diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher.h b/chrome/browser/extensions/api/messaging/native_process_launcher.h
index b8bfbd2a..c40bc634 100644
--- a/chrome/browser/extensions/api/messaging/native_process_launcher.h
+++ b/chrome/browser/extensions/api/messaging/native_process_launcher.h
@@ -58,6 +58,10 @@
const std::string& error_arg);
NativeProcessLauncher() = default;
+
+ NativeProcessLauncher(const NativeProcessLauncher&) = delete;
+ NativeProcessLauncher& operator=(const NativeProcessLauncher&) = delete;
+
virtual ~NativeProcessLauncher() = default;
// Finds native messaging host with the specified name and launches it
@@ -86,9 +90,6 @@
base::Process* process,
base::File* read_file,
base::File* write_file);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NativeProcessLauncher);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/metrics_private/chrome_metrics_private_delegate.h b/chrome/browser/extensions/api/metrics_private/chrome_metrics_private_delegate.h
index eb2c605..868400ee 100644
--- a/chrome/browser/extensions/api/metrics_private/chrome_metrics_private_delegate.h
+++ b/chrome/browser/extensions/api/metrics_private/chrome_metrics_private_delegate.h
@@ -13,13 +13,15 @@
class ChromeMetricsPrivateDelegate : public MetricsPrivateDelegate {
public:
ChromeMetricsPrivateDelegate() {}
+
+ ChromeMetricsPrivateDelegate(const ChromeMetricsPrivateDelegate&) = delete;
+ ChromeMetricsPrivateDelegate& operator=(const ChromeMetricsPrivateDelegate&) =
+ delete;
+
~ChromeMetricsPrivateDelegate() override {}
// MetricsPrivateDelegate:
bool IsCrashReportingEnabled() override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeMetricsPrivateDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
index 235370d..1f2ae79 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
@@ -45,6 +45,10 @@
explicit TestNetworkingPrivateDelegate(bool test_failure)
: fail_(test_failure) {}
+ TestNetworkingPrivateDelegate(const TestNetworkingPrivateDelegate&) = delete;
+ TestNetworkingPrivateDelegate& operator=(
+ const TestNetworkingPrivateDelegate&) = delete;
+
~TestNetworkingPrivateDelegate() override {}
// Asynchronous methods
@@ -266,13 +270,15 @@
std::map<std::string, bool> enabled_;
std::map<std::string, bool> disabled_;
std::vector<std::string> scan_requested_;
-
- DISALLOW_COPY_AND_ASSIGN(TestNetworkingPrivateDelegate);
};
class NetworkingPrivateApiTest : public ExtensionApiTest {
public:
NetworkingPrivateApiTest() = default;
+
+ NetworkingPrivateApiTest(const NetworkingPrivateApiTest&) = delete;
+ NetworkingPrivateApiTest& operator=(const NetworkingPrivateApiTest&) = delete;
+
~NetworkingPrivateApiTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -329,8 +335,6 @@
protected:
bool test_failure_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateApiTest);
};
} // namespace
@@ -437,10 +441,13 @@
public:
NetworkingPrivateApiTestFail() { test_failure_ = true; }
+ NetworkingPrivateApiTestFail(const NetworkingPrivateApiTestFail&) = delete;
+ NetworkingPrivateApiTestFail& operator=(const NetworkingPrivateApiTestFail&) =
+ delete;
+
~NetworkingPrivateApiTestFail() override = default;
protected:
- DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateApiTestFail);
};
} // namespace
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_chromeos.h b/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_chromeos.h
index 941fd24..ebb2f88 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_chromeos.h
+++ b/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_chromeos.h
@@ -16,13 +16,16 @@
: public ::extensions::NetworkingPrivateDelegate::UIDelegate {
public:
NetworkingPrivateUIDelegateChromeOS();
+
+ NetworkingPrivateUIDelegateChromeOS(
+ const NetworkingPrivateUIDelegateChromeOS&) = delete;
+ NetworkingPrivateUIDelegateChromeOS& operator=(
+ const NetworkingPrivateUIDelegateChromeOS&) = delete;
+
~NetworkingPrivateUIDelegateChromeOS() override;
// NetworkingPrivateDelegate::UIDelegate
void ShowAccountDetails(const std::string& guid) const override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateUIDelegateChromeOS);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.h b/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.h
index d2b04c5..55424dad 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.h
+++ b/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.h
@@ -14,13 +14,16 @@
: public NetworkingPrivateDelegateFactory::UIDelegateFactory {
public:
NetworkingPrivateUIDelegateFactoryImpl();
+
+ NetworkingPrivateUIDelegateFactoryImpl(
+ const NetworkingPrivateUIDelegateFactoryImpl&) = delete;
+ NetworkingPrivateUIDelegateFactoryImpl& operator=(
+ const NetworkingPrivateUIDelegateFactoryImpl&) = delete;
+
~NetworkingPrivateUIDelegateFactoryImpl() override;
std::unique_ptr<NetworkingPrivateDelegate::UIDelegate> CreateDelegate()
override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateUIDelegateFactoryImpl);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/notifications/extension_notification_display_helper.h b/chrome/browser/extensions/api/notifications/extension_notification_display_helper.h
index a256184..1ed985ea 100644
--- a/chrome/browser/extensions/api/notifications/extension_notification_display_helper.h
+++ b/chrome/browser/extensions/api/notifications/extension_notification_display_helper.h
@@ -30,6 +30,12 @@
class ExtensionNotificationDisplayHelper : public KeyedService {
public:
explicit ExtensionNotificationDisplayHelper(Profile* profile);
+
+ ExtensionNotificationDisplayHelper(
+ const ExtensionNotificationDisplayHelper&) = delete;
+ ExtensionNotificationDisplayHelper& operator=(
+ const ExtensionNotificationDisplayHelper&) = delete;
+
~ExtensionNotificationDisplayHelper() override;
// Displays the |notification| using the notification display service.
@@ -68,8 +74,6 @@
// Vector of notifications that are being shown for extensions.
NotificationVector notifications_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionNotificationDisplayHelper);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/notifications/extension_notification_handler.h b/chrome/browser/extensions/api/notifications/extension_notification_handler.h
index 2f0a8bc..5e9a432 100644
--- a/chrome/browser/extensions/api/notifications/extension_notification_handler.h
+++ b/chrome/browser/extensions/api/notifications/extension_notification_handler.h
@@ -18,6 +18,11 @@
class ExtensionNotificationHandler : public NotificationHandler {
public:
ExtensionNotificationHandler();
+
+ ExtensionNotificationHandler(const ExtensionNotificationHandler&) = delete;
+ ExtensionNotificationHandler& operator=(const ExtensionNotificationHandler&) =
+ delete;
+
~ExtensionNotificationHandler() override;
// Extracts an extension ID from the URL for an app window, or an empty string
@@ -46,8 +51,6 @@
const std::string& name,
EventRouter::UserGestureState user_gesture,
std::unique_ptr<base::ListValue> args);
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionNotificationHandler);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.h b/chrome/browser/extensions/api/omnibox/omnibox_api.h
index 11722fcc7..5a1462e6 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api.h
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.h
@@ -88,6 +88,10 @@
public ExtensionRegistryObserver {
public:
explicit OmniboxAPI(content::BrowserContext* context);
+
+ OmniboxAPI(const OmniboxAPI&) = delete;
+ OmniboxAPI& operator=(const OmniboxAPI&) = delete;
+
~OmniboxAPI() override;
// BrowserContextKeyedAPI implementation.
@@ -139,8 +143,6 @@
ExtensionIconManager omnibox_icon_manager_;
base::CallbackListSubscription template_url_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(OmniboxAPI);
};
template <>
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc
index 7faacc3..c29bc2af 100644
--- a/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc
+++ b/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc
@@ -41,6 +41,10 @@
class PasswordsPrivateApiTest : public ExtensionApiTest {
public:
PasswordsPrivateApiTest() = default;
+
+ PasswordsPrivateApiTest(const PasswordsPrivateApiTest&) = delete;
+ PasswordsPrivateApiTest& operator=(const PasswordsPrivateApiTest&) = delete;
+
~PasswordsPrivateApiTest() override = default;
void SetUpOnMainThread() override {
@@ -108,8 +112,6 @@
private:
TestPasswordsPrivateDelegate* s_test_delegate_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(PasswordsPrivateApiTest);
};
} // namespace
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.h b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.h
index 76fa8b3..9a6e6bb0 100644
--- a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.h
+++ b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.h
@@ -43,6 +43,11 @@
public PasswordUIView {
public:
explicit PasswordsPrivateDelegateImpl(Profile* profile);
+
+ PasswordsPrivateDelegateImpl(const PasswordsPrivateDelegateImpl&) = delete;
+ PasswordsPrivateDelegateImpl& operator=(const PasswordsPrivateDelegateImpl&) =
+ delete;
+
~PasswordsPrivateDelegateImpl() override;
// PasswordsPrivateDelegate implementation.
@@ -192,8 +197,6 @@
content::WebContents* web_contents_;
base::WeakPtrFactory<PasswordsPrivateDelegateImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PasswordsPrivateDelegateImpl);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc
index 85e4a9e..a313af3 100644
--- a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc
+++ b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc
@@ -120,6 +120,9 @@
// The observer will only listen to events with the |event_name|.
explicit PasswordEventObserver(const std::string& event_name);
+ PasswordEventObserver(const PasswordEventObserver&) = delete;
+ PasswordEventObserver& operator=(const PasswordEventObserver&) = delete;
+
~PasswordEventObserver() override;
// Removes |event_args_| from |*this| and returns them.
@@ -134,8 +137,6 @@
// The arguments passed for the last observed event.
base::Value event_args_;
-
- DISALLOW_COPY_AND_ASSIGN(PasswordEventObserver);
};
PasswordEventObserver::PasswordEventObserver(const std::string& event_name)
@@ -174,6 +175,12 @@
class PasswordsPrivateDelegateImplTest : public testing::Test {
public:
PasswordsPrivateDelegateImplTest();
+
+ PasswordsPrivateDelegateImplTest(const PasswordsPrivateDelegateImplTest&) =
+ delete;
+ PasswordsPrivateDelegateImplTest& operator=(
+ const PasswordsPrivateDelegateImplTest&) = delete;
+
~PasswordsPrivateDelegateImplTest() override;
// Sets up a testing password store and fills it with |forms|.
@@ -198,7 +205,6 @@
private:
base::HistogramTester histogram_tester_;
- DISALLOW_COPY_AND_ASSIGN(PasswordsPrivateDelegateImplTest);
};
PasswordsPrivateDelegateImplTest::PasswordsPrivateDelegateImplTest() {
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_event_router.h b/chrome/browser/extensions/api/passwords_private/passwords_private_event_router.h
index af834e8..125af76 100644
--- a/chrome/browser/extensions/api/passwords_private/passwords_private_event_router.h
+++ b/chrome/browser/extensions/api/passwords_private/passwords_private_event_router.h
@@ -28,6 +28,11 @@
public:
static PasswordsPrivateEventRouter* Create(
content::BrowserContext* browser_context);
+
+ PasswordsPrivateEventRouter(const PasswordsPrivateEventRouter&) = delete;
+ PasswordsPrivateEventRouter& operator=(const PasswordsPrivateEventRouter&) =
+ delete;
+
~PasswordsPrivateEventRouter() override;
// Notifies listeners of updated passwords.
@@ -89,8 +94,6 @@
absl::optional<std::vector<base::Value>> cached_saved_password_parameters_;
absl::optional<std::vector<base::Value>>
cached_password_exception_parameters_;
-
- DISALLOW_COPY_AND_ASSIGN(PasswordsPrivateEventRouter);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/permissions/permissions_api_unittest.cc b/chrome/browser/extensions/api/permissions/permissions_api_unittest.cc
index e2c9ad1a..cc470592 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api_unittest.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api_unittest.cc
@@ -99,6 +99,10 @@
class PermissionsAPIUnitTest : public ExtensionServiceTestWithInstall {
public:
PermissionsAPIUnitTest() {}
+
+ PermissionsAPIUnitTest(const PermissionsAPIUnitTest&) = delete;
+ PermissionsAPIUnitTest& operator=(const PermissionsAPIUnitTest&) = delete;
+
~PermissionsAPIUnitTest() override {}
Browser* browser() { return browser_.get(); }
@@ -156,8 +160,6 @@
std::unique_ptr<TestBrowserWindow> browser_window_;
std::unique_ptr<Browser> browser_;
-
- DISALLOW_COPY_AND_ASSIGN(PermissionsAPIUnitTest);
};
TEST_F(PermissionsAPIUnitTest, Contains) {
diff --git a/chrome/browser/extensions/api/platform_keys/platform_keys_test_base.h b/chrome/browser/extensions/api/platform_keys/platform_keys_test_base.h
index 089acf5..cf6882b2 100644
--- a/chrome/browser/extensions/api/platform_keys/platform_keys_test_base.h
+++ b/chrome/browser/extensions/api/platform_keys/platform_keys_test_base.h
@@ -39,6 +39,10 @@
PlatformKeysTestBase(SystemTokenStatus system_token_status,
EnrollmentStatus enrollment_status,
UserStatus user_status);
+
+ PlatformKeysTestBase(const PlatformKeysTestBase&) = delete;
+ PlatformKeysTestBase& operator=(const PlatformKeysTestBase&) = delete;
+
~PlatformKeysTestBase() override;
protected:
@@ -102,8 +106,6 @@
FakeGaia fake_gaia_;
net::EmbeddedTestServer gaia_server_{net::EmbeddedTestServer::TYPE_HTTPS};
chromeos::ScopedStubInstallAttributes install_attributes_;
-
- DISALLOW_COPY_AND_ASSIGN(PlatformKeysTestBase);
};
#endif // CHROME_BROWSER_EXTENSIONS_API_PLATFORM_KEYS_PLATFORM_KEYS_TEST_BASE_H_
diff --git a/chrome/browser/extensions/api/platform_keys/verify_trust_api.h b/chrome/browser/extensions/api/platform_keys/verify_trust_api.h
index 00f46a28..8d726579a 100644
--- a/chrome/browser/extensions/api/platform_keys/verify_trust_api.h
+++ b/chrome/browser/extensions/api/platform_keys/verify_trust_api.h
@@ -48,6 +48,10 @@
// Consumers should use the factory instead of this constructor.
explicit VerifyTrustAPI(content::BrowserContext* context);
+
+ VerifyTrustAPI(const VerifyTrustAPI&) = delete;
+ VerifyTrustAPI& operator=(const VerifyTrustAPI&) = delete;
+
~VerifyTrustAPI() override;
// Verifies the server certificate as described by |params| for the
@@ -101,8 +105,6 @@
registry_observation_{this};
base::WeakPtrFactory<VerifyTrustAPI> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(VerifyTrustAPI);
};
template <>
diff --git a/chrome/browser/extensions/api/preference/preference_api.h b/chrome/browser/extensions/api/preference/preference_api.h
index 404df5e..33651a1 100644
--- a/chrome/browser/extensions/api/preference/preference_api.h
+++ b/chrome/browser/extensions/api/preference/preference_api.h
@@ -33,6 +33,10 @@
class PreferenceEventRouter : public ProfileObserver {
public:
explicit PreferenceEventRouter(Profile* profile);
+
+ PreferenceEventRouter(const PreferenceEventRouter&) = delete;
+ PreferenceEventRouter& operator=(const PreferenceEventRouter&) = delete;
+
~PreferenceEventRouter() override;
private:
@@ -53,8 +57,6 @@
base::ScopedMultiSourceObservation<Profile, ProfileObserver>
observed_profiles_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PreferenceEventRouter);
};
// The class containing the implementation for extension-controlled preference
@@ -108,6 +110,10 @@
public ContentSettingsStore::Observer {
public:
explicit PreferenceAPI(content::BrowserContext* context);
+
+ PreferenceAPI(const PreferenceAPI&) = delete;
+ PreferenceAPI& operator=(const PreferenceAPI&) = delete;
+
~PreferenceAPI() override;
// KeyedService implementation.
@@ -148,8 +154,6 @@
// Created lazily upon OnListenerAdded.
std::unique_ptr<PreferenceEventRouter> preference_event_router_;
-
- DISALLOW_COPY_AND_ASSIGN(PreferenceAPI);
};
class PrefTransformerInterface {
diff --git a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc
index 43d821b..ec79d58 100644
--- a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc
+++ b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc
@@ -47,6 +47,10 @@
ContentSettingsService* content_settings)
: test_extension_prefs_(test_extension_prefs),
content_settings_(content_settings) {}
+
+ TestPreferenceAPI(const TestPreferenceAPI&) = delete;
+ TestPreferenceAPI& operator=(const TestPreferenceAPI&) = delete;
+
~TestPreferenceAPI() {}
private:
@@ -63,8 +67,6 @@
TestExtensionPrefs* test_extension_prefs_;
ContentSettingsService* content_settings_;
-
- DISALLOW_COPY_AND_ASSIGN(TestPreferenceAPI);
};
class ExtensionControlledPrefsTest : public PrefsPrepopulatedTestBase {
diff --git a/chrome/browser/extensions/api/printing/printing_api_handler_unittest.cc b/chrome/browser/extensions/api/printing/printing_api_handler_unittest.cc
index 4cfbc2f..d88af50c 100644
--- a/chrome/browser/extensions/api/printing/printing_api_handler_unittest.cc
+++ b/chrome/browser/extensions/api/printing/printing_api_handler_unittest.cc
@@ -53,6 +53,9 @@
event_router_->AddEventObserver(this);
}
+ PrintingEventObserver(const PrintingEventObserver&) = delete;
+ PrintingEventObserver& operator=(const PrintingEventObserver&) = delete;
+
~PrintingEventObserver() override {
event_router_->RemoveEventObserver(this);
}
@@ -82,8 +85,6 @@
// The arguments passed for the last observed event.
base::Value event_args_;
-
- DISALLOW_COPY_AND_ASSIGN(PrintingEventObserver);
};
constexpr char kExtensionId[] = "abcdefghijklmnopqrstuvwxyzabcdef";
diff --git a/chrome/browser/extensions/api/processes/processes_api.h b/chrome/browser/extensions/api/processes/processes_api.h
index 0f389faa..c5e855b 100644
--- a/chrome/browser/extensions/api/processes/processes_api.h
+++ b/chrome/browser/extensions/api/processes/processes_api.h
@@ -24,6 +24,10 @@
class ProcessesEventRouter : public task_manager::TaskManagerObserver {
public:
explicit ProcessesEventRouter(content::BrowserContext* context);
+
+ ProcessesEventRouter(const ProcessesEventRouter&) = delete;
+ ProcessesEventRouter& operator=(const ProcessesEventRouter&) = delete;
+
~ProcessesEventRouter() override;
// Called when an extension process wants to listen to process events.
@@ -65,8 +69,6 @@
// Count of listeners, so we avoid sending updates if no one is interested.
int listeners_;
-
- DISALLOW_COPY_AND_ASSIGN(ProcessesEventRouter);
};
////////////////////////////////////////////////////////////////////////////////
@@ -75,6 +77,10 @@
public EventRouter::Observer {
public:
explicit ProcessesAPI(content::BrowserContext* context);
+
+ ProcessesAPI(const ProcessesAPI&) = delete;
+ ProcessesAPI& operator=(const ProcessesAPI&) = delete;
+
~ProcessesAPI() override;
// BrowserContextKeyedAPI:
@@ -104,8 +110,6 @@
// Created lazily on first access.
std::unique_ptr<ProcessesEventRouter> processes_event_router_;
-
- DISALLOW_COPY_AND_ASSIGN(ProcessesAPI);
};
////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/extensions/api/processes/processes_apitest.cc b/chrome/browser/extensions/api/processes/processes_apitest.cc
index 745c8c1..7e529269 100644
--- a/chrome/browser/extensions/api/processes/processes_apitest.cc
+++ b/chrome/browser/extensions/api/processes/processes_apitest.cc
@@ -18,15 +18,16 @@
class ProcessesApiTest : public extensions::ExtensionApiTest {
public:
ProcessesApiTest() {}
+
+ ProcessesApiTest(const ProcessesApiTest&) = delete;
+ ProcessesApiTest& operator=(const ProcessesApiTest&) = delete;
+
~ProcessesApiTest() override {}
int GetListenersCount() {
return extensions::ProcessesAPI::Get(profile())->
processes_event_router()->listeners_;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ProcessesApiTest);
};
diff --git a/chrome/browser/extensions/api/proxy/proxy_api.h b/chrome/browser/extensions/api/proxy/proxy_api.h
index 4cb1d1a3..d014e5b 100644
--- a/chrome/browser/extensions/api/proxy/proxy_api.h
+++ b/chrome/browser/extensions/api/proxy/proxy_api.h
@@ -28,6 +28,10 @@
class ProxyPrefTransformer : public PrefTransformerInterface {
public:
ProxyPrefTransformer();
+
+ ProxyPrefTransformer(const ProxyPrefTransformer&) = delete;
+ ProxyPrefTransformer& operator=(const ProxyPrefTransformer&) = delete;
+
~ProxyPrefTransformer() override;
// Implementation of PrefTransformerInterface.
@@ -38,9 +42,6 @@
std::unique_ptr<base::Value> BrowserToExtensionPref(
const base::Value* browser_pref,
bool is_incognito_profile) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ProxyPrefTransformer);
};
// This class observes proxy error events and routes them to the appropriate
diff --git a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.h b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.h
index b64a0c6..1549bdd6 100644
--- a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.h
+++ b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.h
@@ -39,6 +39,10 @@
public extensions::ExtensionRegistryObserver {
public:
explicit ChromeRuntimeAPIDelegate(content::BrowserContext* context);
+
+ ChromeRuntimeAPIDelegate(const ChromeRuntimeAPIDelegate&) = delete;
+ ChromeRuntimeAPIDelegate& operator=(const ChromeRuntimeAPIDelegate&) = delete;
+
~ChromeRuntimeAPIDelegate() override;
// Sets a custom TickClock to use in tests.
@@ -93,8 +97,6 @@
base::ScopedObservation<extensions::ExtensionRegistry,
extensions::ExtensionRegistryObserver>
extension_registry_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeRuntimeAPIDelegate);
};
#endif // CHROME_BROWSER_EXTENSIONS_API_RUNTIME_CHROME_RUNTIME_API_DELEGATE_H_
diff --git a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate_unittest.cc b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate_unittest.cc
index 37b56dc..5fab62d 100644
--- a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate_unittest.cc
+++ b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate_unittest.cc
@@ -44,6 +44,10 @@
public:
explicit TestEventRouter(content::BrowserContext* context)
: EventRouter(context, ExtensionPrefs::Get(context)) {}
+
+ TestEventRouter(const TestEventRouter&) = delete;
+ TestEventRouter& operator=(const TestEventRouter&) = delete;
+
~TestEventRouter() override {}
// An entry in our fake event registry.
@@ -62,8 +66,6 @@
private:
std::set<Entry> fake_registry_;
-
- DISALLOW_COPY_AND_ASSIGN(TestEventRouter);
};
std::unique_ptr<KeyedService> TestEventRouterFactoryFunction(
diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.h b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.h
index 1879be1..0bdf26e7 100644
--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.h
+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.h
@@ -112,6 +112,11 @@
explicit SafeBrowsingPrivateEventRouter(content::BrowserContext* context);
+ SafeBrowsingPrivateEventRouter(const SafeBrowsingPrivateEventRouter&) =
+ delete;
+ SafeBrowsingPrivateEventRouter& operator=(
+ const SafeBrowsingPrivateEventRouter&) = delete;
+
~SafeBrowsingPrivateEventRouter() override;
// Notifies listeners that the user reused a protected password.
@@ -358,7 +363,6 @@
rejected_dm_token_timers_;
base::WeakPtrFactory<SafeBrowsingPrivateEventRouter> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(SafeBrowsingPrivateEventRouter);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
index b9a0b21c..177fcf2 100644
--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
@@ -82,6 +82,10 @@
explicit SafeBrowsingEventObserver(const std::string& event_name)
: event_name_(event_name) {}
+ SafeBrowsingEventObserver(const SafeBrowsingEventObserver&) = delete;
+ SafeBrowsingEventObserver& operator=(const SafeBrowsingEventObserver&) =
+ delete;
+
~SafeBrowsingEventObserver() override = default;
// Removes |event_args_| from |*this| and returns them.
@@ -100,8 +104,6 @@
// The arguments passed for the last observed event.
base::Value event_args_;
-
- DISALLOW_COPY_AND_ASSIGN(SafeBrowsingEventObserver);
};
std::unique_ptr<KeyedService> BuildSafeBrowsingPrivateEventRouter(
diff --git a/chrome/browser/extensions/api/sessions/sessions_api.h b/chrome/browser/extensions/api/sessions/sessions_api.h
index ba77563..a7db66c 100644
--- a/chrome/browser/extensions/api/sessions/sessions_api.h
+++ b/chrome/browser/extensions/api/sessions/sessions_api.h
@@ -87,6 +87,10 @@
class SessionsEventRouter : public sessions::TabRestoreServiceObserver {
public:
explicit SessionsEventRouter(Profile* profile);
+
+ SessionsEventRouter(const SessionsEventRouter&) = delete;
+ SessionsEventRouter& operator=(const SessionsEventRouter&) = delete;
+
~SessionsEventRouter() override;
// Observer callback for TabRestoreServiceObserver. Sends data on
@@ -104,14 +108,16 @@
// TabRestoreService that we are observing.
sessions::TabRestoreService* tab_restore_service_;
-
- DISALLOW_COPY_AND_ASSIGN(SessionsEventRouter);
};
class SessionsAPI : public BrowserContextKeyedAPI,
public extensions::EventRouter::Observer {
public:
explicit SessionsAPI(content::BrowserContext* context);
+
+ SessionsAPI(const SessionsAPI&) = delete;
+ SessionsAPI& operator=(const SessionsAPI&) = delete;
+
~SessionsAPI() override;
// BrowserContextKeyedService implementation.
@@ -136,8 +142,6 @@
// Created lazily upon OnListenerAdded.
std::unique_ptr<SessionsEventRouter> sessions_event_router_;
-
- DISALLOW_COPY_AND_ASSIGN(SessionsAPI);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h
index 8b74270..6b031db 100644
--- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h
+++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h
@@ -24,6 +24,10 @@
public ExtensionRegistryObserver {
public:
explicit SettingsOverridesAPI(content::BrowserContext* context);
+
+ SettingsOverridesAPI(const SettingsOverridesAPI&) = delete;
+ SettingsOverridesAPI& operator=(const SettingsOverridesAPI&) = delete;
+
~SettingsOverridesAPI() override;
// BrowserContextKeyedAPI implementation.
@@ -57,8 +61,6 @@
// Listen to extension load, unloaded notifications.
base::ScopedObservation<ExtensionRegistry, ExtensionRegistryObserver>
extension_registry_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SettingsOverridesAPI);
};
template <>
diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc
index 54c71fe..8fdc8d50 100644
--- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc
+++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc
@@ -236,6 +236,12 @@
: prompt_for_external_extensions_(
FeatureSwitch::prompt_for_external_extensions(),
false) {}
+
+ ExtensionsDisabledWithSettingsOverrideAPI(
+ const ExtensionsDisabledWithSettingsOverrideAPI&) = delete;
+ ExtensionsDisabledWithSettingsOverrideAPI& operator=(
+ const ExtensionsDisabledWithSettingsOverrideAPI&) = delete;
+
~ExtensionsDisabledWithSettingsOverrideAPI() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -252,8 +258,6 @@
private:
FeatureSwitch::ScopedOverride prompt_for_external_extensions_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionsDisabledWithSettingsOverrideAPI);
};
// The following test combo is a regression test for https://crbug.com/828295.
diff --git a/chrome/browser/extensions/api/settings_private/chromeos_resolve_time_zone_by_geolocation_method_short.cc b/chrome/browser/extensions/api/settings_private/chromeos_resolve_time_zone_by_geolocation_method_short.cc
index 0d1bb8a6..2f85efd 100644
--- a/chrome/browser/extensions/api/settings_private/chromeos_resolve_time_zone_by_geolocation_method_short.cc
+++ b/chrome/browser/extensions/api/settings_private/chromeos_resolve_time_zone_by_geolocation_method_short.cc
@@ -27,14 +27,17 @@
: public GeneratedTimeZonePrefBase {
public:
explicit GeneratedResolveTimezoneByGeolocationMethodShort(Profile* profile);
+
+ GeneratedResolveTimezoneByGeolocationMethodShort(
+ const GeneratedResolveTimezoneByGeolocationMethodShort&) = delete;
+ GeneratedResolveTimezoneByGeolocationMethodShort& operator=(
+ const GeneratedResolveTimezoneByGeolocationMethodShort&) = delete;
+
~GeneratedResolveTimezoneByGeolocationMethodShort() override;
// GeneratedPrefsChromeOSImpl implementation:
std::unique_ptr<settings_api::PrefObject> GetPrefObject() const override;
SetPrefResult SetPref(const base::Value* value) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(GeneratedResolveTimezoneByGeolocationMethodShort);
};
GeneratedResolveTimezoneByGeolocationMethodShort::
diff --git a/chrome/browser/extensions/api/settings_private/chromeos_resolve_time_zone_by_geolocation_on_off.cc b/chrome/browser/extensions/api/settings_private/chromeos_resolve_time_zone_by_geolocation_on_off.cc
index 8f404b82..91eba02 100644
--- a/chrome/browser/extensions/api/settings_private/chromeos_resolve_time_zone_by_geolocation_on_off.cc
+++ b/chrome/browser/extensions/api/settings_private/chromeos_resolve_time_zone_by_geolocation_on_off.cc
@@ -28,14 +28,17 @@
: public GeneratedTimeZonePrefBase {
public:
explicit GeneratedResolveTimezoneByGeolocationOnOff(Profile* profile);
+
+ GeneratedResolveTimezoneByGeolocationOnOff(
+ const GeneratedResolveTimezoneByGeolocationOnOff&) = delete;
+ GeneratedResolveTimezoneByGeolocationOnOff& operator=(
+ const GeneratedResolveTimezoneByGeolocationOnOff&) = delete;
+
~GeneratedResolveTimezoneByGeolocationOnOff() override;
// GeneratedPref implementation:
std::unique_ptr<settings_api::PrefObject> GetPrefObject() const override;
SetPrefResult SetPref(const base::Value* value) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(GeneratedResolveTimezoneByGeolocationOnOff);
};
GeneratedResolveTimezoneByGeolocationOnOff::
diff --git a/chrome/browser/extensions/api/settings_private/generated_pref.h b/chrome/browser/extensions/api/settings_private/generated_pref.h
index 6914046..07e16f8 100644
--- a/chrome/browser/extensions/api/settings_private/generated_pref.h
+++ b/chrome/browser/extensions/api/settings_private/generated_pref.h
@@ -35,16 +35,20 @@
class Observer {
public:
Observer();
+
+ Observer(const Observer&) = delete;
+ Observer& operator=(const Observer&) = delete;
+
virtual ~Observer();
// This method is called to notify observer that visible value
// of the preference has changed.
virtual void OnGeneratedPrefChanged(const std::string& pref_name) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Observer);
};
+ GeneratedPref(const GeneratedPref&) = delete;
+ GeneratedPref& operator=(const GeneratedPref&) = delete;
+
virtual ~GeneratedPref();
// Returns fully populated PrefObject.
@@ -85,8 +89,6 @@
private:
base::ObserverList<Observer>::Unchecked observers_;
-
- DISALLOW_COPY_AND_ASSIGN(GeneratedPref);
};
} // namespace settings_private
diff --git a/chrome/browser/extensions/api/settings_private/generated_prefs.h b/chrome/browser/extensions/api/settings_private/generated_prefs.h
index c58a5fef..ad7f955 100644
--- a/chrome/browser/extensions/api/settings_private/generated_prefs.h
+++ b/chrome/browser/extensions/api/settings_private/generated_prefs.h
@@ -39,6 +39,10 @@
std::unordered_map<std::string, std::unique_ptr<GeneratedPref>>;
explicit GeneratedPrefs(Profile* profile);
+
+ GeneratedPrefs(const GeneratedPrefs&) = delete;
+ GeneratedPrefs& operator=(const GeneratedPrefs&) = delete;
+
~GeneratedPrefs() override;
// Returns true if preference is supported.
@@ -72,8 +76,6 @@
PrefsMap prefs_;
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(GeneratedPrefs);
};
} // namespace settings_private
diff --git a/chrome/browser/extensions/api/settings_private/generated_time_zone_pref_base.h b/chrome/browser/extensions/api/settings_private/generated_time_zone_pref_base.h
index 6b0d431..f13499a 100644
--- a/chrome/browser/extensions/api/settings_private/generated_time_zone_pref_base.h
+++ b/chrome/browser/extensions/api/settings_private/generated_time_zone_pref_base.h
@@ -21,6 +21,10 @@
: public GeneratedPref,
public ash::system::TimeZoneResolverManager::Observer {
public:
+ GeneratedTimeZonePrefBase(const GeneratedTimeZonePrefBase&) = delete;
+ GeneratedTimeZonePrefBase& operator=(const GeneratedTimeZonePrefBase&) =
+ delete;
+
~GeneratedTimeZonePrefBase() override;
// chromeos::system::TimeZoneResolverManager::Observer
@@ -35,8 +39,6 @@
const std::string pref_name_;
Profile* const profile_;
-
- DISALLOW_COPY_AND_ASSIGN(GeneratedTimeZonePrefBase);
};
} // namespace settings_private
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_delegate.h b/chrome/browser/extensions/api/settings_private/settings_private_delegate.h
index 1826e7b..81a8d62 100644
--- a/chrome/browser/extensions/api/settings_private/settings_private_delegate.h
+++ b/chrome/browser/extensions/api/settings_private/settings_private_delegate.h
@@ -32,6 +32,10 @@
class SettingsPrivateDelegate : public KeyedService {
public:
explicit SettingsPrivateDelegate(Profile* profile);
+
+ SettingsPrivateDelegate(const SettingsPrivateDelegate&) = delete;
+ SettingsPrivateDelegate& operator=(const SettingsPrivateDelegate&) = delete;
+
~SettingsPrivateDelegate() override;
// Sets the pref with the given name and value in the proper PrefService.
@@ -55,9 +59,6 @@
protected:
Profile* profile_; // weak; not owned by us
std::unique_ptr<PrefsUtil> prefs_util_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SettingsPrivateDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_event_router.h b/chrome/browser/extensions/api/settings_private/settings_private_event_router.h
index 1ee722b2..11c05727 100644
--- a/chrome/browser/extensions/api/settings_private/settings_private_event_router.h
+++ b/chrome/browser/extensions/api/settings_private/settings_private_event_router.h
@@ -37,6 +37,11 @@
public:
static SettingsPrivateEventRouter* Create(
content::BrowserContext* browser_context);
+
+ SettingsPrivateEventRouter(const SettingsPrivateEventRouter&) = delete;
+ SettingsPrivateEventRouter& operator=(const SettingsPrivateEventRouter&) =
+ delete;
+
~SettingsPrivateEventRouter() override;
// settings_private::GeneratedPref::Observer implementation.
@@ -85,8 +90,6 @@
std::unique_ptr<PrefsUtil> prefs_util_;
base::WeakPtrFactory<SettingsPrivateEventRouter> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SettingsPrivateEventRouter);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h
index b5ec792c..8c015fcc 100644
--- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h
+++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h
@@ -42,6 +42,11 @@
public:
SignedInDevicesChangeObserver(const std::string& extension_id,
Profile* profile);
+
+ SignedInDevicesChangeObserver(const SignedInDevicesChangeObserver&) = delete;
+ SignedInDevicesChangeObserver& operator=(
+ const SignedInDevicesChangeObserver&) = delete;
+
virtual ~SignedInDevicesChangeObserver();
void OnDeviceInfoChange() override;
@@ -54,8 +59,6 @@
std::string extension_id_;
Profile* const profile_;
content::NotificationRegistrar registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(SignedInDevicesChangeObserver);
};
class SignedInDevicesManager : public BrowserContextKeyedAPI,
@@ -65,6 +68,10 @@
// Default constructor used for testing.
SignedInDevicesManager();
explicit SignedInDevicesManager(content::BrowserContext* context);
+
+ SignedInDevicesManager(const SignedInDevicesManager&) = delete;
+ SignedInDevicesManager& operator=(const SignedInDevicesManager&) = delete;
+
~SignedInDevicesManager() override;
// BrowserContextKeyedAPI implementation.
@@ -100,8 +107,6 @@
extension_registry_observation_{this};
FRIEND_TEST_ALL_PREFIXES(SignedInDevicesManager, UpdateListener);
-
- DISALLOW_COPY_AND_ASSIGN(SignedInDevicesManager);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc b/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc
index ac39bac2..48b59f5 100644
--- a/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc
+++ b/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc
@@ -474,6 +474,11 @@
success_(success) {
this->set_enable_read_if_ready(true);
}
+
+ ExtensionsMockClientSocket(const ExtensionsMockClientSocket&) = delete;
+ ExtensionsMockClientSocket& operator=(const ExtensionsMockClientSocket&) =
+ delete;
+
~ExtensionsMockClientSocket() override {}
bool SetNoDelay(bool no_delay) override { return success_; }
@@ -482,8 +487,6 @@
private:
// Whether to return success for SetNoDelay() and SetKeepAlive().
const bool success_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionsMockClientSocket);
};
static const net::MockRead kMockReads[] = {net::MockRead(net::ASYNC, net::OK)};
@@ -493,6 +496,10 @@
class TestSocketFactory : public net::ClientSocketFactory {
public:
explicit TestSocketFactory(bool success) : success_(success) {}
+
+ TestSocketFactory(const TestSocketFactory&) = delete;
+ TestSocketFactory& operator=(const TestSocketFactory&) = delete;
+
~TestSocketFactory() override = default;
std::unique_ptr<net::DatagramClientSocket> CreateDatagramClientSocket(
@@ -541,8 +548,6 @@
// Whether to return success for net::TransportClientSocket::SetNoDelay() and
// SetKeepAlive().
const bool success_;
-
- DISALLOW_COPY_AND_ASSIGN(TestSocketFactory);
};
} // namespace
diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc
index 9fab813..2269b14 100644
--- a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc
+++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc
@@ -71,6 +71,10 @@
: public ExtensionRegistryObserver {
public:
ExtensionTracker(Profile* profile, policy::PolicyDomain policy_domain);
+
+ ExtensionTracker(const ExtensionTracker&) = delete;
+ ExtensionTracker& operator=(const ExtensionTracker&) = delete;
+
~ExtensionTracker() override {}
private:
@@ -104,8 +108,6 @@
extension_registry_observation_{this};
policy::SchemaRegistry* schema_registry_;
base::WeakPtrFactory<ExtensionTracker> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionTracker);
};
ManagedValueStoreCache::ExtensionTracker::ExtensionTracker(
diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.h b/chrome/browser/extensions/api/storage/managed_value_store_cache.h
index 03ddb95..c6a3770 100644
--- a/chrome/browser/extensions/api/storage/managed_value_store_cache.h
+++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.h
@@ -48,6 +48,10 @@
ManagedValueStoreCache(content::BrowserContext* context,
scoped_refptr<value_store::ValueStoreFactory> factory,
scoped_refptr<SettingsObserverList> observers);
+
+ ManagedValueStoreCache(const ManagedValueStoreCache&) = delete;
+ ManagedValueStoreCache& operator=(const ManagedValueStoreCache&) = delete;
+
~ManagedValueStoreCache() override;
private:
@@ -102,8 +106,6 @@
// All the PolicyValueStores live on the FILE thread, and |store_map_| can be
// accessed only on the FILE thread as well.
std::map<std::string, std::unique_ptr<PolicyValueStore>> store_map_;
-
- DISALLOW_COPY_AND_ASSIGN(ManagedValueStoreCache);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/storage/policy_value_store.h b/chrome/browser/extensions/api/storage/policy_value_store.h
index 40719c38..4efbb6dc 100644
--- a/chrome/browser/extensions/api/storage/policy_value_store.h
+++ b/chrome/browser/extensions/api/storage/policy_value_store.h
@@ -33,6 +33,10 @@
PolicyValueStore(const std::string& extension_id,
scoped_refptr<SettingsObserverList> observers,
std::unique_ptr<value_store::ValueStore> delegate);
+
+ PolicyValueStore(const PolicyValueStore&) = delete;
+ PolicyValueStore& operator=(const PolicyValueStore&) = delete;
+
~PolicyValueStore() override;
// Stores |policy| in the persistent database represented by the |delegate_|
@@ -65,8 +69,6 @@
std::string extension_id_;
scoped_refptr<SettingsObserverList> observers_;
std::unique_ptr<value_store::ValueStore> delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(PolicyValueStore);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
index 9bdf1b4..a6327a5 100644
--- a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
+++ b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
@@ -76,6 +76,10 @@
std::make_unique<value_store::LeveldbValueStore>(
kDatabaseUMAClientName,
path)) {}
+
+ MutablePolicyValueStore(const MutablePolicyValueStore&) = delete;
+ MutablePolicyValueStore& operator=(const MutablePolicyValueStore&) = delete;
+
~MutablePolicyValueStore() override = default;
WriteResult Set(WriteOptions options,
@@ -98,9 +102,6 @@
}
WriteResult Clear() override { return delegate()->Clear(); }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MutablePolicyValueStore);
};
ValueStore* Param(const base::FilePath& file_path) {
diff --git a/chrome/browser/extensions/api/storage/setting_sync_data.h b/chrome/browser/extensions/api/storage/setting_sync_data.h
index 21f1c2a..cb0bb19 100644
--- a/chrome/browser/extensions/api/storage/setting_sync_data.h
+++ b/chrome/browser/extensions/api/storage/setting_sync_data.h
@@ -35,6 +35,9 @@
const std::string& key,
std::unique_ptr<base::Value> value);
+ SettingSyncData(const SettingSyncData&) = delete;
+ SettingSyncData& operator=(const SettingSyncData&) = delete;
+
~SettingSyncData();
// May return absl::nullopt if this object represents sync data that isn't
@@ -61,8 +64,6 @@
std::string extension_id_;
std::string key_;
std::unique_ptr<base::Value> value_;
-
- DISALLOW_COPY_AND_ASSIGN(SettingSyncData);
};
using SettingSyncDataList = std::vector<std::unique_ptr<SettingSyncData>>;
diff --git a/chrome/browser/extensions/api/storage/settings_sync_processor.h b/chrome/browser/extensions/api/storage/settings_sync_processor.h
index 5e3305e..7e3ca713 100644
--- a/chrome/browser/extensions/api/storage/settings_sync_processor.h
+++ b/chrome/browser/extensions/api/storage/settings_sync_processor.h
@@ -31,6 +31,10 @@
SettingsSyncProcessor(const std::string& extension_id,
syncer::ModelType type,
syncer::SyncChangeProcessor* sync_processor);
+
+ SettingsSyncProcessor(const SettingsSyncProcessor&) = delete;
+ SettingsSyncProcessor& operator=(const SettingsSyncProcessor&) = delete;
+
~SettingsSyncProcessor();
// Initializes this with the initial state of sync.
@@ -62,8 +66,6 @@
// Keys of the settings that are currently being synced. Used to decide what
// kind of action (ADD, UPDATE, REMOVE) to send to sync.
std::set<std::string> synced_keys_;
-
- DISALLOW_COPY_AND_ASSIGN(SettingsSyncProcessor);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/storage/sync_storage_backend.h b/chrome/browser/extensions/api/storage/sync_storage_backend.h
index c57904f..32777d4 100644
--- a/chrome/browser/extensions/api/storage/sync_storage_backend.h
+++ b/chrome/browser/extensions/api/storage/sync_storage_backend.h
@@ -45,6 +45,9 @@
syncer::ModelType sync_type,
const syncer::SyncableService::StartSyncFlare& flare);
+ SyncStorageBackend(const SyncStorageBackend&) = delete;
+ SyncStorageBackend& operator=(const SyncStorageBackend&) = delete;
+
~SyncStorageBackend() override;
virtual value_store::ValueStore* GetStorage(const std::string& extension_id);
@@ -99,8 +102,6 @@
std::unique_ptr<syncer::SyncErrorFactory> sync_error_factory_;
syncer::SyncableService::StartSyncFlare flare_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncStorageBackend);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/storage/sync_value_store_cache.h b/chrome/browser/extensions/api/storage/sync_value_store_cache.h
index ba66012..c466f61 100644
--- a/chrome/browser/extensions/api/storage/sync_value_store_cache.h
+++ b/chrome/browser/extensions/api/storage/sync_value_store_cache.h
@@ -39,6 +39,10 @@
SyncValueStoreCache(scoped_refptr<value_store::ValueStoreFactory> factory,
scoped_refptr<SettingsObserverList> observers,
const base::FilePath& profile_path);
+
+ SyncValueStoreCache(const SyncValueStoreCache&) = delete;
+ SyncValueStoreCache& operator=(const SyncValueStoreCache&) = delete;
+
~SyncValueStoreCache() override;
base::WeakPtr<SyncValueStoreCache> AsWeakPtr();
@@ -59,8 +63,6 @@
std::unique_ptr<SyncStorageBackend> app_backend_;
std::unique_ptr<SyncStorageBackend> extension_backend_;
base::WeakPtrFactory<SyncValueStoreCache> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SyncValueStoreCache);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/storage/syncable_settings_storage.h b/chrome/browser/extensions/api/storage/syncable_settings_storage.h
index 12fb106b..3578c54 100644
--- a/chrome/browser/extensions/api/storage/syncable_settings_storage.h
+++ b/chrome/browser/extensions/api/storage/syncable_settings_storage.h
@@ -40,6 +40,9 @@
syncer::ModelType sync_type,
const syncer::SyncableService::StartSyncFlare& flare);
+ SyncableSettingsStorage(const SyncableSettingsStorage&) = delete;
+ SyncableSettingsStorage& operator=(const SyncableSettingsStorage&) = delete;
+
~SyncableSettingsStorage() override;
// ValueStore implementation.
@@ -127,8 +130,6 @@
const syncer::ModelType sync_type_;
const syncer::SyncableService::StartSyncFlare flare_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncableSettingsStorage);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc
index f8548684..6a24564 100644
--- a/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc
+++ b/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc
@@ -24,6 +24,10 @@
class SystemIndicatorApiTest : public ExtensionApiTest {
public:
SystemIndicatorApiTest() : scoped_channel_(version_info::Channel::DEV) {}
+
+ SystemIndicatorApiTest(const SystemIndicatorApiTest&) = delete;
+ SystemIndicatorApiTest& operator=(const SystemIndicatorApiTest&) = delete;
+
~SystemIndicatorApiTest() override = default;
void SetUpOnMainThread() override {
@@ -45,8 +49,6 @@
private:
ScopedCurrentChannel scoped_channel_;
-
- DISALLOW_COPY_AND_ASSIGN(SystemIndicatorApiTest);
};
// https://crbug.com/960363: Test crashes on ChromeOS.
diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc
index d27dc73..efafbe4 100644
--- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc
+++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc
@@ -38,6 +38,10 @@
const ExtensionIconSet& icon_set,
Profile* profile,
StatusTray* status_tray);
+
+ ExtensionIndicatorIcon(const ExtensionIndicatorIcon&) = delete;
+ ExtensionIndicatorIcon& operator=(const ExtensionIndicatorIcon&) = delete;
+
~ExtensionIndicatorIcon() override;
// Sets the dynamic icon for the indicator.
@@ -61,8 +65,6 @@
Profile* profile_;
IconImage manifest_icon_;
gfx::Image dynamic_icon_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionIndicatorIcon);
};
std::unique_ptr<ExtensionIndicatorIcon> ExtensionIndicatorIcon::Create(
diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h
index 7a8472e..1e0c307 100644
--- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h
+++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h
@@ -34,6 +34,10 @@
public KeyedService {
public:
SystemIndicatorManager(Profile* profile, StatusTray* status_tray);
+
+ SystemIndicatorManager(const SystemIndicatorManager&) = delete;
+ SystemIndicatorManager& operator=(const SystemIndicatorManager&) = delete;
+
~SystemIndicatorManager() override;
// Sets the icon of the system indicator for the given |extension| to
@@ -87,8 +91,6 @@
base::ScopedObservation<ExtensionRegistry, ExtensionRegistryObserver>
extension_registry_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SystemIndicatorManager);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_performance_test_base.h b/chrome/browser/extensions/api/tab_capture/tab_capture_performance_test_base.h
index 47f2e10..0a97db88 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_performance_test_base.h
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_performance_test_base.h
@@ -41,6 +41,11 @@
class TabCapturePerformanceTestBase : public InProcessBrowserTest {
public:
TabCapturePerformanceTestBase();
+
+ TabCapturePerformanceTestBase(const TabCapturePerformanceTestBase&) = delete;
+ TabCapturePerformanceTestBase& operator=(
+ const TabCapturePerformanceTestBase&) = delete;
+
~TabCapturePerformanceTestBase() override;
// SetUp overrides to enable pixel output, configure the embedded test server,
@@ -150,8 +155,6 @@
// Manages the Audio Service feature set, enabled for these performance tests.
base::test::ScopedFeatureList feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(TabCapturePerformanceTestBase);
};
#endif // CHROME_BROWSER_EXTENSIONS_API_TAB_CAPTURE_TAB_CAPTURE_PERFORMANCE_TEST_BASE_H_
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
index d522b493..76d6ebb 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
@@ -54,6 +54,9 @@
DCHECK(registry_);
}
+ LiveRequest(const LiveRequest&) = delete;
+ LiveRequest& operator=(const LiveRequest&) = delete;
+
~LiveRequest() override {}
// Accessors.
@@ -115,8 +118,6 @@
// calls to OnRequestUpdate() will always refer to this request by this ID.
int render_process_id_;
int render_frame_id_;
-
- DISALLOW_COPY_AND_ASSIGN(LiveRequest);
};
TabCaptureRegistry::TabCaptureRegistry(content::BrowserContext* context)
diff --git a/chrome/browser/extensions/api/tabs/app_base_window.h b/chrome/browser/extensions/api/tabs/app_base_window.h
index 08f4a14..4555987 100644
--- a/chrome/browser/extensions/api/tabs/app_base_window.h
+++ b/chrome/browser/extensions/api/tabs/app_base_window.h
@@ -19,6 +19,10 @@
class AppBaseWindow : public ui::BaseWindow {
public:
explicit AppBaseWindow(AppWindow* app_window);
+
+ AppBaseWindow(const AppBaseWindow&) = delete;
+ AppBaseWindow& operator=(const AppBaseWindow&) = delete;
+
virtual ~AppBaseWindow();
private:
@@ -49,8 +53,6 @@
NativeAppWindow* GetBaseWindow() const;
AppWindow* app_window_;
-
- DISALLOW_COPY_AND_ASSIGN(AppBaseWindow);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/tabs/app_window_controller.h b/chrome/browser/extensions/api/tabs/app_window_controller.h
index e2a6b49..85abc749 100644
--- a/chrome/browser/extensions/api/tabs/app_window_controller.h
+++ b/chrome/browser/extensions/api/tabs/app_window_controller.h
@@ -24,6 +24,10 @@
AppWindowController(AppWindow* window,
std::unique_ptr<AppBaseWindow> base_window,
Profile* profile);
+
+ AppWindowController(const AppWindowController&) = delete;
+ AppWindowController& operator=(const AppWindowController&) = delete;
+
~AppWindowController() override;
// extensions::WindowController:
@@ -38,8 +42,6 @@
private:
AppWindow* app_window_; // Owns us.
std::unique_ptr<AppBaseWindow> base_window_;
-
- DISALLOW_COPY_AND_ASSIGN(AppWindowController);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/tabs/tabs_event_router.h b/chrome/browser/extensions/api/tabs/tabs_event_router.h
index 3dd45a2..e2bad16 100644
--- a/chrome/browser/extensions/api/tabs/tabs_event_router.h
+++ b/chrome/browser/extensions/api/tabs/tabs_event_router.h
@@ -43,6 +43,10 @@
public resource_coordinator::TabLifecycleObserver {
public:
explicit TabsEventRouter(Profile* profile);
+
+ TabsEventRouter(const TabsEventRouter&) = delete;
+ TabsEventRouter& operator=(const TabsEventRouter&) = delete;
+
~TabsEventRouter() override;
// BrowserTabStripTrackerDelegate:
@@ -214,8 +218,6 @@
base::ScopedObservation<resource_coordinator::TabManager,
resource_coordinator::TabLifecycleObserver>
tab_manager_scoped_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TabsEventRouter);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/tabs/windows_event_router.h b/chrome/browser/extensions/api/tabs/windows_event_router.h
index 71a694e..f214a5d 100644
--- a/chrome/browser/extensions/api/tabs/windows_event_router.h
+++ b/chrome/browser/extensions/api/tabs/windows_event_router.h
@@ -49,6 +49,10 @@
public WindowControllerListObserver {
public:
explicit WindowsEventRouter(Profile* profile);
+
+ WindowsEventRouter(const WindowsEventRouter&) = delete;
+ WindowsEventRouter& operator=(const WindowsEventRouter&) = delete;
+
~WindowsEventRouter() override;
// |window_controller| is NULL to indicate a focused window has lost focus.
@@ -109,8 +113,6 @@
base::ScopedObservation<KeyWindowNotifier, KeyWindowNotifier::Observer>
observed_key_window_notifier_{this};
#endif
-
- DISALLOW_COPY_AND_ASSIGN(WindowsEventRouter);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/terminal/terminal_private_api.h b/chrome/browser/extensions/api/terminal/terminal_private_api.h
index 790830dc..a249356d 100644
--- a/chrome/browser/extensions/api/terminal/terminal_private_api.h
+++ b/chrome/browser/extensions/api/terminal/terminal_private_api.h
@@ -24,6 +24,10 @@
class TerminalPrivateAPI : public BrowserContextKeyedAPI {
public:
explicit TerminalPrivateAPI(content::BrowserContext* context);
+
+ TerminalPrivateAPI(const TerminalPrivateAPI&) = delete;
+ TerminalPrivateAPI& operator=(const TerminalPrivateAPI&) = delete;
+
~TerminalPrivateAPI() override;
// BrowserContextKeyedAPI implementation.
@@ -38,8 +42,6 @@
content::BrowserContext* const context_;
std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(TerminalPrivateAPI);
};
// Opens new terminal process. Returns the new terminal id.
diff --git a/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.h b/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.h
index ebc1927..6ac7126 100644
--- a/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.h
+++ b/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.h
@@ -27,6 +27,11 @@
public:
explicit ChromeVirtualKeyboardDelegate(
content::BrowserContext* browser_context);
+
+ ChromeVirtualKeyboardDelegate(const ChromeVirtualKeyboardDelegate&) = delete;
+ ChromeVirtualKeyboardDelegate& operator=(
+ const ChromeVirtualKeyboardDelegate&) = delete;
+
~ChromeVirtualKeyboardDelegate() override;
// TODO(oka): Create ChromeVirtualKeyboardPrivateDelegate class and move all
@@ -81,7 +86,6 @@
std::unique_ptr<media::AudioSystem> audio_system_;
base::WeakPtr<ChromeVirtualKeyboardDelegate> weak_this_;
base::WeakPtrFactory<ChromeVirtualKeyboardDelegate> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(ChromeVirtualKeyboardDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.h b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.h
index 0c3d8a3..fcb47a5f 100644
--- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.h
+++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.h
@@ -24,6 +24,9 @@
class FrameNavigationState
: public content::RenderDocumentHostUserData<FrameNavigationState> {
public:
+ FrameNavigationState(const FrameNavigationState&) = delete;
+ FrameNavigationState& operator=(const FrameNavigationState&) = delete;
+
~FrameNavigationState() override;
// True if in general webNavigation events may be sent for the given URL.
@@ -82,8 +85,6 @@
// If true, also allow events from chrome-extension:// URLs.
static bool allow_extension_scheme_;
-
- DISALLOW_COPY_AND_ASSIGN(FrameNavigationState);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h
index 19fc0517..16295ecb 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h
@@ -33,6 +33,9 @@
: public content::WebContentsObserver,
public content::WebContentsUserData<WebNavigationTabObserver> {
public:
+ WebNavigationTabObserver(const WebNavigationTabObserver&) = delete;
+ WebNavigationTabObserver& operator=(const WebNavigationTabObserver&) = delete;
+
~WebNavigationTabObserver() override;
// Returns the object for the given |web_contents|.
@@ -86,8 +89,6 @@
std::unique_ptr<Event> pending_on_before_navigate_event_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(WebNavigationTabObserver);
};
// Tracks new tab navigations and routes them as events to the extension system.
@@ -95,6 +96,10 @@
public BrowserTabStripTrackerDelegate {
public:
explicit WebNavigationEventRouter(Profile* profile);
+
+ WebNavigationEventRouter(const WebNavigationEventRouter&) = delete;
+ WebNavigationEventRouter& operator=(const WebNavigationEventRouter&) = delete;
+
~WebNavigationEventRouter() override;
// Router level handler for the creation of WebContents. Stores information
@@ -114,6 +119,10 @@
class PendingWebContents : public content::WebContentsObserver {
public:
PendingWebContents();
+
+ PendingWebContents(const PendingWebContents&) = delete;
+ PendingWebContents& operator=(const PendingWebContents&) = delete;
+
~PendingWebContents() override;
void Set(int source_tab_id,
@@ -144,8 +153,6 @@
content::WebContents* target_web_contents_ = nullptr;
GURL target_url_;
base::OnceCallback<void(content::WebContents*)> on_destroy_;
-
- DISALLOW_COPY_AND_ASSIGN(PendingWebContents);
};
// BrowserTabStripTrackerDelegate implementation.
@@ -172,8 +179,6 @@
Profile* profile_;
BrowserTabStripTracker browser_tab_strip_tracker_;
-
- DISALLOW_COPY_AND_ASSIGN(WebNavigationEventRouter);
};
// API function that returns the state of a given frame.
@@ -195,6 +200,10 @@
public extensions::EventRouter::Observer {
public:
explicit WebNavigationAPI(content::BrowserContext* context);
+
+ WebNavigationAPI(const WebNavigationAPI&) = delete;
+ WebNavigationAPI& operator=(const WebNavigationAPI&) = delete;
+
~WebNavigationAPI() override;
// KeyedService implementation.
@@ -221,8 +230,6 @@
// Created lazily upon OnListenerAdded.
std::unique_ptr<WebNavigationEventRouter> web_navigation_event_router_;
-
- DISALLOW_COPY_AND_ASSIGN(WebNavigationAPI);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
index 151a3e3..4972f12 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
@@ -81,6 +81,11 @@
browser->tab_strip_model()->AddObserver(this);
}
+ DelayLoadStartAndExecuteJavascript(
+ const DelayLoadStartAndExecuteJavascript&) = delete;
+ DelayLoadStartAndExecuteJavascript& operator=(
+ const DelayLoadStartAndExecuteJavascript&) = delete;
+
~DelayLoadStartAndExecuteJavascript() override {}
// TabStripModelObserver:
@@ -173,8 +178,6 @@
bool has_user_gesture_ = false;
bool script_was_executed_ = false;
content::RenderFrameHost* rfh_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(DelayLoadStartAndExecuteJavascript);
};
// Handles requests for URLs with paths of "/test*" sent to the test server, so
diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
index 99dd1d4..adf9c9e 100644
--- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
@@ -152,6 +152,9 @@
content::NotificationService::AllSources());
}
+ CancelLoginDialog(const CancelLoginDialog&) = delete;
+ CancelLoginDialog& operator=(const CancelLoginDialog&) = delete;
+
~CancelLoginDialog() override {}
void Observe(int type,
@@ -164,8 +167,6 @@
private:
content::NotificationRegistrar registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(CancelLoginDialog);
};
// Observer that listens for messages from chrome.test.sendMessage to allow them
diff --git a/chrome/browser/extensions/api/webrtc_from_web_accessible_resource_browsertest.cc b/chrome/browser/extensions/api/webrtc_from_web_accessible_resource_browsertest.cc
index c9ffd1a..27d53980 100644
--- a/chrome/browser/extensions/api/webrtc_from_web_accessible_resource_browsertest.cc
+++ b/chrome/browser/extensions/api/webrtc_from_web_accessible_resource_browsertest.cc
@@ -19,6 +19,12 @@
class WebRtcFromWebAccessibleResourceTest : public ExtensionApiTest {
public:
WebRtcFromWebAccessibleResourceTest() {}
+
+ WebRtcFromWebAccessibleResourceTest(
+ const WebRtcFromWebAccessibleResourceTest&) = delete;
+ WebRtcFromWebAccessibleResourceTest& operator=(
+ const WebRtcFromWebAccessibleResourceTest&) = delete;
+
~WebRtcFromWebAccessibleResourceTest() override {}
// InProcessBrowserTest:
@@ -43,9 +49,6 @@
ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
"webrtc_from_web_accessible_resource")));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WebRtcFromWebAccessibleResourceTest);
};
// Verify that a chrome-extension:// web accessible URL can successfully access
diff --git a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_browsertest.cc b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_browsertest.cc
index b74cae3..7522c34 100644
--- a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_browsertest.cc
+++ b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_browsertest.cc
@@ -15,15 +15,18 @@
: public extensions::PlatformAppBrowserTest {
public:
WebrtcLoggingPrivateApiBrowserTest() = default;
+
+ WebrtcLoggingPrivateApiBrowserTest(
+ const WebrtcLoggingPrivateApiBrowserTest&) = delete;
+ WebrtcLoggingPrivateApiBrowserTest& operator=(
+ const WebrtcLoggingPrivateApiBrowserTest&) = delete;
+
~WebrtcLoggingPrivateApiBrowserTest() override = default;
base::FilePath webrtc_logs_path() {
return webrtc_logging::TextLogList::
GetWebRtcLogDirectoryForBrowserContextPath(profile()->GetPath());
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WebrtcLoggingPrivateApiBrowserTest);
};
#if defined(OS_LINUX) || defined(OS_CHROMEOS)
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
index 7806065..e8f5460 100644
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -97,6 +97,10 @@
class PendingApprovals {
public:
PendingApprovals();
+
+ PendingApprovals(const PendingApprovals&) = delete;
+ PendingApprovals& operator=(const PendingApprovals&) = delete;
+
~PendingApprovals();
void PushApproval(std::unique_ptr<WebstoreInstaller::Approval> approval);
@@ -110,8 +114,6 @@
std::vector<std::unique_ptr<WebstoreInstaller::Approval>>;
ApprovalList approvals_;
-
- DISALLOW_COPY_AND_ASSIGN(PendingApprovals);
};
PendingApprovals::PendingApprovals() {}
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
index afc6eaf0..9c25c6dd 100644
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
@@ -137,6 +137,12 @@
class ExtensionWebstorePrivateApiTest : public MixinBasedExtensionApiTest {
public:
ExtensionWebstorePrivateApiTest() {}
+
+ ExtensionWebstorePrivateApiTest(const ExtensionWebstorePrivateApiTest&) =
+ delete;
+ ExtensionWebstorePrivateApiTest& operator=(
+ const ExtensionWebstorePrivateApiTest&) = delete;
+
~ExtensionWebstorePrivateApiTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -208,8 +214,6 @@
base::FilePath webstore_install_dir_copy_;
std::unique_ptr<ScopedTestDialogAutoConfirm> auto_confirm_install_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionWebstorePrivateApiTest);
};
// Test cases for webstore origin frame blocking.
diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc
index 7c848e5..25f7f2a 100644
--- a/chrome/browser/extensions/app_background_page_apitest.cc
+++ b/chrome/browser/extensions/app_background_page_apitest.cc
@@ -62,6 +62,11 @@
BackgroundContentsServiceFactory::GetForProfile(profile));
}
+ BackgroundContentsCreationObserver(
+ const BackgroundContentsCreationObserver&) = delete;
+ BackgroundContentsCreationObserver& operator=(
+ const BackgroundContentsCreationObserver&) = delete;
+
~BackgroundContentsCreationObserver() override = default;
void OnBackgroundContentsOpened(
@@ -78,8 +83,6 @@
base::ScopedObservation<BackgroundContentsService,
BackgroundContentsServiceObserver>
observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BackgroundContentsCreationObserver);
};
} // namespace
diff --git a/chrome/browser/extensions/background_xhr_browsertest.cc b/chrome/browser/extensions/background_xhr_browsertest.cc
index c899130..bd2cabd 100644
--- a/chrome/browser/extensions/background_xhr_browsertest.cc
+++ b/chrome/browser/extensions/background_xhr_browsertest.cc
@@ -106,6 +106,11 @@
class BackgroundXhrWebstoreTest : public ExtensionApiTestWithManagementPolicy {
public:
BackgroundXhrWebstoreTest() = default;
+
+ BackgroundXhrWebstoreTest(const BackgroundXhrWebstoreTest&) = delete;
+ BackgroundXhrWebstoreTest& operator=(const BackgroundXhrWebstoreTest&) =
+ delete;
+
~BackgroundXhrWebstoreTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -167,9 +172,6 @@
EXPECT_TRUE(listener.WaitUntilSatisfied());
return extension;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BackgroundXhrWebstoreTest);
};
// Extensions should not be able to XHR to the webstore.
diff --git a/chrome/browser/extensions/blocklist.h b/chrome/browser/extensions/blocklist.h
index fbc984e..c33b72b1 100644
--- a/chrome/browser/extensions/blocklist.h
+++ b/chrome/browser/extensions/blocklist.h
@@ -53,12 +53,14 @@
scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
database_manager);
+ ScopedDatabaseManagerForTest(const ScopedDatabaseManagerForTest&) = delete;
+ ScopedDatabaseManagerForTest& operator=(
+ const ScopedDatabaseManagerForTest&) = delete;
+
~ScopedDatabaseManagerForTest();
private:
scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> original_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedDatabaseManagerForTest);
};
using BlocklistStateMap = std::map<std::string, BlocklistState>;
diff --git a/chrome/browser/extensions/blocklist_check.h b/chrome/browser/extensions/blocklist_check.h
index fbe2452..09ecfd0 100644
--- a/chrome/browser/extensions/blocklist_check.h
+++ b/chrome/browser/extensions/blocklist_check.h
@@ -20,6 +20,10 @@
public:
BlocklistCheck(Blocklist* blocklist,
scoped_refptr<const Extension> extension);
+
+ BlocklistCheck(const BlocklistCheck&) = delete;
+ BlocklistCheck& operator=(const BlocklistCheck&) = delete;
+
~BlocklistCheck() override;
// PreloadCheck:
@@ -31,8 +35,6 @@
Blocklist* blocklist_;
ResultCallback callback_;
base::WeakPtrFactory<BlocklistCheck> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BlocklistCheck);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/blocklist_state_fetcher.h b/chrome/browser/extensions/blocklist_state_fetcher.h
index 36b999d..c9396643 100644
--- a/chrome/browser/extensions/blocklist_state_fetcher.h
+++ b/chrome/browser/extensions/blocklist_state_fetcher.h
@@ -30,6 +30,9 @@
BlocklistStateFetcher();
+ BlocklistStateFetcher(const BlocklistStateFetcher&) = delete;
+ BlocklistStateFetcher& operator=(const BlocklistStateFetcher&) = delete;
+
virtual ~BlocklistStateFetcher();
virtual void Request(const std::string& id, RequestCallback callback);
@@ -66,8 +69,6 @@
CallbackMultiMap callbacks_;
base::WeakPtrFactory<BlocklistStateFetcher> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BlocklistStateFetcher);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/browser_extension_window_controller.h b/chrome/browser/extensions/browser_extension_window_controller.h
index 95534b6a..1020e7ba 100644
--- a/chrome/browser/extensions/browser_extension_window_controller.h
+++ b/chrome/browser/extensions/browser_extension_window_controller.h
@@ -17,6 +17,12 @@
class BrowserExtensionWindowController : public WindowController {
public:
explicit BrowserExtensionWindowController(Browser* browser);
+
+ BrowserExtensionWindowController(const BrowserExtensionWindowController&) =
+ delete;
+ BrowserExtensionWindowController& operator=(
+ const BrowserExtensionWindowController&) = delete;
+
~BrowserExtensionWindowController() override;
// Sets the window's fullscreen state. |extension_url| provides the url
@@ -34,8 +40,6 @@
private:
Browser* const browser_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserExtensionWindowController);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/chrome_app_icon.cc b/chrome/browser/extensions/chrome_app_icon.cc
index 637c7e4..7a8e0dc 100644
--- a/chrome/browser/extensions/chrome_app_icon.cc
+++ b/chrome/browser/extensions/chrome_app_icon.cc
@@ -30,6 +30,11 @@
public:
explicit RoundedCornersImageSource(const gfx::ImageSkia& icon)
: gfx::CanvasImageSource(icon.size()), icon_(icon) {}
+
+ RoundedCornersImageSource(const RoundedCornersImageSource&) = delete;
+ RoundedCornersImageSource& operator=(const RoundedCornersImageSource&) =
+ delete;
+
~RoundedCornersImageSource() override {}
private:
@@ -56,8 +61,6 @@
}
gfx::ImageSkia icon_;
-
- DISALLOW_COPY_AND_ASSIGN(RoundedCornersImageSource);
};
} // namespace
diff --git a/chrome/browser/extensions/chrome_app_icon.h b/chrome/browser/extensions/chrome_app_icon.h
index bf05b63..233fd37 100644
--- a/chrome/browser/extensions/chrome_app_icon.h
+++ b/chrome/browser/extensions/chrome_app_icon.h
@@ -60,6 +60,10 @@
const std::string& app_id,
int resource_size_in_dip,
const ResizeFunction& resize_function);
+
+ ChromeAppIcon(const ChromeAppIcon&) = delete;
+ ChromeAppIcon& operator=(const ChromeAppIcon&) = delete;
+
~ChromeAppIcon() override;
// Reloads icon.
@@ -113,8 +117,6 @@
const ResizeFunction resize_function_;
std::unique_ptr<IconImage> icon_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeAppIcon);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/chrome_app_icon_loader.h b/chrome/browser/extensions/chrome_app_icon_loader.h
index a5f64aa..ce739b4 100644
--- a/chrome/browser/extensions/chrome_app_icon_loader.h
+++ b/chrome/browser/extensions/chrome_app_icon_loader.h
@@ -40,6 +40,10 @@
ChromeAppIconLoader(Profile* profile,
int icon_size_in_dip,
AppIconLoaderDelegate* delegate);
+
+ ChromeAppIconLoader(const ChromeAppIconLoader&) = delete;
+ ChromeAppIconLoader& operator=(const ChromeAppIconLoader&) = delete;
+
~ChromeAppIconLoader() override;
// AppIconLoader overrides:
@@ -68,8 +72,6 @@
// Loads icons for extensions only if true, otherwise loads icon for both
// Chrome apps and extensions.
bool extensions_only_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeAppIconLoader);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/chrome_app_icon_service.h b/chrome/browser/extensions/chrome_app_icon_service.h
index 402a337..8df9228e 100644
--- a/chrome/browser/extensions/chrome_app_icon_service.h
+++ b/chrome/browser/extensions/chrome_app_icon_service.h
@@ -52,6 +52,9 @@
explicit ChromeAppIconService(content::BrowserContext* context);
+ ChromeAppIconService(const ChromeAppIconService&) = delete;
+ ChromeAppIconService& operator=(const ChromeAppIconService&) = delete;
+
~ChromeAppIconService() override;
// Convenience function to get the ChromeAppIconService for a
@@ -121,8 +124,6 @@
observation_{this};
base::WeakPtrFactory<ChromeAppIconService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeAppIconService);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/chrome_app_icon_unittest.cc b/chrome/browser/extensions/chrome_app_icon_unittest.cc
index 37ae5ee3..dad6608 100644
--- a/chrome/browser/extensions/chrome_app_icon_unittest.cc
+++ b/chrome/browser/extensions/chrome_app_icon_unittest.cc
@@ -60,6 +60,9 @@
DCHECK(app_icon_);
}
+ TestAppIcon(const TestAppIcon&) = delete;
+ TestAppIcon& operator=(const TestAppIcon&) = delete;
+
~TestAppIcon() override = default;
void Reset() { app_icon_.reset(); }
@@ -97,14 +100,16 @@
size_t icon_update_count_expected_ = 0;
base::OnceClosure icon_updated_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(TestAppIcon);
};
// Receives icon image updates from ChromeAppIconLoader.
class TestAppIconLoader : public AppIconLoaderDelegate {
public:
TestAppIconLoader() = default;
+
+ TestAppIconLoader(const TestAppIconLoader&) = delete;
+ TestAppIconLoader& operator=(const TestAppIconLoader&) = delete;
+
~TestAppIconLoader() override = default;
// AppIconLoaderDelegate:
@@ -118,8 +123,6 @@
private:
gfx::ImageSkia image_skia_;
-
- DISALLOW_COPY_AND_ASSIGN(TestAppIconLoader);
};
// Returns true if provided |image| consists from only empty pixels.
@@ -188,6 +191,10 @@
class ChromeAppIconTest : public ExtensionServiceTestBase {
public:
ChromeAppIconTest() = default;
+
+ ChromeAppIconTest(const ChromeAppIconTest&) = delete;
+ ChromeAppIconTest& operator=(const ChromeAppIconTest&) = delete;
+
~ChromeAppIconTest() override = default;
// ExtensionServiceTestBase:
@@ -201,9 +208,6 @@
InitializeInstalledExtensionService(pref_path, source_install_dir);
service_->Init();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeAppIconTest);
};
TEST_F(ChromeAppIconTest, IconLifeCycle) {
diff --git a/chrome/browser/extensions/chrome_app_sorting.h b/chrome/browser/extensions/chrome_app_sorting.h
index a7bd358..7b57748 100644
--- a/chrome/browser/extensions/chrome_app_sorting.h
+++ b/chrome/browser/extensions/chrome_app_sorting.h
@@ -35,6 +35,10 @@
public web_app::AppRegistrarObserver {
public:
explicit ChromeAppSorting(content::BrowserContext* browser_context);
+
+ ChromeAppSorting(const ChromeAppSorting&) = delete;
+ ChromeAppSorting& operator=(const ChromeAppSorting&) = delete;
+
~ChromeAppSorting() override;
// AppSorting implementation:
@@ -192,8 +196,6 @@
std::set<std::string> ntp_hidden_extensions_;
base::WeakPtrFactory<ChromeAppSorting> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeAppSorting);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.h b/chrome/browser/extensions/chrome_component_extension_resource_manager.h
index f270d14d..bc03dc6b 100644
--- a/chrome/browser/extensions/chrome_component_extension_resource_manager.h
+++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.h
@@ -16,6 +16,12 @@
: public ComponentExtensionResourceManager {
public:
ChromeComponentExtensionResourceManager();
+
+ ChromeComponentExtensionResourceManager(
+ const ChromeComponentExtensionResourceManager&) = delete;
+ ChromeComponentExtensionResourceManager& operator=(
+ const ChromeComponentExtensionResourceManager&) = delete;
+
~ChromeComponentExtensionResourceManager() override;
// Overridden from ComponentExtensionResourceManager:
@@ -32,8 +38,6 @@
// Logically const. Initialized on demand to keep browser start-up fast.
mutable std::unique_ptr<const Data> data_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeComponentExtensionResourceManager);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.h b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.h
index cc1221e..2c82e0e 100644
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.h
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.h
@@ -46,6 +46,12 @@
: public ChromeContentBrowserClientParts {
public:
ChromeContentBrowserClientExtensionsPart();
+
+ ChromeContentBrowserClientExtensionsPart(
+ const ChromeContentBrowserClientExtensionsPart&) = delete;
+ ChromeContentBrowserClientExtensionsPart& operator=(
+ const ChromeContentBrowserClientExtensionsPart&) = delete;
+
~ChromeContentBrowserClientExtensionsPart() override;
// Corresponds to the ChromeContentBrowserClient function of the same name.
@@ -133,8 +139,6 @@
service_manager::BinderRegistry* registry,
blink::AssociatedInterfaceRegistry* associated_registry,
content::RenderProcessHost* render_process_host) override;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClientExtensionsPart);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/chrome_content_verifier_delegate.h b/chrome/browser/extensions/chrome_content_verifier_delegate.h
index 351a04e..9d7e5ae 100644
--- a/chrome/browser/extensions/chrome_content_verifier_delegate.h
+++ b/chrome/browser/extensions/chrome_content_verifier_delegate.h
@@ -69,6 +69,10 @@
explicit ChromeContentVerifierDelegate(content::BrowserContext* context);
+ ChromeContentVerifierDelegate(const ChromeContentVerifierDelegate&) = delete;
+ ChromeContentVerifierDelegate& operator=(
+ const ChromeContentVerifierDelegate&) = delete;
+
~ChromeContentVerifierDelegate() override;
// ContentVerifierDelegate:
@@ -108,8 +112,6 @@
std::set<std::string> would_be_reinstalled_ids_;
std::unique_ptr<PolicyExtensionReinstaller> policy_extension_reinstaller_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeContentVerifierDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/chrome_extension_chooser_dialog.h b/chrome/browser/extensions/chrome_extension_chooser_dialog.h
index 5a2d429..b1bdef0 100644
--- a/chrome/browser/extensions/chrome_extension_chooser_dialog.h
+++ b/chrome/browser/extensions/chrome_extension_chooser_dialog.h
@@ -19,6 +19,11 @@
public:
explicit ChromeExtensionChooserDialog(content::WebContents* web_contents)
: web_contents_(web_contents) {}
+
+ ChromeExtensionChooserDialog(const ChromeExtensionChooserDialog&) = delete;
+ ChromeExtensionChooserDialog& operator=(const ChromeExtensionChooserDialog&) =
+ delete;
+
~ChromeExtensionChooserDialog() {}
void ShowDialog(
@@ -29,8 +34,6 @@
std::unique_ptr<permissions::ChooserController> chooser_controller) const;
content::WebContents* web_contents_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeExtensionChooserDialog);
};
#endif // CHROME_BROWSER_EXTENSIONS_CHROME_EXTENSION_CHOOSER_DIALOG_H_
diff --git a/chrome/browser/extensions/chrome_extension_cookies.h b/chrome/browser/extensions/chrome_extension_cookies.h
index 4888f84d..c6ff6b7 100644
--- a/chrome/browser/extensions/chrome_extension_cookies.h
+++ b/chrome/browser/extensions/chrome_extension_cookies.h
@@ -74,6 +74,10 @@
public:
IOData(std::unique_ptr<content::CookieStoreConfig> creation_config,
network::mojom::CookieManagerParamsPtr initial_mojo_cookie_settings);
+
+ IOData(const IOData&) = delete;
+ IOData& operator=(const IOData&) = delete;
+
~IOData();
void CreateRestrictedCookieManager(
@@ -108,8 +112,6 @@
mojo::UniqueReceiverSet<network::mojom::RestrictedCookieManager>
restricted_cookie_managers_;
-
- DISALLOW_COPY_AND_ASSIGN(IOData);
};
explicit ChromeExtensionCookies(Profile* profile);
diff --git a/chrome/browser/extensions/chrome_extension_function_details.h b/chrome/browser/extensions/chrome_extension_function_details.h
index d611d0f..56f1b88d 100644
--- a/chrome/browser/extensions/chrome_extension_function_details.h
+++ b/chrome/browser/extensions/chrome_extension_function_details.h
@@ -19,6 +19,12 @@
// This instance does not own |function|. |function| must outlive this
// instance.
explicit ChromeExtensionFunctionDetails(ExtensionFunction* function);
+
+ ChromeExtensionFunctionDetails(const ChromeExtensionFunctionDetails&) =
+ delete;
+ ChromeExtensionFunctionDetails& operator=(
+ const ChromeExtensionFunctionDetails&) = delete;
+
~ChromeExtensionFunctionDetails();
// Gets the "current" browser, if any.
@@ -60,8 +66,6 @@
// The function for which these details have been created. Must outlive the
// ChromeExtensionFunctionDetails instance.
ExtensionFunction* function_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeExtensionFunctionDetails);
};
#endif // CHROME_BROWSER_EXTENSIONS_CHROME_EXTENSION_FUNCTION_DETAILS_H_
diff --git a/chrome/browser/extensions/chrome_extension_test_notification_observer.h b/chrome/browser/extensions/chrome_extension_test_notification_observer.h
index b803b8f..36efe5d 100644
--- a/chrome/browser/extensions/chrome_extension_test_notification_observer.h
+++ b/chrome/browser/extensions/chrome_extension_test_notification_observer.h
@@ -27,6 +27,12 @@
explicit ChromeExtensionTestNotificationObserver(Browser* browser);
explicit ChromeExtensionTestNotificationObserver(
content::BrowserContext* browser_context);
+
+ ChromeExtensionTestNotificationObserver(
+ const ChromeExtensionTestNotificationObserver&) = delete;
+ ChromeExtensionTestNotificationObserver& operator=(
+ const ChromeExtensionTestNotificationObserver&) = delete;
+
~ChromeExtensionTestNotificationObserver() override;
// Waits for the number of visible page actions to change to |count|.
@@ -51,8 +57,6 @@
content::BrowserContext* browser_context) override;
Browser* const browser_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeExtensionTestNotificationObserver);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/chrome_extension_web_contents_observer.h b/chrome/browser/extensions/chrome_extension_web_contents_observer.h
index f357cabc5..d11e71a 100644
--- a/chrome/browser/extensions/chrome_extension_web_contents_observer.h
+++ b/chrome/browser/extensions/chrome_extension_web_contents_observer.h
@@ -28,6 +28,11 @@
: public ExtensionWebContentsObserver,
public content::WebContentsUserData<ChromeExtensionWebContentsObserver> {
public:
+ ChromeExtensionWebContentsObserver(
+ const ChromeExtensionWebContentsObserver&) = delete;
+ ChromeExtensionWebContentsObserver& operator=(
+ const ChromeExtensionWebContentsObserver&) = delete;
+
~ChromeExtensionWebContentsObserver() override;
// Creates and initializes an instance of this class for the given
@@ -65,8 +70,6 @@
void ReloadIfTerminated(content::RenderFrameHost* render_frame_host);
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(ChromeExtensionWebContentsObserver);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/chrome_extensions_browser_api_provider.h b/chrome/browser/extensions/chrome_extensions_browser_api_provider.h
index 42a5fa5a..b1367402 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_api_provider.h
+++ b/chrome/browser/extensions/chrome_extensions_browser_api_provider.h
@@ -13,12 +13,15 @@
class ChromeExtensionsBrowserAPIProvider : public ExtensionsBrowserAPIProvider {
public:
ChromeExtensionsBrowserAPIProvider();
+
+ ChromeExtensionsBrowserAPIProvider(
+ const ChromeExtensionsBrowserAPIProvider&) = delete;
+ ChromeExtensionsBrowserAPIProvider& operator=(
+ const ChromeExtensionsBrowserAPIProvider&) = delete;
+
~ChromeExtensionsBrowserAPIProvider() override;
void RegisterExtensionFunctions(ExtensionFunctionRegistry* registry) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeExtensionsBrowserAPIProvider);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.h b/chrome/browser/extensions/chrome_extensions_browser_client.h
index 8aea6cc..3c0f767 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.h
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.h
@@ -46,6 +46,11 @@
class ChromeExtensionsBrowserClient : public ExtensionsBrowserClient {
public:
ChromeExtensionsBrowserClient();
+
+ ChromeExtensionsBrowserClient(const ChromeExtensionsBrowserClient&) = delete;
+ ChromeExtensionsBrowserClient& operator=(
+ const ChromeExtensionsBrowserClient&) = delete;
+
~ChromeExtensionsBrowserClient() override;
// ExtensionsBrowserClient overrides:
@@ -181,8 +186,6 @@
std::unique_ptr<KioskDelegate> kiosk_delegate_;
UserScriptListener user_script_listener_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeExtensionsBrowserClient);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/chrome_process_manager_delegate.h b/chrome/browser/extensions/chrome_process_manager_delegate.h
index ee30fba..9624ba1 100644
--- a/chrome/browser/extensions/chrome_process_manager_delegate.h
+++ b/chrome/browser/extensions/chrome_process_manager_delegate.h
@@ -27,6 +27,11 @@
public ProfileObserver {
public:
ChromeProcessManagerDelegate();
+
+ ChromeProcessManagerDelegate(const ChromeProcessManagerDelegate&) = delete;
+ ChromeProcessManagerDelegate& operator=(const ChromeProcessManagerDelegate&) =
+ delete;
+
~ChromeProcessManagerDelegate() override;
// ProcessManagerDelegate:
@@ -51,8 +56,6 @@
private:
base::ScopedMultiSourceObservation<Profile, ProfileObserver>
observed_profiles_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeProcessManagerDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/chrome_test_extension_loader.h b/chrome/browser/extensions/chrome_test_extension_loader.h
index 5383c40..c8c125d 100644
--- a/chrome/browser/extensions/chrome_test_extension_loader.h
+++ b/chrome/browser/extensions/chrome_test_extension_loader.h
@@ -35,6 +35,11 @@
class ChromeTestExtensionLoader {
public:
explicit ChromeTestExtensionLoader(content::BrowserContext* browser_context);
+
+ ChromeTestExtensionLoader(const ChromeTestExtensionLoader&) = delete;
+ ChromeTestExtensionLoader& operator=(const ChromeTestExtensionLoader&) =
+ delete;
+
~ChromeTestExtensionLoader();
// Loads the extension specified by |file_path|. Works for both packed and
@@ -171,8 +176,6 @@
// renderer and false otherwise (this roughly maps to "true in browser tests,
// false in unit tests").
absl::optional<bool> wait_for_renderers_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeTestExtensionLoader);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/clipboard_extension_helper_chromeos.cc b/chrome/browser/extensions/clipboard_extension_helper_chromeos.cc
index f67c79e..378d649 100644
--- a/chrome/browser/extensions/clipboard_extension_helper_chromeos.cc
+++ b/chrome/browser/extensions/clipboard_extension_helper_chromeos.cc
@@ -28,6 +28,10 @@
explicit ClipboardImageDataDecoder(ClipboardExtensionHelper* owner)
: owner_(owner) {}
+ ClipboardImageDataDecoder(const ClipboardImageDataDecoder&) = delete;
+ ClipboardImageDataDecoder& operator=(const ClipboardImageDataDecoder&) =
+ delete;
+
~ClipboardImageDataDecoder() override { ImageDecoder::Cancel(this); }
bool has_request_pending() const { return has_request_pending_; }
@@ -72,8 +76,6 @@
private:
ClipboardExtensionHelper* owner_; // Not owned.
bool has_request_pending_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ClipboardImageDataDecoder);
};
ClipboardExtensionHelper::ClipboardExtensionHelper() {
diff --git a/chrome/browser/extensions/clipboard_extension_helper_chromeos.h b/chrome/browser/extensions/clipboard_extension_helper_chromeos.h
index 6c6bf9b..9d22944 100644
--- a/chrome/browser/extensions/clipboard_extension_helper_chromeos.h
+++ b/chrome/browser/extensions/clipboard_extension_helper_chromeos.h
@@ -21,6 +21,10 @@
class ClipboardExtensionHelper {
public:
ClipboardExtensionHelper();
+
+ ClipboardExtensionHelper(const ClipboardExtensionHelper&) = delete;
+ ClipboardExtensionHelper& operator=(const ClipboardExtensionHelper&) = delete;
+
~ClipboardExtensionHelper();
// Decodes and saves the image data on clipboard. Must run on UI thread.
@@ -46,8 +50,6 @@
base::OnceClosure image_save_success_callback_;
base::OnceCallback<void(const std::string&)> image_save_error_callback_;
AdditionalDataItemList additonal_items_;
-
- DISALLOW_COPY_AND_ASSIGN(ClipboardExtensionHelper);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h
index 29f6c00..8501173 100644
--- a/chrome/browser/extensions/component_loader.h
+++ b/chrome/browser/extensions/component_loader.h
@@ -34,6 +34,10 @@
class ComponentLoader {
public:
ComponentLoader(ExtensionSystem* extension_system, Profile* browser_context);
+
+ ComponentLoader(const ComponentLoader&) = delete;
+ ComponentLoader& operator=(const ComponentLoader&) = delete;
+
virtual ~ComponentLoader();
size_t registered_extensions_count() const {
@@ -230,8 +234,6 @@
base::WeakPtrFactory<ComponentLoader> weak_factory_{this};
friend class TtsApiTest;
-
- DISALLOW_COPY_AND_ASSIGN(ComponentLoader);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc
index a9e1d584..fef586d 100644
--- a/chrome/browser/extensions/content_script_apitest.cc
+++ b/chrome/browser/extensions/content_script_apitest.cc
@@ -112,15 +112,16 @@
class ContentScriptApiTest : public ExtensionApiTest {
public:
ContentScriptApiTest() {}
+
+ ContentScriptApiTest(const ContentScriptApiTest&) = delete;
+ ContentScriptApiTest& operator=(const ContentScriptApiTest&) = delete;
+
~ContentScriptApiTest() override {}
void SetUpOnMainThread() override {
ExtensionApiTest::SetUpOnMainThread();
host_resolver()->AddRule("*", "127.0.0.1");
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ContentScriptApiTest);
};
IN_PROC_BROWSER_TEST_F(ContentScriptApiTest, ContentScriptAllFrames) {
@@ -1210,6 +1211,11 @@
class ContentScriptRelatedFrameTest : public ContentScriptApiTest {
public:
ContentScriptRelatedFrameTest() = default;
+
+ ContentScriptRelatedFrameTest(const ContentScriptRelatedFrameTest&) = delete;
+ ContentScriptRelatedFrameTest& operator=(
+ const ContentScriptRelatedFrameTest&) = delete;
+
~ContentScriptRelatedFrameTest() override = default;
void SetUpOnMainThread() override;
@@ -1283,8 +1289,6 @@
// The test directory used to load our extension.
TestExtensionDir test_extension_dir_;
-
- DISALLOW_COPY_AND_ASSIGN(ContentScriptRelatedFrameTest);
};
constexpr char ContentScriptRelatedFrameTest::kMarkerSpanId[];
diff --git a/chrome/browser/extensions/content_verifier_hash_fetch_behavior_browsertest.cc b/chrome/browser/extensions/content_verifier_hash_fetch_behavior_browsertest.cc
index daf0d04..4073169e 100644
--- a/chrome/browser/extensions/content_verifier_hash_fetch_behavior_browsertest.cc
+++ b/chrome/browser/extensions/content_verifier_hash_fetch_behavior_browsertest.cc
@@ -50,6 +50,10 @@
public testing::WithParamInterface<ContentVerificationMode> {
public:
ContentVerifierHashTest() = default;
+
+ ContentVerifierHashTest(const ContentVerifierHashTest&) = delete;
+ ContentVerifierHashTest& operator=(const ContentVerifierHashTest&) = delete;
+
~ContentVerifierHashTest() override {}
enum TamperResourceType {
@@ -409,8 +413,6 @@
std::string verified_contents_contents_;
bool hash_fetching_disabled_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ContentVerifierHashTest);
};
// Tests that corruption of a requested extension resource always disables the
diff --git a/chrome/browser/extensions/content_verifier_test_utils.h b/chrome/browser/extensions/content_verifier_test_utils.h
index 782cb11..f7b88f4 100644
--- a/chrome/browser/extensions/content_verifier_test_utils.h
+++ b/chrome/browser/extensions/content_verifier_test_utils.h
@@ -36,6 +36,10 @@
class DownloaderTestDelegate : public ExtensionDownloaderTestDelegate {
public:
DownloaderTestDelegate();
+
+ DownloaderTestDelegate(const DownloaderTestDelegate&) = delete;
+ DownloaderTestDelegate& operator=(const DownloaderTestDelegate&) = delete;
+
~DownloaderTestDelegate();
// This makes it so that update check requests for |extension_id| will return
@@ -59,8 +63,6 @@
// The prepared responses - this maps an extension id to a (version string,
// crx file path) pair.
std::map<ExtensionId, std::pair<base::Version, base::FilePath>> responses_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloaderTestDelegate);
};
// This lets us simulate a policy-installed extension being "force" installed;
@@ -68,6 +70,10 @@
class ForceInstallProvider : public ManagementPolicy::Provider {
public:
explicit ForceInstallProvider(const ExtensionId& id);
+
+ ForceInstallProvider(const ForceInstallProvider&) = delete;
+ ForceInstallProvider& operator=(const ForceInstallProvider&) = delete;
+
~ForceInstallProvider() override;
std::string GetDebugPolicyProviderName() const override;
@@ -79,8 +85,6 @@
private:
// The extension id we want to disallow uninstall/disable for.
ExtensionId id_;
-
- DISALLOW_COPY_AND_ASSIGN(ForceInstallProvider);
};
// A helper for intercepting the normal action that
@@ -90,6 +94,9 @@
public:
DelayTracker();
+ DelayTracker(const DelayTracker&) = delete;
+ DelayTracker& operator=(const DelayTracker&) = delete;
+
~DelayTracker();
const std::vector<base::TimeDelta>& calls();
@@ -101,8 +108,6 @@
std::vector<base::TimeDelta> calls_;
absl::optional<base::OnceClosure> saved_callback_;
PolicyExtensionReinstaller::ReinstallCallback action_;
-
- DISALLOW_COPY_AND_ASSIGN(DelayTracker);
};
} // namespace content_verifier_test
diff --git a/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc b/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc
index 0ca2771..525f637 100644
--- a/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc
+++ b/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc
@@ -1937,6 +1937,9 @@
explicit ReadyToCommitWaiter(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents) {}
+ ReadyToCommitWaiter(const ReadyToCommitWaiter&) = delete;
+ ReadyToCommitWaiter& operator=(const ReadyToCommitWaiter&) = delete;
+
~ReadyToCommitWaiter() override {}
void Wait() { run_loop_.Run(); }
@@ -1948,8 +1951,6 @@
private:
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(ReadyToCommitWaiter);
};
IN_PROC_BROWSER_TEST_F(CorbAndCorsExtensionBrowserTest,
diff --git a/chrome/browser/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc
index 7cd7fc1..d38bc6e4 100644
--- a/chrome/browser/extensions/crx_installer_browsertest.cc
+++ b/chrome/browser/extensions/crx_installer_browsertest.cc
@@ -90,6 +90,10 @@
public:
MockPromptProxy(content::WebContents* web_contents,
ScopedTestDialogAutoConfirm::AutoConfirm confirm_mode);
+
+ MockPromptProxy(const MockPromptProxy&) = delete;
+ MockPromptProxy& operator=(const MockPromptProxy&) = delete;
+
~MockPromptProxy();
bool did_succeed() const { return !extension_id_.empty(); }
@@ -115,8 +119,6 @@
std::u16string error_;
std::unique_ptr<ScopedTestDialogAutoConfirm> auto_confirm;
-
- DISALLOW_COPY_AND_ASSIGN(MockPromptProxy);
};
class MockInstallPrompt : public ExtensionInstallPrompt {
diff --git a/chrome/browser/extensions/dev_mode_bubble_delegate.h b/chrome/browser/extensions/dev_mode_bubble_delegate.h
index 5b951d7..dde8bf5 100644
--- a/chrome/browser/extensions/dev_mode_bubble_delegate.h
+++ b/chrome/browser/extensions/dev_mode_bubble_delegate.h
@@ -20,6 +20,10 @@
: public ExtensionMessageBubbleController::Delegate {
public:
explicit DevModeBubbleDelegate(Profile* profile);
+
+ DevModeBubbleDelegate(const DevModeBubbleDelegate&) = delete;
+ DevModeBubbleDelegate& operator=(const DevModeBubbleDelegate&) = delete;
+
~DevModeBubbleDelegate() override;
// ExtensionMessageBubbleController::Delegate methods.
@@ -48,8 +52,6 @@
private:
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(DevModeBubbleDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/device_permissions_dialog_controller.h b/chrome/browser/extensions/device_permissions_dialog_controller.h
index e76af7dd8..169d0b7 100644
--- a/chrome/browser/extensions/device_permissions_dialog_controller.h
+++ b/chrome/browser/extensions/device_permissions_dialog_controller.h
@@ -23,6 +23,12 @@
DevicePermissionsDialogController(
content::RenderFrameHost* owner,
scoped_refptr<extensions::DevicePermissionsPrompt::Prompt> prompt);
+
+ DevicePermissionsDialogController(const DevicePermissionsDialogController&) =
+ delete;
+ DevicePermissionsDialogController& operator=(
+ const DevicePermissionsDialogController&) = delete;
+
~DevicePermissionsDialogController() override;
// permissions::ChooserController:
@@ -49,8 +55,6 @@
scoped_refptr<extensions::DevicePermissionsPrompt::Prompt> prompt_;
// Maps from device name to number of devices.
std::unordered_map<std::u16string, int> device_name_map_;
-
- DISALLOW_COPY_AND_ASSIGN(DevicePermissionsDialogController);
};
#endif // CHROME_BROWSER_EXTENSIONS_DEVICE_PERMISSIONS_DIALOG_CONTROLLER_H_
diff --git a/chrome/browser/extensions/error_console/error_console.h b/chrome/browser/extensions/error_console/error_console.h
index 6c42d707..5ccc40a0 100644
--- a/chrome/browser/extensions/error_console/error_console.h
+++ b/chrome/browser/extensions/error_console/error_console.h
@@ -61,6 +61,10 @@
};
explicit ErrorConsole(Profile* profile);
+
+ ErrorConsole(const ErrorConsole&) = delete;
+ ErrorConsole& operator=(const ErrorConsole&) = delete;
+
~ErrorConsole() override;
// Convenience method to return the ErrorConsole for a given |context|.
@@ -198,8 +202,6 @@
base::ScopedObservation<ExtensionRegistry, ExtensionRegistryObserver>
registry_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ErrorConsole);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/error_console/error_console_browsertest.cc b/chrome/browser/extensions/error_console/error_console_browsertest.cc
index cd85c0d..334cf46 100644
--- a/chrome/browser/extensions/error_console/error_console_browsertest.cc
+++ b/chrome/browser/extensions/error_console/error_console_browsertest.cc
@@ -153,6 +153,10 @@
error_console_(error_console) {
error_console_->AddObserver(this);
}
+
+ ErrorObserver(const ErrorObserver&) = delete;
+ ErrorObserver& operator=(const ErrorObserver&) = delete;
+
virtual ~ErrorObserver() {
if (error_console_)
error_console_->RemoveObserver(this);
@@ -184,8 +188,6 @@
bool waiting_;
ErrorConsole* error_console_;
-
- DISALLOW_COPY_AND_ASSIGN(ErrorObserver);
};
// The type of action which we take after we load an extension in order to
diff --git a/chrome/browser/extensions/extension_action_icon_factory.h b/chrome/browser/extensions/extension_action_icon_factory.h
index a932980..5f59111c 100644
--- a/chrome/browser/extensions/extension_action_icon_factory.h
+++ b/chrome/browser/extensions/extension_action_icon_factory.h
@@ -35,6 +35,11 @@
const extensions::Extension* extension,
extensions::ExtensionAction* action,
Observer* observer);
+
+ ExtensionActionIconFactory(const ExtensionActionIconFactory&) = delete;
+ ExtensionActionIconFactory& operator=(const ExtensionActionIconFactory&) =
+ delete;
+
~ExtensionActionIconFactory() override;
// Controls whether invisible icons will be returned by GetIcon().
@@ -64,8 +69,6 @@
base::ScopedObservation<extensions::IconImage,
extensions::IconImage::Observer>
icon_image_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionActionIconFactory);
};
#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_ICON_FACTORY_H_
diff --git a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
index 842c8a4..9c45a950 100644
--- a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
+++ b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
@@ -91,6 +91,11 @@
public:
ExtensionActionIconFactoryTest() : quit_in_icon_updated_(false) {}
+ ExtensionActionIconFactoryTest(const ExtensionActionIconFactoryTest&) =
+ delete;
+ ExtensionActionIconFactoryTest& operator=(
+ const ExtensionActionIconFactoryTest&) = delete;
+
~ExtensionActionIconFactoryTest() override {}
void WaitForIconUpdate() {
@@ -173,8 +178,6 @@
ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
ash::ScopedTestUserManager test_user_manager_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionActionIconFactoryTest);
};
// If there is no default icon, and the icon has not been set using |SetIcon|,
diff --git a/chrome/browser/extensions/extension_action_runner.h b/chrome/browser/extensions/extension_action_runner.h
index aa02e2a..e139083 100644
--- a/chrome/browser/extensions/extension_action_runner.h
+++ b/chrome/browser/extensions/extension_action_runner.h
@@ -54,6 +54,10 @@
};
explicit ExtensionActionRunner(content::WebContents* web_contents);
+
+ ExtensionActionRunner(const ExtensionActionRunner&) = delete;
+ ExtensionActionRunner& operator=(const ExtensionActionRunner&) = delete;
+
~ExtensionActionRunner() override;
// Returns the ExtensionActionRunner for the given |web_contents|, or null
@@ -259,8 +263,6 @@
extension_registry_observation_{this};
base::WeakPtrFactory<ExtensionActionRunner> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionActionRunner);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_action_runner_browsertest.cc b/chrome/browser/extensions/extension_action_runner_browsertest.cc
index 3dcddbc..46896d4 100644
--- a/chrome/browser/extensions/extension_action_runner_browsertest.cc
+++ b/chrome/browser/extensions/extension_action_runner_browsertest.cc
@@ -237,6 +237,10 @@
: runner_(runner) {
runner_->set_observer_for_testing(this);
}
+
+ BlockedActionWaiter(const BlockedActionWaiter&) = delete;
+ BlockedActionWaiter& operator=(const BlockedActionWaiter&) = delete;
+
~BlockedActionWaiter() { runner_->set_observer_for_testing(nullptr); }
void Wait() { run_loop_.Run(); }
@@ -247,8 +251,6 @@
ExtensionActionRunner* runner_;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(BlockedActionWaiter);
};
BlockedActionWaiter waiter(runner);
diff --git a/chrome/browser/extensions/extension_action_storage_manager.h b/chrome/browser/extensions/extension_action_storage_manager.h
index 141d3af9..27df52ce 100644
--- a/chrome/browser/extensions/extension_action_storage_manager.h
+++ b/chrome/browser/extensions/extension_action_storage_manager.h
@@ -27,6 +27,11 @@
public ExtensionRegistryObserver {
public:
explicit ExtensionActionStorageManager(content::BrowserContext* context);
+
+ ExtensionActionStorageManager(const ExtensionActionStorageManager&) = delete;
+ ExtensionActionStorageManager& operator=(
+ const ExtensionActionStorageManager&) = delete;
+
~ExtensionActionStorageManager() override;
private:
@@ -59,8 +64,6 @@
extension_registry_observation_{this};
base::WeakPtrFactory<ExtensionActionStorageManager> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionActionStorageManager);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_bindings_apitest.cc b/chrome/browser/extensions/extension_bindings_apitest.cc
index 85ec540..a83eca3a 100644
--- a/chrome/browser/extensions/extension_bindings_apitest.cc
+++ b/chrome/browser/extensions/extension_bindings_apitest.cc
@@ -65,6 +65,10 @@
class ExtensionBindingsApiTest : public ExtensionApiTest {
public:
ExtensionBindingsApiTest() {}
+
+ ExtensionBindingsApiTest(const ExtensionBindingsApiTest&) = delete;
+ ExtensionBindingsApiTest& operator=(const ExtensionBindingsApiTest&) = delete;
+
~ExtensionBindingsApiTest() override {}
void SetUpOnMainThread() override {
@@ -79,9 +83,6 @@
// deferred commits.
command_line->AppendSwitch(blink::switches::kAllowPreCommitInput);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ExtensionBindingsApiTest);
};
IN_PROC_BROWSER_TEST_F(ExtensionBindingsApiTest,
diff --git a/chrome/browser/extensions/extension_browser_window_helper.h b/chrome/browser/extensions/extension_browser_window_helper.h
index debb5a0b..1ddd40a84 100644
--- a/chrome/browser/extensions/extension_browser_window_helper.h
+++ b/chrome/browser/extensions/extension_browser_window_helper.h
@@ -19,6 +19,11 @@
public:
// Note: |browser| must outlive this object.
explicit ExtensionBrowserWindowHelper(Browser* browser);
+
+ ExtensionBrowserWindowHelper(const ExtensionBrowserWindowHelper&) = delete;
+ ExtensionBrowserWindowHelper& operator=(const ExtensionBrowserWindowHelper&) =
+ delete;
+
~ExtensionBrowserWindowHelper() override;
private:
@@ -37,8 +42,6 @@
base::ScopedObservation<ExtensionRegistry, ExtensionRegistryObserver>
registry_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionBrowserWindowHelper);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_commands_global_registry.h b/chrome/browser/extensions/extension_commands_global_registry.h
index e7b6754f..88fe9847 100644
--- a/chrome/browser/extensions/extension_commands_global_registry.h
+++ b/chrome/browser/extensions/extension_commands_global_registry.h
@@ -43,6 +43,12 @@
static ExtensionCommandsGlobalRegistry* Get(content::BrowserContext* context);
explicit ExtensionCommandsGlobalRegistry(content::BrowserContext* context);
+
+ ExtensionCommandsGlobalRegistry(const ExtensionCommandsGlobalRegistry&) =
+ delete;
+ ExtensionCommandsGlobalRegistry& operator=(
+ const ExtensionCommandsGlobalRegistry&) = delete;
+
~ExtensionCommandsGlobalRegistry() override;
// Returns which non-global command registry is active (belonging to the
@@ -88,8 +94,6 @@
// and
// NULL otherwise.
ExtensionKeybindingRegistry* registry_for_active_window_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionCommandsGlobalRegistry);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_context_menu_model_unittest.cc b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
index 4f6ae41..3c0b526 100644
--- a/chrome/browser/extensions/extension_context_menu_model_unittest.cc
+++ b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
@@ -134,6 +134,10 @@
browser_(browser),
menu_manager_(menu_manager),
cur_id_(0) {}
+
+ MenuBuilder(const MenuBuilder&) = delete;
+ MenuBuilder& operator=(const MenuBuilder&) = delete;
+
~MenuBuilder() {}
std::unique_ptr<ExtensionContextMenuModel> BuildMenu() {
@@ -177,8 +181,6 @@
Browser* browser_;
MenuManager* menu_manager_;
int cur_id_;
-
- DISALLOW_COPY_AND_ASSIGN(MenuBuilder);
};
// Returns the number of extension menu items that show up in |model|.
diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc
index 2f8e5de..c27817cf 100644
--- a/chrome/browser/extensions/extension_disabled_ui.cc
+++ b/chrome/browser/extensions/extension_disabled_ui.cc
@@ -58,6 +58,11 @@
ExtensionDisabledGlobalError(ExtensionService* service,
const Extension* extension,
bool is_remote_install);
+
+ ExtensionDisabledGlobalError(const ExtensionDisabledGlobalError&) = delete;
+ ExtensionDisabledGlobalError& operator=(const ExtensionDisabledGlobalError&) =
+ delete;
+
~ExtensionDisabledGlobalError() override;
// GlobalError:
@@ -115,8 +120,6 @@
base::ScopedObservation<ExtensionRegistry, ExtensionRegistryObserver>
registry_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionDisabledGlobalError);
};
// TODO(yoz): create error at startup for disabled extensions.
diff --git a/chrome/browser/extensions/extension_error_controller.h b/chrome/browser/extensions/extension_error_controller.h
index b6d1b02..c157773 100644
--- a/chrome/browser/extensions/extension_error_controller.h
+++ b/chrome/browser/extensions/extension_error_controller.h
@@ -25,6 +25,10 @@
typedef ExtensionErrorUI* (*UICreateMethod)(ExtensionErrorUI::Delegate*);
ExtensionErrorController(content::BrowserContext* context, bool is_first_run);
+
+ ExtensionErrorController(const ExtensionErrorController&) = delete;
+ ExtensionErrorController& operator=(const ExtensionErrorController&) = delete;
+
virtual ~ExtensionErrorController();
void ShowErrorIfNeeded();
@@ -56,8 +60,6 @@
// Whether or not this is the first run. If it is, we avoid noisy errors, and
// silently acknowledge blocklisted extensions.
bool is_first_run_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionErrorController);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_error_ui_default.h b/chrome/browser/extensions/extension_error_ui_default.h
index aace870..e753e4c 100644
--- a/chrome/browser/extensions/extension_error_ui_default.h
+++ b/chrome/browser/extensions/extension_error_ui_default.h
@@ -22,6 +22,10 @@
class ExtensionErrorUIDefault : public ExtensionErrorUI {
public:
explicit ExtensionErrorUIDefault(ExtensionErrorUI::Delegate* delegate);
+
+ ExtensionErrorUIDefault(const ExtensionErrorUIDefault&) = delete;
+ ExtensionErrorUIDefault& operator=(const ExtensionErrorUIDefault&) = delete;
+
~ExtensionErrorUIDefault() override;
bool ShowErrorInBubbleView() override;
@@ -39,8 +43,6 @@
Browser* browser_ = nullptr;
std::unique_ptr<ExtensionGlobalError> global_error_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionErrorUIDefault);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_garbage_collector.h b/chrome/browser/extensions/extension_garbage_collector.h
index 4e4f8a4..2173921 100644
--- a/chrome/browser/extensions/extension_garbage_collector.h
+++ b/chrome/browser/extensions/extension_garbage_collector.h
@@ -31,6 +31,11 @@
public InstallGate {
public:
explicit ExtensionGarbageCollector(content::BrowserContext* context);
+
+ ExtensionGarbageCollector(const ExtensionGarbageCollector&) = delete;
+ ExtensionGarbageCollector& operator=(const ExtensionGarbageCollector&) =
+ delete;
+
~ExtensionGarbageCollector() override;
static ExtensionGarbageCollector* Get(content::BrowserContext* context);
@@ -89,8 +94,6 @@
// Generate weak pointers for safely posting to the file thread for garbage
// collection.
base::WeakPtrFactory<ExtensionGarbageCollector> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionGarbageCollector);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_garbage_collector_chromeos.h b/chrome/browser/extensions/extension_garbage_collector_chromeos.h
index 57e795c7..45d7bbd 100644
--- a/chrome/browser/extensions/extension_garbage_collector_chromeos.h
+++ b/chrome/browser/extensions/extension_garbage_collector_chromeos.h
@@ -16,6 +16,12 @@
class ExtensionGarbageCollectorChromeOS : public ExtensionGarbageCollector {
public:
explicit ExtensionGarbageCollectorChromeOS(content::BrowserContext* context);
+
+ ExtensionGarbageCollectorChromeOS(const ExtensionGarbageCollectorChromeOS&) =
+ delete;
+ ExtensionGarbageCollectorChromeOS& operator=(
+ const ExtensionGarbageCollectorChromeOS&) = delete;
+
~ExtensionGarbageCollectorChromeOS() override;
static ExtensionGarbageCollectorChromeOS* Get(
@@ -49,8 +55,6 @@
// class are created per-profile so this static variable prevents multiple
// processing.
static bool shared_extensions_garbage_collected_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionGarbageCollectorChromeOS);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_gcm_app_handler.h b/chrome/browser/extensions/extension_gcm_app_handler.h
index c40281d..91fca891 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler.h
+++ b/chrome/browser/extensions/extension_gcm_app_handler.h
@@ -43,6 +43,10 @@
public ExtensionRegistryObserver {
public:
explicit ExtensionGCMAppHandler(content::BrowserContext* context);
+
+ ExtensionGCMAppHandler(const ExtensionGCMAppHandler&) = delete;
+ ExtensionGCMAppHandler& operator=(const ExtensionGCMAppHandler&) = delete;
+
~ExtensionGCMAppHandler() override;
// BrowserContextKeyedAPI implementation.
@@ -104,8 +108,6 @@
std::unique_ptr<extensions::GcmJsEventRouter> js_event_router_;
base::WeakPtrFactory<ExtensionGCMAppHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionGCMAppHandler);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
index 2c09376..b527590 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
+++ b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
@@ -106,6 +106,10 @@
class Waiter {
public:
Waiter() {}
+
+ Waiter(const Waiter&) = delete;
+ Waiter& operator=(const Waiter&) = delete;
+
~Waiter() {}
// Waits until the asynchronous operation finishes.
@@ -156,8 +160,6 @@
}
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(Waiter);
};
class FakeExtensionGCMAppHandler : public ExtensionGCMAppHandler {
@@ -170,6 +172,10 @@
app_handler_count_drop_to_zero_(false) {
}
+ FakeExtensionGCMAppHandler(const FakeExtensionGCMAppHandler&) = delete;
+ FakeExtensionGCMAppHandler& operator=(const FakeExtensionGCMAppHandler&) =
+ delete;
+
~FakeExtensionGCMAppHandler() override {}
void OnMessage(const std::string& app_id,
@@ -215,8 +221,6 @@
gcm::GCMClient::Result unregistration_result_;
instance_id::InstanceID::Result delete_id_result_;
bool app_handler_count_drop_to_zero_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeExtensionGCMAppHandler);
};
class ExtensionGCMAppHandlerTest : public testing::Test {
@@ -250,6 +254,10 @@
registration_result_(gcm::GCMClient::UNKNOWN_ERROR),
unregistration_result_(gcm::GCMClient::UNKNOWN_ERROR) {}
+ ExtensionGCMAppHandlerTest(const ExtensionGCMAppHandlerTest&) = delete;
+ ExtensionGCMAppHandlerTest& operator=(const ExtensionGCMAppHandlerTest&) =
+ delete;
+
~ExtensionGCMAppHandlerTest() override {}
// Overridden from test::Test:
@@ -426,8 +434,6 @@
std::unique_ptr<FakeExtensionGCMAppHandler> gcm_app_handler_;
gcm::GCMClient::Result registration_result_;
gcm::GCMClient::Result unregistration_result_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionGCMAppHandlerTest);
};
TEST_F(ExtensionGCMAppHandlerTest, AddAndRemoveAppHandler) {
diff --git a/chrome/browser/extensions/extension_icon_manager.h b/chrome/browser/extensions/extension_icon_manager.h
index 5b80d93..dc32eea0 100644
--- a/chrome/browser/extensions/extension_icon_manager.h
+++ b/chrome/browser/extensions/extension_icon_manager.h
@@ -29,6 +29,10 @@
};
ExtensionIconManager();
+
+ ExtensionIconManager(const ExtensionIconManager&) = delete;
+ ExtensionIconManager& operator=(const ExtensionIconManager&) = delete;
+
virtual ~ExtensionIconManager();
// Start loading the icon for the given extension.
@@ -68,8 +72,6 @@
Observer* observer_ = nullptr;
base::WeakPtrFactory<ExtensionIconManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionIconManager);
};
#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_ICON_MANAGER_H_
diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc
index ee808a4..7b4ce17 100644
--- a/chrome/browser/extensions/extension_icon_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc
@@ -50,6 +50,10 @@
test_screen_.get());
}
+ ScopedSetDeviceScaleFactor(const ScopedSetDeviceScaleFactor&) = delete;
+ ScopedSetDeviceScaleFactor& operator=(const ScopedSetDeviceScaleFactor&) =
+ delete;
+
~ScopedSetDeviceScaleFactor() {
display::Display::ResetForceDeviceScaleFactorForTesting();
}
@@ -58,8 +62,6 @@
std::unique_ptr<display::test::TestScreen> test_screen_;
std::unique_ptr<display::test::ScopedScreenOverride> screen_override_;
base::test::ScopedCommandLine command_line_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedSetDeviceScaleFactor);
};
// Our test class that takes care of managing the necessary threads for loading
@@ -69,6 +71,9 @@
public:
ExtensionIconManagerTest() : unwaited_image_loads_(0), waiting_(false) {}
+ ExtensionIconManagerTest(const ExtensionIconManagerTest&) = delete;
+ ExtensionIconManagerTest& operator=(const ExtensionIconManagerTest&) = delete;
+
~ExtensionIconManagerTest() override = default;
void OnImageLoaded(const std::string& extension_id) override {
@@ -96,8 +101,6 @@
// Whether we are currently waiting for an image load.
bool waiting_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionIconManagerTest);
};
// Returns the default icon that ExtensionIconManager gives when an extension
diff --git a/chrome/browser/extensions/extension_install_error_menu_item_id_provider.h b/chrome/browser/extensions/extension_install_error_menu_item_id_provider.h
index 79c6b1b..4000b6b 100644
--- a/chrome/browser/extensions/extension_install_error_menu_item_id_provider.h
+++ b/chrome/browser/extensions/extension_install_error_menu_item_id_provider.h
@@ -17,14 +17,18 @@
class ExtensionInstallErrorMenuItemIdProvider {
public:
ExtensionInstallErrorMenuItemIdProvider();
+
+ ExtensionInstallErrorMenuItemIdProvider(
+ const ExtensionInstallErrorMenuItemIdProvider&) = delete;
+ ExtensionInstallErrorMenuItemIdProvider& operator=(
+ const ExtensionInstallErrorMenuItemIdProvider&) = delete;
+
~ExtensionInstallErrorMenuItemIdProvider();
int menu_command_id() { return menu_command_id_; }
private:
int menu_command_id_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionInstallErrorMenuItemIdProvider);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_install_prompt.h b/chrome/browser/extensions/extension_install_prompt.h
index 2f8aa2c..b7c9ce3e 100644
--- a/chrome/browser/extensions/extension_install_prompt.h
+++ b/chrome/browser/extensions/extension_install_prompt.h
@@ -100,6 +100,10 @@
class Prompt {
public:
explicit Prompt(PromptType type);
+
+ Prompt(const Prompt&) = delete;
+ Prompt& operator=(const Prompt&) = delete;
+
~Prompt();
void AddPermissionSet(const extensions::PermissionSet& permissions);
@@ -239,8 +243,6 @@
std::vector<std::u16string> retained_device_messages_;
base::ObserverList<Observer> observers_;
-
- DISALLOW_COPY_AND_ASSIGN(Prompt);
};
static const int kMinExtensionRating = 0;
diff --git a/chrome/browser/extensions/extension_install_prompt_show_params.cc b/chrome/browser/extensions/extension_install_prompt_show_params.cc
index 9dd8e8c..7b79d3f 100644
--- a/chrome/browser/extensions/extension_install_prompt_show_params.cc
+++ b/chrome/browser/extensions/extension_install_prompt_show_params.cc
@@ -32,6 +32,11 @@
params_(params) {
}
+ WebContentsDestructionObserver(const WebContentsDestructionObserver&) =
+ delete;
+ WebContentsDestructionObserver& operator=(
+ const WebContentsDestructionObserver&) = delete;
+
~WebContentsDestructionObserver() override {}
void WebContentsDestroyed() override { params_->WebContentsDestroyed(); }
@@ -39,8 +44,6 @@
private:
// Not owned.
ExtensionInstallPromptShowParams* params_;
-
- DISALLOW_COPY_AND_ASSIGN(WebContentsDestructionObserver);
};
ExtensionInstallPromptShowParams::ExtensionInstallPromptShowParams(
diff --git a/chrome/browser/extensions/extension_install_prompt_show_params.h b/chrome/browser/extensions/extension_install_prompt_show_params.h
index 9e5c676..562a236 100644
--- a/chrome/browser/extensions/extension_install_prompt_show_params.h
+++ b/chrome/browser/extensions/extension_install_prompt_show_params.h
@@ -29,6 +29,11 @@
// are no browser windows) is used if a new tab needs to be opened.
ExtensionInstallPromptShowParams(Profile* profile, gfx::NativeWindow window);
+ ExtensionInstallPromptShowParams(const ExtensionInstallPromptShowParams&) =
+ delete;
+ ExtensionInstallPromptShowParams& operator=(
+ const ExtensionInstallPromptShowParams&) = delete;
+
virtual ~ExtensionInstallPromptShowParams();
Profile* profile() {
@@ -60,8 +65,6 @@
web_contents_destruction_observer_;
std::unique_ptr<NativeWindowTracker> native_window_tracker_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionInstallPromptShowParams);
};
#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_SHOW_PARAMS_H_
diff --git a/chrome/browser/extensions/extension_install_prompt_test_helper.h b/chrome/browser/extensions/extension_install_prompt_test_helper.h
index a6e5fcc..dde5bcf 100644
--- a/chrome/browser/extensions/extension_install_prompt_test_helper.h
+++ b/chrome/browser/extensions/extension_install_prompt_test_helper.h
@@ -14,6 +14,12 @@
public:
ExtensionInstallPromptTestHelper();
explicit ExtensionInstallPromptTestHelper(base::OnceClosure quit_closure);
+
+ ExtensionInstallPromptTestHelper(const ExtensionInstallPromptTestHelper&) =
+ delete;
+ ExtensionInstallPromptTestHelper& operator=(
+ const ExtensionInstallPromptTestHelper&) = delete;
+
~ExtensionInstallPromptTestHelper();
// Returns a callback to be used with the ExtensionInstallPrompt.
@@ -42,8 +48,6 @@
// A closure to run once HandlePayload() has been called; used for exiting
// run loops in tests.
base::OnceClosure quit_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionInstallPromptTestHelper);
};
#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_TEST_HELPER_H_
diff --git a/chrome/browser/extensions/extension_install_prompt_unittest.cc b/chrome/browser/extensions/extension_install_prompt_unittest.cc
index 136771a0..4754925 100644
--- a/chrome/browser/extensions/extension_install_prompt_unittest.cc
+++ b/chrome/browser/extensions/extension_install_prompt_unittest.cc
@@ -83,6 +83,12 @@
class ExtensionInstallPromptUnitTest : public testing::Test {
public:
ExtensionInstallPromptUnitTest() {}
+
+ ExtensionInstallPromptUnitTest(const ExtensionInstallPromptUnitTest&) =
+ delete;
+ ExtensionInstallPromptUnitTest& operator=(
+ const ExtensionInstallPromptUnitTest&) = delete;
+
~ExtensionInstallPromptUnitTest() override {}
// testing::Test:
@@ -96,8 +102,6 @@
private:
content::BrowserTaskEnvironment task_environment_;
std::unique_ptr<TestingProfile> profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionInstallPromptUnitTest);
};
} // namespace
diff --git a/chrome/browser/extensions/extension_install_ui_browsertest.cc b/chrome/browser/extensions/extension_install_ui_browsertest.cc
index 1d43d4d..b531f30 100644
--- a/chrome/browser/extensions/extension_install_ui_browsertest.cc
+++ b/chrome/browser/extensions/extension_install_ui_browsertest.cc
@@ -37,6 +37,11 @@
class ExtensionInstallUIBrowserTest : public extensions::ExtensionBrowserTest {
public:
ExtensionInstallUIBrowserTest() {}
+
+ ExtensionInstallUIBrowserTest(const ExtensionInstallUIBrowserTest&) = delete;
+ ExtensionInstallUIBrowserTest& operator=(
+ const ExtensionInstallUIBrowserTest&) = delete;
+
~ExtensionInstallUIBrowserTest() override {}
// Checks that a theme info bar is currently visible and issues an undo to
@@ -89,9 +94,6 @@
ThemeServiceFactory::GetForProfile(browser()->profile()));
waiter.WaitForThemeChanged();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ExtensionInstallUIBrowserTest);
};
// Fails on Linux and Windows (http://crbug.com/580907).
diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc
index 997220a3..6aa795c7 100644
--- a/chrome/browser/extensions/extension_keybinding_apitest.cc
+++ b/chrome/browser/extensions/extension_keybinding_apitest.cc
@@ -83,6 +83,10 @@
class DomMessageListener : public content::TestMessageHandler {
public:
explicit DomMessageListener(content::WebContents* web_contents);
+
+ DomMessageListener(const DomMessageListener&) = delete;
+ DomMessageListener& operator=(const DomMessageListener&) = delete;
+
~DomMessageListener() override;
// Wait until a message is received.
@@ -103,8 +107,6 @@
std::string message_;
content::JavascriptTestObserver observer_;
-
- DISALLOW_COPY_AND_ASSIGN(DomMessageListener);
};
DomMessageListener::DomMessageListener(content::WebContents* web_contents)
diff --git a/chrome/browser/extensions/extension_keybinding_registry.h b/chrome/browser/extensions/extension_keybinding_registry.h
index 2c56e67..d888a1a9 100644
--- a/chrome/browser/extensions/extension_keybinding_registry.h
+++ b/chrome/browser/extensions/extension_keybinding_registry.h
@@ -55,6 +55,10 @@
ExtensionFilter extension_filter,
Delegate* delegate);
+ ExtensionKeybindingRegistry(const ExtensionKeybindingRegistry&) = delete;
+ ExtensionKeybindingRegistry& operator=(const ExtensionKeybindingRegistry&) =
+ delete;
+
~ExtensionKeybindingRegistry() override;
// Enables/Disables general shortcut handling in Chrome.
@@ -190,8 +194,6 @@
// Listen for Media keys events.
std::unique_ptr<ui::MediaKeysListener> media_keys_listener_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionKeybindingRegistry);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_management.h b/chrome/browser/extensions/extension_management.h
index e27bce4f..a6ac384 100644
--- a/chrome/browser/extensions/extension_management.h
+++ b/chrome/browser/extensions/extension_management.h
@@ -88,6 +88,10 @@
};
explicit ExtensionManagement(Profile* profile);
+
+ ExtensionManagement(const ExtensionManagement&) = delete;
+ ExtensionManagement& operator=(const ExtensionManagement&) = delete;
+
~ExtensionManagement() override;
// KeyedService implementations:
@@ -302,8 +306,6 @@
base::ObserverList<Observer, true>::Unchecked observer_list_;
PrefChangeRegistrar pref_change_registrar_;
std::vector<std::unique_ptr<ManagementPolicy::Provider>> providers_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionManagement);
};
class ExtensionManagementFactory : public BrowserContextKeyedServiceFactory {
diff --git a/chrome/browser/extensions/extension_management_test_util.h b/chrome/browser/extensions/extension_management_test_util.h
index 6c3fb93..2f6743b7 100644
--- a/chrome/browser/extensions/extension_management_test_util.h
+++ b/chrome/browser/extensions/extension_management_test_util.h
@@ -25,6 +25,12 @@
class ExtensionManagementPrefUpdaterBase {
public:
ExtensionManagementPrefUpdaterBase();
+
+ ExtensionManagementPrefUpdaterBase(
+ const ExtensionManagementPrefUpdaterBase&) = delete;
+ ExtensionManagementPrefUpdaterBase& operator=(
+ const ExtensionManagementPrefUpdaterBase&) = delete;
+
virtual ~ExtensionManagementPrefUpdaterBase();
// Helper functions for per extension settings.
@@ -118,8 +124,6 @@
void RemoveStringFromList(const std::string& path, const std::string& str);
std::unique_ptr<base::DictionaryValue> pref_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionManagementPrefUpdaterBase);
};
// A helper class to manipulate the extension management preference in unit
@@ -139,14 +143,17 @@
SetPref(new base::DictionaryValue);
}
+ ExtensionManagementPrefUpdater(const ExtensionManagementPrefUpdater&) =
+ delete;
+ ExtensionManagementPrefUpdater& operator=(
+ const ExtensionManagementPrefUpdater&) = delete;
+
virtual ~ExtensionManagementPrefUpdater() {
service_->SetManagedPref(pref_names::kExtensionManagement, TakePref());
}
private:
TestingPrefService* service_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionManagementPrefUpdater);
};
// A helper class to manipulate the extension management policy in browser
@@ -156,13 +163,17 @@
public:
explicit ExtensionManagementPolicyUpdater(
policy::MockConfigurationPolicyProvider* provider);
+
+ ExtensionManagementPolicyUpdater(const ExtensionManagementPolicyUpdater&) =
+ delete;
+ ExtensionManagementPolicyUpdater& operator=(
+ const ExtensionManagementPolicyUpdater&) = delete;
+
~ExtensionManagementPolicyUpdater() override;
private:
policy::MockConfigurationPolicyProvider* provider_;
std::unique_ptr<policy::PolicyBundle> policies_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionManagementPolicyUpdater);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_message_bubble_controller.h b/chrome/browser/extensions/extension_message_bubble_controller.h
index a7ffc22..7efab5b 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller.h
+++ b/chrome/browser/extensions/extension_message_bubble_controller.h
@@ -40,6 +40,10 @@
class Delegate {
public:
explicit Delegate(Profile* profile);
+
+ Delegate(const Delegate&) = delete;
+ Delegate& operator=(const Delegate&) = delete;
+
virtual ~Delegate();
virtual bool ShouldIncludeExtension(const Extension* extension) = 0;
@@ -125,8 +129,6 @@
// Name for corresponding pref that keeps if the info the bubble contains
// was acknowledged by user.
std::string acknowledged_pref_name_;
-
- DISALLOW_COPY_AND_ASSIGN(Delegate);
};
ExtensionMessageBubbleController(Delegate* delegate, Browser* browser);
diff --git a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
index a371746..6e8c3bf 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
@@ -88,6 +88,12 @@
action_button_callback_count_(0),
dismiss_button_callback_count_(0),
link_click_callback_count_(0) {}
+
+ TestExtensionMessageBubbleController(
+ const TestExtensionMessageBubbleController&) = delete;
+ TestExtensionMessageBubbleController& operator=(
+ const TestExtensionMessageBubbleController&) = delete;
+
~TestExtensionMessageBubbleController() override {}
// ExtensionMessageBubbleController:
@@ -113,8 +119,6 @@
size_t action_button_callback_count_;
size_t dismiss_button_callback_count_;
size_t link_click_callback_count_;
-
- DISALLOW_COPY_AND_ASSIGN(TestExtensionMessageBubbleController);
};
// A fake bubble used for testing the controller. Takes an action that specifies
@@ -356,6 +360,10 @@
profile(), base::BindRepeating(&BuildToolbarModel));
}
+ ExtensionMessageBubbleTest(const ExtensionMessageBubbleTest&) = delete;
+ ExtensionMessageBubbleTest& operator=(const ExtensionMessageBubbleTest&) =
+ delete;
+
~ExtensionMessageBubbleTest() override {}
void SetUp() override {
@@ -431,8 +439,6 @@
private:
std::unique_ptr<base::CommandLine> command_line_;
std::unique_ptr<ScopedProfileKeepAlive> profile_keep_alive_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleTest);
};
// Test that the bubble correctly treats dismissal due to deactivation.
diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc
index 4d2c7f5..ac8b453a 100644
--- a/chrome/browser/extensions/extension_messages_apitest.cc
+++ b/chrome/browser/extensions/extension_messages_apitest.cc
@@ -135,6 +135,10 @@
class MessagingApiTest : public ExtensionApiTest {
public:
MessagingApiTest() {}
+
+ MessagingApiTest(const MessagingApiTest&) = delete;
+ MessagingApiTest& operator=(const MessagingApiTest&) = delete;
+
~MessagingApiTest() override {}
void SetUpOnMainThread() override {
@@ -142,9 +146,6 @@
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(StartEmbeddedTestServer());
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MessagingApiTest);
};
IN_PROC_BROWSER_TEST_F(MessagingApiTest, Messaging) {
@@ -1073,14 +1074,17 @@
: public ExternallyConnectableMessagingTest {
public:
ExternallyConnectableMessagingTestNoChannelID() {}
+
+ ExternallyConnectableMessagingTestNoChannelID(
+ const ExternallyConnectableMessagingTestNoChannelID&) = delete;
+ ExternallyConnectableMessagingTestNoChannelID& operator=(
+ const ExternallyConnectableMessagingTestNoChannelID&) = delete;
+
~ExternallyConnectableMessagingTestNoChannelID() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
ExternallyConnectableMessagingTest::SetUpCommandLine(command_line);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ExternallyConnectableMessagingTestNoChannelID);
};
IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTestNoChannelID,
diff --git a/chrome/browser/extensions/extension_migrator_unittest.cc b/chrome/browser/extensions/extension_migrator_unittest.cc
index e3ba533..027992b 100644
--- a/chrome/browser/extensions/extension_migrator_unittest.cc
+++ b/chrome/browser/extensions/extension_migrator_unittest.cc
@@ -33,6 +33,10 @@
class ExtensionMigratorTest : public ExtensionServiceTestBase {
public:
ExtensionMigratorTest() {}
+
+ ExtensionMigratorTest(const ExtensionMigratorTest&) = delete;
+ ExtensionMigratorTest& operator=(const ExtensionMigratorTest&) = delete;
+
~ExtensionMigratorTest() override {}
protected:
@@ -65,9 +69,6 @@
return service()->pending_extension_manager()->IsIdPending(kNewId) ||
registry()->GetInstalledExtension(kNewId);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ExtensionMigratorTest);
};
TEST_F(ExtensionMigratorTest, NoExistingOld) {
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index ddbb945f..75ccd44e 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -933,6 +933,12 @@
class ExtensionPrefsRuntimeGrantedPermissions : public ExtensionPrefsTest {
public:
ExtensionPrefsRuntimeGrantedPermissions() = default;
+
+ ExtensionPrefsRuntimeGrantedPermissions(
+ const ExtensionPrefsRuntimeGrantedPermissions&) = delete;
+ ExtensionPrefsRuntimeGrantedPermissions& operator=(
+ const ExtensionPrefsRuntimeGrantedPermissions&) = delete;
+
~ExtensionPrefsRuntimeGrantedPermissions() override {}
void Initialize() override {
@@ -1011,8 +1017,6 @@
private:
scoped_refptr<const Extension> extension_a_;
scoped_refptr<const Extension> extension_b_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionPrefsRuntimeGrantedPermissions);
};
TEST_F(ExtensionPrefsRuntimeGrantedPermissions,
ExtensionPrefsRuntimeGrantedPermissions) {}
@@ -1021,6 +1025,12 @@
class ExtensionPrefsObsoletePrefRemoval : public ExtensionPrefsTest {
public:
ExtensionPrefsObsoletePrefRemoval() = default;
+
+ ExtensionPrefsObsoletePrefRemoval(const ExtensionPrefsObsoletePrefRemoval&) =
+ delete;
+ ExtensionPrefsObsoletePrefRemoval& operator=(
+ const ExtensionPrefsObsoletePrefRemoval&) = delete;
+
~ExtensionPrefsObsoletePrefRemoval() override = default;
void Initialize() override {
@@ -1047,8 +1057,6 @@
private:
scoped_refptr<const Extension> extension_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionPrefsObsoletePrefRemoval);
};
TEST_F(ExtensionPrefsObsoletePrefRemoval, ExtensionPrefsObsoletePrefRemoval) {}
@@ -1057,6 +1065,11 @@
class ExtensionPrefsMigratedPref : public ExtensionPrefsTest {
public:
ExtensionPrefsMigratedPref() = default;
+
+ ExtensionPrefsMigratedPref(const ExtensionPrefsMigratedPref&) = delete;
+ ExtensionPrefsMigratedPref& operator=(const ExtensionPrefsMigratedPref&) =
+ delete;
+
~ExtensionPrefsMigratedPref() override = default;
void Initialize() override {
@@ -1086,8 +1099,6 @@
private:
scoped_refptr<const Extension> extension_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionPrefsMigratedPref);
};
TEST_F(ExtensionPrefsMigratedPref, ExtensionPrefsMigratedPref) {}
@@ -1099,6 +1110,12 @@
static constexpr char kLegacyBlocklistAcknowledgedPref[] = "ack_blacklist";
ExtensionPrefsMigrateOldBlocklistPrefs() = default;
+
+ ExtensionPrefsMigrateOldBlocklistPrefs(
+ const ExtensionPrefsMigrateOldBlocklistPrefs&) = delete;
+ ExtensionPrefsMigrateOldBlocklistPrefs& operator=(
+ const ExtensionPrefsMigrateOldBlocklistPrefs&) = delete;
+
~ExtensionPrefsMigrateOldBlocklistPrefs() override = default;
void Initialize() override {
@@ -1147,8 +1164,6 @@
private:
scoped_refptr<const Extension> extension_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionPrefsMigrateOldBlocklistPrefs);
};
// static
diff --git a/chrome/browser/extensions/extension_prefs_unittest.h b/chrome/browser/extensions/extension_prefs_unittest.h
index e46d7d4..2b21ff1 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.h
+++ b/chrome/browser/extensions/extension_prefs_unittest.h
@@ -24,6 +24,10 @@
class ExtensionPrefsTest : public testing::Test {
public:
ExtensionPrefsTest();
+
+ ExtensionPrefsTest(const ExtensionPrefsTest&) = delete;
+ ExtensionPrefsTest& operator=(const ExtensionPrefsTest&) = delete;
+
~ExtensionPrefsTest() override;
// This function will get called once, and is the right place to do operations
@@ -48,9 +52,6 @@
content::BrowserTaskEnvironment task_environment_;
TestExtensionPrefs prefs_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ExtensionPrefsTest);
};
@@ -59,6 +60,11 @@
static const size_t kNumInstalledExtensions = 5;
PrefsPrepopulatedTestBase();
+
+ PrefsPrepopulatedTestBase(const PrefsPrepopulatedTestBase&) = delete;
+ PrefsPrepopulatedTestBase& operator=(const PrefsPrepopulatedTestBase&) =
+ delete;
+
~PrefsPrepopulatedTestBase() override;
Extension* extension1() { return extension1_.get(); }
@@ -79,9 +85,6 @@
// This extension has a location of mojom::ManifestLocation::kInternal.
scoped_refptr<Extension> internal_extension_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PrefsPrepopulatedTestBase);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc
index 81348e60..8612fdd 100644
--- a/chrome/browser/extensions/extension_protocols_unittest.cc
+++ b/chrome/browser/extensions/extension_protocols_unittest.cc
@@ -166,6 +166,10 @@
GetResult(network::mojom::URLResponseHeadPtr response, int result)
: response_(std::move(response)), result_(result) {}
GetResult(GetResult&& other) : result_(other.result_) {}
+
+ GetResult(const GetResult&) = delete;
+ GetResult& operator=(const GetResult&) = delete;
+
~GetResult() = default;
std::string GetResponseHeaderByName(const std::string& name) const {
@@ -180,8 +184,6 @@
private:
network::mojom::URLResponseHeadPtr response_;
int result_;
-
- DISALLOW_COPY_AND_ASSIGN(GetResult);
};
} // namespace
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 9907cc7..972396d1 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -174,6 +174,9 @@
bool extensions_enabled,
base::OneShotEvent* ready);
+ ExtensionService(const ExtensionService&) = delete;
+ ExtensionService& operator=(const ExtensionService&) = delete;
+
~ExtensionService() override;
// ExtensionServiceInterface implementation.
@@ -771,8 +774,6 @@
friend class ::BlocklistedExtensionSyncServiceTest;
friend class SafeBrowsingVerdictHandlerUnitTest;
friend class BlocklistStatesInteractionUnitTest;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionService);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_service_sync_unittest.cc b/chrome/browser/extensions/extension_service_sync_unittest.cc
index ab4fbc8..250c820 100644
--- a/chrome/browser/extensions/extension_service_sync_unittest.cc
+++ b/chrome/browser/extensions/extension_service_sync_unittest.cc
@@ -120,6 +120,9 @@
expected_type == syncer::ModelType::APPS);
}
+ StatefulChangeProcessor(const StatefulChangeProcessor&) = delete;
+ StatefulChangeProcessor& operator=(const StatefulChangeProcessor&) = delete;
+
~StatefulChangeProcessor() override {}
// We let our parent class, FakeSyncChangeProcessor, handle saving the
@@ -173,8 +176,6 @@
// The expected ModelType of changes that this processor will see.
const syncer::ModelType expected_type_;
syncer::SyncDataList data_;
-
- DISALLOW_COPY_AND_ASSIGN(StatefulChangeProcessor);
};
} // namespace
diff --git a/chrome/browser/extensions/extension_service_test_with_install.h b/chrome/browser/extensions/extension_service_test_with_install.h
index 3d598723..217dccba 100644
--- a/chrome/browser/extensions/extension_service_test_with_install.h
+++ b/chrome/browser/extensions/extension_service_test_with_install.h
@@ -36,6 +36,12 @@
ExtensionServiceTestWithInstall();
explicit ExtensionServiceTestWithInstall(
std::unique_ptr<content::BrowserTaskEnvironment> task_environment);
+
+ ExtensionServiceTestWithInstall(const ExtensionServiceTestWithInstall&) =
+ delete;
+ ExtensionServiceTestWithInstall& operator=(
+ const ExtensionServiceTestWithInstall&) = delete;
+
~ExtensionServiceTestWithInstall() override;
protected:
@@ -153,8 +159,6 @@
base::ScopedObservation<ExtensionRegistry, ExtensionRegistryObserver>
registry_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionServiceTestWithInstall);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_sync_service.h b/chrome/browser/extensions/extension_sync_service.h
index 6bac0d4..91d8b30 100644
--- a/chrome/browser/extensions/extension_sync_service.h
+++ b/chrome/browser/extensions/extension_sync_service.h
@@ -41,6 +41,10 @@
public extensions::ExtensionPrefsObserver {
public:
explicit ExtensionSyncService(Profile* profile);
+
+ ExtensionSyncService(const ExtensionSyncService&) = delete;
+ ExtensionSyncService& operator=(const ExtensionSyncService&) = delete;
+
~ExtensionSyncService() override;
// Convenience function to get the ExtensionSyncService for a BrowserContext.
@@ -153,8 +157,6 @@
// have started happening. It will cause sync to call us back
// asynchronously via MergeDataAndStartSyncing as soon as possible.
syncer::SyncableService::StartSyncFlare flare_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionSyncService);
};
#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYNC_SERVICE_H_
diff --git a/chrome/browser/extensions/extension_system_impl.h b/chrome/browser/extensions/extension_system_impl.h
index 0bf8fb2d..641fe1b2 100644
--- a/chrome/browser/extensions/extension_system_impl.h
+++ b/chrome/browser/extensions/extension_system_impl.h
@@ -46,6 +46,10 @@
using InstallUpdateCallback = ExtensionSystem::InstallUpdateCallback;
explicit ExtensionSystemImpl(Profile* profile);
+
+ ExtensionSystemImpl(const ExtensionSystemImpl&) = delete;
+ ExtensionSystemImpl& operator=(const ExtensionSystemImpl&) = delete;
+
~ExtensionSystemImpl() override;
// KeyedService implementation.
@@ -169,8 +173,6 @@
Profile* profile_;
Shared* shared_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionSystemImpl);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_tab_util_unittest.cc b/chrome/browser/extensions/extension_tab_util_unittest.cc
index e6dffeb8..585f6ac 100644
--- a/chrome/browser/extensions/extension_tab_util_unittest.cc
+++ b/chrome/browser/extensions/extension_tab_util_unittest.cc
@@ -18,6 +18,11 @@
class ExtensionTabUtilTestDelegate : public ExtensionTabUtil::Delegate {
public:
ExtensionTabUtilTestDelegate() {}
+
+ ExtensionTabUtilTestDelegate(const ExtensionTabUtilTestDelegate&) = delete;
+ ExtensionTabUtilTestDelegate& operator=(const ExtensionTabUtilTestDelegate&) =
+ delete;
+
~ExtensionTabUtilTestDelegate() override {}
// ExtensionTabUtil::Delegate
@@ -25,9 +30,6 @@
const Extension* extension) override {
return ExtensionTabUtil::kScrubTabUrlToOrigin;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ExtensionTabUtilTestDelegate);
};
} // namespace
diff --git a/chrome/browser/extensions/extension_unload_browsertest.cc b/chrome/browser/extensions/extension_unload_browsertest.cc
index 21dc75c..79ecdd6 100644
--- a/chrome/browser/extensions/extension_unload_browsertest.cc
+++ b/chrome/browser/extensions/extension_unload_browsertest.cc
@@ -40,6 +40,11 @@
: model_(model), desired_count_(0) {
model->AddObserver(this);
}
+
+ TestTabStripModelObserver(const TestTabStripModelObserver&) = delete;
+ TestTabStripModelObserver& operator=(const TestTabStripModelObserver&) =
+ delete;
+
~TestTabStripModelObserver() override = default;
void WaitForTabCount(int count) {
@@ -62,8 +67,6 @@
TabStripModel* model_;
int desired_count_;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(TestTabStripModelObserver);
};
} // namespace
diff --git a/chrome/browser/extensions/extension_view_host.h b/chrome/browser/extensions/extension_view_host.h
index b59769e..e3554c5 100644
--- a/chrome/browser/extensions/extension_view_host.h
+++ b/chrome/browser/extensions/extension_view_host.h
@@ -43,6 +43,10 @@
const GURL& url,
mojom::ViewType host_type,
Browser* browser);
+
+ ExtensionViewHost(const ExtensionViewHost&) = delete;
+ ExtensionViewHost& operator=(const ExtensionViewHost&) = delete;
+
~ExtensionViewHost() override;
Browser* browser() { return browser_; }
@@ -129,8 +133,6 @@
associated_web_contents_observer_;
content::NotificationRegistrar registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionViewHost);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_web_ui_override_registrar.h b/chrome/browser/extensions/extension_web_ui_override_registrar.h
index a943a90a..3326df30 100644
--- a/chrome/browser/extensions/extension_web_ui_override_registrar.h
+++ b/chrome/browser/extensions/extension_web_ui_override_registrar.h
@@ -22,6 +22,12 @@
public ExtensionRegistryObserver {
public:
explicit ExtensionWebUIOverrideRegistrar(content::BrowserContext* context);
+
+ ExtensionWebUIOverrideRegistrar(const ExtensionWebUIOverrideRegistrar&) =
+ delete;
+ ExtensionWebUIOverrideRegistrar& operator=(
+ const ExtensionWebUIOverrideRegistrar&) = delete;
+
~ExtensionWebUIOverrideRegistrar() override;
// BrowserContextKeyedAPI implementation.
@@ -54,8 +60,6 @@
extension_registry_observation_{this};
base::WeakPtrFactory<ExtensionWebUIOverrideRegistrar> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionWebUIOverrideRegistrar);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_with_management_policy_apitest.h b/chrome/browser/extensions/extension_with_management_policy_apitest.h
index baea1d8..1343500 100644
--- a/chrome/browser/extensions/extension_with_management_policy_apitest.h
+++ b/chrome/browser/extensions/extension_with_management_policy_apitest.h
@@ -24,6 +24,12 @@
: public extensions::ExtensionApiTest {
public:
ExtensionApiTestWithManagementPolicy();
+
+ ExtensionApiTestWithManagementPolicy(
+ const ExtensionApiTestWithManagementPolicy&) = delete;
+ ExtensionApiTestWithManagementPolicy& operator=(
+ const ExtensionApiTestWithManagementPolicy&) = delete;
+
~ExtensionApiTestWithManagementPolicy() override;
void SetUpInProcessBrowserTestFixture() override;
void SetUpOnMainThread() override;
@@ -36,8 +42,6 @@
private:
std::vector<ManagementPolicyRequestLog> request_log_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionApiTestWithManagementPolicy);
};
#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_WITH_MANAGEMENT_POLICY_APITEST_H_
diff --git a/chrome/browser/extensions/extensions_disabled_browsertest.cc b/chrome/browser/extensions/extensions_disabled_browsertest.cc
index 44ea228..729d1ee3 100644
--- a/chrome/browser/extensions/extensions_disabled_browsertest.cc
+++ b/chrome/browser/extensions/extensions_disabled_browsertest.cc
@@ -22,6 +22,11 @@
class ExtensionsDisabledBrowserTest : public ExtensionBrowserTest {
public:
ExtensionsDisabledBrowserTest() = default;
+
+ ExtensionsDisabledBrowserTest(const ExtensionsDisabledBrowserTest&) = delete;
+ ExtensionsDisabledBrowserTest& operator=(
+ const ExtensionsDisabledBrowserTest&) = delete;
+
~ExtensionsDisabledBrowserTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
// A little tricky: we disable extensions (via the commandline) on the
@@ -34,9 +39,6 @@
command_line->AppendSwitch(::switches::kDisableExtensions);
}
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ExtensionsDisabledBrowserTest);
};
// Tests installing a number of extensions, and then restarting Chrome with the
diff --git a/chrome/browser/extensions/external_install_error.cc b/chrome/browser/extensions/external_install_error.cc
index 65016ef..2ef56a8 100644
--- a/chrome/browser/extensions/external_install_error.cc
+++ b/chrome/browser/extensions/external_install_error.cc
@@ -82,6 +82,10 @@
class ExternalInstallMenuAlert : public GlobalError {
public:
explicit ExternalInstallMenuAlert(ExternalInstallError* error);
+
+ ExternalInstallMenuAlert(const ExternalInstallMenuAlert&) = delete;
+ ExternalInstallMenuAlert& operator=(const ExternalInstallMenuAlert&) = delete;
+
~ExternalInstallMenuAlert() override;
private:
@@ -101,8 +105,6 @@
// Provides menu item id for GlobalError.
ExtensionInstallErrorMenuItemIdProvider id_provider_;
-
- DISALLOW_COPY_AND_ASSIGN(ExternalInstallMenuAlert);
};
// A global error that spawns a bubble when the menu item is clicked.
@@ -110,6 +112,11 @@
public:
ExternalInstallBubbleAlert(ExternalInstallError* error,
ExtensionInstallPrompt::Prompt* prompt);
+
+ ExternalInstallBubbleAlert(const ExternalInstallBubbleAlert&) = delete;
+ ExternalInstallBubbleAlert& operator=(const ExternalInstallBubbleAlert&) =
+ delete;
+
~ExternalInstallBubbleAlert() override;
private:
@@ -137,8 +144,6 @@
// The Prompt with all information, which we then use to populate the bubble.
// Owned by |error|.
ExtensionInstallPrompt::Prompt* prompt_;
-
- DISALLOW_COPY_AND_ASSIGN(ExternalInstallBubbleAlert);
};
////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/extensions/external_install_error.h b/chrome/browser/extensions/external_install_error.h
index f2f560d..cc7359e 100644
--- a/chrome/browser/extensions/external_install_error.h
+++ b/chrome/browser/extensions/external_install_error.h
@@ -55,6 +55,10 @@
const std::string& extension_id,
AlertType error_type,
ExternalInstallManager* manager);
+
+ ExternalInstallError(const ExternalInstallError&) = delete;
+ ExternalInstallError& operator=(const ExternalInstallError&) = delete;
+
~ExternalInstallError() override;
void OnInstallPromptDone(ExtensionInstallPrompt::DoneCallbackPayload payload);
@@ -138,8 +142,6 @@
std::unique_ptr<WebstoreDataFetcher> webstore_data_fetcher_;
base::WeakPtrFactory<ExternalInstallError> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExternalInstallError);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/external_install_manager.h b/chrome/browser/extensions/external_install_manager.h
index 8ae864d..5d98b6a 100644
--- a/chrome/browser/extensions/external_install_manager.h
+++ b/chrome/browser/extensions/external_install_manager.h
@@ -32,6 +32,10 @@
public:
ExternalInstallManager(content::BrowserContext* browser_context,
bool is_first_run);
+
+ ExternalInstallManager(const ExternalInstallManager&) = delete;
+ ExternalInstallManager& operator=(const ExternalInstallManager&) = delete;
+
~ExternalInstallManager() override;
// Called when the associated profile will be destroyed.
@@ -122,8 +126,6 @@
base::ScopedObservation<ExtensionRegistry, ExtensionRegistryObserver>
extension_registry_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExternalInstallManager);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc
index a002a3b..1f90565e6 100644
--- a/chrome/browser/extensions/external_pref_loader.cc
+++ b/chrome/browser/extensions/external_pref_loader.cc
@@ -123,6 +123,9 @@
DCHECK(profile_);
}
+ PrioritySyncReadyWaiter(const PrioritySyncReadyWaiter&) = delete;
+ PrioritySyncReadyWaiter& operator=(const PrioritySyncReadyWaiter&) = delete;
+
~PrioritySyncReadyWaiter() override = default;
void Start(base::OnceClosure done_closure) {
@@ -235,8 +238,6 @@
syncable_pref_observation_{this};
base::ScopedObservation<syncer::SyncService, syncer::SyncServiceObserver>
sync_service_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PrioritySyncReadyWaiter);
};
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/extensions/external_pref_loader_unittest.cc b/chrome/browser/extensions/external_pref_loader_unittest.cc
index 54a84af5..6d2e1ead 100644
--- a/chrome/browser/extensions/external_pref_loader_unittest.cc
+++ b/chrome/browser/extensions/external_pref_loader_unittest.cc
@@ -38,6 +38,10 @@
class TestSyncService : public syncer::TestSyncService {
public:
TestSyncService() {}
+
+ TestSyncService(const TestSyncService&) = delete;
+ TestSyncService& operator=(const TestSyncService&) = delete;
+
~TestSyncService() override {}
// syncer::SyncService:
@@ -56,8 +60,6 @@
private:
syncer::SyncServiceObserver* observer_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(TestSyncService);
};
std::unique_ptr<KeyedService> TestingSyncFactoryFunction(
@@ -94,6 +96,10 @@
class ExternalPrefLoaderTest : public testing::Test {
public:
ExternalPrefLoaderTest() {}
+
+ ExternalPrefLoaderTest(const ExternalPrefLoaderTest&) = delete;
+ ExternalPrefLoaderTest& operator=(const ExternalPrefLoaderTest&) = delete;
+
~ExternalPrefLoaderTest() override {}
void SetUp() override {
@@ -114,8 +120,6 @@
content::BrowserTaskEnvironment task_environment_;
std::unique_ptr<TestingProfile> profile_;
TestSyncService* sync_service_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(ExternalPrefLoaderTest);
};
// TODO(lazyboy): Add a test to cover
diff --git a/chrome/browser/extensions/external_provider_impl.h b/chrome/browser/extensions/external_provider_impl.h
index 0f20160b..e69b549 100644
--- a/chrome/browser/extensions/external_provider_impl.h
+++ b/chrome/browser/extensions/external_provider_impl.h
@@ -45,6 +45,9 @@
mojom::ManifestLocation download_location,
int creation_flags);
+ ExternalProviderImpl(const ExternalProviderImpl&) = delete;
+ ExternalProviderImpl& operator=(const ExternalProviderImpl&) = delete;
+
~ExternalProviderImpl() override;
// Populates a list with providers for all known sources.
@@ -151,8 +154,6 @@
// Whether the provider should be allowed to update the set of external
// extensions it provides.
bool allow_updates_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ExternalProviderImpl);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc
index 5a9f5adb..7bf86b65d 100644
--- a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc
+++ b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc
@@ -56,6 +56,11 @@
: fake_user_manager_(new ash::FakeChromeUserManager()),
scoped_user_manager_(base::WrapUnique(fake_user_manager_)) {}
+ ExternalProviderImplChromeOSTest(const ExternalProviderImplChromeOSTest&) =
+ delete;
+ ExternalProviderImplChromeOSTest& operator=(
+ const ExternalProviderImplChromeOSTest&) = delete;
+
~ExternalProviderImplChromeOSTest() override {}
void InitServiceWithExternalProviders(bool standalone) {
@@ -142,8 +147,6 @@
chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider_;
ash::FakeChromeUserManager* fake_user_manager_;
user_manager::ScopedUserManager scoped_user_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(ExternalProviderImplChromeOSTest);
};
} // namespace
diff --git a/chrome/browser/extensions/external_provider_impl_unittest.cc b/chrome/browser/extensions/external_provider_impl_unittest.cc
index c15c3ef..cd80ea0 100644
--- a/chrome/browser/extensions/external_provider_impl_unittest.cc
+++ b/chrome/browser/extensions/external_provider_impl_unittest.cc
@@ -95,6 +95,10 @@
class ExternalProviderImplTest : public ExtensionServiceTestBase {
public:
ExternalProviderImplTest() {}
+
+ ExternalProviderImplTest(const ExternalProviderImplTest&) = delete;
+ ExternalProviderImplTest& operator=(const ExternalProviderImplTest&) = delete;
+
~ExternalProviderImplTest() override {}
void InitService() {
@@ -248,8 +252,6 @@
base::win::RegKey external_extension_key_;
registry_util::RegistryOverrideManager registry_override_manager_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(ExternalProviderImplTest);
};
} // namespace
diff --git a/chrome/browser/extensions/external_registry_loader_win_unittest.cc b/chrome/browser/extensions/external_registry_loader_win_unittest.cc
index 08de7b0..9f7c69b 100644
--- a/chrome/browser/extensions/external_registry_loader_win_unittest.cc
+++ b/chrome/browser/extensions/external_registry_loader_win_unittest.cc
@@ -67,6 +67,12 @@
class ExternalRegistryLoaderUnittest : public testing::Test {
public:
ExternalRegistryLoaderUnittest() {}
+
+ ExternalRegistryLoaderUnittest(const ExternalRegistryLoaderUnittest&) =
+ delete;
+ ExternalRegistryLoaderUnittest& operator=(
+ const ExternalRegistryLoaderUnittest&) = delete;
+
~ExternalRegistryLoaderUnittest() override {}
protected:
@@ -74,8 +80,6 @@
private:
content::BrowserTaskEnvironment task_environment_;
-
- DISALLOW_COPY_AND_ASSIGN(ExternalRegistryLoaderUnittest);
};
// Tests that calling StartLoading() more than once doesn't fail DCHECK.
diff --git a/chrome/browser/extensions/global_shortcut_listener.h b/chrome/browser/extensions/global_shortcut_listener.h
index 9aec54a..554930bc3 100644
--- a/chrome/browser/extensions/global_shortcut_listener.h
+++ b/chrome/browser/extensions/global_shortcut_listener.h
@@ -27,6 +27,9 @@
virtual void OnKeyPressed(const ui::Accelerator& accelerator) = 0;
};
+ GlobalShortcutListener(const GlobalShortcutListener&) = delete;
+ GlobalShortcutListener& operator=(const GlobalShortcutListener&) = delete;
+
virtual ~GlobalShortcutListener();
static GlobalShortcutListener* GetInstance();
@@ -90,8 +93,6 @@
// Keeps track of whether shortcut handling is currently suspended.
bool shortcut_handling_suspended_;
-
- DISALLOW_COPY_AND_ASSIGN(GlobalShortcutListener);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/global_shortcut_listener_mac.h b/chrome/browser/extensions/global_shortcut_listener_mac.h
index af972bb..f54709d 100644
--- a/chrome/browser/extensions/global_shortcut_listener_mac.h
+++ b/chrome/browser/extensions/global_shortcut_listener_mac.h
@@ -31,6 +31,11 @@
public ui::MediaKeysListener::Delegate {
public:
GlobalShortcutListenerMac();
+
+ GlobalShortcutListenerMac(const GlobalShortcutListenerMac&) = delete;
+ GlobalShortcutListenerMac& operator=(const GlobalShortcutListenerMac&) =
+ delete;
+
~GlobalShortcutListenerMac() override;
private:
@@ -88,8 +93,6 @@
// Media keys listener.
std::unique_ptr<ui::MediaKeysListener> media_keys_listener_;
-
- DISALLOW_COPY_AND_ASSIGN(GlobalShortcutListenerMac);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/global_shortcut_listener_ozone.h b/chrome/browser/extensions/global_shortcut_listener_ozone.h
index 2765564..866c4e6c 100644
--- a/chrome/browser/extensions/global_shortcut_listener_ozone.h
+++ b/chrome/browser/extensions/global_shortcut_listener_ozone.h
@@ -28,6 +28,11 @@
public ui::PlatformGlobalShortcutListenerDelegate {
public:
GlobalShortcutListenerOzone();
+
+ GlobalShortcutListenerOzone(const GlobalShortcutListenerOzone&) = delete;
+ GlobalShortcutListenerOzone& operator=(const GlobalShortcutListenerOzone&) =
+ delete;
+
~GlobalShortcutListenerOzone() override;
private:
@@ -50,8 +55,6 @@
// The platform implementation.
ui::PlatformGlobalShortcutListener* platform_global_shortcut_listener_ =
nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(GlobalShortcutListenerOzone);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/global_shortcut_listener_win.h b/chrome/browser/extensions/global_shortcut_listener_win.h
index d7b245a..2af68b0 100644
--- a/chrome/browser/extensions/global_shortcut_listener_win.h
+++ b/chrome/browser/extensions/global_shortcut_listener_win.h
@@ -28,6 +28,11 @@
public ui::MediaKeysListener::Delegate {
public:
GlobalShortcutListenerWin();
+
+ GlobalShortcutListenerWin(const GlobalShortcutListenerWin&) = delete;
+ GlobalShortcutListenerWin& operator=(const GlobalShortcutListenerWin&) =
+ delete;
+
~GlobalShortcutListenerWin() override;
private:
@@ -54,8 +59,6 @@
using HotKeyMap = std::map<ui::Accelerator,
std::unique_ptr<gfx::SingletonHwndHotKeyObserver>>;
HotKeyMap hotkeys_;
-
- DISALLOW_COPY_AND_ASSIGN(GlobalShortcutListenerWin);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/install_signer.h b/chrome/browser/extensions/install_signer.h
index a398a42..f57a3a5 100644
--- a/chrome/browser/extensions/install_signer.h
+++ b/chrome/browser/extensions/install_signer.h
@@ -72,6 +72,10 @@
InstallSigner(
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
const ExtensionIdSet& ids);
+
+ InstallSigner(const InstallSigner&) = delete;
+ InstallSigner& operator=(const InstallSigner&) = delete;
+
~InstallSigner();
// Returns a set of ids that are forced to be considered not from webstore,
@@ -120,8 +124,6 @@
// The time the request to the server was started.
base::Time request_start_time_;
-
- DISALLOW_COPY_AND_ASSIGN(InstallSigner);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/install_tracker.h b/chrome/browser/extensions/install_tracker.h
index f3645d4..8dc5390 100644
--- a/chrome/browser/extensions/install_tracker.h
+++ b/chrome/browser/extensions/install_tracker.h
@@ -35,6 +35,10 @@
public:
InstallTracker(content::BrowserContext* browser_context,
extensions::ExtensionPrefs* prefs);
+
+ InstallTracker(const InstallTracker&) = delete;
+ InstallTracker& operator=(const InstallTracker&) = delete;
+
~InstallTracker() override;
static InstallTracker* Get(content::BrowserContext* context);
@@ -99,8 +103,6 @@
PrefChangeRegistrar pref_change_registrar_;
base::ScopedObservation<ExtensionRegistry, ExtensionRegistryObserver>
extension_registry_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(InstallTracker);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/install_verifier.h b/chrome/browser/extensions/install_verifier.h
index 9a5eb16..1c3ba0a 100644
--- a/chrome/browser/extensions/install_verifier.h
+++ b/chrome/browser/extensions/install_verifier.h
@@ -40,6 +40,10 @@
public ManagementPolicy::Provider {
public:
InstallVerifier(ExtensionPrefs* prefs, content::BrowserContext* context);
+
+ InstallVerifier(const InstallVerifier&) = delete;
+ InstallVerifier& operator=(const InstallVerifier&) = delete;
+
~InstallVerifier() override;
// Convenience method to return the InstallVerifier for a given |context|.
@@ -174,8 +178,6 @@
ExtensionIdSet provisional_;
base::WeakPtrFactory<InstallVerifier> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(InstallVerifier);
};
// Instances of this class can be constructed to disable install verification
@@ -188,13 +190,17 @@
};
explicit ScopedInstallVerifierBypassForTest(ForceType force_type = kForceOff);
+
+ ScopedInstallVerifierBypassForTest(
+ const ScopedInstallVerifierBypassForTest&) = delete;
+ ScopedInstallVerifierBypassForTest& operator=(
+ const ScopedInstallVerifierBypassForTest&) = delete;
+
~ScopedInstallVerifierBypassForTest();
private:
ForceType value_;
ForceType* old_value_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedInstallVerifierBypassForTest);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/install_verifier_unittest.cc b/chrome/browser/extensions/install_verifier_unittest.cc
index c7dc3a0..d55ee26 100644
--- a/chrome/browser/extensions/install_verifier_unittest.cc
+++ b/chrome/browser/extensions/install_verifier_unittest.cc
@@ -26,6 +26,10 @@
class InstallVerifierTest : public ExtensionServiceTestBase {
public:
InstallVerifierTest() = default;
+
+ InstallVerifierTest(const InstallVerifierTest&) = delete;
+ InstallVerifierTest& operator=(const InstallVerifierTest&) = delete;
+
~InstallVerifierTest() override = default;
void SetUp() override {
@@ -50,8 +54,6 @@
ScopedInstallVerifierBypassForTest::kForceOn};
std::unique_ptr<ExtensionManagement> extension_management_;
std::unique_ptr<TestingPrefServiceSimple> pref_service_;
-
- DISALLOW_COPY_AND_ASSIGN(InstallVerifierTest);
};
// Test the behavior of the InstallVerifier for various extensions.
diff --git a/chrome/browser/extensions/installed_loader_unittest.cc b/chrome/browser/extensions/installed_loader_unittest.cc
index e984fed..53762ab 100644
--- a/chrome/browser/extensions/installed_loader_unittest.cc
+++ b/chrome/browser/extensions/installed_loader_unittest.cc
@@ -63,6 +63,10 @@
class InstalledLoaderUnitTest : public ExtensionServiceTestBase {
public:
InstalledLoaderUnitTest() {}
+
+ InstalledLoaderUnitTest(const InstalledLoaderUnitTest&) = delete;
+ InstalledLoaderUnitTest& operator=(const InstalledLoaderUnitTest&) = delete;
+
~InstalledLoaderUnitTest() override = default;
void SetUp() override {
@@ -74,9 +78,6 @@
mojom::ManifestLocation location);
void RunHostPermissionsMetricsTest(HostPermissionsMetricsTestParams params);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(InstalledLoaderUnitTest);
};
const Extension* InstalledLoaderUnitTest::AddExtension(
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc
index 602be68e..647e328 100644
--- a/chrome/browser/extensions/lazy_background_page_apitest.cc
+++ b/chrome/browser/extensions/lazy_background_page_apitest.cc
@@ -105,6 +105,11 @@
class LazyBackgroundPageApiTest : public ExtensionApiTest {
public:
LazyBackgroundPageApiTest() {}
+
+ LazyBackgroundPageApiTest(const LazyBackgroundPageApiTest&) = delete;
+ LazyBackgroundPageApiTest& operator=(const LazyBackgroundPageApiTest&) =
+ delete;
+
~LazyBackgroundPageApiTest() override {}
void SetUpInProcessBrowserTestFixture() override {
@@ -158,9 +163,6 @@
extension->id().c_str()),
browser(), api_test_utils::NONE);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LazyBackgroundPageApiTest);
};
IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, BrowserActionCreateTab) {
@@ -709,6 +711,12 @@
: public LazyBackgroundPageApiTest {
public:
PictureInPictureLazyBackgroundPageApiTest() = default;
+
+ PictureInPictureLazyBackgroundPageApiTest(
+ const PictureInPictureLazyBackgroundPageApiTest&) = delete;
+ PictureInPictureLazyBackgroundPageApiTest& operator=(
+ const PictureInPictureLazyBackgroundPageApiTest&) = delete;
+
~PictureInPictureLazyBackgroundPageApiTest() override {}
void SetUpInProcessBrowserTestFixture() override {
@@ -717,9 +725,6 @@
ProcessManager::SetEventPageIdleTimeForTesting(2000);
ProcessManager::SetEventPageSuspendingTimeForTesting(2000);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PictureInPictureLazyBackgroundPageApiTest);
};
// Tests that the lazy background page stays alive while a video is playing in
diff --git a/chrome/browser/extensions/manifest_v3_browsertest.cc b/chrome/browser/extensions/manifest_v3_browsertest.cc
index dc2a2a8..791525a 100644
--- a/chrome/browser/extensions/manifest_v3_browsertest.cc
+++ b/chrome/browser/extensions/manifest_v3_browsertest.cc
@@ -28,6 +28,10 @@
class ManifestV3BrowserTest : public ExtensionBrowserTest {
public:
ManifestV3BrowserTest() {}
+
+ ManifestV3BrowserTest(const ManifestV3BrowserTest&) = delete;
+ ManifestV3BrowserTest& operator=(const ManifestV3BrowserTest&) = delete;
+
~ManifestV3BrowserTest() override {}
void SetUpOnMainThread() override {
@@ -38,8 +42,6 @@
private:
ScopedCurrentChannel channel_override_{version_info::Channel::UNKNOWN};
-
- DISALLOW_COPY_AND_ASSIGN(ManifestV3BrowserTest);
};
IN_PROC_BROWSER_TEST_F(ManifestV3BrowserTest, ProgrammaticScriptInjection) {
diff --git a/chrome/browser/extensions/menu_manager.h b/chrome/browser/extensions/menu_manager.h
index 779f474..6e44a6d 100644
--- a/chrome/browser/extensions/menu_manager.h
+++ b/chrome/browser/extensions/menu_manager.h
@@ -300,6 +300,10 @@
};
MenuManager(content::BrowserContext* context, StateStore* store_);
+
+ MenuManager(const MenuManager&) = delete;
+ MenuManager& operator=(const MenuManager&) = delete;
+
~MenuManager() override;
// Convenience function to get the MenuManager for a browser context.
@@ -430,8 +434,6 @@
StateStore* store_;
base::ObserverList<TestObserver> observers_;
-
- DISALLOW_COPY_AND_ASSIGN(MenuManager);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/native_bindings_apitest.cc b/chrome/browser/extensions/native_bindings_apitest.cc
index f508275..ea1c6be0 100644
--- a/chrome/browser/extensions/native_bindings_apitest.cc
+++ b/chrome/browser/extensions/native_bindings_apitest.cc
@@ -34,6 +34,10 @@
class NativeBindingsApiTest : public ExtensionApiTest {
public:
NativeBindingsApiTest() {}
+
+ NativeBindingsApiTest(const NativeBindingsApiTest&) = delete;
+ NativeBindingsApiTest& operator=(const NativeBindingsApiTest&) = delete;
+
~NativeBindingsApiTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -48,9 +52,6 @@
ExtensionApiTest::SetUpOnMainThread();
host_resolver()->AddRule("*", "127.0.0.1");
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NativeBindingsApiTest);
};
IN_PROC_BROWSER_TEST_F(NativeBindingsApiTest, SimpleEndToEndTest) {
diff --git a/chrome/browser/extensions/navigation_observer.h b/chrome/browser/extensions/navigation_observer.h
index e1f60fbd..a579f32 100644
--- a/chrome/browser/extensions/navigation_observer.h
+++ b/chrome/browser/extensions/navigation_observer.h
@@ -34,6 +34,10 @@
public ExtensionRegistryObserver {
public:
explicit NavigationObserver(Profile* profile);
+
+ NavigationObserver(const NavigationObserver&) = delete;
+ NavigationObserver& operator=(const NavigationObserver&) = delete;
+
~NavigationObserver() override;
// content::NotificationObserver
@@ -80,8 +84,6 @@
extension_registry_observation_{this};
base::WeakPtrFactory<NavigationObserver> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NavigationObserver);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/pending_extension_manager.h b/chrome/browser/extensions/pending_extension_manager.h
index 4b9373e7..b09ca74 100644
--- a/chrome/browser/extensions/pending_extension_manager.h
+++ b/chrome/browser/extensions/pending_extension_manager.h
@@ -88,6 +88,10 @@
};
explicit PendingExtensionManager(content::BrowserContext* context);
+
+ PendingExtensionManager(const PendingExtensionManager&) = delete;
+ PendingExtensionManager& operator=(const PendingExtensionManager&) = delete;
+
~PendingExtensionManager();
// TODO(skerner): Many of these methods can be private once code in
@@ -222,8 +226,6 @@
friend void SetupPendingExtensionManagerForTest(
int count, const GURL& update_url,
PendingExtensionManager* pending_extension_manager);
-
- DISALLOW_COPY_AND_ASSIGN(PendingExtensionManager);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/permission_message_combinations_unittest.cc b/chrome/browser/extensions/permission_message_combinations_unittest.cc
index c3518b5..ade57280 100644
--- a/chrome/browser/extensions/permission_message_combinations_unittest.cc
+++ b/chrome/browser/extensions/permission_message_combinations_unittest.cc
@@ -31,6 +31,12 @@
PermissionMessageCombinationsUnittest()
: message_provider_(new ChromePermissionMessageProvider()),
allowlisted_extension_id_(kAllowlistedExtensionID) {}
+
+ PermissionMessageCombinationsUnittest(
+ const PermissionMessageCombinationsUnittest&) = delete;
+ PermissionMessageCombinationsUnittest& operator=(
+ const PermissionMessageCombinationsUnittest&) = delete;
+
~PermissionMessageCombinationsUnittest() override {}
// Overridden from testing::Test:
@@ -205,8 +211,6 @@
// Add a known extension id to the explicit allowlist so we can test all
// permissions. This ID will be used for each test app.
SimpleFeature::ScopedThreadUnsafeAllowlistForTest allowlisted_extension_id_;
-
- DISALLOW_COPY_AND_ASSIGN(PermissionMessageCombinationsUnittest);
};
// Test that the USB, Bluetooth and Serial permissions do not coalesce on their
diff --git a/chrome/browser/extensions/permission_messages_unittest.cc b/chrome/browser/extensions/permission_messages_unittest.cc
index 509b8e3..90fdb4a 100644
--- a/chrome/browser/extensions/permission_messages_unittest.cc
+++ b/chrome/browser/extensions/permission_messages_unittest.cc
@@ -52,6 +52,11 @@
public:
PermissionMessagesUnittest()
: message_provider_(new ChromePermissionMessageProvider()) {}
+
+ PermissionMessagesUnittest(const PermissionMessagesUnittest&) = delete;
+ PermissionMessagesUnittest& operator=(const PermissionMessagesUnittest&) =
+ delete;
+
~PermissionMessagesUnittest() override {}
protected:
@@ -114,8 +119,6 @@
extensions::TestExtensionEnvironment env_;
std::unique_ptr<ChromePermissionMessageProvider> message_provider_;
scoped_refptr<const Extension> app_;
-
- DISALLOW_COPY_AND_ASSIGN(PermissionMessagesUnittest);
};
// If an app has both the 'history' and 'tabs' permission, one should hide the
diff --git a/chrome/browser/extensions/permissions_based_management_policy_provider.h b/chrome/browser/extensions/permissions_based_management_policy_provider.h
index dad65f0..649f759 100644
--- a/chrome/browser/extensions/permissions_based_management_policy_provider.h
+++ b/chrome/browser/extensions/permissions_based_management_policy_provider.h
@@ -23,6 +23,12 @@
public:
explicit PermissionsBasedManagementPolicyProvider(
ExtensionManagement* settings);
+
+ PermissionsBasedManagementPolicyProvider(
+ const PermissionsBasedManagementPolicyProvider&) = delete;
+ PermissionsBasedManagementPolicyProvider& operator=(
+ const PermissionsBasedManagementPolicyProvider&) = delete;
+
~PermissionsBasedManagementPolicyProvider() override;
// ManagementPolicy::Provider implementation.
@@ -32,8 +38,6 @@
private:
ExtensionManagement* settings_;
-
- DISALLOW_COPY_AND_ASSIGN(PermissionsBasedManagementPolicyProvider);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/permissions_updater.h b/chrome/browser/extensions/permissions_updater.h
index 17d70995..322ccea 100644
--- a/chrome/browser/extensions/permissions_updater.h
+++ b/chrome/browser/extensions/permissions_updater.h
@@ -67,6 +67,10 @@
explicit PermissionsUpdater(content::BrowserContext* browser_context);
PermissionsUpdater(content::BrowserContext* browser_context,
InitFlag init_flag);
+
+ PermissionsUpdater(const PermissionsUpdater&) = delete;
+ PermissionsUpdater& operator=(const PermissionsUpdater&) = delete;
+
~PermissionsUpdater();
// Sets a delegate to provide platform-specific logic. This should be set
@@ -235,8 +239,6 @@
// Initialization flag that determines whether prefs is consulted about the
// extension. Transient extensions should not have entries in prefs.
InitFlag init_flag_;
-
- DISALLOW_COPY_AND_ASSIGN(PermissionsUpdater);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/permissions_updater_unittest.cc b/chrome/browser/extensions/permissions_updater_unittest.cc
index 76b4513f..fda0295 100644
--- a/chrome/browser/extensions/permissions_updater_unittest.cc
+++ b/chrome/browser/extensions/permissions_updater_unittest.cc
@@ -131,6 +131,12 @@
class PermissionsUpdaterTestDelegate : public PermissionsUpdater::Delegate {
public:
PermissionsUpdaterTestDelegate() {}
+
+ PermissionsUpdaterTestDelegate(const PermissionsUpdaterTestDelegate&) =
+ delete;
+ PermissionsUpdaterTestDelegate& operator=(
+ const PermissionsUpdaterTestDelegate&) = delete;
+
~PermissionsUpdaterTestDelegate() override {}
// PermissionsUpdater::Delegate
@@ -145,9 +151,6 @@
std::move(api_permission_set), ManifestPermissionSet(), URLPatternSet(),
URLPatternSet());
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PermissionsUpdaterTestDelegate);
};
} // namespace
diff --git a/chrome/browser/extensions/plugin_manager.h b/chrome/browser/extensions/plugin_manager.h
index 0d63441..b7d33d8 100644
--- a/chrome/browser/extensions/plugin_manager.h
+++ b/chrome/browser/extensions/plugin_manager.h
@@ -26,6 +26,10 @@
public ExtensionRegistryObserver {
public:
explicit PluginManager(content::BrowserContext* context);
+
+ PluginManager(const PluginManager&) = delete;
+ PluginManager& operator=(const PluginManager&) = delete;
+
~PluginManager() override;
// BrowserContextKeyedAPI implementation.
@@ -71,8 +75,6 @@
// Listen to extension load, unloaded notifications.
base::ScopedObservation<ExtensionRegistry, ExtensionRegistryObserver>
extension_registry_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PluginManager);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/policy_extension_reinstaller.h b/chrome/browser/extensions/policy_extension_reinstaller.h
index e6a28652..7954963 100644
--- a/chrome/browser/extensions/policy_extension_reinstaller.h
+++ b/chrome/browser/extensions/policy_extension_reinstaller.h
@@ -27,6 +27,11 @@
base::TimeDelta delay)>;
explicit PolicyExtensionReinstaller(content::BrowserContext* context);
+
+ PolicyExtensionReinstaller(const PolicyExtensionReinstaller&) = delete;
+ PolicyExtensionReinstaller& operator=(const PolicyExtensionReinstaller&) =
+ delete;
+
~PolicyExtensionReinstaller();
// Notifies this reinstaller about a policy extension corruption.
@@ -47,8 +52,6 @@
bool scheduled_fire_pending_ = false;
base::WeakPtrFactory<PolicyExtensionReinstaller> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PolicyExtensionReinstaller);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/policy_extension_reinstaller_unittest.cc b/chrome/browser/extensions/policy_extension_reinstaller_unittest.cc
index bb793b2..dbc8795 100644
--- a/chrome/browser/extensions/policy_extension_reinstaller_unittest.cc
+++ b/chrome/browser/extensions/policy_extension_reinstaller_unittest.cc
@@ -28,6 +28,10 @@
base::Unretained(this))) {
PolicyExtensionReinstaller::set_policy_reinstall_action_for_test(&action_);
}
+
+ TestReinstallerTracker(const TestReinstallerTracker&) = delete;
+ TestReinstallerTracker& operator=(const TestReinstallerTracker&) = delete;
+
~TestReinstallerTracker() {
PolicyExtensionReinstaller::set_policy_reinstall_action_for_test(nullptr);
}
@@ -50,8 +54,6 @@
int call_count_ = 0;
absl::optional<base::OnceClosure> saved_callback_;
PolicyExtensionReinstaller::ReinstallCallback action_;
-
- DISALLOW_COPY_AND_ASSIGN(TestReinstallerTracker);
};
using PolicyExtensionReinstallerUnittest = ExtensionServiceTestBase;
diff --git a/chrome/browser/extensions/policy_handlers.h b/chrome/browser/extensions/policy_handlers.h
index 3a9e612e..d5df2b79 100644
--- a/chrome/browser/extensions/policy_handlers.h
+++ b/chrome/browser/extensions/policy_handlers.h
@@ -23,6 +23,11 @@
ExtensionListPolicyHandler(const char* policy_name,
const char* pref_path,
bool allow_wildcards);
+
+ ExtensionListPolicyHandler(const ExtensionListPolicyHandler&) = delete;
+ ExtensionListPolicyHandler& operator=(const ExtensionListPolicyHandler&) =
+ delete;
+
~ExtensionListPolicyHandler() override;
protected:
@@ -37,8 +42,6 @@
private:
const char* pref_path_;
bool allow_wildcards_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionListPolicyHandler);
};
// Class for parsing the list of extensions to force install.
@@ -72,6 +75,12 @@
public:
ExtensionURLPatternListPolicyHandler(const char* policy_name,
const char* pref_path);
+
+ ExtensionURLPatternListPolicyHandler(
+ const ExtensionURLPatternListPolicyHandler&) = delete;
+ ExtensionURLPatternListPolicyHandler& operator=(
+ const ExtensionURLPatternListPolicyHandler&) = delete;
+
~ExtensionURLPatternListPolicyHandler() override;
// ConfigurationPolicyHandler methods:
@@ -82,14 +91,18 @@
private:
const char* pref_path_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionURLPatternListPolicyHandler);
};
class ExtensionSettingsPolicyHandler
: public policy::SchemaValidatingPolicyHandler {
public:
explicit ExtensionSettingsPolicyHandler(const policy::Schema& chrome_schema);
+
+ ExtensionSettingsPolicyHandler(const ExtensionSettingsPolicyHandler&) =
+ delete;
+ ExtensionSettingsPolicyHandler& operator=(
+ const ExtensionSettingsPolicyHandler&) = delete;
+
~ExtensionSettingsPolicyHandler() override;
// ConfigurationPolicyHandler methods:
@@ -104,8 +117,6 @@
// dictionary. Validation errors are stored in |errors| if non-null.
void SanitizePolicySettings(base::Value* dict_value,
policy::PolicyErrorMap* errors);
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsPolicyHandler);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/proxy_overridden_bubble_delegate.h b/chrome/browser/extensions/proxy_overridden_bubble_delegate.h
index 37f2873..ca75ed9 100644
--- a/chrome/browser/extensions/proxy_overridden_bubble_delegate.h
+++ b/chrome/browser/extensions/proxy_overridden_bubble_delegate.h
@@ -18,6 +18,11 @@
: public ExtensionMessageBubbleController::Delegate {
public:
explicit ProxyOverriddenBubbleDelegate(Profile* profile);
+
+ ProxyOverriddenBubbleDelegate(const ProxyOverriddenBubbleDelegate&) = delete;
+ ProxyOverriddenBubbleDelegate& operator=(
+ const ProxyOverriddenBubbleDelegate&) = delete;
+
~ProxyOverriddenBubbleDelegate() override;
// ExtensionMessageBubbleController::Delegate methods.
@@ -48,8 +53,6 @@
// The ID of the extension we are showing the bubble for.
std::string extension_id_;
-
- DISALLOW_COPY_AND_ASSIGN(ProxyOverriddenBubbleDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/scoped_active_install.h b/chrome/browser/extensions/scoped_active_install.h
index 27b5bd3d..eb2470e 100644
--- a/chrome/browser/extensions/scoped_active_install.h
+++ b/chrome/browser/extensions/scoped_active_install.h
@@ -27,6 +27,9 @@
// is still deregistered upon destruction.
ScopedActiveInstall(InstallTracker* tracker, const std::string& extension_id);
+ ScopedActiveInstall(const ScopedActiveInstall&) = delete;
+ ScopedActiveInstall& operator=(const ScopedActiveInstall&) = delete;
+
~ScopedActiveInstall() override;
// Ensures that the active install is not deregistered upon destruction. This
@@ -44,8 +47,6 @@
base::ScopedObservation<InstallTracker, InstallObserver> tracker_observation_{
this};
const std::string extension_id_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedActiveInstall);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/scripting_permissions_modifier.h b/chrome/browser/extensions/scripting_permissions_modifier.h
index 833aa6f..90fe0cc6 100644
--- a/chrome/browser/extensions/scripting_permissions_modifier.h
+++ b/chrome/browser/extensions/scripting_permissions_modifier.h
@@ -46,6 +46,11 @@
ScriptingPermissionsModifier(content::BrowserContext* browser_context,
const scoped_refptr<const Extension>& extension);
+
+ ScriptingPermissionsModifier(const ScriptingPermissionsModifier&) = delete;
+ ScriptingPermissionsModifier& operator=(const ScriptingPermissionsModifier&) =
+ delete;
+
~ScriptingPermissionsModifier();
// Sets whether Chrome should withhold host permissions from the extension.
@@ -132,8 +137,6 @@
scoped_refptr<const Extension> extension_;
ExtensionPrefs* extension_prefs_;
-
- DISALLOW_COPY_AND_ASSIGN(ScriptingPermissionsModifier);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/service_worker_apitest.cc b/chrome/browser/extensions/service_worker_apitest.cc
index f21b0c7..d09f65c 100644
--- a/chrome/browser/extensions/service_worker_apitest.cc
+++ b/chrome/browser/extensions/service_worker_apitest.cc
@@ -253,6 +253,12 @@
class ServiceWorkerBasedBackgroundTest : public ServiceWorkerTest {
public:
ServiceWorkerBasedBackgroundTest() = default;
+
+ ServiceWorkerBasedBackgroundTest(const ServiceWorkerBasedBackgroundTest&) =
+ delete;
+ ServiceWorkerBasedBackgroundTest& operator=(
+ const ServiceWorkerBasedBackgroundTest&) = delete;
+
~ServiceWorkerBasedBackgroundTest() override {}
void SetUpOnMainThread() override {
@@ -292,9 +298,6 @@
}
return false;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ServiceWorkerBasedBackgroundTest);
};
// A specialization of ExtensionSettingsApiTest that pretends it's running
@@ -319,6 +322,12 @@
: public ServiceWorkerBasedBackgroundTest {
public:
ServiceWorkerBasedBackgroundTestWithNotification() {}
+
+ ServiceWorkerBasedBackgroundTestWithNotification(
+ const ServiceWorkerBasedBackgroundTestWithNotification&) = delete;
+ ServiceWorkerBasedBackgroundTestWithNotification& operator=(
+ const ServiceWorkerBasedBackgroundTestWithNotification&) = delete;
+
~ServiceWorkerBasedBackgroundTestWithNotification() override = default;
void SetUpOnMainThread() override {
@@ -342,9 +351,6 @@
}
std::unique_ptr<NotificationDisplayServiceTester> display_service_tester_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ServiceWorkerBasedBackgroundTestWithNotification);
};
enum class ManifestVersion { kTwo, kThree };
@@ -655,6 +661,12 @@
explicit ServiceWorkerWithEarlyMessageListenerTest(
const std::string& test_message)
: test_message_(test_message) {}
+
+ ServiceWorkerWithEarlyMessageListenerTest(
+ const ServiceWorkerWithEarlyMessageListenerTest&) = delete;
+ ServiceWorkerWithEarlyMessageListenerTest& operator=(
+ const ServiceWorkerWithEarlyMessageListenerTest&) = delete;
+
~ServiceWorkerWithEarlyMessageListenerTest() override = default;
bool WaitForMessage() { return listener_->WaitUntilSatisfied(); }
@@ -670,8 +682,6 @@
private:
const std::string test_message_;
std::unique_ptr<ExtensionTestMessageListener> listener_;
-
- DISALLOW_COPY_AND_ASSIGN(ServiceWorkerWithEarlyMessageListenerTest);
};
class ServiceWorkerOnStartupEventTest
@@ -679,10 +689,13 @@
public:
ServiceWorkerOnStartupEventTest()
: ServiceWorkerWithEarlyMessageListenerTest("onStartup event") {}
- ~ServiceWorkerOnStartupEventTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(ServiceWorkerOnStartupEventTest);
+ ServiceWorkerOnStartupEventTest(const ServiceWorkerOnStartupEventTest&) =
+ delete;
+ ServiceWorkerOnStartupEventTest& operator=(
+ const ServiceWorkerOnStartupEventTest&) = delete;
+
+ ~ServiceWorkerOnStartupEventTest() override = default;
};
// Tests "runtime.onStartup" for extension SW.
@@ -705,6 +718,12 @@
: ServiceWorkerWithEarlyMessageListenerTest("WORKER_RUNNING") {
ServiceWorkerTaskQueue::SetObserverForTest(this);
}
+
+ ServiceWorkerRegistrationAtStartupTest(
+ const ServiceWorkerRegistrationAtStartupTest&) = delete;
+ ServiceWorkerRegistrationAtStartupTest& operator=(
+ const ServiceWorkerRegistrationAtStartupTest&) = delete;
+
~ServiceWorkerRegistrationAtStartupTest() override {
ServiceWorkerTaskQueue::SetObserverForTest(nullptr);
}
@@ -740,8 +759,6 @@
bool extension_activated_ = false;
absl::optional<bool> will_register_service_worker_;
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(ServiceWorkerRegistrationAtStartupTest);
};
// Observes ServiceWorkerTaskQueue::DidStartWorkerFail.
@@ -841,6 +858,9 @@
event_router_->RegisterObserver(this, event_->event_name);
}
+ EarlyWorkerMessageSender(const EarlyWorkerMessageSender&) = delete;
+ EarlyWorkerMessageSender& operator=(const EarlyWorkerMessageSender&) = delete;
+
~EarlyWorkerMessageSender() override {
event_router_->UnregisterObserver(this);
}
@@ -875,8 +895,6 @@
const ExtensionId extension_id_;
std::unique_ptr<Event> event_;
ExtensionTestMessageListener listener_;
-
- DISALLOW_COPY_AND_ASSIGN(EarlyWorkerMessageSender);
};
// Tests that extension event dispatch works correctly right after extension
@@ -937,6 +955,12 @@
class ServiceWorkerBackgroundSyncTest : public ServiceWorkerTest {
public:
ServiceWorkerBackgroundSyncTest() {}
+
+ ServiceWorkerBackgroundSyncTest(const ServiceWorkerBackgroundSyncTest&) =
+ delete;
+ ServiceWorkerBackgroundSyncTest& operator=(
+ const ServiceWorkerBackgroundSyncTest&) = delete;
+
~ServiceWorkerBackgroundSyncTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -950,9 +974,6 @@
content::background_sync_test_util::SetIgnoreNetworkChanges(true);
ServiceWorkerTest::SetUp();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ServiceWorkerBackgroundSyncTest);
};
class ServiceWorkerPushMessagingTest : public ServiceWorkerTest {
@@ -966,6 +987,11 @@
features::kPushMessagingDisallowSenderIDs);
}
+ ServiceWorkerPushMessagingTest(const ServiceWorkerPushMessagingTest&) =
+ delete;
+ ServiceWorkerPushMessagingTest& operator=(
+ const ServiceWorkerPushMessagingTest&) = delete;
+
~ServiceWorkerPushMessagingTest() override {}
void GrantNotificationPermissionForTest(const GURL& url) {
@@ -1018,13 +1044,17 @@
instance_id::FakeGCMDriverForInstanceID* gcm_driver_;
PushMessagingServiceImpl* push_service_;
-
- DISALLOW_COPY_AND_ASSIGN(ServiceWorkerPushMessagingTest);
};
class ServiceWorkerLazyBackgroundTest : public ServiceWorkerTest {
public:
ServiceWorkerLazyBackgroundTest() = default;
+
+ ServiceWorkerLazyBackgroundTest(const ServiceWorkerLazyBackgroundTest&) =
+ delete;
+ ServiceWorkerLazyBackgroundTest& operator=(
+ const ServiceWorkerLazyBackgroundTest&) = delete;
+
~ServiceWorkerLazyBackgroundTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -1041,9 +1071,6 @@
ProcessManager::SetEventPageIdleTimeForTesting(1);
ProcessManager::SetEventPageSuspendingTimeForTesting(1);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ServiceWorkerLazyBackgroundTest);
};
IN_PROC_BROWSER_TEST_F(ServiceWorkerTest, RegisterSucceeds) {
@@ -2627,6 +2654,10 @@
browser_context->GetDefaultStoragePartition();
scoped_observation_.Observe(partition->GetServiceWorkerContext());
}
+
+ ConsoleMessageObserver(const ConsoleMessageObserver&) = delete;
+ ConsoleMessageObserver& operator=(const ConsoleMessageObserver&) = delete;
+
~ConsoleMessageObserver() override = default;
void Wait() { run_loop_.Run(); }
@@ -2650,8 +2681,6 @@
base::ScopedObservation<content::ServiceWorkerContext,
content::ServiceWorkerContextObserver>
scoped_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ConsoleMessageObserver);
};
TestExtensionDir test_dir;
@@ -2696,10 +2725,13 @@
public testing::WithParamInterface<version_info::Channel> {
public:
ServiceWorkerCheckBindingsTest() = default;
- ~ServiceWorkerCheckBindingsTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(ServiceWorkerCheckBindingsTest);
+ ServiceWorkerCheckBindingsTest(const ServiceWorkerCheckBindingsTest&) =
+ delete;
+ ServiceWorkerCheckBindingsTest& operator=(
+ const ServiceWorkerCheckBindingsTest&) = delete;
+
+ ~ServiceWorkerCheckBindingsTest() override = default;
};
// Load an extension in each allowed channel and check that the expected
diff --git a/chrome/browser/extensions/service_worker_messaging_apitest.cc b/chrome/browser/extensions/service_worker_messaging_apitest.cc
index 8bc23c1..42e3300 100644
--- a/chrome/browser/extensions/service_worker_messaging_apitest.cc
+++ b/chrome/browser/extensions/service_worker_messaging_apitest.cc
@@ -69,6 +69,11 @@
class ServiceWorkerMessagingTest : public ExtensionApiTest {
public:
ServiceWorkerMessagingTest() = default;
+
+ ServiceWorkerMessagingTest(const ServiceWorkerMessagingTest&) = delete;
+ ServiceWorkerMessagingTest& operator=(const ServiceWorkerMessagingTest&) =
+ delete;
+
~ServiceWorkerMessagingTest() override = default;
void SetUpOnMainThread() override {
@@ -92,9 +97,6 @@
}
extensions::ScopedTestNativeMessagingHost test_host_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ServiceWorkerMessagingTest);
};
class ServiceWorkerMessagingTestWithActivityLog
diff --git a/chrome/browser/extensions/settings_api_bubble_delegate.h b/chrome/browser/extensions/settings_api_bubble_delegate.h
index 18f469c..5702cd6 100644
--- a/chrome/browser/extensions/settings_api_bubble_delegate.h
+++ b/chrome/browser/extensions/settings_api_bubble_delegate.h
@@ -19,6 +19,11 @@
: public ExtensionMessageBubbleController::Delegate {
public:
SettingsApiBubbleDelegate(Profile* profile, SettingsApiOverrideType type);
+
+ SettingsApiBubbleDelegate(const SettingsApiBubbleDelegate&) = delete;
+ SettingsApiBubbleDelegate& operator=(const SettingsApiBubbleDelegate&) =
+ delete;
+
~SettingsApiBubbleDelegate() override;
// The preference used to indicate if the user has acknowledged the extension
@@ -64,8 +69,6 @@
std::string extension_id_;
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(SettingsApiBubbleDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/shared_module_service.h b/chrome/browser/extensions/shared_module_service.h
index 2fc6e596..7a3a31d 100644
--- a/chrome/browser/extensions/shared_module_service.h
+++ b/chrome/browser/extensions/shared_module_service.h
@@ -39,6 +39,10 @@
};
explicit SharedModuleService(content::BrowserContext* context);
+
+ SharedModuleService(const SharedModuleService&) = delete;
+ SharedModuleService& operator=(const SharedModuleService&) = delete;
+
~SharedModuleService() override;
// Checks an extension's imports. Imports that are not installed are stored
@@ -79,8 +83,6 @@
// The context associated with this SharedModuleService.
content::BrowserContext* browser_context_;
-
- DISALLOW_COPY_AND_ASSIGN(SharedModuleService);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/startup_helper.h b/chrome/browser/extensions/startup_helper.h
index f1f8e37..ed3844c 100644
--- a/chrome/browser/extensions/startup_helper.h
+++ b/chrome/browser/extensions/startup_helper.h
@@ -19,6 +19,10 @@
class StartupHelper : public PackExtensionJob::Client {
public:
StartupHelper();
+
+ StartupHelper(const StartupHelper&) = delete;
+ StartupHelper& operator=(const StartupHelper&) = delete;
+
~StartupHelper() override;
void OnPackSuccess(const base::FilePath& crx_path,
@@ -38,8 +42,6 @@
private:
bool pack_job_succeeded_;
-
- DISALLOW_COPY_AND_ASSIGN(StartupHelper);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/startup_helper_browsertest.cc b/chrome/browser/extensions/startup_helper_browsertest.cc
index 48d2072..3a105ac 100644
--- a/chrome/browser/extensions/startup_helper_browsertest.cc
+++ b/chrome/browser/extensions/startup_helper_browsertest.cc
@@ -18,6 +18,10 @@
class StartupHelperBrowserTest : public InProcessBrowserTest {
public:
StartupHelperBrowserTest() {}
+
+ StartupHelperBrowserTest(const StartupHelperBrowserTest&) = delete;
+ StartupHelperBrowserTest& operator=(const StartupHelperBrowserTest&) = delete;
+
~StartupHelperBrowserTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -29,8 +33,6 @@
protected:
base::FilePath test_data_dir_;
-
- DISALLOW_COPY_AND_ASSIGN(StartupHelperBrowserTest);
};
IN_PROC_BROWSER_TEST_F(StartupHelperBrowserTest, ValidateCrx) {
diff --git a/chrome/browser/extensions/suspicious_extension_bubble_delegate.h b/chrome/browser/extensions/suspicious_extension_bubble_delegate.h
index 1d80962d..ef17868 100644
--- a/chrome/browser/extensions/suspicious_extension_bubble_delegate.h
+++ b/chrome/browser/extensions/suspicious_extension_bubble_delegate.h
@@ -16,6 +16,12 @@
: public ExtensionMessageBubbleController::Delegate {
public:
explicit SuspiciousExtensionBubbleDelegate(Profile* profile);
+
+ SuspiciousExtensionBubbleDelegate(const SuspiciousExtensionBubbleDelegate&) =
+ delete;
+ SuspiciousExtensionBubbleDelegate& operator=(
+ const SuspiciousExtensionBubbleDelegate&) = delete;
+
~SuspiciousExtensionBubbleDelegate() override;
// ExtensionMessageBubbleController::Delegate methods.
@@ -43,8 +49,6 @@
private:
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(SuspiciousExtensionBubbleDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/sync_bundle.h b/chrome/browser/extensions/sync_bundle.h
index d8288f9..96a931e 100644
--- a/chrome/browser/extensions/sync_bundle.h
+++ b/chrome/browser/extensions/sync_bundle.h
@@ -22,6 +22,10 @@
class SyncBundle {
public:
SyncBundle();
+
+ SyncBundle(const SyncBundle&) = delete;
+ SyncBundle& operator=(const SyncBundle&) = delete;
+
~SyncBundle();
void StartSyncing(
@@ -89,8 +93,6 @@
// server until we've installed the extension locally, to prevent the sync
// state from flipping back and forth until all clients are up to date.
std::map<ExtensionId, ExtensionSyncData> pending_sync_data_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncBundle);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/system_display/display_info_provider_chromeos.h b/chrome/browser/extensions/system_display/display_info_provider_chromeos.h
index 1cb872a..ee98c61 100644
--- a/chrome/browser/extensions/system_display/display_info_provider_chromeos.h
+++ b/chrome/browser/extensions/system_display/display_info_provider_chromeos.h
@@ -25,6 +25,11 @@
explicit DisplayInfoProviderChromeOS(
mojo::PendingRemote<ash::mojom::CrosDisplayConfigController>
display_config);
+
+ DisplayInfoProviderChromeOS(const DisplayInfoProviderChromeOS&) = delete;
+ DisplayInfoProviderChromeOS& operator=(const DisplayInfoProviderChromeOS&) =
+ delete;
+
~DisplayInfoProviderChromeOS() override;
// DisplayInfoProvider implementation.
@@ -83,8 +88,6 @@
cros_display_config_observer_receiver_{this};
std::string touch_calibration_target_id_;
base::WeakPtrFactory<DisplayInfoProviderChromeOS> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DisplayInfoProviderChromeOS);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/system_display/display_info_provider_chromeos_unittest.cc b/chrome/browser/extensions/system_display/display_info_provider_chromeos_unittest.cc
index 95bec926..ee6fe92 100644
--- a/chrome/browser/extensions/system_display/display_info_provider_chromeos_unittest.cc
+++ b/chrome/browser/extensions/system_display/display_info_provider_chromeos_unittest.cc
@@ -52,6 +52,11 @@
public:
DisplayInfoProviderChromeosTest() {}
+ DisplayInfoProviderChromeosTest(const DisplayInfoProviderChromeosTest&) =
+ delete;
+ DisplayInfoProviderChromeosTest& operator=(
+ const DisplayInfoProviderChromeosTest&) = delete;
+
~DisplayInfoProviderChromeosTest() override {}
void SetUp() override {
@@ -187,8 +192,6 @@
private:
std::unique_ptr<ash::CrosDisplayConfig> cros_display_config_;
-
- DISALLOW_COPY_AND_ASSIGN(DisplayInfoProviderChromeosTest);
};
TEST_F(DisplayInfoProviderChromeosTest, GetBasic) {
@@ -1574,6 +1577,11 @@
public:
DisplayInfoProviderChromeosTouchviewTest() {}
+ DisplayInfoProviderChromeosTouchviewTest(
+ const DisplayInfoProviderChromeosTouchviewTest&) = delete;
+ DisplayInfoProviderChromeosTouchviewTest& operator=(
+ const DisplayInfoProviderChromeosTouchviewTest&) = delete;
+
~DisplayInfoProviderChromeosTouchviewTest() override {}
void SetUp() override {
@@ -1583,9 +1591,6 @@
ash::switches::kAshEnableTabletMode);
DisplayInfoProviderChromeosTest::SetUp();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DisplayInfoProviderChromeosTouchviewTest);
};
TEST_F(DisplayInfoProviderChromeosTouchviewTest, GetTabletMode) {
diff --git a/chrome/browser/extensions/tab_helper.h b/chrome/browser/extensions/tab_helper.h
index d30bb22..5030b29 100644
--- a/chrome/browser/extensions/tab_helper.h
+++ b/chrome/browser/extensions/tab_helper.h
@@ -44,6 +44,9 @@
public ExtensionRegistryObserver,
public content::WebContentsUserData<TabHelper> {
public:
+ TabHelper(const TabHelper&) = delete;
+ TabHelper& operator=(const TabHelper&) = delete;
+
~TabHelper() override;
// Sets the extension denoting this as an app. If |extension| is non-null this
@@ -166,8 +169,6 @@
base::WeakPtrFactory<TabHelper> weak_ptr_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(TabHelper);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/test_blocklist.h b/chrome/browser/extensions/test_blocklist.h
index e59122e..beddea9 100644
--- a/chrome/browser/extensions/test_blocklist.h
+++ b/chrome/browser/extensions/test_blocklist.h
@@ -48,6 +48,9 @@
explicit TestBlocklist(Blocklist* blocklist);
+ TestBlocklist(const TestBlocklist&) = delete;
+ TestBlocklist& operator=(const TestBlocklist&) = delete;
+
~TestBlocklist();
void Attach(Blocklist* blocklist);
@@ -87,8 +90,6 @@
scoped_refptr<FakeSafeBrowsingDatabaseManager> blocklist_db_;
Blocklist::ScopedDatabaseManagerForTest scoped_blocklist_db_;
-
- DISALLOW_COPY_AND_ASSIGN(TestBlocklist);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/test_blocklist_state_fetcher.h b/chrome/browser/extensions/test_blocklist_state_fetcher.h
index 9ad92a9..3ff28f36 100644
--- a/chrome/browser/extensions/test_blocklist_state_fetcher.h
+++ b/chrome/browser/extensions/test_blocklist_state_fetcher.h
@@ -18,6 +18,10 @@
public:
explicit TestBlocklistStateFetcher(BlocklistStateFetcher* fetcher);
+ TestBlocklistStateFetcher(const TestBlocklistStateFetcher&) = delete;
+ TestBlocklistStateFetcher& operator=(const TestBlocklistStateFetcher&) =
+ delete;
+
~TestBlocklistStateFetcher();
void SetBlocklistVerdict(const std::string& id,
@@ -35,8 +39,6 @@
// Dummy URLLoaderFactory not used for responses but avoids crashes.
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(TestBlocklistStateFetcher);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/test_extension_environment.h b/chrome/browser/extensions/test_extension_environment.h
index 1c4e8161..f3516c5 100644
--- a/chrome/browser/extensions/test_extension_environment.h
+++ b/chrome/browser/extensions/test_extension_environment.h
@@ -56,6 +56,9 @@
explicit TestExtensionEnvironment(Type type = Type::kWithTaskEnvironment);
+ TestExtensionEnvironment(const TestExtensionEnvironment&) = delete;
+ TestExtensionEnvironment& operator=(const TestExtensionEnvironment&) = delete;
+
~TestExtensionEnvironment();
TestingProfile* profile() const;
@@ -112,8 +115,6 @@
std::unique_ptr<TestingProfile> profile_;
ExtensionService* extension_service_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(TestExtensionEnvironment);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc
index d03b0c0..b1abe56 100644
--- a/chrome/browser/extensions/test_extension_prefs.cc
+++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -50,6 +50,9 @@
public:
IncrementalClock() : current_time_(base::Time::Now()) {}
+ IncrementalClock(const IncrementalClock&) = delete;
+ IncrementalClock& operator=(const IncrementalClock&) = delete;
+
~IncrementalClock() override {}
base::Time Now() const override {
@@ -59,8 +62,6 @@
private:
mutable base::Time current_time_;
-
- DISALLOW_COPY_AND_ASSIGN(IncrementalClock);
};
TestExtensionPrefs::TestExtensionPrefs(
diff --git a/chrome/browser/extensions/test_extension_prefs.h b/chrome/browser/extensions/test_extension_prefs.h
index 4959939..ec140ccd 100644
--- a/chrome/browser/extensions/test_extension_prefs.h
+++ b/chrome/browser/extensions/test_extension_prefs.h
@@ -41,6 +41,10 @@
public:
explicit TestExtensionPrefs(
const scoped_refptr<base::SequencedTaskRunner>& task_runner);
+
+ TestExtensionPrefs(const TestExtensionPrefs&) = delete;
+ TestExtensionPrefs& operator=(const TestExtensionPrefs&) = delete;
+
virtual ~TestExtensionPrefs();
ExtensionPrefs* prefs();
@@ -119,7 +123,6 @@
std::unique_ptr<IncrementalClock> clock_;
TestingProfile profile_;
bool extensions_disabled_;
- DISALLOW_COPY_AND_ASSIGN(TestExtensionPrefs);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/test_resources_browsertest.cc b/chrome/browser/extensions/test_resources_browsertest.cc
index fc9c794e..ada80ae 100644
--- a/chrome/browser/extensions/test_resources_browsertest.cc
+++ b/chrome/browser/extensions/test_resources_browsertest.cc
@@ -44,6 +44,12 @@
: public ExtensionBrowserTest {
public:
ExtensionBrowserTestWithCustomTestResourcesLocation() = default;
+
+ ExtensionBrowserTestWithCustomTestResourcesLocation(
+ const ExtensionBrowserTestWithCustomTestResourcesLocation&) = delete;
+ ExtensionBrowserTestWithCustomTestResourcesLocation& operator=(
+ const ExtensionBrowserTestWithCustomTestResourcesLocation&) = delete;
+
~ExtensionBrowserTestWithCustomTestResourcesLocation() override = default;
private:
@@ -54,8 +60,6 @@
base::PathService::Get(chrome::DIR_TEST_DATA, &test_root_path);
return test_root_path.AppendASCII("extensions/test_resources_test");
}
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionBrowserTestWithCustomTestResourcesLocation);
};
} // namespace
diff --git a/chrome/browser/extensions/updater/chrome_update_client_config.cc b/chrome/browser/extensions/updater/chrome_update_client_config.cc
index 5111bf57..2c3e10b 100644
--- a/chrome/browser/extensions/updater/chrome_update_client_config.cc
+++ b/chrome/browser/extensions/updater/chrome_update_client_config.cc
@@ -55,6 +55,11 @@
: public update_client::ActivityDataService {
public:
explicit ExtensionActivityDataService(ExtensionPrefs* extension_prefs);
+
+ ExtensionActivityDataService(const ExtensionActivityDataService&) = delete;
+ ExtensionActivityDataService& operator=(const ExtensionActivityDataService&) =
+ delete;
+
~ExtensionActivityDataService() override = default;
// update_client::ActivityDataService:
@@ -71,8 +76,6 @@
// This member is not owned by this class, it's owned by a profile keyed
// service.
ExtensionPrefs* extension_prefs_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionActivityDataService);
};
// Calculates the value to use for the ping days parameter.
diff --git a/chrome/browser/extensions/updater/extension_cache_impl.h b/chrome/browser/extensions/updater/extension_cache_impl.h
index 67622cb5..3557f08 100644
--- a/chrome/browser/extensions/updater/extension_cache_impl.h
+++ b/chrome/browser/extensions/updater/extension_cache_impl.h
@@ -34,6 +34,10 @@
public:
explicit ExtensionCacheImpl(
std::unique_ptr<ChromeOSExtensionCacheDelegate> delegate);
+
+ ExtensionCacheImpl(const ExtensionCacheImpl&) = delete;
+ ExtensionCacheImpl& operator=(const ExtensionCacheImpl&) = delete;
+
~ExtensionCacheImpl() override;
// Implementation of ExtensionCache.
@@ -76,8 +80,6 @@
// Weak factory for callbacks.
base::WeakPtrFactory<ExtensionCacheImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionCacheImpl);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/updater/extension_update_client_base_browsertest.cc b/chrome/browser/extensions/updater/extension_update_client_base_browsertest.cc
index 95b5365..d471f4d 100644
--- a/chrome/browser/extensions/updater/extension_update_client_base_browsertest.cc
+++ b/chrome/browser/extensions/updater/extension_update_client_base_browsertest.cc
@@ -67,6 +67,12 @@
public:
explicit TestChromeBrowserMainExtraParts(ExtensionUpdateClientBaseTest* test)
: test_(test) {}
+
+ TestChromeBrowserMainExtraParts(const TestChromeBrowserMainExtraParts&) =
+ delete;
+ TestChromeBrowserMainExtraParts& operator=(
+ const TestChromeBrowserMainExtraParts&) = delete;
+
~TestChromeBrowserMainExtraParts() override = default;
// ChromeBrowserMainExtraParts:
@@ -74,8 +80,6 @@
private:
ExtensionUpdateClientBaseTest* test_;
-
- DISALLOW_COPY_AND_ASSIGN(TestChromeBrowserMainExtraParts);
};
class UpdateClientCompleteEventWaiter
@@ -86,6 +90,11 @@
explicit UpdateClientCompleteEventWaiter(const std::string& id)
: id_(id), event_(UpdateClientEvents::COMPONENT_UPDATE_ERROR) {}
+ UpdateClientCompleteEventWaiter(const UpdateClientCompleteEventWaiter&) =
+ delete;
+ UpdateClientCompleteEventWaiter& operator=(
+ const UpdateClientCompleteEventWaiter&) = delete;
+
~UpdateClientCompleteEventWaiter() override = default;
void OnEvent(update_client::UpdateClient::Observer::Events event,
@@ -107,8 +116,6 @@
const std::string id_;
UpdateClientEvents event_;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(UpdateClientCompleteEventWaiter);
};
} // namespace
diff --git a/chrome/browser/extensions/updater/extension_update_client_base_browsertest.h b/chrome/browser/extensions/updater/extension_update_client_base_browsertest.h
index 68d6e87..2803de5 100644
--- a/chrome/browser/extensions/updater/extension_update_client_base_browsertest.h
+++ b/chrome/browser/extensions/updater/extension_update_client_base_browsertest.h
@@ -41,6 +41,11 @@
using ConfigFactoryCallback = ChromeUpdateClientConfig::FactoryCallback;
ExtensionUpdateClientBaseTest();
+
+ ExtensionUpdateClientBaseTest(const ExtensionUpdateClientBaseTest&) = delete;
+ ExtensionUpdateClientBaseTest& operator=(
+ const ExtensionUpdateClientBaseTest&) = delete;
+
~ExtensionUpdateClientBaseTest() override;
// ExtensionBrowserTest:
@@ -91,8 +96,6 @@
bool OnRequest(content::URLLoaderInterceptor::RequestParams* params);
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionUpdateClientBaseTest);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h
index 751b7e0a..04e4474 100644
--- a/chrome/browser/extensions/updater/extension_updater.h
+++ b/chrome/browser/extensions/updater/extension_updater.h
@@ -95,10 +95,13 @@
class ScopedSkipScheduledCheckForTest {
public:
ScopedSkipScheduledCheckForTest();
- ~ScopedSkipScheduledCheckForTest();
- private:
- DISALLOW_COPY_AND_ASSIGN(ScopedSkipScheduledCheckForTest);
+ ScopedSkipScheduledCheckForTest(const ScopedSkipScheduledCheckForTest&) =
+ delete;
+ ScopedSkipScheduledCheckForTest& operator=(
+ const ScopedSkipScheduledCheckForTest&) = delete;
+
+ ~ScopedSkipScheduledCheckForTest();
};
// Holds a pointer to the passed |service|, using it for querying installed
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc
index 8993c0b..792b10e 100644
--- a/chrome/browser/extensions/updater/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc
@@ -298,6 +298,9 @@
downloader_delegate_override_(nullptr),
test_shared_url_loader_factory_(url_loader_factory) {}
+ MockService(const MockService&) = delete;
+ MockService& operator=(const MockService&) = delete;
+
~MockService() override = default;
PendingExtensionManager* pending_extension_manager() override {
@@ -394,8 +397,6 @@
scoped_refptr<network::SharedURLLoaderFactory>
test_shared_url_loader_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(MockService);
};
bool ShouldInstallExtensionsOnly(const Extension* extension,
diff --git a/chrome/browser/extensions/updater/local_extension_cache.h b/chrome/browser/extensions/updater/local_extension_cache.h
index fdc33654..5616eee2e 100644
--- a/chrome/browser/extensions/updater/local_extension_cache.h
+++ b/chrome/browser/extensions/updater/local_extension_cache.h
@@ -45,6 +45,10 @@
uint64_t max_cache_size,
const base::TimeDelta& max_cache_age,
const scoped_refptr<base::SequencedTaskRunner>& backend_task_runner);
+
+ LocalExtensionCache(const LocalExtensionCache&) = delete;
+ LocalExtensionCache& operator=(const LocalExtensionCache&) = delete;
+
~LocalExtensionCache();
// Name of flag file that indicates that cache is ready (import finished).
@@ -277,8 +281,6 @@
// Weak factory for callbacks from the backend and delayed tasks.
base::WeakPtrFactory<LocalExtensionCache> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LocalExtensionCache);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/updater/local_extension_cache_unittest.cc b/chrome/browser/extensions/updater/local_extension_cache_unittest.cc
index 321348a..035b628 100644
--- a/chrome/browser/extensions/updater/local_extension_cache_unittest.cc
+++ b/chrome/browser/extensions/updater/local_extension_cache_unittest.cc
@@ -39,6 +39,10 @@
class LocalExtensionCacheTest : public testing::Test {
public:
LocalExtensionCacheTest() = default;
+
+ LocalExtensionCacheTest(const LocalExtensionCacheTest&) = delete;
+ LocalExtensionCacheTest& operator=(const LocalExtensionCacheTest&) = delete;
+
~LocalExtensionCacheTest() override = default;
base::FilePath CreateCacheDir() {
@@ -112,8 +116,6 @@
base::ScopedTempDir cache_dir_;
base::ScopedTempDir temp_dir_;
-
- DISALLOW_COPY_AND_ASSIGN(LocalExtensionCacheTest);
};
static void SimpleCallback(bool* ptr) {
diff --git a/chrome/browser/extensions/user_script_listener.h b/chrome/browser/extensions/user_script_listener.h
index d06455b8..70d2f41 100644
--- a/chrome/browser/extensions/user_script_listener.h
+++ b/chrome/browser/extensions/user_script_listener.h
@@ -40,6 +40,10 @@
public ExtensionRegistryObserver {
public:
UserScriptListener();
+
+ UserScriptListener(const UserScriptListener&) = delete;
+ UserScriptListener& operator=(const UserScriptListener&) = delete;
+
~UserScriptListener() override;
// Constructs a NavigationThrottle if the UserScriptListener needs to delay
@@ -119,8 +123,6 @@
extension_registry_observations_{this};
content::NotificationRegistrar registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(UserScriptListener);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/webstore_data_fetcher.h b/chrome/browser/extensions/webstore_data_fetcher.h
index 42b9c9f..5d90fe2 100644
--- a/chrome/browser/extensions/webstore_data_fetcher.h
+++ b/chrome/browser/extensions/webstore_data_fetcher.h
@@ -32,6 +32,10 @@
WebstoreDataFetcher(WebstoreDataFetcherDelegate* delegate,
const GURL& referrer_url,
const std::string webstore_item_id);
+
+ WebstoreDataFetcher(const WebstoreDataFetcher&) = delete;
+ WebstoreDataFetcher& operator=(const WebstoreDataFetcher&) = delete;
+
~WebstoreDataFetcher();
static void SetLogResponseCodeForTesting(bool enabled);
@@ -59,8 +63,6 @@
// Maximum auto retry times on server 5xx error or ERR_NETWORK_CHANGED.
// Default is 0 which means to use the URLFetcher default behavior.
int max_auto_retries_;
-
- DISALLOW_COPY_AND_ASSIGN(WebstoreDataFetcher);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/webstore_installer_test.h b/chrome/browser/extensions/webstore_installer_test.h
index ccb8514..fe369008 100644
--- a/chrome/browser/extensions/webstore_installer_test.h
+++ b/chrome/browser/extensions/webstore_installer_test.h
@@ -34,6 +34,10 @@
const std::string& crx_filename,
const std::string& verified_domain,
const std::string& unverified_domain);
+
+ WebstoreInstallerTest(const WebstoreInstallerTest&) = delete;
+ WebstoreInstallerTest& operator=(const WebstoreInstallerTest&) = delete;
+
~WebstoreInstallerTest() override;
void SetUpCommandLine(base::CommandLine* command_line) override;
@@ -80,8 +84,6 @@
std::unique_ptr<extensions::ScopedTestDialogAutoConfirm>
install_auto_confirm_;
-
- DISALLOW_COPY_AND_ASSIGN(WebstoreInstallerTest);
};
#endif // CHROME_BROWSER_EXTENSIONS_WEBSTORE_INSTALLER_TEST_H_
diff --git a/chrome/browser/external_protocol/external_protocol_observer.h b/chrome/browser/external_protocol/external_protocol_observer.h
index a703b76..30cf0a08 100644
--- a/chrome/browser/external_protocol/external_protocol_observer.h
+++ b/chrome/browser/external_protocol/external_protocol_observer.h
@@ -15,6 +15,9 @@
: public content::WebContentsObserver,
public content::WebContentsUserData<ExternalProtocolObserver> {
public:
+ ExternalProtocolObserver(const ExternalProtocolObserver&) = delete;
+ ExternalProtocolObserver& operator=(const ExternalProtocolObserver&) = delete;
+
~ExternalProtocolObserver() override;
// content::WebContentsObserver overrides.
@@ -25,8 +28,6 @@
friend class content::WebContentsUserData<ExternalProtocolObserver>;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(ExternalProtocolObserver);
};
#endif // CHROME_BROWSER_EXTERNAL_PROTOCOL_EXTERNAL_PROTOCOL_OBSERVER_H_
diff --git a/chrome/browser/favicon/chrome_favicon_client.h b/chrome/browser/favicon/chrome_favicon_client.h
index 5ceeb798..452e5980 100644
--- a/chrome/browser/favicon/chrome_favicon_client.h
+++ b/chrome/browser/favicon/chrome_favicon_client.h
@@ -15,6 +15,10 @@
class ChromeFaviconClient : public favicon::FaviconClient {
public:
explicit ChromeFaviconClient(Profile* profile);
+
+ ChromeFaviconClient(const ChromeFaviconClient&) = delete;
+ ChromeFaviconClient& operator=(const ChromeFaviconClient&) = delete;
+
~ChromeFaviconClient() override;
private:
@@ -29,8 +33,6 @@
base::CancelableTaskTracker* tracker) override;
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeFaviconClient);
};
#endif // CHROME_BROWSER_FAVICON_CHROME_FAVICON_CLIENT_H_
diff --git a/chrome/browser/favicon/content_favicon_driver_browsertest.cc b/chrome/browser/favicon/content_favicon_driver_browsertest.cc
index aa5d888..3de1a40 100644
--- a/chrome/browser/favicon/content_favicon_driver_browsertest.cc
+++ b/chrome/browser/favicon/content_favicon_driver_browsertest.cc
@@ -120,6 +120,10 @@
public:
explicit PendingTaskWaiter(content::WebContents* web_contents)
: WebContentsObserver(web_contents) {}
+
+ PendingTaskWaiter(const PendingTaskWaiter&) = delete;
+ PendingTaskWaiter& operator=(const PendingTaskWaiter&) = delete;
+
~PendingTaskWaiter() override {}
void AlsoRequireUrl(const GURL& url) { required_url_ = url; }
@@ -186,14 +190,16 @@
GURL required_url_;
absl::optional<std::u16string> required_title_;
base::WeakPtrFactory<PendingTaskWaiter> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PendingTaskWaiter);
};
class PageLoadStopper : public content::WebContentsObserver {
public:
explicit PageLoadStopper(content::WebContents* web_contents)
: WebContentsObserver(web_contents), stop_on_finish_(false) {}
+
+ PageLoadStopper(const PageLoadStopper&) = delete;
+ PageLoadStopper& operator=(const PageLoadStopper&) = delete;
+
~PageLoadStopper() override {}
void StopOnDidFinishNavigation() { stop_on_finish_ = true; }
@@ -222,8 +228,6 @@
bool stop_on_finish_;
std::vector<GURL> last_favicon_candidates_;
-
- DISALLOW_COPY_AND_ASSIGN(PageLoadStopper);
};
} // namespace
@@ -234,6 +238,10 @@
: prerender_helper_(
base::BindRepeating(&ContentFaviconDriverTest::web_contents,
base::Unretained(this))) {}
+
+ ContentFaviconDriverTest(const ContentFaviconDriverTest&) = delete;
+ ContentFaviconDriverTest& operator=(const ContentFaviconDriverTest&) = delete;
+
~ContentFaviconDriverTest() override = default;
void SetUp() override {
@@ -297,8 +305,6 @@
private:
content::test::PrerenderTestHelper prerender_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(ContentFaviconDriverTest);
};
IN_PROC_BROWSER_TEST_F(ContentFaviconDriverTest,
diff --git a/chrome/browser/federated_learning/floc_event_logger_unittest.cc b/chrome/browser/federated_learning/floc_event_logger_unittest.cc
index 6d65bc7..43cbec9 100644
--- a/chrome/browser/federated_learning/floc_event_logger_unittest.cc
+++ b/chrome/browser/federated_learning/floc_event_logger_unittest.cc
@@ -49,6 +49,9 @@
FlocEventLoggerUnitTest()
: task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
+ FlocEventLoggerUnitTest(const FlocEventLoggerUnitTest&) = delete;
+ FlocEventLoggerUnitTest& operator=(const FlocEventLoggerUnitTest&) = delete;
+
~FlocEventLoggerUnitTest() override = default;
void SetUp() override {
@@ -115,8 +118,6 @@
std::unique_ptr<FakeFlocRemotePermissionService>
fake_floc_remote_permission_service_;
std::unique_ptr<FlocEventLogger> floc_event_logger_;
-
- DISALLOW_COPY_AND_ASSIGN(FlocEventLoggerUnitTest);
};
TEST_F(FlocEventLoggerUnitTest, DefaultSyncDisabled_EventLogging) {
diff --git a/chrome/browser/federated_learning/floc_id_provider_unittest.cc b/chrome/browser/federated_learning/floc_id_provider_unittest.cc
index 63583a4..894b72f 100644
--- a/chrome/browser/federated_learning/floc_id_provider_unittest.cc
+++ b/chrome/browser/federated_learning/floc_id_provider_unittest.cc
@@ -160,6 +160,9 @@
FlocIdProviderUnitTest()
: task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
+ FlocIdProviderUnitTest(const FlocIdProviderUnitTest&) = delete;
+ FlocIdProviderUnitTest& operator=(const FlocIdProviderUnitTest&) = delete;
+
~FlocIdProviderUnitTest() override = default;
void SetUp() override {
@@ -306,8 +309,6 @@
MockFlocSortingLshService* sorting_lsh_service_;
base::ScopedTempDir temp_dir_;
-
- DISALLOW_COPY_AND_ASSIGN(FlocIdProviderUnitTest);
};
TEST_F(FlocIdProviderUnitTest, DefaultSetup_ComputationState) {
diff --git a/chrome/browser/federated_learning/floc_remote_permission_service_unittest.cc b/chrome/browser/federated_learning/floc_remote_permission_service_unittest.cc
index aab0b51..199ca9e 100644
--- a/chrome/browser/federated_learning/floc_remote_permission_service_unittest.cc
+++ b/chrome/browser/federated_learning/floc_remote_permission_service_unittest.cc
@@ -35,6 +35,12 @@
: FlocRemotePermissionService(url_loader_factory),
expected_url_(GURL()),
expected_floc_permission_(false) {}
+
+ TestingFlocRemotePermissionService(
+ const TestingFlocRemotePermissionService&) = delete;
+ TestingFlocRemotePermissionService& operator=(
+ const TestingFlocRemotePermissionService&) = delete;
+
~TestingFlocRemotePermissionService() override = default;
std::unique_ptr<FlocRemotePermissionService::Request> CreateRequest(
@@ -69,8 +75,6 @@
bool expected_floc_permission_;
absl::optional<int> response_code_override_;
absl::optional<std::string> response_body_override_;
-
- DISALLOW_COPY_AND_ASSIGN(TestingFlocRemotePermissionService);
};
// A testing request class that allows expected values to be filled in.
@@ -85,6 +89,9 @@
response_code_(response_code),
response_body_(response_body) {}
+ TestRequest(const TestRequest&) = delete;
+ TestRequest& operator=(const TestRequest&) = delete;
+
~TestRequest() override = default;
// FlocRemotePermissionService::Request overrides
@@ -114,8 +121,6 @@
FlocRemotePermissionService::CreateRequestCallback callback_;
int response_code_;
std::string response_body_;
-
- DISALLOW_COPY_AND_ASSIGN(TestRequest);
};
std::unique_ptr<FlocRemotePermissionService::Request>
@@ -154,6 +159,11 @@
&test_url_loader_factory_)),
floc_remote_permission_service_(test_shared_loader_factory_) {}
+ FlocRemotePermissionServiceTest(const FlocRemotePermissionServiceTest&) =
+ delete;
+ FlocRemotePermissionServiceTest& operator=(
+ const FlocRemotePermissionServiceTest&) = delete;
+
~FlocRemotePermissionServiceTest() override = default;
void TearDown() override {
@@ -172,8 +182,6 @@
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory_;
TestingFlocRemotePermissionService floc_remote_permission_service_;
-
- DISALLOW_COPY_AND_ASSIGN(FlocRemotePermissionServiceTest);
};
TEST_F(FlocRemotePermissionServiceTest, QueryFlocPermission) {
diff --git a/chrome/browser/feedback/feedback_uploader_chrome.h b/chrome/browser/feedback/feedback_uploader_chrome.h
index 0a70c2ae..433ef9e 100644
--- a/chrome/browser/feedback/feedback_uploader_chrome.h
+++ b/chrome/browser/feedback/feedback_uploader_chrome.h
@@ -35,6 +35,10 @@
class FeedbackUploaderChrome : public FeedbackUploader {
public:
explicit FeedbackUploaderChrome(content::BrowserContext* context);
+
+ FeedbackUploaderChrome(const FeedbackUploaderChrome&) = delete;
+ FeedbackUploaderChrome& operator=(const FeedbackUploaderChrome&) = delete;
+
~FeedbackUploaderChrome() override;
class Delegate {
@@ -80,8 +84,6 @@
Delegate* delegate_ = nullptr; // Not owned.
content::BrowserContext* context_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(FeedbackUploaderChrome);
};
} // namespace feedback
diff --git a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.h b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.h
index b04ff4d..2cc290a 100644
--- a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.h
+++ b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.h
@@ -21,6 +21,10 @@
class ChromeInternalLogSource : public SystemLogsSource {
public:
ChromeInternalLogSource();
+
+ ChromeInternalLogSource(const ChromeInternalLogSource&) = delete;
+ ChromeInternalLogSource& operator=(const ChromeInternalLogSource&) = delete;
+
~ChromeInternalLogSource() override;
// SystemLogsSource override.
@@ -48,8 +52,6 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
mojo::Remote<ash::mojom::CrosDisplayConfigController> cros_display_config_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(ChromeInternalLogSource);
};
} // namespace system_logs
diff --git a/chrome/browser/feedback/system_logs/log_sources/crash_ids_source.h b/chrome/browser/feedback/system_logs/log_sources/crash_ids_source.h
index d5071493..d715404 100644
--- a/chrome/browser/feedback/system_logs/log_sources/crash_ids_source.h
+++ b/chrome/browser/feedback/system_logs/log_sources/crash_ids_source.h
@@ -18,6 +18,10 @@
class CrashIdsSource : public SystemLogsSource {
public:
CrashIdsSource();
+
+ CrashIdsSource(const CrashIdsSource&) = delete;
+ CrashIdsSource& operator=(const CrashIdsSource&) = delete;
+
~CrashIdsSource() override;
// SystemLogsSource:
@@ -46,8 +50,6 @@
bool pending_crash_list_loading_;
base::WeakPtrFactory<CrashIdsSource> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CrashIdsSource);
};
} // namespace system_logs
diff --git a/chrome/browser/feedback/system_logs/log_sources/crash_ids_source_unittest.cc b/chrome/browser/feedback/system_logs/log_sources/crash_ids_source_unittest.cc
index 9cacffd9..ed78ceb 100644
--- a/chrome/browser/feedback/system_logs/log_sources/crash_ids_source_unittest.cc
+++ b/chrome/browser/feedback/system_logs/log_sources/crash_ids_source_unittest.cc
@@ -36,6 +36,10 @@
class TestDebugDaemonClient : public chromeos::FakeDebugDaemonClient {
public:
TestDebugDaemonClient() = default;
+
+ TestDebugDaemonClient(const TestDebugDaemonClient&) = delete;
+ TestDebugDaemonClient& operator=(const TestDebugDaemonClient&) = delete;
+
~TestDebugDaemonClient() override = default;
void UploadCrashes(UploadCrashesCallback callback) override {
@@ -47,8 +51,6 @@
private:
int upload_crashes_called_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(TestDebugDaemonClient);
};
TestDebugDaemonClient* fake_debug_client() {
diff --git a/chrome/browser/feedback/system_logs/log_sources/memory_details_log_source.h b/chrome/browser/feedback/system_logs/log_sources/memory_details_log_source.h
index d0de608..bae8dfd3 100644
--- a/chrome/browser/feedback/system_logs/log_sources/memory_details_log_source.h
+++ b/chrome/browser/feedback/system_logs/log_sources/memory_details_log_source.h
@@ -14,13 +14,14 @@
class MemoryDetailsLogSource : public SystemLogsSource {
public:
MemoryDetailsLogSource();
+
+ MemoryDetailsLogSource(const MemoryDetailsLogSource&) = delete;
+ MemoryDetailsLogSource& operator=(const MemoryDetailsLogSource&) = delete;
+
~MemoryDetailsLogSource() override;
// SystemLogsSource override.
void Fetch(SysLogsSourceCallback request) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MemoryDetailsLogSource);
};
} // namespace system_logs
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc
index 313feec..a4dc6cb7 100644
--- a/chrome/browser/first_run/first_run.cc
+++ b/chrome/browser/first_run/first_run.cc
@@ -86,6 +86,10 @@
class ImportEndedObserver : public importer::ImporterProgressObserver {
public:
ImportEndedObserver() : ended_(false) {}
+
+ ImportEndedObserver(const ImportEndedObserver&) = delete;
+ ImportEndedObserver& operator=(const ImportEndedObserver&) = delete;
+
~ImportEndedObserver() override {}
// importer::ImporterProgressObserver:
@@ -111,8 +115,6 @@
bool ended_;
base::OnceClosure callback_for_import_end_;
-
- DISALLOW_COPY_AND_ASSIGN(ImportEndedObserver);
};
// Launches the import, via |importer_host|, from |source_profile| into
diff --git a/chrome/browser/first_run/first_run_browsertest.cc b/chrome/browser/first_run/first_run_browsertest.cc
index 366fc80..c3bcc78 100644
--- a/chrome/browser/first_run/first_run_browsertest.cc
+++ b/chrome/browser/first_run/first_run_browsertest.cc
@@ -318,6 +318,12 @@
base::CommandLine::ForCurrentProcess()->AppendSwitch(
variations::switches::kDisableFieldTrialTestingConfig);
}
+
+ FirstRunMasterPrefsVariationsSeedTest(
+ const FirstRunMasterPrefsVariationsSeedTest&) = delete;
+ FirstRunMasterPrefsVariationsSeedTest& operator=(
+ const FirstRunMasterPrefsVariationsSeedTest&) = delete;
+
~FirstRunMasterPrefsVariationsSeedTest() override = default;
void SetUp() override {
@@ -360,8 +366,6 @@
EXPECT_TRUE(base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
return user_data_dir.AppendASCII("FirstRunMasterPrefsVariationsSeedTest");
}
-
- DISALLOW_COPY_AND_ASSIGN(FirstRunMasterPrefsVariationsSeedTest);
};
IN_PROC_BROWSER_TEST_P(FirstRunMasterPrefsVariationsSeedTest, Test) {
diff --git a/chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h b/chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h
index e3cfda6..1c7242d 100644
--- a/chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h
+++ b/chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h
@@ -18,12 +18,16 @@
public:
explicit ScopedRelaunchChromeBrowserOverride(
RelaunchChromeBrowserCallback callback);
+
+ ScopedRelaunchChromeBrowserOverride(
+ const ScopedRelaunchChromeBrowserOverride&) = delete;
+ ScopedRelaunchChromeBrowserOverride& operator=(
+ const ScopedRelaunchChromeBrowserOverride&) = delete;
+
~ScopedRelaunchChromeBrowserOverride();
private:
RelaunchChromeBrowserCallback previous_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedRelaunchChromeBrowserOverride);
};
} // namespace upgrade_util
diff --git a/chrome/browser/font_family_cache.h b/chrome/browser/font_family_cache.h
index 0e5573a..514fb3a 100644
--- a/chrome/browser/font_family_cache.h
+++ b/chrome/browser/font_family_cache.h
@@ -30,6 +30,10 @@
class FontFamilyCache : public base::SupportsUserData::Data {
public:
explicit FontFamilyCache(Profile* profile);
+
+ FontFamilyCache(const FontFamilyCache&) = delete;
+ FontFamilyCache& operator=(const FontFamilyCache&) = delete;
+
~FontFamilyCache() override;
// Gets or creates the relevant FontFamilyCache, and then fills |map|.
@@ -87,8 +91,6 @@
// |this| is destroyed after the Profile destructor completes as part of
// Profile's super class destructor ~base::SupportsUserData.
FontPrefChangeNotifier::Registrar font_change_registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(FontFamilyCache);
};
#endif // CHROME_BROWSER_FONT_FAMILY_CACHE_H_
diff --git a/chrome/browser/font_family_cache_unittest.cc b/chrome/browser/font_family_cache_unittest.cc
index 2e46a6f..59af4858b 100644
--- a/chrome/browser/font_family_cache_unittest.cc
+++ b/chrome/browser/font_family_cache_unittest.cc
@@ -17,6 +17,10 @@
public:
explicit TestingFontFamilyCache(Profile* profile)
: FontFamilyCache(profile), fetch_font_count_(0) {}
+
+ TestingFontFamilyCache(const TestingFontFamilyCache&) = delete;
+ TestingFontFamilyCache& operator=(const TestingFontFamilyCache&) = delete;
+
~TestingFontFamilyCache() override {}
std::u16string FetchFont(const char* script, const char* map_name) override {
++fetch_font_count_;
@@ -24,9 +28,6 @@
}
int fetch_font_count_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestingFontFamilyCache);
};
} // namespace
diff --git a/chrome/browser/font_pref_change_notifier.h b/chrome/browser/font_pref_change_notifier.h
index 8bf874b..60664305 100644
--- a/chrome/browser/font_pref_change_notifier.h
+++ b/chrome/browser/font_pref_change_notifier.h
@@ -35,6 +35,10 @@
class Registrar {
public:
Registrar();
+
+ Registrar(const Registrar&) = delete;
+ Registrar& operator=(const Registrar&) = delete;
+
~Registrar();
bool is_registered() const { return !!notifier_; }
@@ -52,8 +56,6 @@
FontPrefChangeNotifier* notifier_ = nullptr;
FontPrefChangeNotifier::Callback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(Registrar);
};
// The pref service must outlive this class.
diff --git a/chrome/browser/gcm/gcm_profile_service_factory.h b/chrome/browser/gcm/gcm_profile_service_factory.h
index a4f8d65..988b792 100644
--- a/chrome/browser/gcm/gcm_profile_service_factory.h
+++ b/chrome/browser/gcm/gcm_profile_service_factory.h
@@ -29,9 +29,13 @@
class ScopedTestingFactoryInstaller {
public:
explicit ScopedTestingFactoryInstaller(TestingFactory testing_factory);
- ~ScopedTestingFactoryInstaller();
- DISALLOW_COPY_AND_ASSIGN(ScopedTestingFactoryInstaller);
+ ScopedTestingFactoryInstaller(const ScopedTestingFactoryInstaller&) =
+ delete;
+ ScopedTestingFactoryInstaller& operator=(
+ const ScopedTestingFactoryInstaller&) = delete;
+
+ ~ScopedTestingFactoryInstaller();
};
private:
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index c084e08..f5e7af89 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -68,6 +68,10 @@
class IFrameLoader : public content::NotificationObserver {
public:
IFrameLoader(Browser* browser, int iframe_id, const GURL& url);
+
+ IFrameLoader(const IFrameLoader&) = delete;
+ IFrameLoader& operator=(const IFrameLoader&) = delete;
+
~IFrameLoader() override;
// content::NotificationObserver:
@@ -90,8 +94,6 @@
// The URL for the iframe we just loaded.
GURL iframe_url_;
-
- DISALLOW_COPY_AND_ASSIGN(IFrameLoader);
};
IFrameLoader::IFrameLoader(Browser* browser, int iframe_id, const GURL& url)
@@ -165,6 +167,10 @@
};
GeolocationBrowserTest();
+
+ GeolocationBrowserTest(const GeolocationBrowserTest&) = delete;
+ GeolocationBrowserTest& operator=(const GeolocationBrowserTest&) = delete;
+
~GeolocationBrowserTest() override = default;
// InProcessBrowserTest:
@@ -254,8 +260,6 @@
// The urls for the iframes loaded by LoadIFrames.
std::vector<GURL> iframe_urls_;
-
- DISALLOW_COPY_AND_ASSIGN(GeolocationBrowserTest);
};
// WebContentImpl tries to connect Device Service earlier than
diff --git a/chrome/browser/geolocation/geolocation_permission_context_delegate.h b/chrome/browser/geolocation/geolocation_permission_context_delegate.h
index c8fdc48..9fe49fc 100644
--- a/chrome/browser/geolocation/geolocation_permission_context_delegate.h
+++ b/chrome/browser/geolocation/geolocation_permission_context_delegate.h
@@ -23,6 +23,12 @@
public:
explicit GeolocationPermissionContextDelegate(
content::BrowserContext* browser_context);
+
+ GeolocationPermissionContextDelegate(
+ const GeolocationPermissionContextDelegate&) = delete;
+ GeolocationPermissionContextDelegate& operator=(
+ const GeolocationPermissionContextDelegate&) = delete;
+
~GeolocationPermissionContextDelegate() override;
// In addition to the base class flow the geolocation permission decision
@@ -39,8 +45,6 @@
private:
// This must only be accessed from the UI thread.
GeolocationPermissionContextExtensions extensions_context_;
-
- DISALLOW_COPY_AND_ASSIGN(GeolocationPermissionContextDelegate);
};
#endif // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_DELEGATE_H_
diff --git a/chrome/browser/geolocation/geolocation_permission_context_delegate_android.h b/chrome/browser/geolocation/geolocation_permission_context_delegate_android.h
index 08ad2dc..f900bba 100644
--- a/chrome/browser/geolocation/geolocation_permission_context_delegate_android.h
+++ b/chrome/browser/geolocation/geolocation_permission_context_delegate_android.h
@@ -13,6 +13,12 @@
: public GeolocationPermissionContextDelegate {
public:
explicit GeolocationPermissionContextDelegateAndroid(Profile* profile);
+
+ GeolocationPermissionContextDelegateAndroid(
+ const GeolocationPermissionContextDelegateAndroid&) = delete;
+ GeolocationPermissionContextDelegateAndroid& operator=(
+ const GeolocationPermissionContextDelegateAndroid&) = delete;
+
~GeolocationPermissionContextDelegateAndroid() override;
// GeolocationPermissionContext::Delegate:
@@ -31,9 +37,6 @@
void FinishNotifyPermissionSet(const permissions::PermissionRequestID& id,
const GURL& requesting_origin,
const GURL& embedding_origin) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(GeolocationPermissionContextDelegateAndroid);
};
#endif // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_DELEGATE_ANDROID_H_
diff --git a/chrome/browser/geolocation/geolocation_permission_context_extensions.h b/chrome/browser/geolocation/geolocation_permission_context_extensions.h
index 26fad06..1f31d22 100644
--- a/chrome/browser/geolocation/geolocation_permission_context_extensions.h
+++ b/chrome/browser/geolocation/geolocation_permission_context_extensions.h
@@ -25,6 +25,12 @@
class GeolocationPermissionContextExtensions {
public:
explicit GeolocationPermissionContextExtensions(Profile* profile);
+
+ GeolocationPermissionContextExtensions(
+ const GeolocationPermissionContextExtensions&) = delete;
+ GeolocationPermissionContextExtensions& operator=(
+ const GeolocationPermissionContextExtensions&) = delete;
+
~GeolocationPermissionContextExtensions();
// Returns true if the permission request was handled. In which case,
@@ -44,8 +50,6 @@
#if BUILDFLAG(ENABLE_EXTENSIONS)
Profile* profile_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(GeolocationPermissionContextExtensions);
};
#endif // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_EXTENSIONS_H_
diff --git a/chrome/browser/google/google_brand.h b/chrome/browser/google/google_brand.h
index 72a9862..b1a98ba 100644
--- a/chrome/browser/google/google_brand.h
+++ b/chrome/browser/google/google_brand.h
@@ -50,12 +50,14 @@
class BrandForTesting {
public:
explicit BrandForTesting(const std::string& brand);
+
+ BrandForTesting(const BrandForTesting&) = delete;
+ BrandForTesting& operator=(const BrandForTesting&) = delete;
+
~BrandForTesting();
private:
std::string brand_;
-
- DISALLOW_COPY_AND_ASSIGN(BrandForTesting);
};
} // namespace google_brand
diff --git a/chrome/browser/gpu/gpu_mode_manager.h b/chrome/browser/gpu/gpu_mode_manager.h
index 878eae6b..24de80d 100644
--- a/chrome/browser/gpu/gpu_mode_manager.h
+++ b/chrome/browser/gpu/gpu_mode_manager.h
@@ -15,6 +15,10 @@
static void RegisterPrefs(PrefRegistrySimple* registry);
GpuModeManager();
+
+ GpuModeManager(const GpuModeManager&) = delete;
+ GpuModeManager& operator=(const GpuModeManager&) = delete;
+
~GpuModeManager();
bool initial_gpu_mode_pref() const;
@@ -25,9 +29,6 @@
PrefChangeRegistrar pref_registrar_;
bool initial_gpu_mode_pref_;
-
- DISALLOW_COPY_AND_ASSIGN(GpuModeManager);
};
#endif // CHROME_BROWSER_GPU_GPU_MODE_MANAGER_H_
-
diff --git a/chrome/browser/guest_view/app_view/chrome_app_view_guest_delegate.h b/chrome/browser/guest_view/app_view/chrome_app_view_guest_delegate.h
index 23092dba..ff1310c 100644
--- a/chrome/browser/guest_view/app_view/chrome_app_view_guest_delegate.h
+++ b/chrome/browser/guest_view/app_view/chrome_app_view_guest_delegate.h
@@ -14,15 +14,17 @@
class ChromeAppViewGuestDelegate : public AppViewGuestDelegate {
public:
ChromeAppViewGuestDelegate();
+
+ ChromeAppViewGuestDelegate(const ChromeAppViewGuestDelegate&) = delete;
+ ChromeAppViewGuestDelegate& operator=(const ChromeAppViewGuestDelegate&) =
+ delete;
+
~ChromeAppViewGuestDelegate() override;
// AppViewGuestDelegate:
bool HandleContextMenu(content::WebContents* web_contents,
const content::ContextMenuParams& params) override;
AppDelegate* CreateAppDelegate(content::WebContents* web_contents) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeAppViewGuestDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/guest_view/chrome_guest_view_manager_delegate.h b/chrome/browser/guest_view/chrome_guest_view_manager_delegate.h
index 447a34b..e2fcb4c 100644
--- a/chrome/browser/guest_view/chrome_guest_view_manager_delegate.h
+++ b/chrome/browser/guest_view/chrome_guest_view_manager_delegate.h
@@ -18,13 +18,16 @@
: public ExtensionsGuestViewManagerDelegate {
public:
explicit ChromeGuestViewManagerDelegate(content::BrowserContext* context);
+
+ ChromeGuestViewManagerDelegate(const ChromeGuestViewManagerDelegate&) =
+ delete;
+ ChromeGuestViewManagerDelegate& operator=(
+ const ChromeGuestViewManagerDelegate&) = delete;
+
~ChromeGuestViewManagerDelegate() override;
// GuestViewManagerDelegate:
void OnGuestAdded(content::WebContents* guest_web_contents) const override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeGuestViewManagerDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/guest_view/extension_options/chrome_extension_options_guest_delegate.h b/chrome/browser/guest_view/extension_options/chrome_extension_options_guest_delegate.h
index 007cdd9..d87812e9 100644
--- a/chrome/browser/guest_view/extension_options/chrome_extension_options_guest_delegate.h
+++ b/chrome/browser/guest_view/extension_options/chrome_extension_options_guest_delegate.h
@@ -17,15 +17,18 @@
: public ExtensionOptionsGuestDelegate {
public:
explicit ChromeExtensionOptionsGuestDelegate(ExtensionOptionsGuest* guest);
+
+ ChromeExtensionOptionsGuestDelegate(
+ const ChromeExtensionOptionsGuestDelegate&) = delete;
+ ChromeExtensionOptionsGuestDelegate& operator=(
+ const ChromeExtensionOptionsGuestDelegate&) = delete;
+
~ChromeExtensionOptionsGuestDelegate() override;
bool HandleContextMenu(const content::ContextMenuParams& params) override;
content::WebContents* OpenURLInNewTab(
const content::OpenURLParams& params) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeExtensionOptionsGuestDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.h b/chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.h
index 0820c3a7..6279732 100644
--- a/chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.h
+++ b/chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.h
@@ -18,6 +18,12 @@
class ChromeMimeHandlerViewGuestDelegate : public MimeHandlerViewGuestDelegate {
public:
ChromeMimeHandlerViewGuestDelegate();
+
+ ChromeMimeHandlerViewGuestDelegate(
+ const ChromeMimeHandlerViewGuestDelegate&) = delete;
+ ChromeMimeHandlerViewGuestDelegate& operator=(
+ const ChromeMimeHandlerViewGuestDelegate&) = delete;
+
~ChromeMimeHandlerViewGuestDelegate() override;
// MimeHandlerViewGuestDelegate.
@@ -25,9 +31,6 @@
const content::ContextMenuParams& params) override;
void RecordLoadMetric(bool in_main_frame,
const std::string& mime_type) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeMimeHandlerViewGuestDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h
index bab7aa4..934480f2 100644
--- a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h
+++ b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h
@@ -37,6 +37,12 @@
explicit ChromeWebViewPermissionHelperDelegate(
WebViewPermissionHelper* web_view_permission_helper);
+
+ ChromeWebViewPermissionHelperDelegate(
+ const ChromeWebViewPermissionHelperDelegate&) = delete;
+ ChromeWebViewPermissionHelperDelegate& operator=(
+ const ChromeWebViewPermissionHelperDelegate&) = delete;
+
~ChromeWebViewPermissionHelperDelegate() override;
// WebViewPermissionHelperDelegate implementation.
@@ -100,8 +106,6 @@
base::WeakPtrFactory<ChromeWebViewPermissionHelperDelegate> weak_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeWebViewPermissionHelperDelegate);
};
} // namespace extensions
diff --git a/chrome/browser/guest_view/web_view/context_menu_content_type_web_view.h b/chrome/browser/guest_view/web_view/context_menu_content_type_web_view.h
index e70f57d..64d5a89 100644
--- a/chrome/browser/guest_view/web_view/context_menu_content_type_web_view.h
+++ b/chrome/browser/guest_view/web_view/context_menu_content_type_web_view.h
@@ -18,6 +18,10 @@
// guests are: searching, printing, speech and instant.
class ContextMenuContentTypeWebView : public ContextMenuContentType {
public:
+ ContextMenuContentTypeWebView(const ContextMenuContentTypeWebView&) = delete;
+ ContextMenuContentTypeWebView& operator=(
+ const ContextMenuContentTypeWebView&) = delete;
+
~ContextMenuContentTypeWebView() override;
// ContextMenuContentType overrides.
@@ -31,8 +35,6 @@
friend class ContextMenuContentTypeFactory;
const extensions::Extension* GetExtension() const;
-
- DISALLOW_COPY_AND_ASSIGN(ContextMenuContentTypeWebView);
};
#endif // CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CONTEXT_MENU_CONTENT_TYPE_WEB_VIEW_H_
diff --git a/chrome/browser/history/chrome_history_backend_client.h b/chrome/browser/history/chrome_history_backend_client.h
index 9eb44396..b1eae6e 100644
--- a/chrome/browser/history/chrome_history_backend_client.h
+++ b/chrome/browser/history/chrome_history_backend_client.h
@@ -19,6 +19,11 @@
public:
explicit ChromeHistoryBackendClient(
scoped_refptr<bookmarks::ModelLoader> model_loader);
+
+ ChromeHistoryBackendClient(const ChromeHistoryBackendClient&) = delete;
+ ChromeHistoryBackendClient& operator=(const ChromeHistoryBackendClient&) =
+ delete;
+
~ChromeHistoryBackendClient() override;
// history::HistoryBackendClient implementation.
@@ -29,8 +34,6 @@
private:
// ModelLoader is used to access bookmarks. May be null during testing.
scoped_refptr<bookmarks::ModelLoader> model_loader_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeHistoryBackendClient);
};
#endif // CHROME_BROWSER_HISTORY_CHROME_HISTORY_BACKEND_CLIENT_H_
diff --git a/chrome/browser/history/chrome_history_client.h b/chrome/browser/history/chrome_history_client.h
index 48452aa..a6ccbc9 100644
--- a/chrome/browser/history/chrome_history_client.h
+++ b/chrome/browser/history/chrome_history_client.h
@@ -28,6 +28,10 @@
public bookmarks::BaseBookmarkModelObserver {
public:
explicit ChromeHistoryClient(bookmarks::BookmarkModel* bookmark_model);
+
+ ChromeHistoryClient(const ChromeHistoryClient&) = delete;
+ ChromeHistoryClient& operator=(const ChromeHistoryClient&) = delete;
+
~ChromeHistoryClient() override;
// history::HistoryClient implementation.
@@ -62,8 +66,6 @@
// Subscription for notifications of changes to favicons.
base::CallbackListSubscription favicons_changed_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeHistoryClient);
};
#endif // CHROME_BROWSER_HISTORY_CHROME_HISTORY_CLIENT_H_
diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/history/history_tab_helper.h
index fd4357a..b1914c7 100644
--- a/chrome/browser/history/history_tab_helper.h
+++ b/chrome/browser/history/history_tab_helper.h
@@ -19,6 +19,9 @@
class HistoryTabHelper : public content::WebContentsObserver,
public content::WebContentsUserData<HistoryTabHelper> {
public:
+ HistoryTabHelper(const HistoryTabHelper&) = delete;
+ HistoryTabHelper& operator=(const HistoryTabHelper&) = delete;
+
~HistoryTabHelper() override;
// Updates history with the specified navigation. This is called by
@@ -91,8 +94,6 @@
base::WeakPtr<content::WebContents> opener_web_contents_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(HistoryTabHelper);
};
#endif // CHROME_BROWSER_HISTORY_HISTORY_TAB_HELPER_H_
diff --git a/chrome/browser/icon_loader_browsertest.cc b/chrome/browser/icon_loader_browsertest.cc
index cd0517c1..2c5341cf 100644
--- a/chrome/browser/icon_loader_browsertest.cc
+++ b/chrome/browser/icon_loader_browsertest.cc
@@ -25,6 +25,9 @@
explicit TestIconLoader(base::OnceClosure quit_closure)
: quit_closure_(std::move(quit_closure)) {}
+ TestIconLoader(const TestIconLoader&) = delete;
+ TestIconLoader& operator=(const TestIconLoader&) = delete;
+
~TestIconLoader() {
if (!quit_closure_.is_null()) {
std::move(quit_closure_).Run();
@@ -59,8 +62,6 @@
bool load_succeeded_ = false;
base::OnceClosure quit_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(TestIconLoader);
};
#if !((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(MEMORY_SANITIZER))
diff --git a/chrome/browser/icon_manager.h b/chrome/browser/icon_manager.h
index 745a349..f514c5dc 100644
--- a/chrome/browser/icon_manager.h
+++ b/chrome/browser/icon_manager.h
@@ -58,6 +58,10 @@
class IconManager {
public:
IconManager();
+
+ IconManager(const IconManager&) = delete;
+ IconManager& operator=(const IconManager&) = delete;
+
~IconManager();
// Synchronous call to examine the internal caches for the icon. Returns the
@@ -113,8 +117,6 @@
std::map<CacheKey, gfx::Image> icon_cache_;
base::WeakPtrFactory<IconManager> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(IconManager);
};
#endif // CHROME_BROWSER_ICON_MANAGER_H_
diff --git a/chrome/browser/idle/idle_browsertest.cc b/chrome/browser/idle/idle_browsertest.cc
index 8515928e..cddc5bd 100644
--- a/chrome/browser/idle/idle_browsertest.cc
+++ b/chrome/browser/idle/idle_browsertest.cc
@@ -28,13 +28,14 @@
class MockIdleTimeProvider : public content::IdleTimeProvider {
public:
MockIdleTimeProvider() = default;
+
+ MockIdleTimeProvider(const MockIdleTimeProvider&) = delete;
+ MockIdleTimeProvider& operator=(const MockIdleTimeProvider&) = delete;
+
~MockIdleTimeProvider() override = default;
MOCK_METHOD0(CalculateIdleTime, base::TimeDelta());
MOCK_METHOD0(CheckIdleStateIsLocked, bool());
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockIdleTimeProvider);
};
class IdleBrowserTest : public InProcessBrowserTest {
diff --git a/chrome/browser/idle/idle_detection_permission_context.h b/chrome/browser/idle/idle_detection_permission_context.h
index a0c0ac5c..1931c88 100644
--- a/chrome/browser/idle/idle_detection_permission_context.h
+++ b/chrome/browser/idle/idle_detection_permission_context.h
@@ -14,6 +14,12 @@
public:
explicit IdleDetectionPermissionContext(
content::BrowserContext* browser_context);
+
+ IdleDetectionPermissionContext(const IdleDetectionPermissionContext&) =
+ delete;
+ IdleDetectionPermissionContext& operator=(
+ const IdleDetectionPermissionContext&) = delete;
+
~IdleDetectionPermissionContext() override;
private:
@@ -31,8 +37,6 @@
permissions::BrowserPermissionCallback callback) override;
base::WeakPtrFactory<IdleDetectionPermissionContext> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(IdleDetectionPermissionContext);
};
#endif // CHROME_BROWSER_IDLE_IDLE_DETECTION_PERMISSION_CONTEXT_H_
diff --git a/chrome/browser/image_decoder/image_decoder_browsertest.cc b/chrome/browser/image_decoder/image_decoder_browsertest.cc
index 88a17e6f..1ff7ad9 100644
--- a/chrome/browser/image_decoder/image_decoder_browsertest.cc
+++ b/chrome/browser/image_decoder/image_decoder_browsertest.cc
@@ -65,6 +65,9 @@
quit_closure_(std::move(quit_closure)),
quit_called_(false) {}
+ TestImageRequest(const TestImageRequest&) = delete;
+ TestImageRequest& operator=(const TestImageRequest&) = delete;
+
~TestImageRequest() override {
if (!quit_called_) {
std::move(quit_closure_).Run();
@@ -95,8 +98,6 @@
base::OnceClosure quit_closure_;
bool quit_called_;
SkBitmap bitmap_;
-
- DISALLOW_COPY_AND_ASSIGN(TestImageRequest);
};
} // namespace
diff --git a/chrome/browser/image_fetcher/image_decoder_impl.cc b/chrome/browser/image_fetcher/image_decoder_impl.cc
index 90d935d..2c3501a6 100644
--- a/chrome/browser/image_fetcher/image_decoder_impl.cc
+++ b/chrome/browser/image_fetcher/image_decoder_impl.cc
@@ -17,6 +17,10 @@
DecodeImageRequest(ImageDecoderImpl* decoder,
image_fetcher::ImageDecodedCallback callback)
: decoder_(decoder), callback_(std::move(callback)) {}
+
+ DecodeImageRequest(const DecodeImageRequest&) = delete;
+ DecodeImageRequest& operator=(const DecodeImageRequest&) = delete;
+
~DecodeImageRequest() override {}
private:
@@ -33,8 +37,6 @@
// The callback to call after the request completed.
image_fetcher::ImageDecodedCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(DecodeImageRequest);
};
void ImageDecoderImpl::DecodeImageRequest::OnImageDecoded(
diff --git a/chrome/browser/image_fetcher/image_decoder_impl.h b/chrome/browser/image_fetcher/image_decoder_impl.h
index d8463a2..5a53489 100644
--- a/chrome/browser/image_fetcher/image_decoder_impl.h
+++ b/chrome/browser/image_fetcher/image_decoder_impl.h
@@ -15,6 +15,10 @@
class ImageDecoderImpl : public image_fetcher::ImageDecoder {
public:
ImageDecoderImpl();
+
+ ImageDecoderImpl(const ImageDecoderImpl&) = delete;
+ ImageDecoderImpl& operator=(const ImageDecoderImpl&) = delete;
+
~ImageDecoderImpl() override;
void DecodeImage(const std::string& image_data,
@@ -29,8 +33,6 @@
// All active image decoding requests.
std::vector<std::unique_ptr<DecodeImageRequest>> decode_image_requests_;
-
- DISALLOW_COPY_AND_ASSIGN(ImageDecoderImpl);
};
#endif // CHROME_BROWSER_IMAGE_FETCHER_IMAGE_DECODER_IMPL_H_
diff --git a/chrome/browser/importer/firefox_profile_lock.h b/chrome/browser/importer/firefox_profile_lock.h
index 0068200..43e40ed 100644
--- a/chrome/browser/importer/firefox_profile_lock.h
+++ b/chrome/browser/importer/firefox_profile_lock.h
@@ -68,6 +68,10 @@
class FirefoxProfileLock {
public:
explicit FirefoxProfileLock(const base::FilePath& path);
+
+ FirefoxProfileLock(const FirefoxProfileLock&) = delete;
+ FirefoxProfileLock& operator=(const FirefoxProfileLock&) = delete;
+
~FirefoxProfileLock();
// Locks and releases the profile.
@@ -105,8 +109,6 @@
// other cases.
bool LockWithFcntl();
#endif
-
- DISALLOW_COPY_AND_ASSIGN(FirefoxProfileLock);
};
#endif // CHROME_BROWSER_IMPORTER_FIREFOX_PROFILE_LOCK_H__
diff --git a/chrome/browser/importer/importer_list.h b/chrome/browser/importer/importer_list.h
index 418fb0d0..a9e1339 100644
--- a/chrome/browser/importer/importer_list.h
+++ b/chrome/browser/importer/importer_list.h
@@ -21,6 +21,10 @@
class ImporterList {
public:
ImporterList();
+
+ ImporterList(const ImporterList&) = delete;
+ ImporterList& operator=(const ImporterList&) = delete;
+
~ImporterList();
// Detects the installed browsers and their associated profiles, then stores
@@ -57,8 +61,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<ImporterList> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ImporterList);
};
#endif // CHROME_BROWSER_IMPORTER_IMPORTER_LIST_H_
diff --git a/chrome/browser/importer/profile_writer_unittest.cc b/chrome/browser/importer/profile_writer_unittest.cc
index 5b5a692..2608d66 100644
--- a/chrome/browser/importer/profile_writer_unittest.cc
+++ b/chrome/browser/importer/profile_writer_unittest.cc
@@ -64,6 +64,10 @@
class ProfileWriterTest : public testing::Test {
public:
ProfileWriterTest() {}
+
+ ProfileWriterTest(const ProfileWriterTest&) = delete;
+ ProfileWriterTest& operator=(const ProfileWriterTest&) = delete;
+
~ProfileWriterTest() override {}
void SetUp() override {
@@ -187,8 +191,6 @@
std::unique_ptr<TestingProfile> profile_;
std::unique_ptr<TestingProfile> second_profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ProfileWriterTest);
};
// Add bookmarks via ProfileWriter to profile1 when profile2 also exists.
diff --git a/chrome/browser/infobars/infobar_observer.h b/chrome/browser/infobars/infobar_observer.h
index 6e662e7..aabb885 100644
--- a/chrome/browser/infobars/infobar_observer.h
+++ b/chrome/browser/infobars/infobar_observer.h
@@ -22,6 +22,10 @@
// Creates the observer. |type| is the type of infobar event that should be
// waited for.
InfoBarObserver(infobars::InfoBarManager* manager, Type type);
+
+ InfoBarObserver(const InfoBarObserver&) = delete;
+ InfoBarObserver& operator=(const InfoBarObserver&) = delete;
+
~InfoBarObserver() override;
// Waits for the specified infobar event to happen. It is OK if the infobar
@@ -44,8 +48,6 @@
base::ScopedObservation<infobars::InfoBarManager,
infobars::InfoBarManager::Observer>
infobar_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(InfoBarObserver);
};
#endif // CHROME_BROWSER_INFOBARS_INFOBAR_OBSERVER_H_
diff --git a/chrome/browser/infobars/infobar_responder.h b/chrome/browser/infobars/infobar_responder.h
index bacb810..2d897ca 100644
--- a/chrome/browser/infobars/infobar_responder.h
+++ b/chrome/browser/infobars/infobar_responder.h
@@ -31,6 +31,10 @@
// The responder will asynchronously perform the requested |response|.
InfoBarResponder(infobars::ContentInfoBarManager* infobar_manager,
AutoResponseType response);
+
+ InfoBarResponder(const InfoBarResponder&) = delete;
+ InfoBarResponder& operator=(const InfoBarResponder&) = delete;
+
~InfoBarResponder() override;
// infobars::InfoBarManager::Observer:
@@ -43,8 +47,6 @@
infobars::ContentInfoBarManager* infobar_manager_;
AutoResponseType response_;
-
- DISALLOW_COPY_AND_ASSIGN(InfoBarResponder);
};
#endif // CHROME_BROWSER_INFOBARS_INFOBAR_RESPONDER_H_
diff --git a/chrome/browser/install_verification/win/module_list.h b/chrome/browser/install_verification/win/module_list.h
index f4b28e4..3b83434 100644
--- a/chrome/browser/install_verification/win/module_list.h
+++ b/chrome/browser/install_verification/win/module_list.h
@@ -19,6 +19,9 @@
// Manages a list of HMODULEs, releasing them upon destruction.
class ModuleList {
public:
+ ModuleList(const ModuleList&) = delete;
+ ModuleList& operator=(const ModuleList&) = delete;
+
~ModuleList();
// Attempts to AddRef each HMODULE in |snapshot|. If a module was unloaded
@@ -44,8 +47,6 @@
ModuleList();
std::vector<HMODULE> modules_;
-
- DISALLOW_COPY_AND_ASSIGN(ModuleList);
};
#endif // CHROME_BROWSER_INSTALL_VERIFICATION_WIN_MODULE_LIST_H_
diff --git a/chrome/browser/installable/installed_webapp_provider.cc b/chrome/browser/installable/installed_webapp_provider.cc
index 3e3461a3..82a54f9d 100644
--- a/chrome/browser/installable/installed_webapp_provider.cc
+++ b/chrome/browser/installable/installed_webapp_provider.cc
@@ -25,6 +25,10 @@
public:
explicit InstalledWebappIterator(InstalledWebappProvider::RuleList rules)
: rules_(std::move(rules)) {}
+
+ InstalledWebappIterator(const InstalledWebappIterator&) = delete;
+ InstalledWebappIterator& operator=(const InstalledWebappIterator&) = delete;
+
~InstalledWebappIterator() override = default;
bool HasNext() const override { return index_ < rules_.size(); }
@@ -44,8 +48,6 @@
private:
size_t index_ = 0;
InstalledWebappProvider::RuleList rules_;
-
- DISALLOW_COPY_AND_ASSIGN(InstalledWebappIterator);
};
bool IsSupportedContentType(ContentSettingsType content_type) {
diff --git a/chrome/browser/installable/installed_webapp_provider.h b/chrome/browser/installable/installed_webapp_provider.h
index 63f4946..1cb21b3 100644
--- a/chrome/browser/installable/installed_webapp_provider.h
+++ b/chrome/browser/installable/installed_webapp_provider.h
@@ -21,6 +21,10 @@
using RuleList = std::vector<std::pair<GURL, ContentSetting>>;
InstalledWebappProvider();
+
+ InstalledWebappProvider(const InstalledWebappProvider&) = delete;
+ InstalledWebappProvider& operator=(const InstalledWebappProvider&) = delete;
+
~InstalledWebappProvider() override;
// ProviderInterface implementations.
@@ -40,9 +44,6 @@
void ShutdownOnUIThread() override;
void Notify(ContentSettingsType content_type);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(InstalledWebappProvider);
};
#endif // CHROME_BROWSER_INSTALLABLE_INSTALLED_WEBAPP_PROVIDER_H_
diff --git a/chrome/browser/intranet_redirect_detector.h b/chrome/browser/intranet_redirect_detector.h
index 30c0d86..5b21a4fb 100644
--- a/chrome/browser/intranet_redirect_detector.h
+++ b/chrome/browser/intranet_redirect_detector.h
@@ -59,6 +59,10 @@
// since there aren't useful public functions on this object for consumers to
// access anyway).
IntranetRedirectDetector();
+
+ IntranetRedirectDetector(const IntranetRedirectDetector&) = delete;
+ IntranetRedirectDetector& operator=(const IntranetRedirectDetector&) = delete;
+
~IntranetRedirectDetector() override;
// Returns the current redirect origin. This will be empty if no redirection
@@ -104,8 +108,6 @@
mojo::Receiver<network::mojom::DnsConfigChangeManagerClient>
dns_config_client_receiver_{this};
base::WeakPtrFactory<IntranetRedirectDetector> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(IntranetRedirectDetector);
};
#endif // CHROME_BROWSER_INTRANET_REDIRECT_DETECTOR_H_
diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
index 0e48ee3..9675471 100644
--- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc
+++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
@@ -129,6 +129,11 @@
service_->AddObserver(this);
}
+ TabRestoreServiceChangesObserver(const TabRestoreServiceChangesObserver&) =
+ delete;
+ TabRestoreServiceChangesObserver& operator=(
+ const TabRestoreServiceChangesObserver&) = delete;
+
~TabRestoreServiceChangesObserver() override {
if (service_)
service_->RemoveObserver(this);
@@ -149,8 +154,6 @@
sessions::TabRestoreService* service_ = nullptr;
size_t changes_count_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(TabRestoreServiceChangesObserver);
};
class TestBrowserCloseManager : public BrowserCloseManager {
diff --git a/chrome/browser/lifetime/browser_shutdown_browsertest.cc b/chrome/browser/lifetime/browser_shutdown_browsertest.cc
index 07e9b3a..aa200b9 100644
--- a/chrome/browser/lifetime/browser_shutdown_browsertest.cc
+++ b/chrome/browser/lifetime/browser_shutdown_browsertest.cc
@@ -32,13 +32,15 @@
class BrowserShutdownBrowserTest : public InProcessBrowserTest {
public:
BrowserShutdownBrowserTest() {}
+
+ BrowserShutdownBrowserTest(const BrowserShutdownBrowserTest&) = delete;
+ BrowserShutdownBrowserTest& operator=(const BrowserShutdownBrowserTest&) =
+ delete;
+
~BrowserShutdownBrowserTest() override {}
protected:
base::HistogramTester histogram_tester_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BrowserShutdownBrowserTest);
};
class BrowserClosingObserver : public BrowserListObserver {
diff --git a/chrome/browser/lite_video/lite_video_decider_unittest.cc b/chrome/browser/lite_video/lite_video_decider_unittest.cc
index 25d77833..0b7205d 100644
--- a/chrome/browser/lite_video/lite_video_decider_unittest.cc
+++ b/chrome/browser/lite_video/lite_video_decider_unittest.cc
@@ -86,6 +86,11 @@
: public optimization_guide::TestOptimizationGuideDecider {
public:
TestOptimizationGuideDecider() = default;
+
+ TestOptimizationGuideDecider(const TestOptimizationGuideDecider&) = delete;
+ TestOptimizationGuideDecider& operator=(const TestOptimizationGuideDecider&) =
+ delete;
+
~TestOptimizationGuideDecider() override = default;
void RegisterOptimizationTypes(
@@ -140,8 +145,6 @@
std::tuple<optimization_guide::OptimizationGuideDecision,
optimization_guide::OptimizationMetadata>>
responses_;
-
- DISALLOW_COPY_AND_ASSIGN(TestOptimizationGuideDecider);
};
class LiteVideoDeciderTest : public ChromeRenderViewHostTestHarness {
diff --git a/chrome/browser/loader/signed_exchange_policy_browsertest.cc b/chrome/browser/loader/signed_exchange_policy_browsertest.cc
index 0801eb2c..5757d56 100644
--- a/chrome/browser/loader/signed_exchange_policy_browsertest.cc
+++ b/chrome/browser/loader/signed_exchange_policy_browsertest.cc
@@ -18,6 +18,12 @@
class SignedExchangePolicyBrowserTest : public CertVerifierBrowserTest {
public:
SignedExchangePolicyBrowserTest() = default;
+
+ SignedExchangePolicyBrowserTest(const SignedExchangePolicyBrowserTest&) =
+ delete;
+ SignedExchangePolicyBrowserTest& operator=(
+ const SignedExchangePolicyBrowserTest&) = delete;
+
~SignedExchangePolicyBrowserTest() override = default;
protected:
@@ -49,8 +55,6 @@
}
content::SignedExchangeBrowserTestHelper sxg_test_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(SignedExchangePolicyBrowserTest);
};
IN_PROC_BROWSER_TEST_F(SignedExchangePolicyBrowserTest, BlackList) {
diff --git a/chrome/browser/local_discovery/endpoint_resolver.h b/chrome/browser/local_discovery/endpoint_resolver.h
index 04ea2920..5ddb3612 100644
--- a/chrome/browser/local_discovery/endpoint_resolver.h
+++ b/chrome/browser/local_discovery/endpoint_resolver.h
@@ -29,6 +29,10 @@
base::OnceCallback<void(const net::IPEndPoint& endpoint)>;
EndpointResolver();
+
+ EndpointResolver(const EndpointResolver&) = delete;
+ EndpointResolver& operator=(const EndpointResolver&) = delete;
+
~EndpointResolver();
void Start(const net::HostPortPair& address, ResultCallback callback);
@@ -44,8 +48,6 @@
scoped_refptr<ServiceDiscoverySharedClient> service_discovery_client_;
std::unique_ptr<ServiceResolver> service_resolver_;
std::unique_ptr<LocalDomainResolver> domain_resolver_;
-
- DISALLOW_COPY_AND_ASSIGN(EndpointResolver);
};
} // namespace local_discovery
diff --git a/chrome/browser/local_discovery/service_discovery_client_impl.h b/chrome/browser/local_discovery/service_discovery_client_impl.h
index 5912825..68807bb 100644
--- a/chrome/browser/local_discovery/service_discovery_client_impl.h
+++ b/chrome/browser/local_discovery/service_discovery_client_impl.h
@@ -25,6 +25,11 @@
public:
// |mdns_client| must outlive the Service Discovery Client.
explicit ServiceDiscoveryClientImpl(net::MDnsClient* mdns_client);
+
+ ServiceDiscoveryClientImpl(const ServiceDiscoveryClientImpl&) = delete;
+ ServiceDiscoveryClientImpl& operator=(const ServiceDiscoveryClientImpl&) =
+ delete;
+
~ServiceDiscoveryClientImpl() override;
// ServiceDiscoveryClient implementation:
@@ -43,8 +48,6 @@
private:
net::MDnsClient* mdns_client_;
-
- DISALLOW_COPY_AND_ASSIGN(ServiceDiscoveryClientImpl);
};
class ServiceWatcherImpl : public ServiceWatcher,
@@ -54,6 +57,10 @@
ServiceWatcherImpl(const std::string& service_type,
ServiceWatcher::UpdatedCallback callback,
net::MDnsClient* mdns_client);
+
+ ServiceWatcherImpl(const ServiceWatcherImpl&) = delete;
+ ServiceWatcherImpl& operator=(const ServiceWatcherImpl&) = delete;
+
// Listening will automatically stop when the destructor is called.
~ServiceWatcherImpl() override;
@@ -151,8 +158,6 @@
bool actively_refresh_services_;
net::MDnsClient* const mdns_client_;
-
- DISALLOW_COPY_AND_ASSIGN(ServiceWatcherImpl);
};
class ServiceResolverImpl
@@ -163,6 +168,9 @@
ServiceResolver::ResolveCompleteCallback callback,
net::MDnsClient* mdns_client);
+ ServiceResolverImpl(const ServiceResolverImpl&) = delete;
+ ServiceResolverImpl& operator=(const ServiceResolverImpl&) = delete;
+
~ServiceResolverImpl() override;
// ServiceResolver implementation:
@@ -218,8 +226,6 @@
ServiceDescription service_staging_;
net::MDnsClient* const mdns_client_;
-
- DISALLOW_COPY_AND_ASSIGN(ServiceResolverImpl);
};
class LocalDomainResolverImpl : public LocalDomainResolver {
@@ -228,6 +234,10 @@
net::AddressFamily address_family,
IPAddressCallback callback,
net::MDnsClient* mdns_client);
+
+ LocalDomainResolverImpl(const LocalDomainResolverImpl&) = delete;
+ LocalDomainResolverImpl& operator=(const LocalDomainResolverImpl&) = delete;
+
~LocalDomainResolverImpl() override;
void Start() override;
@@ -260,8 +270,6 @@
net::IPAddress address_ipv6_;
base::CancelableOnceClosure timeout_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(LocalDomainResolverImpl);
};
diff --git a/chrome/browser/local_discovery/service_discovery_client_mac.h b/chrome/browser/local_discovery/service_discovery_client_mac.h
index 61b31746..1fd8e4f 100644
--- a/chrome/browser/local_discovery/service_discovery_client_mac.h
+++ b/chrome/browser/local_discovery/service_discovery_client_mac.h
@@ -63,6 +63,9 @@
ServiceWatcher::UpdatedCallback callback,
scoped_refptr<base::SingleThreadTaskRunner> service_discovery_runner);
+ ServiceWatcherImplMac(const ServiceWatcherImplMac&) = delete;
+ ServiceWatcherImplMac& operator=(const ServiceWatcherImplMac&) = delete;
+
~ServiceWatcherImplMac() override;
void OnServicesUpdate(ServiceWatcher::UpdateType update,
@@ -86,8 +89,6 @@
base::scoped_nsobject<NetServiceBrowser> browser_;
base::WeakPtrFactory<ServiceWatcherImplMac> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ServiceWatcherImplMac);
};
class ServiceResolverImplMac : public ServiceResolver {
@@ -97,6 +98,9 @@
ServiceResolver::ResolveCompleteCallback callback,
scoped_refptr<base::SingleThreadTaskRunner> service_discovery_runner);
+ ServiceResolverImplMac(const ServiceResolverImplMac&) = delete;
+ ServiceResolverImplMac& operator=(const ServiceResolverImplMac&) = delete;
+
~ServiceResolverImplMac() override;
private:
@@ -120,8 +124,6 @@
base::scoped_nsobject<NetServiceResolver> resolver_;
base::WeakPtrFactory<ServiceResolverImplMac> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ServiceResolverImplMac);
};
// Parses the data out of the |service|, updating the |description| with the
diff --git a/chrome/browser/local_discovery/service_discovery_client_mdns.cc b/chrome/browser/local_discovery/service_discovery_client_mdns.cc
index f84eacb..e8978f5 100644
--- a/chrome/browser/local_discovery/service_discovery_client_mdns.cc
+++ b/chrome/browser/local_discovery/service_discovery_client_mdns.cc
@@ -41,6 +41,9 @@
client_->proxies_.AddObserver(this);
}
+ Proxy(const Proxy&) = delete;
+ Proxy& operator=(const Proxy&) = delete;
+
virtual ~Proxy() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
client_->proxies_.RemoveObserver(this);
@@ -110,8 +113,6 @@
// Delayed |mdns_runner_| tasks.
std::vector<base::OnceClosure> delayed_tasks_;
base::WeakPtrFactory<Proxy> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(Proxy);
};
namespace {
@@ -163,6 +164,9 @@
: Proxy(client) {
}
+ ProxyBase(const ProxyBase&) = delete;
+ ProxyBase& operator=(const ProxyBase&) = delete;
+
~ProxyBase() override {
DeleteOnMdnsThread(implementation_.release());
}
@@ -186,8 +190,6 @@
private:
std::unique_ptr<T> implementation_;
-
- DISALLOW_COPY_AND_ASSIGN(ProxyBase);
};
class ServiceWatcherProxy : public ProxyBase<ServiceWatcher> {
diff --git a/chrome/browser/lookalikes/lookalike_url_blocking_page.h b/chrome/browser/lookalikes/lookalike_url_blocking_page.h
index ee8e6a4..eac7250 100644
--- a/chrome/browser/lookalikes/lookalike_url_blocking_page.h
+++ b/chrome/browser/lookalikes/lookalike_url_blocking_page.h
@@ -37,6 +37,9 @@
security_interstitials::SecurityInterstitialControllerClient>
controller);
+ LookalikeUrlBlockingPage(const LookalikeUrlBlockingPage&) = delete;
+ LookalikeUrlBlockingPage& operator=(const LookalikeUrlBlockingPage&) = delete;
+
~LookalikeUrlBlockingPage() override;
// SecurityInterstitialPage method:
@@ -67,8 +70,6 @@
// True if the warning was generated by the first URL in a redirect chain
// (rather than the last). If there were no redirects, this value is false.
const bool triggered_by_initial_url_;
-
- DISALLOW_COPY_AND_ASSIGN(LookalikeUrlBlockingPage);
};
#endif // CHROME_BROWSER_LOOKALIKES_LOOKALIKE_URL_BLOCKING_PAGE_H_
diff --git a/chrome/browser/lookalikes/lookalike_url_controller_client.h b/chrome/browser/lookalikes/lookalike_url_controller_client.h
index 0a37a25..100a184 100644
--- a/chrome/browser/lookalikes/lookalike_url_controller_client.h
+++ b/chrome/browser/lookalikes/lookalike_url_controller_client.h
@@ -27,6 +27,10 @@
const GURL& request_url,
const GURL& safe_url);
+ LookalikeUrlControllerClient(const LookalikeUrlControllerClient&) = delete;
+ LookalikeUrlControllerClient& operator=(const LookalikeUrlControllerClient&) =
+ delete;
+
~LookalikeUrlControllerClient() override;
// security_interstitials::ControllerClient overrides.
@@ -36,8 +40,6 @@
private:
const GURL request_url_;
const GURL safe_url_;
-
- DISALLOW_COPY_AND_ASSIGN(LookalikeUrlControllerClient);
};
#endif // CHROME_BROWSER_LOOKALIKES_LOOKALIKE_URL_CONTROLLER_CLIENT_H_
diff --git a/chrome/browser/lookalikes/lookalike_url_service.h b/chrome/browser/lookalikes/lookalike_url_service.h
index aa0f06c..7d8c22c5 100644
--- a/chrome/browser/lookalikes/lookalike_url_service.h
+++ b/chrome/browser/lookalikes/lookalike_url_service.h
@@ -31,6 +31,10 @@
class LookalikeUrlService : public KeyedService {
public:
explicit LookalikeUrlService(Profile* profile);
+
+ LookalikeUrlService(const LookalikeUrlService&) = delete;
+ LookalikeUrlService& operator=(const LookalikeUrlService&) = delete;
+
~LookalikeUrlService() override;
using EngagedSitesCallback =
@@ -71,7 +75,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<LookalikeUrlService> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(LookalikeUrlService);
};
#endif // CHROME_BROWSER_LOOKALIKES_LOOKALIKE_URL_SERVICE_H_
diff --git a/chrome/browser/lookalikes/lookalike_url_tab_storage.h b/chrome/browser/lookalikes/lookalike_url_tab_storage.h
index 4d7fdce..f879bec 100644
--- a/chrome/browser/lookalikes/lookalike_url_tab_storage.h
+++ b/chrome/browser/lookalikes/lookalike_url_tab_storage.h
@@ -39,6 +39,9 @@
LookalikeUrlTabStorage();
+ LookalikeUrlTabStorage(const LookalikeUrlTabStorage&) = delete;
+ LookalikeUrlTabStorage& operator=(const LookalikeUrlTabStorage&) = delete;
+
~LookalikeUrlTabStorage() override;
static LookalikeUrlTabStorage* GetOrCreate(
@@ -59,8 +62,6 @@
// Parameters associated with the currently displayed interstitial. These are
// cleared immediately on next navigation.
InterstitialParams interstitial_params_;
-
- DISALLOW_COPY_AND_ASSIGN(LookalikeUrlTabStorage);
};
#endif // CHROME_BROWSER_LOOKALIKES_LOOKALIKE_URL_TAB_STORAGE_H_
diff --git a/chrome/browser/mac/install_from_dmg.mm b/chrome/browser/mac/install_from_dmg.mm
index 5c10a4d..f50a808 100644
--- a/chrome/browser/mac/install_from_dmg.mm
+++ b/chrome/browser/mac/install_from_dmg.mm
@@ -548,6 +548,11 @@
DASessionScheduleWithRunLoop(session_, run_loop_, run_loop_mode_);
}
+ ScopedDASessionScheduleWithRunLoop(
+ const ScopedDASessionScheduleWithRunLoop&) = delete;
+ ScopedDASessionScheduleWithRunLoop& operator=(
+ const ScopedDASessionScheduleWithRunLoop&) = delete;
+
~ScopedDASessionScheduleWithRunLoop() {
DASessionUnscheduleFromRunLoop(session_, run_loop_, run_loop_mode_);
}
@@ -556,8 +561,6 @@
DASessionRef session_;
CFRunLoopRef run_loop_;
CFStringRef run_loop_mode_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedDASessionScheduleWithRunLoop);
};
// A small structure used to ferry data between SynchronousDAOperation and
diff --git a/chrome/browser/mac/mac_startup_profiler.h b/chrome/browser/mac/mac_startup_profiler.h
index d3ace2fb..5b89cd8 100644
--- a/chrome/browser/mac/mac_startup_profiler.h
+++ b/chrome/browser/mac/mac_startup_profiler.h
@@ -19,6 +19,10 @@
static MacStartupProfiler* GetInstance();
MacStartupProfiler();
+
+ MacStartupProfiler(const MacStartupProfiler&) = delete;
+ MacStartupProfiler& operator=(const MacStartupProfiler&) = delete;
+
~MacStartupProfiler();
// These locations correspond to major phases of Chrome startup.
@@ -56,8 +60,6 @@
// Whether UMA metrics have been recorded. Only record UMA metrics once.
bool recorded_metrics_;
-
- DISALLOW_COPY_AND_ASSIGN(MacStartupProfiler);
};
#endif // CHROME_BROWSER_MAC_MAC_STARTUP_PROFILER_H_
diff --git a/chrome/browser/media/capture_access_handler_base.cc b/chrome/browser/media/capture_access_handler_base.cc
index 6e4d840..d4afb19 100644
--- a/chrome/browser/media/capture_access_handler_base.cc
+++ b/chrome/browser/media/capture_access_handler_base.cc
@@ -37,6 +37,10 @@
class WeakPtrToWebContents : private content::WebContentsObserver {
public:
WeakPtrToWebContents() = default;
+
+ WeakPtrToWebContents(const WeakPtrToWebContents&) = delete;
+ WeakPtrToWebContents& operator=(const WeakPtrToWebContents&) = delete;
+
~WeakPtrToWebContents() override = default;
void Set(int render_process_id, int render_frame_id) {
@@ -52,10 +56,6 @@
content::WebContents* get() const {
return WebContentsObserver::web_contents();
}
-
- private:
- // WebContentsObserver does not allow copy or assign.
- DISALLOW_COPY_AND_ASSIGN(WeakPtrToWebContents);
};
} // namespace
diff --git a/chrome/browser/media/capture_access_handler_base.h b/chrome/browser/media/capture_access_handler_base.h
index 137ba01..0de9e42 100644
--- a/chrome/browser/media/capture_access_handler_base.h
+++ b/chrome/browser/media/capture_access_handler_base.h
@@ -24,6 +24,10 @@
class CaptureAccessHandlerBase : public MediaAccessHandler {
public:
CaptureAccessHandlerBase();
+
+ CaptureAccessHandlerBase(const CaptureAccessHandlerBase&) = delete;
+ CaptureAccessHandlerBase& operator=(const CaptureAccessHandlerBase&) = delete;
+
~CaptureAccessHandlerBase() override;
// MediaAccessHandler implementation.
@@ -86,8 +90,6 @@
int target_frame_id);
std::list<Session> sessions_;
-
- DISALLOW_COPY_AND_ASSIGN(CaptureAccessHandlerBase);
};
#endif // CHROME_BROWSER_MEDIA_CAPTURE_ACCESS_HANDLER_BASE_H_
diff --git a/chrome/browser/media/cast_mirroring_service_host.h b/chrome/browser/media/cast_mirroring_service_host.h
index bd0ac76..2d6b42f 100644
--- a/chrome/browser/media/cast_mirroring_service_host.h
+++ b/chrome/browser/media/cast_mirroring_service_host.h
@@ -74,6 +74,9 @@
// |source_media_id| indicates the mirroring source.
explicit CastMirroringServiceHost(content::DesktopMediaID source_media_id);
+ CastMirroringServiceHost(const CastMirroringServiceHost&) = delete;
+ CastMirroringServiceHost& operator=(const CastMirroringServiceHost&) = delete;
+
~CastMirroringServiceHost() override;
// mojom::MirroringServiceHost implementation.
@@ -164,8 +167,6 @@
#if BUILDFLAG(ENABLE_EXTENSIONS)
std::unique_ptr<OffscreenTab> offscreen_tab_;
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
-
- DISALLOW_COPY_AND_ASSIGN(CastMirroringServiceHost);
};
} // namespace mirroring
diff --git a/chrome/browser/media/cast_mirroring_service_host_browsertest.cc b/chrome/browser/media/cast_mirroring_service_host_browsertest.cc
index b8d5c70b..69b2a24c 100644
--- a/chrome/browser/media/cast_mirroring_service_host_browsertest.cc
+++ b/chrome/browser/media/cast_mirroring_service_host_browsertest.cc
@@ -135,6 +135,12 @@
public mojom::AudioStreamCreatorClient {
public:
CastMirroringServiceHostBrowserTest() = default;
+
+ CastMirroringServiceHostBrowserTest(
+ const CastMirroringServiceHostBrowserTest&) = delete;
+ CastMirroringServiceHostBrowserTest& operator=(
+ const CastMirroringServiceHostBrowserTest&) = delete;
+
~CastMirroringServiceHostBrowserTest() override = default;
protected:
@@ -242,8 +248,6 @@
std::unique_ptr<CastMirroringServiceHost> host_;
std::unique_ptr<MockVideoCaptureObserver> video_frame_receiver_;
-
- DISALLOW_COPY_AND_ASSIGN(CastMirroringServiceHostBrowserTest);
};
IN_PROC_BROWSER_TEST_F(CastMirroringServiceHostBrowserTest, CaptureTabVideo) {
diff --git a/chrome/browser/media/cast_remoting_connector.cc b/chrome/browser/media/cast_remoting_connector.cc
index 2b361ef..2354b38 100644
--- a/chrome/browser/media/cast_remoting_connector.cc
+++ b/chrome/browser/media/cast_remoting_connector.cc
@@ -53,6 +53,9 @@
connector_->RegisterBridge(this);
}
+ RemotingBridge(const RemotingBridge&) = delete;
+ RemotingBridge& operator=(const RemotingBridge&) = delete;
+
~RemotingBridge() final {
if (connector_)
connector_->DeregisterBridge(this, RemotingStopReason::SOURCE_GONE);
@@ -122,8 +125,6 @@
// Weak pointer. Will be set to nullptr if the CastRemotingConnector is
// destroyed before this RemotingBridge.
CastRemotingConnector* connector_;
-
- DISALLOW_COPY_AND_ASSIGN(RemotingBridge);
};
// static
diff --git a/chrome/browser/media/cast_remoting_connector.h b/chrome/browser/media/cast_remoting_connector.h
index 3f58c318..e56a1196e 100644
--- a/chrome/browser/media/cast_remoting_connector.h
+++ b/chrome/browser/media/cast_remoting_connector.h
@@ -78,6 +78,9 @@
class CastRemotingConnector final : public base::SupportsUserData::Data,
public media::mojom::RemotingSource {
public:
+ CastRemotingConnector(const CastRemotingConnector&) = delete;
+ CastRemotingConnector& operator=(const CastRemotingConnector&) = delete;
+
~CastRemotingConnector() final;
// Returns the instance of the CastRemotingConnector associated with
@@ -243,8 +246,6 @@
// Key used with the base::SupportsUserData interface to search for an
// instance of CastRemotingConnector owned by a WebContents.
static const void* const kUserDataKey;
-
- DISALLOW_COPY_AND_ASSIGN(CastRemotingConnector);
};
#endif // CHROME_BROWSER_MEDIA_CAST_REMOTING_CONNECTOR_H_
diff --git a/chrome/browser/media/history/media_history_contents_observer.h b/chrome/browser/media/history/media_history_contents_observer.h
index e030b1b..1bcdf52 100644
--- a/chrome/browser/media/history/media_history_contents_observer.h
+++ b/chrome/browser/media/history/media_history_contents_observer.h
@@ -18,6 +18,10 @@
public content::WebContentsUserData<MediaHistoryContentsObserver>,
public media_session::mojom::MediaSessionObserver {
public:
+ MediaHistoryContentsObserver(const MediaHistoryContentsObserver&) = delete;
+ MediaHistoryContentsObserver& operator=(const MediaHistoryContentsObserver&) =
+ delete;
+
~MediaHistoryContentsObserver() override;
// content::WebContentsObserver:
@@ -75,8 +79,6 @@
this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(MediaHistoryContentsObserver);
};
#endif // CHROME_BROWSER_MEDIA_HISTORY_MEDIA_HISTORY_CONTENTS_OBSERVER_H_
diff --git a/chrome/browser/media/history/media_history_keyed_service.h b/chrome/browser/media/history/media_history_keyed_service.h
index 8b6a1d74..9610e58 100644
--- a/chrome/browser/media/history/media_history_keyed_service.h
+++ b/chrome/browser/media/history/media_history_keyed_service.h
@@ -31,6 +31,10 @@
public history::HistoryServiceObserver {
public:
explicit MediaHistoryKeyedService(Profile* profile);
+
+ MediaHistoryKeyedService(const MediaHistoryKeyedService&) = delete;
+ MediaHistoryKeyedService& operator=(const MediaHistoryKeyedService&) = delete;
+
~MediaHistoryKeyedService() override;
static bool IsEnabled();
@@ -107,8 +111,6 @@
base::ScopedObservation<history::HistoryService,
history::HistoryServiceObserver>
history_service_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MediaHistoryKeyedService);
};
} // namespace media_history
diff --git a/chrome/browser/media/media_engagement_browsertest.cc b/chrome/browser/media/media_engagement_browsertest.cc
index ca426bb0..07b7731 100644
--- a/chrome/browser/media/media_engagement_browsertest.cc
+++ b/chrome/browser/media/media_engagement_browsertest.cc
@@ -68,6 +68,11 @@
// entire lifetime of |this|.
explicit WasRecentlyAudibleWatcher(content::WebContents* web_contents)
: audible_helper_(RecentlyAudibleHelper::FromWebContents(web_contents)) {}
+
+ WasRecentlyAudibleWatcher(const WasRecentlyAudibleWatcher&) = delete;
+ WasRecentlyAudibleWatcher& operator=(const WasRecentlyAudibleWatcher&) =
+ delete;
+
~WasRecentlyAudibleWatcher() = default;
// Waits until WasRecentlyAudible is true.
@@ -94,8 +99,6 @@
base::RepeatingTimer timer_;
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(WasRecentlyAudibleWatcher);
};
} // namespace
diff --git a/chrome/browser/media/media_engagement_contents_observer.h b/chrome/browser/media/media_engagement_contents_observer.h
index 0f0a942..d49f6c5 100644
--- a/chrome/browser/media/media_engagement_contents_observer.h
+++ b/chrome/browser/media/media_engagement_contents_observer.h
@@ -24,6 +24,11 @@
class MediaEngagementContentsObserver : public content::WebContentsObserver {
public:
+ MediaEngagementContentsObserver(const MediaEngagementContentsObserver&) =
+ delete;
+ MediaEngagementContentsObserver& operator=(
+ const MediaEngagementContentsObserver&) = delete;
+
~MediaEngagementContentsObserver() override;
// WebContentsObserver implementation.
@@ -250,8 +255,6 @@
// may be shared by other instances if they are part of the same session. It
// willl be null if it is not part of a session.
scoped_refptr<MediaEngagementSession> session_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaEngagementContentsObserver);
};
#endif // CHROME_BROWSER_MEDIA_MEDIA_ENGAGEMENT_CONTENTS_OBSERVER_H_
diff --git a/chrome/browser/media/media_engagement_preloaded_list.h b/chrome/browser/media/media_engagement_preloaded_list.h
index 7e78ffb..1713e95d 100644
--- a/chrome/browser/media/media_engagement_preloaded_list.h
+++ b/chrome/browser/media/media_engagement_preloaded_list.h
@@ -24,6 +24,11 @@
static MediaEngagementPreloadedList* GetInstance();
MediaEngagementPreloadedList();
+
+ MediaEngagementPreloadedList(const MediaEngagementPreloadedList&) = delete;
+ MediaEngagementPreloadedList& operator=(const MediaEngagementPreloadedList&) =
+ delete;
+
~MediaEngagementPreloadedList();
// Load the contents from |path|.
@@ -119,8 +124,6 @@
bool is_loaded_ = false;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(MediaEngagementPreloadedList);
};
#endif // CHROME_BROWSER_MEDIA_MEDIA_ENGAGEMENT_PRELOADED_LIST_H_
diff --git a/chrome/browser/media/media_engagement_score.h b/chrome/browser/media/media_engagement_score.h
index 9ff14d8..f47f7bae 100644
--- a/chrome/browser/media/media_engagement_score.h
+++ b/chrome/browser/media/media_engagement_score.h
@@ -41,6 +41,10 @@
MediaEngagementScore(base::Clock* clock,
const url::Origin& origin,
HostContentSettingsMap* settings);
+
+ MediaEngagementScore(const MediaEngagementScore&) = delete;
+ MediaEngagementScore& operator=(const MediaEngagementScore&) = delete;
+
~MediaEngagementScore();
MediaEngagementScore(MediaEngagementScore&&);
@@ -138,8 +142,6 @@
// The content settings map that will persist the score,
// has a lifetime of the Profile like the service which owns |this|.
HostContentSettingsMap* settings_map_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(MediaEngagementScore);
};
#endif // CHROME_BROWSER_MEDIA_MEDIA_ENGAGEMENT_SCORE_H_
diff --git a/chrome/browser/media/media_engagement_service.h b/chrome/browser/media/media_engagement_service.h
index 3fcfad8..b38f67a1 100644
--- a/chrome/browser/media/media_engagement_service.h
+++ b/chrome/browser/media/media_engagement_service.h
@@ -51,6 +51,10 @@
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
explicit MediaEngagementService(Profile* profile);
+
+ MediaEngagementService(const MediaEngagementService&) = delete;
+ MediaEngagementService& operator=(const MediaEngagementService&) = delete;
+
~MediaEngagementService() override;
// Returns the engagement score of |origin|.
@@ -133,8 +137,6 @@
base::ScopedObservation<history::HistoryService,
history::HistoryServiceObserver>
history_service_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MediaEngagementService);
};
#endif // CHROME_BROWSER_MEDIA_MEDIA_ENGAGEMENT_SERVICE_H_
diff --git a/chrome/browser/media/media_engagement_service_unittest.cc b/chrome/browser/media/media_engagement_service_unittest.cc
index c3db78ee..0e1158d 100644
--- a/chrome/browser/media/media_engagement_service_unittest.cc
+++ b/chrome/browser/media/media_engagement_service_unittest.cc
@@ -56,6 +56,10 @@
HostContentSettingsMapFactory::GetForProfile(profile)->AddObserver(this);
}
+ MediaEngagementChangeWaiter(const MediaEngagementChangeWaiter&) = delete;
+ MediaEngagementChangeWaiter& operator=(const MediaEngagementChangeWaiter&) =
+ delete;
+
~MediaEngagementChangeWaiter() override {
HostContentSettingsMapFactory::GetForProfile(profile_)->RemoveObserver(
this);
@@ -76,8 +80,6 @@
Profile* profile_;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaEngagementChangeWaiter);
};
base::Time GetReferenceTime() {
diff --git a/chrome/browser/media/offscreen_tab.cc b/chrome/browser/media/offscreen_tab.cc
index d6295d8..c082310 100644
--- a/chrome/browser/media/offscreen_tab.cc
+++ b/chrome/browser/media/offscreen_tab.cc
@@ -58,6 +58,9 @@
}
}
+ WindowAdoptionAgent(const WindowAdoptionAgent&) = delete;
+ WindowAdoptionAgent& operator=(const WindowAdoptionAgent&) = delete;
+
~WindowAdoptionAgent() final {
if (content_window_)
content_window_->RemoveObserver(this);
@@ -116,8 +119,6 @@
aura::Window* content_window_;
base::WeakPtrFactory<WindowAdoptionAgent> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WindowAdoptionAgent);
};
#endif // defined(USE_AURA)
diff --git a/chrome/browser/media/offscreen_tab.h b/chrome/browser/media/offscreen_tab.h
index 3fd38bcb..c80128b8 100644
--- a/chrome/browser/media/offscreen_tab.h
+++ b/chrome/browser/media/offscreen_tab.h
@@ -58,6 +58,10 @@
};
OffscreenTab(Owner* owner, content::BrowserContext* context);
+
+ OffscreenTab(const OffscreenTab&) = delete;
+ OffscreenTab& operator=(const OffscreenTab&) = delete;
+
~OffscreenTab() final;
// The WebContents instance hosting the rendering engine for this
@@ -173,8 +177,6 @@
#if defined(USE_AURA)
std::unique_ptr<WindowAdoptionAgent> window_agent_;
#endif // defined(USE_AURA)
-
- DISALLOW_COPY_AND_ASSIGN(OffscreenTab);
};
#endif // CHROME_BROWSER_MEDIA_OFFSCREEN_TAB_H_
diff --git a/chrome/browser/media/protected_media_identifier_permission_context.h b/chrome/browser/media/protected_media_identifier_permission_context.h
index c20acb8..7f7fc9a 100644
--- a/chrome/browser/media/protected_media_identifier_permission_context.h
+++ b/chrome/browser/media/protected_media_identifier_permission_context.h
@@ -16,6 +16,12 @@
public:
explicit ProtectedMediaIdentifierPermissionContext(
content::BrowserContext* browser_context);
+
+ ProtectedMediaIdentifierPermissionContext(
+ const ProtectedMediaIdentifierPermissionContext&) = delete;
+ ProtectedMediaIdentifierPermissionContext& operator=(
+ const ProtectedMediaIdentifierPermissionContext&) = delete;
+
~ProtectedMediaIdentifierPermissionContext() override;
// PermissionContextBase implementation.
@@ -38,8 +44,6 @@
// it can be disabled by a switch in content settings, in incognito or guest
// mode, or by the device policy.
bool IsProtectedMediaIdentifierEnabled() const;
-
- DISALLOW_COPY_AND_ASSIGN(ProtectedMediaIdentifierPermissionContext);
};
#endif // CHROME_BROWSER_MEDIA_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_CONTEXT_H_
diff --git a/chrome/browser/media/public_session_media_access_handler.h b/chrome/browser/media/public_session_media_access_handler.h
index 28b8e70..4b1d10d 100644
--- a/chrome/browser/media/public_session_media_access_handler.h
+++ b/chrome/browser/media/public_session_media_access_handler.h
@@ -28,6 +28,12 @@
class PublicSessionMediaAccessHandler : public MediaAccessHandler {
public:
PublicSessionMediaAccessHandler();
+
+ PublicSessionMediaAccessHandler(const PublicSessionMediaAccessHandler&) =
+ delete;
+ PublicSessionMediaAccessHandler& operator=(
+ const PublicSessionMediaAccessHandler&) = delete;
+
~PublicSessionMediaAccessHandler() override;
// MediaAccessHandler implementation.
@@ -55,8 +61,6 @@
const extensions::PermissionIDSet& allowed_permissions);
ExtensionMediaAccessHandler extension_media_access_handler_;
-
- DISALLOW_COPY_AND_ASSIGN(PublicSessionMediaAccessHandler);
};
#endif // CHROME_BROWSER_MEDIA_PUBLIC_SESSION_MEDIA_ACCESS_HANDLER_H_
diff --git a/chrome/browser/media/public_session_tab_capture_access_handler.h b/chrome/browser/media/public_session_tab_capture_access_handler.h
index 9d80791..443a41c6 100644
--- a/chrome/browser/media/public_session_tab_capture_access_handler.h
+++ b/chrome/browser/media/public_session_tab_capture_access_handler.h
@@ -27,6 +27,12 @@
class PublicSessionTabCaptureAccessHandler : public CaptureAccessHandlerBase {
public:
PublicSessionTabCaptureAccessHandler();
+
+ PublicSessionTabCaptureAccessHandler(
+ const PublicSessionTabCaptureAccessHandler&) = delete;
+ PublicSessionTabCaptureAccessHandler& operator=(
+ const PublicSessionTabCaptureAccessHandler&) = delete;
+
~PublicSessionTabCaptureAccessHandler() override;
// MediaAccessHandler implementation.
@@ -54,8 +60,6 @@
const extensions::PermissionIDSet& allowed_permissions);
TabCaptureAccessHandler tab_capture_access_handler_;
-
- DISALLOW_COPY_AND_ASSIGN(PublicSessionTabCaptureAccessHandler);
};
#endif // CHROME_BROWSER_MEDIA_PUBLIC_SESSION_TAB_CAPTURE_ACCESS_HANDLER_H_
diff --git a/chrome/browser/media/router/discovery/dial/device_description_fetcher.h b/chrome/browser/media/router/discovery/dial/device_description_fetcher.h
index 3fd1e3a..be5f5500 100644
--- a/chrome/browser/media/router/discovery/dial/device_description_fetcher.h
+++ b/chrome/browser/media/router/discovery/dial/device_description_fetcher.h
@@ -30,6 +30,9 @@
base::OnceCallback<void(const DialDeviceDescriptionData&)> success_cb,
base::OnceCallback<void(const std::string&)> error_cb);
+ DeviceDescriptionFetcher(const DeviceDescriptionFetcher&) = delete;
+ DeviceDescriptionFetcher& operator=(const DeviceDescriptionFetcher&) = delete;
+
virtual ~DeviceDescriptionFetcher();
const GURL& device_description_url() { return device_description_url_; }
@@ -55,7 +58,6 @@
std::unique_ptr<DialURLFetcher> fetcher_;
SEQUENCE_CHECKER(sequence_checker_);
- DISALLOW_COPY_AND_ASSIGN(DeviceDescriptionFetcher);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/discovery/dial/device_description_service.h b/chrome/browser/media/router/discovery/dial/device_description_service.h
index c32b8cc..1fbe0b2 100644
--- a/chrome/browser/media/router/discovery/dial/device_description_service.h
+++ b/chrome/browser/media/router/discovery/dial/device_description_service.h
@@ -62,6 +62,10 @@
DeviceDescriptionService(
const DeviceDescriptionParseSuccessCallback& success_cb,
const DeviceDescriptionParseErrorCallback& error_cb);
+
+ DeviceDescriptionService(const DeviceDescriptionService&) = delete;
+ DeviceDescriptionService& operator=(const DeviceDescriptionService&) = delete;
+
virtual ~DeviceDescriptionService();
// For each device in |devices|, if there is a valid cache entry for it, call
@@ -160,8 +164,6 @@
SafeDialDeviceDescriptionParser device_description_parser_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(DeviceDescriptionService);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h b/chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h
index ff13ff9..288b9b8 100644
--- a/chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h
+++ b/chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h
@@ -71,6 +71,9 @@
DialAppDiscoveryService();
+ DialAppDiscoveryService(const DialAppDiscoveryService&) = delete;
+ DialAppDiscoveryService& operator=(const DialAppDiscoveryService&) = delete;
+
virtual ~DialAppDiscoveryService();
// Queries |app_name|'s availability on |sink| by issuing a HTTP GET request.
@@ -91,6 +94,10 @@
const std::string& app_name,
DialAppInfoCallback app_info_cb,
DialAppDiscoveryService* const service);
+
+ PendingRequest(const PendingRequest&) = delete;
+ PendingRequest& operator=(const PendingRequest&) = delete;
+
~PendingRequest();
// Starts fetching the app info on |app_url_|.
@@ -126,7 +133,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<PendingRequest> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(PendingRequest);
};
friend class PendingRequest;
@@ -144,7 +150,6 @@
std::unique_ptr<SafeDialAppInfoParser> parser_;
SEQUENCE_CHECKER(sequence_checker_);
- DISALLOW_COPY_AND_ASSIGN(DialAppDiscoveryService);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/discovery/dial/dial_media_sink_service.h b/chrome/browser/media/router/discovery/dial/dial_media_sink_service.h
index e2044f22..937a61d 100644
--- a/chrome/browser/media/router/discovery/dial/dial_media_sink_service.h
+++ b/chrome/browser/media/router/discovery/dial/dial_media_sink_service.h
@@ -34,6 +34,10 @@
class DialMediaSinkService {
public:
DialMediaSinkService();
+
+ DialMediaSinkService(const DialMediaSinkService&) = delete;
+ DialMediaSinkService& operator=(const DialMediaSinkService&) = delete;
+
virtual ~DialMediaSinkService();
// Starts discovery of DIAL sinks. Can only be called once.
@@ -68,8 +72,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<DialMediaSinkService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DialMediaSinkService);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/discovery/dial/dial_service.h b/chrome/browser/media/router/discovery/dial/dial_service.h
index d32d5908..c18cd706 100644
--- a/chrome/browser/media/router/discovery/dial/dial_service.h
+++ b/chrome/browser/media/router/discovery/dial/dial_service.h
@@ -96,6 +96,10 @@
class DialServiceImpl : public DialService {
public:
explicit DialServiceImpl(net::NetLog* net_log);
+
+ DialServiceImpl(const DialServiceImpl&) = delete;
+ DialServiceImpl& operator=(const DialServiceImpl&) = delete;
+
~DialServiceImpl() override;
// DialService implementation
@@ -114,6 +118,10 @@
class DialSocket {
public:
explicit DialSocket(DialServiceImpl* dial_service);
+
+ DialSocket(const DialSocket&) = delete;
+ DialSocket& operator=(const DialSocket&) = delete;
+
~DialSocket();
// Creates a socket using |net_log| and binds it to |bind_ip_address|.
@@ -181,8 +189,6 @@
// Pointer to the DialServiceImpl that owns this socket.
DialServiceImpl* const dial_service_;
-
- DISALLOW_COPY_AND_ASSIGN(DialSocket);
};
// Starts the control flow for one discovery cycle.
@@ -274,7 +280,6 @@
FRIEND_TEST_ALL_PREFIXES(DialServiceTest, TestOnDiscoveryFinished);
FRIEND_TEST_ALL_PREFIXES(DialServiceTest, TestOnDiscoveryRequest);
FRIEND_TEST_ALL_PREFIXES(DialServiceTest, TestResponseParsing);
- DISALLOW_COPY_AND_ASSIGN(DialServiceImpl);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/discovery/dial/dial_url_fetcher.h b/chrome/browser/media/router/discovery/dial/dial_url_fetcher.h
index 7a310c39..a30c061 100644
--- a/chrome/browser/media/router/discovery/dial/dial_url_fetcher.h
+++ b/chrome/browser/media/router/discovery/dial/dial_url_fetcher.h
@@ -44,6 +44,9 @@
// |error_cb|: Invoked when HTTP request to |url| fails.
DialURLFetcher(SuccessCallback success_cb, ErrorCallback error_cb);
+ DialURLFetcher(const DialURLFetcher&) = delete;
+ DialURLFetcher& operator=(const DialURLFetcher&) = delete;
+
virtual ~DialURLFetcher();
// Starts a HTTP GET request.
@@ -110,7 +113,6 @@
network::ResourceRequest* saved_request_for_test_ = nullptr;
SEQUENCE_CHECKER(sequence_checker_);
- DISALLOW_COPY_AND_ASSIGN(DialURLFetcher);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/discovery/dial/safe_dial_app_info_parser.h b/chrome/browser/media/router/discovery/dial/safe_dial_app_info_parser.h
index 0695719c..09372dd1 100644
--- a/chrome/browser/media/router/discovery/dial/safe_dial_app_info_parser.h
+++ b/chrome/browser/media/router/discovery/dial/safe_dial_app_info_parser.h
@@ -35,6 +35,10 @@
};
SafeDialAppInfoParser();
+
+ SafeDialAppInfoParser(const SafeDialAppInfoParser&) = delete;
+ SafeDialAppInfoParser& operator=(const SafeDialAppInfoParser&) = delete;
+
virtual ~SafeDialAppInfoParser();
// Callback function invoked when done parsing DIAL app info XML.
@@ -60,8 +64,6 @@
data_decoder::DataDecoder::ValueOrError result);
base::WeakPtrFactory<SafeDialAppInfoParser> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SafeDialAppInfoParser);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser.h b/chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser.h
index 58130cdc3..e8a08d4 100644
--- a/chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser.h
+++ b/chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser.h
@@ -46,6 +46,12 @@
};
SafeDialDeviceDescriptionParser();
+
+ SafeDialDeviceDescriptionParser(const SafeDialDeviceDescriptionParser&) =
+ delete;
+ SafeDialDeviceDescriptionParser& operator=(
+ const SafeDialDeviceDescriptionParser&) = delete;
+
~SafeDialDeviceDescriptionParser();
// Callback function invoked when done parsing some device description XML.
@@ -77,8 +83,6 @@
data_decoder::DataDecoder::ValueOrError result);
base::WeakPtrFactory<SafeDialDeviceDescriptionParser> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SafeDialDeviceDescriptionParser);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/discovery/discovery_network_list_win.cc b/chrome/browser/media/router/discovery/discovery_network_list_win.cc
index 4321b488..cf55ac3c 100644
--- a/chrome/browser/media/router/discovery/discovery_network_list_win.cc
+++ b/chrome/browser/media/router/discovery/discovery_network_list_win.cc
@@ -79,6 +79,9 @@
return base::WrapUnique(new WlanApi(library));
}
+ WlanApi(const WlanApi&) = delete;
+ WlanApi& operator=(const WlanApi&) = delete;
+
~WlanApi() { FreeLibrary(library_); }
private:
@@ -103,8 +106,6 @@
}
HINSTANCE library_;
-
- DISALLOW_COPY_AND_ASSIGN(WlanApi);
};
class ScopedWlanClientHandle {
@@ -112,6 +113,10 @@
explicit ScopedWlanClientHandle(
const WlanCloseHandleFunction wlan_close_handle)
: wlan_close_handle_(wlan_close_handle) {}
+
+ ScopedWlanClientHandle(const ScopedWlanClientHandle&) = delete;
+ ScopedWlanClientHandle& operator=(const ScopedWlanClientHandle&) = delete;
+
~ScopedWlanClientHandle() {
if (handle != nullptr) {
wlan_close_handle_(handle, nullptr);
@@ -122,8 +127,6 @@
private:
const WlanCloseHandleFunction wlan_close_handle_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedWlanClientHandle);
};
// Returns a map from a network interface's GUID to its MAC address. This
diff --git a/chrome/browser/media/router/discovery/mdns/cast_media_sink_service.h b/chrome/browser/media/router/discovery/mdns/cast_media_sink_service.h
index d3cc263d..6bc252c 100644
--- a/chrome/browser/media/router/discovery/mdns/cast_media_sink_service.h
+++ b/chrome/browser/media/router/discovery/mdns/cast_media_sink_service.h
@@ -34,6 +34,10 @@
class CastMediaSinkService : public DnsSdRegistry::DnsSdObserver {
public:
CastMediaSinkService();
+
+ CastMediaSinkService(const CastMediaSinkService&) = delete;
+ CastMediaSinkService& operator=(const CastMediaSinkService&) = delete;
+
~CastMediaSinkService() override;
// Starts Cast sink discovery. No-ops if already started.
@@ -113,8 +117,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<CastMediaSinkService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CastMediaSinkService);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.h b/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.h
index 53d73a9f..ca6096c 100644
--- a/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.h
+++ b/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.h
@@ -63,6 +63,10 @@
DiscoveryNetworkMonitor* network_monitor,
MediaSinkServiceBase* dial_media_sink_service,
bool allow_all_ips);
+
+ CastMediaSinkServiceImpl(const CastMediaSinkServiceImpl&) = delete;
+ CastMediaSinkServiceImpl& operator=(const CastMediaSinkServiceImpl&) = delete;
+
~CastMediaSinkServiceImpl() override;
// Returns the SequencedTaskRunner that should be used to invoke methods on
@@ -342,8 +346,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<CastMediaSinkServiceImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CastMediaSinkServiceImpl);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.h b/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.h
index 1e3d3c1..7ce617b 100644
--- a/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.h
+++ b/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.h
@@ -29,6 +29,10 @@
local_discovery::ServiceDiscoveryClient* service_discovery_client,
DnsSdDelegate* delegate,
const std::string& service_type);
+
+ DnsSdDeviceLister(const DnsSdDeviceLister&) = delete;
+ DnsSdDeviceLister& operator=(const DnsSdDeviceLister&) = delete;
+
virtual ~DnsSdDeviceLister();
virtual void Discover();
@@ -58,8 +62,6 @@
local_discovery::ServiceDiscoveryClient* const service_discovery_client_;
const std::string service_type_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(DnsSdDeviceLister);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/discovery/mdns/dns_sd_registry.h b/chrome/browser/media/router/discovery/mdns/dns_sd_registry.h
index 60a24dd..23d9f61a 100644
--- a/chrome/browser/media/router/discovery/mdns/dns_sd_registry.h
+++ b/chrome/browser/media/router/discovery/mdns/dns_sd_registry.h
@@ -64,6 +64,10 @@
class ServiceTypeData {
public:
explicit ServiceTypeData(std::unique_ptr<DnsSdDeviceLister> lister);
+
+ ServiceTypeData(const ServiceTypeData&) = delete;
+ ServiceTypeData& operator=(const ServiceTypeData&) = delete;
+
virtual ~ServiceTypeData();
// Notify the data class of listeners so that it can be reference counted.
@@ -90,7 +94,6 @@
int ref_count;
std::unique_ptr<DnsSdDeviceLister> lister_;
DnsSdRegistry::DnsSdServiceList service_list_;
- DISALLOW_COPY_AND_ASSIGN(ServiceTypeData);
};
virtual DnsSdDeviceLister* CreateDnsSdDeviceLister(
diff --git a/chrome/browser/media/router/mojo/media_router_desktop.h b/chrome/browser/media/router/mojo/media_router_desktop.h
index 85b2092..1cdff9d 100644
--- a/chrome/browser/media/router/mojo/media_router_desktop.h
+++ b/chrome/browser/media/router/mojo/media_router_desktop.h
@@ -25,6 +25,10 @@
// This constructor performs a firewall check on Windows and is not suitable
// for use in unit tests; instead use the constructor below.
explicit MediaRouterDesktop(content::BrowserContext* context);
+
+ MediaRouterDesktop(const MediaRouterDesktop&) = delete;
+ MediaRouterDesktop& operator=(const MediaRouterDesktop&) = delete;
+
~MediaRouterDesktop() override;
// MediaRouter implementation.
@@ -100,8 +104,6 @@
MediaSinkServiceStatus media_sink_service_status_;
base::WeakPtrFactory<MediaRouterDesktop> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MediaRouterDesktop);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl.h b/chrome/browser/media/router/mojo/media_router_mojo_impl.h
index 65034bb1..3db853a 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_impl.h
+++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.h
@@ -47,6 +47,9 @@
// MediaRouter implementation that delegates calls to a MediaRouteProvider.
class MediaRouterMojoImpl : public MediaRouterBase, public mojom::MediaRouter {
public:
+ MediaRouterMojoImpl(const MediaRouterMojoImpl&) = delete;
+ MediaRouterMojoImpl& operator=(const MediaRouterMojoImpl&) = delete;
+
~MediaRouterMojoImpl() override;
// MediaRouter implementation.
@@ -168,6 +171,10 @@
class MediaSinksQuery {
public:
MediaSinksQuery();
+
+ MediaSinksQuery(const MediaSinksQuery&) = delete;
+ MediaSinksQuery& operator=(const MediaSinksQuery&) = delete;
+
~MediaSinksQuery();
static MediaSource GetKey(const MediaSource::Id& source_id);
@@ -203,8 +210,6 @@
std::vector<url::Origin> origins_;
base::ObserverList<MediaSinksObserver>::Unchecked observers_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaSinksQuery);
};
// Represents a query to the MediaRouteProviders for media routes and caches
@@ -212,6 +217,10 @@
class MediaRoutesQuery {
public:
MediaRoutesQuery();
+
+ MediaRoutesQuery(const MediaRoutesQuery&) = delete;
+ MediaRoutesQuery& operator=(const MediaRoutesQuery&) = delete;
+
~MediaRoutesQuery();
// Caches the list of routes and joinable route IDs for the provider
@@ -261,8 +270,6 @@
providers_to_joinable_routes_;
base::ObserverList<MediaRoutesObserver>::Unchecked observers_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaRoutesQuery);
};
class ProviderSinkAvailability {
@@ -439,8 +446,6 @@
LoggerImpl logger_;
base::WeakPtrFactory<MediaRouterMojoImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MediaRouterMojoImpl);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/mojo/media_sink_service_status.h b/chrome/browser/media/router/mojo/media_sink_service_status.h
index 5d116f8..cd47c08b 100644
--- a/chrome/browser/media/router/mojo/media_sink_service_status.h
+++ b/chrome/browser/media/router/mojo/media_sink_service_status.h
@@ -22,6 +22,10 @@
class MediaSinkServiceStatus {
public:
MediaSinkServiceStatus();
+
+ MediaSinkServiceStatus(const MediaSinkServiceStatus&) = delete;
+ MediaSinkServiceStatus& operator=(const MediaSinkServiceStatus&) = delete;
+
~MediaSinkServiceStatus();
// Called when a media sink service reports discovered sinks to MR.
@@ -52,7 +56,6 @@
base::MRUCache<std::string, std::vector<MediaSinkInternal>> available_sinks_;
base::WeakPtrFactory<MediaSinkServiceStatus> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(MediaSinkServiceStatus);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/providers/cast/cast_app_availability_tracker.h b/chrome/browser/media/router/providers/cast/cast_app_availability_tracker.h
index 9e14936..a0b931e8 100644
--- a/chrome/browser/media/router/providers/cast/cast_app_availability_tracker.h
+++ b/chrome/browser/media/router/providers/cast/cast_app_availability_tracker.h
@@ -54,6 +54,11 @@
std::pair<cast_channel::GetAppAvailabilityResult, base::TimeTicks>;
CastAppAvailabilityTracker();
+
+ CastAppAvailabilityTracker(const CastAppAvailabilityTracker&) = delete;
+ CastAppAvailabilityTracker& operator=(const CastAppAvailabilityTracker&) =
+ delete;
+
~CastAppAvailabilityTracker();
// Registers |source| with the tracker. Returns a list of new app IDs that
@@ -123,8 +128,6 @@
// IDs and app availabilities of known sinks.
base::flat_map<MediaSink::Id, CapabilitiesAndAvailabilityMap>
capabilities_and_availabilities_;
-
- DISALLOW_COPY_AND_ASSIGN(CastAppAvailabilityTracker);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/providers/cast/cast_app_availability_tracker_unittest.cc b/chrome/browser/media/router/providers/cast/cast_app_availability_tracker_unittest.cc
index 28d3143..89dde15 100644
--- a/chrome/browser/media/router/providers/cast/cast_app_availability_tracker_unittest.cc
+++ b/chrome/browser/media/router/providers/cast/cast_app_availability_tracker_unittest.cc
@@ -42,6 +42,12 @@
class CastAppAvailabilityTrackerTest : public testing::Test {
public:
CastAppAvailabilityTrackerTest() = default;
+
+ CastAppAvailabilityTrackerTest(const CastAppAvailabilityTrackerTest&) =
+ delete;
+ CastAppAvailabilityTrackerTest& operator=(
+ const CastAppAvailabilityTrackerTest&) = delete;
+
~CastAppAvailabilityTrackerTest() override = default;
base::TimeTicks Now() const { return clock_.NowTicks(); }
@@ -57,9 +63,6 @@
protected:
base::SimpleTestTickClock clock_;
CastAppAvailabilityTracker tracker_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CastAppAvailabilityTrackerTest);
};
TEST_F(CastAppAvailabilityTrackerTest, RegisterSource) {
diff --git a/chrome/browser/media/router/providers/cast/cast_app_discovery_service.h b/chrome/browser/media/router/providers/cast/cast_app_discovery_service.h
index 34b70c5..5e31121d 100644
--- a/chrome/browser/media/router/providers/cast/cast_app_discovery_service.h
+++ b/chrome/browser/media/router/providers/cast/cast_app_discovery_service.h
@@ -80,6 +80,11 @@
cast_channel::CastSocketService* socket_service,
MediaSinkServiceBase* media_sink_service,
const base::TickClock* clock);
+
+ CastAppDiscoveryServiceImpl(const CastAppDiscoveryServiceImpl&) = delete;
+ CastAppDiscoveryServiceImpl& operator=(const CastAppDiscoveryServiceImpl&) =
+ delete;
+
~CastAppDiscoveryServiceImpl() override;
// CastAppDiscoveryService implementation.
@@ -156,7 +161,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<CastAppDiscoveryServiceImpl> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(CastAppDiscoveryServiceImpl);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/providers/cast/cast_app_discovery_service_unittest.cc b/chrome/browser/media/router/providers/cast/cast_app_discovery_service_unittest.cc
index 3755100f..719fe13 100644
--- a/chrome/browser/media/router/providers/cast/cast_app_discovery_service_unittest.cc
+++ b/chrome/browser/media/router/providers/cast/cast_app_discovery_service_unittest.cc
@@ -45,6 +45,10 @@
task_runner_->RunPendingTasks();
}
+ CastAppDiscoveryServiceTest(const CastAppDiscoveryServiceTest&) = delete;
+ CastAppDiscoveryServiceTest& operator=(const CastAppDiscoveryServiceTest&) =
+ delete;
+
~CastAppDiscoveryServiceTest() override { task_runner_->RunPendingTasks(); }
MOCK_METHOD2(OnSinkQueryUpdated,
@@ -81,9 +85,6 @@
CastMediaSource source_a_1_;
CastMediaSource source_a_2_;
CastMediaSource source_b_1_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CastAppDiscoveryServiceTest);
};
TEST_F(CastAppDiscoveryServiceTest, StartObservingMediaSinks) {
diff --git a/chrome/browser/media/router/providers/cast/cast_internal_message_util.h b/chrome/browser/media/router/providers/cast/cast_internal_message_util.h
index b750356..7d17bb7 100644
--- a/chrome/browser/media/router/providers/cast/cast_internal_message_util.h
+++ b/chrome/browser/media/router/providers/cast/cast_internal_message_util.h
@@ -84,6 +84,9 @@
// a valid Cast internal message.
static std::unique_ptr<CastInternalMessage> From(base::Value message);
+ CastInternalMessage(const CastInternalMessage&) = delete;
+ CastInternalMessage& operator=(const CastInternalMessage&) = delete;
+
~CastInternalMessage();
Type type() const { return type_; }
@@ -135,8 +138,6 @@
const std::string session_id_;
const std::string namespace_or_v2_type_;
const base::Value message_body_;
-
- DISALLOW_COPY_AND_ASSIGN(CastInternalMessage);
};
// Represents a Cast session on a Cast device. Cast sessions are derived from
diff --git a/chrome/browser/media/router/providers/cast/cast_media_controller.h b/chrome/browser/media/router/providers/cast/cast_media_controller.h
index d84b164..c147920d 100644
--- a/chrome/browser/media/router/providers/cast/cast_media_controller.h
+++ b/chrome/browser/media/router/providers/cast/cast_media_controller.h
@@ -52,6 +52,10 @@
CastMediaController(AppActivity* activity,
mojo::PendingReceiver<mojom::MediaController> receiver,
mojo::PendingRemote<mojom::MediaStatusObserver> observer);
+
+ CastMediaController(const CastMediaController&) = delete;
+ CastMediaController& operator=(const CastMediaController&) = delete;
+
~CastMediaController() override;
// mojom::MediaController overrides:
@@ -84,8 +88,6 @@
mojo::Receiver<mojom::MediaController> receiver_;
mojo::Remote<mojom::MediaStatusObserver> observer_;
-
- DISALLOW_COPY_AND_ASSIGN(CastMediaController);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/providers/cast/cast_media_route_provider.h b/chrome/browser/media/router/providers/cast/cast_media_route_provider.h
index 6c5162e..1982e4c 100644
--- a/chrome/browser/media/router/providers/cast/cast_media_route_provider.h
+++ b/chrome/browser/media/router/providers/cast/cast_media_route_provider.h
@@ -46,6 +46,10 @@
cast_channel::CastMessageHandler* message_handler,
const std::string& hash_token,
const scoped_refptr<base::SequencedTaskRunner>& task_runner);
+
+ CastMediaRouteProvider(const CastMediaRouteProvider&) = delete;
+ CastMediaRouteProvider& operator=(const CastMediaRouteProvider&) = delete;
+
~CastMediaRouteProvider() override;
// mojom::MediaRouteProvider:
@@ -132,7 +136,6 @@
std::unique_ptr<CastActivityManager> activity_manager_;
SEQUENCE_CHECKER(sequence_checker_);
- DISALLOW_COPY_AND_ASSIGN(CastMediaRouteProvider);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/providers/cast/cast_session_tracker.h b/chrome/browser/media/router/providers/cast/cast_session_tracker.h
index f2991d4..c9917013 100644
--- a/chrome/browser/media/router/providers/cast/cast_session_tracker.h
+++ b/chrome/browser/media/router/providers/cast/cast_session_tracker.h
@@ -40,6 +40,9 @@
absl::optional<int> request_id) = 0;
};
+ CastSessionTracker(const CastSessionTracker&) = delete;
+ CastSessionTracker& operator=(const CastSessionTracker&) = delete;
+
~CastSessionTracker() override;
// Must be called on UI thread.
@@ -102,7 +105,6 @@
base::ObserverList<Observer> observers_;
SEQUENCE_CHECKER(sequence_checker_);
- DISALLOW_COPY_AND_ASSIGN(CastSessionTracker);
FRIEND_TEST_ALL_PREFIXES(AppActivityTest, SendAppMessageToReceiver);
FRIEND_TEST_ALL_PREFIXES(CastMediaRouteProviderTest, GetState);
FRIEND_TEST_ALL_PREFIXES(CastSessionTrackerTest, RemoveSession);
diff --git a/chrome/browser/media/router/providers/common/buffered_message_sender.h b/chrome/browser/media/router/providers/common/buffered_message_sender.h
index fffb08b5..9a4a618 100644
--- a/chrome/browser/media/router/providers/common/buffered_message_sender.h
+++ b/chrome/browser/media/router/providers/common/buffered_message_sender.h
@@ -22,6 +22,10 @@
class BufferedMessageSender {
public:
explicit BufferedMessageSender(mojom::MediaRouter* media_router);
+
+ BufferedMessageSender(const BufferedMessageSender&) = delete;
+ BufferedMessageSender& operator=(const BufferedMessageSender&) = delete;
+
~BufferedMessageSender();
// Sends |messages| for route given by |route_id|. The messages are buffered
@@ -46,8 +50,6 @@
// Non-owned pointer provided by DialMediaRouteProvider.
mojom::MediaRouter* const media_router_;
-
- DISALLOW_COPY_AND_ASSIGN(BufferedMessageSender);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/providers/dial/dial_activity_manager.h b/chrome/browser/media/router/providers/dial/dial_activity_manager.h
index 2940e6b1..587a0d5 100644
--- a/chrome/browser/media/router/providers/dial/dial_activity_manager.h
+++ b/chrome/browser/media/router/providers/dial/dial_activity_manager.h
@@ -78,12 +78,14 @@
DialPendingRequest(std::unique_ptr<DialURLFetcher> fetcher,
CallbackType callback)
: fetcher(std::move(fetcher)), callback(std::move(callback)) {}
+
+ DialPendingRequest(const DialPendingRequest&) = delete;
+ DialPendingRequest& operator=(const DialPendingRequest&) = delete;
+
~DialPendingRequest() = default;
std::unique_ptr<DialURLFetcher> fetcher;
CallbackType callback;
-
- DISALLOW_COPY_AND_ASSIGN(DialPendingRequest);
};
// Keeps track of all ongoing custom DIAL launch activities, and is the source
@@ -107,6 +109,10 @@
using LaunchAppCallback = base::OnceCallback<void(bool)>;
explicit DialActivityManager(DialAppDiscoveryService* app_discovery_service);
+
+ DialActivityManager(const DialActivityManager&) = delete;
+ DialActivityManager& operator=(const DialActivityManager&) = delete;
+
virtual ~DialActivityManager();
// Adds |activity| to the manager. This call is valid only if there is no
@@ -207,7 +213,6 @@
DialAppDiscoveryService* const app_discovery_service_;
SEQUENCE_CHECKER(sequence_checker_);
- DISALLOW_COPY_AND_ASSIGN(DialActivityManager);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/providers/dial/dial_internal_message_util.h b/chrome/browser/media/router/providers/dial/dial_internal_message_util.h
index 54bda74..ac5c9ff 100644
--- a/chrome/browser/media/router/providers/dial/dial_internal_message_util.h
+++ b/chrome/browser/media/router/providers/dial/dial_internal_message_util.h
@@ -94,6 +94,10 @@
public:
// |hash_token|: A per-profile value used to hash sink IDs.
explicit DialInternalMessageUtil(const std::string& hash_token);
+
+ DialInternalMessageUtil(const DialInternalMessageUtil&) = delete;
+ DialInternalMessageUtil& operator=(const DialInternalMessageUtil&) = delete;
+
~DialInternalMessageUtil();
// Returns |true| if |message| is a valid STOP_SESSION message.
@@ -162,7 +166,6 @@
int sequence_number = -1) const;
std::string hash_token_;
- DISALLOW_COPY_AND_ASSIGN(DialInternalMessageUtil);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/providers/dial/dial_media_route_provider.h b/chrome/browser/media/router/providers/dial/dial_media_route_provider.h
index a759059..fd830d3 100644
--- a/chrome/browser/media/router/providers/dial/dial_media_route_provider.h
+++ b/chrome/browser/media/router/providers/dial/dial_media_route_provider.h
@@ -61,6 +61,10 @@
DialMediaSinkServiceImpl* media_sink_service,
const std::string& hash_token,
const scoped_refptr<base::SequencedTaskRunner>& task_runner);
+
+ DialMediaRouteProvider(const DialMediaRouteProvider&) = delete;
+ DialMediaRouteProvider& operator=(const DialMediaRouteProvider&) = delete;
+
~DialMediaRouteProvider() override;
// mojom::MediaRouteProvider:
@@ -210,7 +214,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<DialMediaRouteProvider> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(DialMediaRouteProvider);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/providers/openscreen/discovery/open_screen_listener.h b/chrome/browser/media/router/providers/openscreen/discovery/open_screen_listener.h
index 411c553c..7395589 100644
--- a/chrome/browser/media/router/providers/openscreen/discovery/open_screen_listener.h
+++ b/chrome/browser/media/router/providers/openscreen/discovery/open_screen_listener.h
@@ -21,6 +21,9 @@
public:
explicit OpenScreenListener(std::string service_type);
+ OpenScreenListener(const OpenScreenListener&) = delete;
+ OpenScreenListener& operator=(const OpenScreenListener&) = delete;
+
// ServiceListener overrides
~OpenScreenListener() override;
@@ -50,8 +53,6 @@
bool is_running_ = false;
const std::string service_type_;
std::vector<openscreen::osp::ServiceInfo> receivers_;
-
- DISALLOW_COPY_AND_ASSIGN(OpenScreenListener);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/providers/openscreen/network_service_async_packet_sender.h b/chrome/browser/media/router/providers/openscreen/network_service_async_packet_sender.h
index cb52ecf..f5ff534 100644
--- a/chrome/browser/media/router/providers/openscreen/network_service_async_packet_sender.h
+++ b/chrome/browser/media/router/providers/openscreen/network_service_async_packet_sender.h
@@ -29,6 +29,12 @@
explicit NetworkServiceAsyncPacketSender(
network::mojom::NetworkContext* network_context);
explicit NetworkServiceAsyncPacketSender(NetworkServiceAsyncPacketSender&&);
+
+ NetworkServiceAsyncPacketSender(const NetworkServiceAsyncPacketSender&) =
+ delete;
+ NetworkServiceAsyncPacketSender& operator=(
+ const NetworkServiceAsyncPacketSender&) = delete;
+
~NetworkServiceAsyncPacketSender() override;
// network::mojom::UDPSocket forwards.
@@ -38,8 +44,6 @@
private:
mojo::Remote<network::mojom::UDPSocket> socket_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkServiceAsyncPacketSender);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/providers/openscreen/network_service_quic_packet_writer.h b/chrome/browser/media/router/providers/openscreen/network_service_quic_packet_writer.h
index c9e5a1d..ff9629da 100644
--- a/chrome/browser/media/router/providers/openscreen/network_service_quic_packet_writer.h
+++ b/chrome/browser/media/router/providers/openscreen/network_service_quic_packet_writer.h
@@ -49,6 +49,11 @@
Delegate* delegate,
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
+ NetworkServiceQuicPacketWriter(const NetworkServiceQuicPacketWriter&) =
+ delete;
+ NetworkServiceQuicPacketWriter& operator=(
+ const NetworkServiceQuicPacketWriter&) = delete;
+
~NetworkServiceQuicPacketWriter() override;
// quic::QuicPacketWriter
@@ -112,7 +117,6 @@
bool writable_ = true;
base::WeakPtrFactory<NetworkServiceQuicPacketWriter> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(NetworkServiceQuicPacketWriter);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.h b/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.h
index b1f52dd..1080c60 100644
--- a/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.h
+++ b/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.h
@@ -47,6 +47,12 @@
mojo::PendingReceiver<mojom::MediaRouteProvider> receiver,
mojo::PendingRemote<mojom::MediaRouter> media_router,
Profile* profile);
+
+ WiredDisplayMediaRouteProvider(const WiredDisplayMediaRouteProvider&) =
+ delete;
+ WiredDisplayMediaRouteProvider& operator=(
+ const WiredDisplayMediaRouteProvider&) = delete;
+
~WiredDisplayMediaRouteProvider() override;
// mojom::MediaRouteProvider:
@@ -113,6 +119,10 @@
public:
explicit Presentation(const MediaRoute& route);
Presentation(Presentation&& other);
+
+ Presentation(const Presentation&) = delete;
+ Presentation& operator=(const Presentation&) = delete;
+
~Presentation();
// Updates the title for the presentation page, and notifies media status
@@ -148,8 +158,6 @@
// |media_status_observer|, when set, gets notified whenever |status|
// changes.
mojo::Remote<mojom::MediaStatusObserver> media_status_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(Presentation);
};
// Sends the current list of routes to each query in |route_queries_|.
@@ -208,8 +216,6 @@
WiredDisplayDeviceCountMetrics device_count_metrics_;
absl::optional<display::ScopedDisplayObserver> display_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(WiredDisplayMediaRouteProvider);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver.h b/chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver.h
index cc15916..37f646c 100644
--- a/chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver.h
+++ b/chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver.h
@@ -19,6 +19,12 @@
class WiredDisplayPresentationReceiver {
public:
WiredDisplayPresentationReceiver() = default;
+
+ WiredDisplayPresentationReceiver(const WiredDisplayPresentationReceiver&) =
+ delete;
+ WiredDisplayPresentationReceiver& operator=(
+ const WiredDisplayPresentationReceiver&) = delete;
+
virtual ~WiredDisplayPresentationReceiver() = default;
// Starts a presentation with the given ID and URL.
@@ -30,9 +36,6 @@
// Exits fullscreen and shows the receiver in windowed mode.
virtual void ExitFullscreen() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WiredDisplayPresentationReceiver);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/test/noop_dual_media_sink_service.h b/chrome/browser/media/router/test/noop_dual_media_sink_service.h
index becb615..81076443 100644
--- a/chrome/browser/media/router/test/noop_dual_media_sink_service.h
+++ b/chrome/browser/media/router/test/noop_dual_media_sink_service.h
@@ -14,15 +14,16 @@
class NoopDualMediaSinkService : public DualMediaSinkService {
public:
NoopDualMediaSinkService();
+
+ NoopDualMediaSinkService(const NoopDualMediaSinkService&) = delete;
+ NoopDualMediaSinkService& operator=(const NoopDualMediaSinkService&) = delete;
+
~NoopDualMediaSinkService() override;
// DualMediaSinkService
void OnUserGesture() override {}
void StartMdnsDiscovery() override {}
void BindLogger(LoggerImpl* logger_impl) override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NoopDualMediaSinkService);
};
} // namespace media_router
diff --git a/chrome/browser/media/router/test/provider_test_helpers.h b/chrome/browser/media/router/test/provider_test_helpers.h
index 62555e0c..f2b77e4 100644
--- a/chrome/browser/media/router/test/provider_test_helpers.h
+++ b/chrome/browser/media/router/test/provider_test_helpers.h
@@ -117,6 +117,10 @@
public:
TestDialActivityManager(DialAppDiscoveryService* app_discovery_service,
network::TestURLLoaderFactory* factory);
+
+ TestDialActivityManager(const TestDialActivityManager&) = delete;
+ TestDialActivityManager& operator=(const TestDialActivityManager&) = delete;
+
~TestDialActivityManager() override;
std::unique_ptr<DialURLFetcher> CreateFetcher(
@@ -135,8 +139,6 @@
GURL expected_url_;
std::string expected_method_;
absl::optional<std::string> expected_post_data_;
-
- DISALLOW_COPY_AND_ASSIGN(TestDialActivityManager);
};
// Helper function to create an IP endpoint object.
diff --git a/chrome/browser/media/test_license_server.h b/chrome/browser/media/test_license_server.h
index 2f6b7cd..13b7775 100644
--- a/chrome/browser/media/test_license_server.h
+++ b/chrome/browser/media/test_license_server.h
@@ -18,6 +18,10 @@
public:
explicit TestLicenseServer(
std::unique_ptr<TestLicenseServerConfig> server_config);
+
+ TestLicenseServer(const TestLicenseServer&) = delete;
+ TestLicenseServer& operator=(const TestLicenseServer&) = delete;
+
~TestLicenseServer();
// Returns true if the server started successfully. False otherwise.
@@ -32,8 +36,6 @@
std::unique_ptr<TestLicenseServerConfig> server_config_;
// Process for the license server.
base::Process license_server_process_;
-
- DISALLOW_COPY_AND_ASSIGN(TestLicenseServer);
};
#endif // CHROME_BROWSER_MEDIA_TEST_LICENSE_SERVER_H_
diff --git a/chrome/browser/media/test_license_server_config.h b/chrome/browser/media/test_license_server_config.h
index 651564b..dfff298 100644
--- a/chrome/browser/media/test_license_server_config.h
+++ b/chrome/browser/media/test_license_server_config.h
@@ -20,6 +20,10 @@
class TestLicenseServerConfig {
public:
TestLicenseServerConfig() {}
+
+ TestLicenseServerConfig(const TestLicenseServerConfig&) = delete;
+ TestLicenseServerConfig& operator=(const TestLicenseServerConfig&) = delete;
+
virtual ~TestLicenseServerConfig() {}
// Returns a string containing the URL and port the server is listening to.
@@ -37,9 +41,6 @@
// Returns true if the server is supported on current platform.
virtual bool IsPlatformSupported() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestLicenseServerConfig);
};
#endif // CHROME_BROWSER_MEDIA_TEST_LICENSE_SERVER_CONFIG_H_
diff --git a/chrome/browser/media/webrtc/current_tab_desktop_media_list.h b/chrome/browser/media/webrtc/current_tab_desktop_media_list.h
index f3d18ae..53d9c11 100644
--- a/chrome/browser/media/webrtc/current_tab_desktop_media_list.h
+++ b/chrome/browser/media/webrtc/current_tab_desktop_media_list.h
@@ -13,6 +13,11 @@
class CurrentTabDesktopMediaList : public DesktopMediaListBase {
public:
explicit CurrentTabDesktopMediaList(content::WebContents* web_contents);
+
+ CurrentTabDesktopMediaList(const CurrentTabDesktopMediaList&) = delete;
+ CurrentTabDesktopMediaList& operator=(const CurrentTabDesktopMediaList&) =
+ delete;
+
~CurrentTabDesktopMediaList() override;
private:
@@ -52,8 +57,6 @@
scoped_refptr<base::SequencedTaskRunner> thumbnail_task_runner_;
base::WeakPtrFactory<CurrentTabDesktopMediaList> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CurrentTabDesktopMediaList);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_CURRENT_TAB_DESKTOP_MEDIA_LIST_H_
diff --git a/chrome/browser/media/webrtc/desktop_capture_access_handler.h b/chrome/browser/media/webrtc/desktop_capture_access_handler.h
index 34e049c1..8a93d385 100644
--- a/chrome/browser/media/webrtc/desktop_capture_access_handler.h
+++ b/chrome/browser/media/webrtc/desktop_capture_access_handler.h
@@ -39,6 +39,11 @@
DesktopCaptureAccessHandler();
explicit DesktopCaptureAccessHandler(
std::unique_ptr<DesktopMediaPickerFactory> picker_factory);
+
+ DesktopCaptureAccessHandler(const DesktopCaptureAccessHandler&) = delete;
+ DesktopCaptureAccessHandler& operator=(const DesktopCaptureAccessHandler&) =
+ delete;
+
~DesktopCaptureAccessHandler() override;
// MediaAccessHandler implementation.
@@ -110,8 +115,6 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
aura::Window* primary_root_window_for_testing_ = nullptr;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(DesktopCaptureAccessHandler);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_CAPTURE_ACCESS_HANDLER_H_
diff --git a/chrome/browser/media/webrtc/desktop_media_list_ash.h b/chrome/browser/media/webrtc/desktop_media_list_ash.h
index 188577e0..ba5f92f 100644
--- a/chrome/browser/media/webrtc/desktop_media_list_ash.h
+++ b/chrome/browser/media/webrtc/desktop_media_list_ash.h
@@ -25,6 +25,10 @@
class DesktopMediaListAsh : public DesktopMediaListBase {
public:
explicit DesktopMediaListAsh(DesktopMediaList::Type type);
+
+ DesktopMediaListAsh(const DesktopMediaListAsh&) = delete;
+ DesktopMediaListAsh& operator=(const DesktopMediaListAsh&) = delete;
+
~DesktopMediaListAsh() override;
private:
@@ -47,8 +51,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<DesktopMediaListAsh> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DesktopMediaListAsh);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_MEDIA_LIST_ASH_H_
diff --git a/chrome/browser/media/webrtc/desktop_media_list_ash_unittest.cc b/chrome/browser/media/webrtc/desktop_media_list_ash_unittest.cc
index db827a2..844afc3 100644
--- a/chrome/browser/media/webrtc/desktop_media_list_ash_unittest.cc
+++ b/chrome/browser/media/webrtc/desktop_media_list_ash_unittest.cc
@@ -37,6 +37,10 @@
class DesktopMediaListAshTest : public ChromeAshTestBase {
public:
DesktopMediaListAshTest() {}
+
+ DesktopMediaListAshTest(const DesktopMediaListAshTest&) = delete;
+ DesktopMediaListAshTest& operator=(const DesktopMediaListAshTest&) = delete;
+
~DesktopMediaListAshTest() override {}
void TearDown() override {
@@ -56,7 +60,6 @@
protected:
MockDesktopMediaListObserver observer_;
std::unique_ptr<DesktopMediaListAsh> list_;
- DISALLOW_COPY_AND_ASSIGN(DesktopMediaListAshTest);
};
ACTION(QuitMessageLoop) {
diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.h b/chrome/browser/media/webrtc/desktop_media_list_base.h
index a103818..c875359 100644
--- a/chrome/browser/media/webrtc/desktop_media_list_base.h
+++ b/chrome/browser/media/webrtc/desktop_media_list_base.h
@@ -24,6 +24,10 @@
class DesktopMediaListBase : public DesktopMediaList {
public:
explicit DesktopMediaListBase(base::TimeDelta update_period);
+
+ DesktopMediaListBase(const DesktopMediaListBase&) = delete;
+ DesktopMediaListBase& operator=(const DesktopMediaListBase&) = delete;
+
~DesktopMediaListBase() override;
// DesktopMediaList interface.
@@ -98,8 +102,6 @@
RefreshCallback refresh_callback_;
base::WeakPtrFactory<DesktopMediaListBase> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DesktopMediaListBase);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_MEDIA_LIST_BASE_H_
diff --git a/chrome/browser/media/webrtc/desktop_media_picker.h b/chrome/browser/media/webrtc/desktop_media_picker.h
index c592ccf..67f1682b 100644
--- a/chrome/browser/media/webrtc/desktop_media_picker.h
+++ b/chrome/browser/media/webrtc/desktop_media_picker.h
@@ -80,6 +80,10 @@
const content::MediaStreamRequest* request = nullptr);
DesktopMediaPicker() = default;
+
+ DesktopMediaPicker(const DesktopMediaPicker&) = delete;
+ DesktopMediaPicker& operator=(const DesktopMediaPicker&) = delete;
+
virtual ~DesktopMediaPicker() = default;
// Shows dialog with list of desktop media sources (screens, windows, tabs)
@@ -89,9 +93,6 @@
virtual void Show(const Params& params,
std::vector<std::unique_ptr<DesktopMediaList>> source_lists,
DoneCallback done_callback) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DesktopMediaPicker);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_MEDIA_PICKER_H_
diff --git a/chrome/browser/media/webrtc/desktop_media_picker_factory.h b/chrome/browser/media/webrtc/desktop_media_picker_factory.h
index d190ab5..387f788 100644
--- a/chrome/browser/media/webrtc/desktop_media_picker_factory.h
+++ b/chrome/browser/media/webrtc/desktop_media_picker_factory.h
@@ -19,6 +19,10 @@
// instances.
class DesktopMediaPickerFactory {
public:
+ DesktopMediaPickerFactory(const DesktopMediaPickerFactory&) = delete;
+ DesktopMediaPickerFactory& operator=(const DesktopMediaPickerFactory&) =
+ delete;
+
virtual ~DesktopMediaPickerFactory();
virtual std::unique_ptr<DesktopMediaPicker> CreatePicker(
@@ -31,9 +35,6 @@
protected:
DesktopMediaPickerFactory();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DesktopMediaPickerFactory);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_MEDIA_PICKER_FACTORY_H_
diff --git a/chrome/browser/media/webrtc/desktop_media_picker_factory_impl.h b/chrome/browser/media/webrtc/desktop_media_picker_factory_impl.h
index bce6245a..39a5f46 100644
--- a/chrome/browser/media/webrtc/desktop_media_picker_factory_impl.h
+++ b/chrome/browser/media/webrtc/desktop_media_picker_factory_impl.h
@@ -18,6 +18,11 @@
class DesktopMediaPickerFactoryImpl : public DesktopMediaPickerFactory {
public:
DesktopMediaPickerFactoryImpl();
+
+ DesktopMediaPickerFactoryImpl(const DesktopMediaPickerFactoryImpl&) = delete;
+ DesktopMediaPickerFactoryImpl& operator=(
+ const DesktopMediaPickerFactoryImpl&) = delete;
+
~DesktopMediaPickerFactoryImpl() override;
// Get the lazy initialized instance of the factory.
@@ -33,9 +38,6 @@
content::WebContents* web_contents,
DesktopMediaList::WebContentsFilter includable_web_contents_filter)
override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DesktopMediaPickerFactoryImpl);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_MEDIA_PICKER_FACTORY_IMPL_H_
diff --git a/chrome/browser/media/webrtc/display_media_access_handler.h b/chrome/browser/media/webrtc/display_media_access_handler.h
index f17bcc3a..8a9df9d8 100644
--- a/chrome/browser/media/webrtc/display_media_access_handler.h
+++ b/chrome/browser/media/webrtc/display_media_access_handler.h
@@ -30,6 +30,11 @@
DisplayMediaAccessHandler(
std::unique_ptr<DesktopMediaPickerFactory> picker_factory,
bool display_notification);
+
+ DisplayMediaAccessHandler(const DisplayMediaAccessHandler&) = delete;
+ DisplayMediaAccessHandler& operator=(const DisplayMediaAccessHandler&) =
+ delete;
+
~DisplayMediaAccessHandler() override;
// MediaAccessHandler implementation.
@@ -77,8 +82,6 @@
RequestsQueues pending_requests_;
WebContentsCollection web_contents_collection_;
-
- DISALLOW_COPY_AND_ASSIGN(DisplayMediaAccessHandler);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_DISPLAY_MEDIA_ACCESS_HANDLER_H_
diff --git a/chrome/browser/media/webrtc/fake_desktop_media_list.h b/chrome/browser/media/webrtc/fake_desktop_media_list.h
index 812eb72..f515a16e 100644
--- a/chrome/browser/media/webrtc/fake_desktop_media_list.h
+++ b/chrome/browser/media/webrtc/fake_desktop_media_list.h
@@ -12,6 +12,10 @@
class FakeDesktopMediaList : public DesktopMediaList {
public:
explicit FakeDesktopMediaList(DesktopMediaList::Type type);
+
+ FakeDesktopMediaList(const FakeDesktopMediaList&) = delete;
+ FakeDesktopMediaList& operator=(const FakeDesktopMediaList&) = delete;
+
~FakeDesktopMediaList() override;
void AddSource(int id);
@@ -36,8 +40,6 @@
DesktopMediaListObserver* observer_;
gfx::ImageSkia thumbnail_;
const DesktopMediaList::Type type_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeDesktopMediaList);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_FAKE_DESKTOP_MEDIA_LIST_H_
diff --git a/chrome/browser/media/webrtc/fake_desktop_media_picker_factory.h b/chrome/browser/media/webrtc/fake_desktop_media_picker_factory.h
index 3221a337..232487403 100644
--- a/chrome/browser/media/webrtc/fake_desktop_media_picker_factory.h
+++ b/chrome/browser/media/webrtc/fake_desktop_media_picker_factory.h
@@ -35,6 +35,11 @@
};
FakeDesktopMediaPickerFactory();
+
+ FakeDesktopMediaPickerFactory(const FakeDesktopMediaPickerFactory&) = delete;
+ FakeDesktopMediaPickerFactory& operator=(
+ const FakeDesktopMediaPickerFactory&) = delete;
+
~FakeDesktopMediaPickerFactory() override;
// |test_flags| are expected to outlive the factory.
@@ -54,14 +59,16 @@
TestFlags* test_flags_;
int tests_count_;
int current_test_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeDesktopMediaPickerFactory);
};
class FakeDesktopMediaPicker : public DesktopMediaPicker {
public:
explicit FakeDesktopMediaPicker(
FakeDesktopMediaPickerFactory::TestFlags* expectation);
+
+ FakeDesktopMediaPicker(const FakeDesktopMediaPicker&) = delete;
+ FakeDesktopMediaPicker& operator=(const FakeDesktopMediaPicker&) = delete;
+
~FakeDesktopMediaPicker() override;
// DesktopMediaPicker interface.
@@ -79,8 +86,6 @@
DesktopMediaPicker::Params picker_params_;
base::WeakPtrFactory<FakeDesktopMediaPicker> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FakeDesktopMediaPicker);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_FAKE_DESKTOP_MEDIA_PICKER_FACTORY_H_
diff --git a/chrome/browser/media/webrtc/media_stream_capture_indicator.cc b/chrome/browser/media/webrtc/media_stream_capture_indicator.cc
index 2f2d9af..79562f9 100644
--- a/chrome/browser/media/webrtc/media_stream_capture_indicator.cc
+++ b/chrome/browser/media/webrtc/media_stream_capture_indicator.cc
@@ -141,6 +141,10 @@
WebContentsDeviceUsage(scoped_refptr<MediaStreamCaptureIndicator> indicator,
WebContents* web_contents)
: WebContentsObserver(web_contents), indicator_(std::move(indicator)) {}
+
+ WebContentsDeviceUsage(const WebContentsDeviceUsage&) = delete;
+ WebContentsDeviceUsage& operator=(const WebContentsDeviceUsage&) = delete;
+
~WebContentsDeviceUsage() override = default;
bool IsCapturingAudio() const { return audio_stream_count_ > 0; }
@@ -181,8 +185,6 @@
base::OnceClosure stop_callback_;
base::WeakPtrFactory<WebContentsDeviceUsage> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WebContentsDeviceUsage);
};
// Implements MediaStreamUI interface. Instances of this class are created for
@@ -208,6 +210,9 @@
DCHECK(!devices_.empty());
}
+ UIDelegate(const UIDelegate&) = delete;
+ UIDelegate& operator=(const UIDelegate&) = delete;
+
~UIDelegate() override {
if (started_ && device_usage_)
device_usage_->RemoveDevices(devices_);
@@ -273,8 +278,6 @@
#endif
const std::u16string application_title_;
bool started_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(UIDelegate);
};
std::unique_ptr<content::MediaStreamUI>
diff --git a/chrome/browser/media/webrtc/media_stream_capture_indicator_unittest.cc b/chrome/browser/media/webrtc/media_stream_capture_indicator_unittest.cc
index ed7dc03..db3174a 100644
--- a/chrome/browser/media/webrtc/media_stream_capture_indicator_unittest.cc
+++ b/chrome/browser/media/webrtc/media_stream_capture_indicator_unittest.cc
@@ -18,6 +18,10 @@
class LenientMockObserver : public MediaStreamCaptureIndicator::Observer {
public:
LenientMockObserver() = default;
+
+ LenientMockObserver(const LenientMockObserver&) = delete;
+ LenientMockObserver& operator=(const LenientMockObserver&) = delete;
+
~LenientMockObserver() override {}
// Helper functions used to set the expectations of the mock methods. This
@@ -62,8 +66,6 @@
void(content::WebContents* contents, bool is_capturing_window));
MOCK_METHOD2(OnIsCapturingDisplayChanged,
void(content::WebContents* contents, bool is_capturing_display));
-
- DISALLOW_COPY_AND_ASSIGN(LenientMockObserver);
};
using MockObserver = testing::StrictMock<LenientMockObserver>;
diff --git a/chrome/browser/media/webrtc/media_stream_device_permission_context.h b/chrome/browser/media/webrtc/media_stream_device_permission_context.h
index db884d6c..8fb079f 100644
--- a/chrome/browser/media/webrtc/media_stream_device_permission_context.h
+++ b/chrome/browser/media/webrtc/media_stream_device_permission_context.h
@@ -15,6 +15,12 @@
public:
MediaStreamDevicePermissionContext(content::BrowserContext* browser_context,
ContentSettingsType content_settings_type);
+
+ MediaStreamDevicePermissionContext(
+ const MediaStreamDevicePermissionContext&) = delete;
+ MediaStreamDevicePermissionContext& operator=(
+ const MediaStreamDevicePermissionContext&) = delete;
+
~MediaStreamDevicePermissionContext() override;
// PermissionContextBase:
@@ -41,8 +47,6 @@
bool IsRestrictedToSecureOrigins() const override;
ContentSettingsType content_settings_type_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicePermissionContext);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICE_PERMISSION_CONTEXT_H_
diff --git a/chrome/browser/media/webrtc/media_stream_permission_browsertest.cc b/chrome/browser/media/webrtc/media_stream_permission_browsertest.cc
index 9b8724d..bc22760 100644
--- a/chrome/browser/media/webrtc/media_stream_permission_browsertest.cc
+++ b/chrome/browser/media/webrtc/media_stream_permission_browsertest.cc
@@ -36,6 +36,11 @@
class MediaStreamPermissionTest : public WebRtcTestBase {
public:
MediaStreamPermissionTest() {}
+
+ MediaStreamPermissionTest(const MediaStreamPermissionTest&) = delete;
+ MediaStreamPermissionTest& operator=(const MediaStreamPermissionTest&) =
+ delete;
+
~MediaStreamPermissionTest() override {}
// InProcessBrowserTest:
@@ -116,8 +121,6 @@
EXPECT_TRUE(ui_test_utils::NavigateToURL(browser, url));
return browser->tab_strip_model()->GetActiveWebContents();
}
-
- DISALLOW_COPY_AND_ASSIGN(MediaStreamPermissionTest);
};
// Actual tests ---------------------------------------------------------------
diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
index 5a851f4..4c822ebc 100644
--- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
+++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
@@ -107,6 +107,10 @@
base::WeakPtr<NativeDesktopMediaList> media_list,
DesktopMediaList::Type type,
std::unique_ptr<webrtc::DesktopCapturer> capturer);
+
+ Worker(const Worker&) = delete;
+ Worker& operator=(const Worker&) = delete;
+
~Worker() override;
void Start();
@@ -147,8 +151,6 @@
std::unique_ptr<RefreshThumbnailsState> refresh_thumbnails_state_;
base::WeakPtrFactory<Worker> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(Worker);
};
NativeDesktopMediaList::Worker::Worker(
diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.h b/chrome/browser/media/webrtc/native_desktop_media_list.h
index 77fba82b..17ad14c 100644
--- a/chrome/browser/media/webrtc/native_desktop_media_list.h
+++ b/chrome/browser/media/webrtc/native_desktop_media_list.h
@@ -24,6 +24,10 @@
// |capturer| must exist.
NativeDesktopMediaList(DesktopMediaList::Type type,
std::unique_ptr<webrtc::DesktopCapturer> capturer);
+
+ NativeDesktopMediaList(const NativeDesktopMediaList&) = delete;
+ NativeDesktopMediaList& operator=(const NativeDesktopMediaList&) = delete;
+
~NativeDesktopMediaList() override;
private:
@@ -61,8 +65,6 @@
bool pending_native_thumbnail_capture_ = false;
#endif
base::WeakPtrFactory<NativeDesktopMediaList> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NativeDesktopMediaList);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_NATIVE_DESKTOP_MEDIA_LIST_H_
diff --git a/chrome/browser/media/webrtc/native_desktop_media_list_unittest.cc b/chrome/browser/media/webrtc/native_desktop_media_list_unittest.cc
index 1916f181..b2e9948 100644
--- a/chrome/browser/media/webrtc/native_desktop_media_list_unittest.cc
+++ b/chrome/browser/media/webrtc/native_desktop_media_list_unittest.cc
@@ -65,6 +65,10 @@
class FakeScreenCapturer : public webrtc::DesktopCapturer {
public:
FakeScreenCapturer() {}
+
+ FakeScreenCapturer(const FakeScreenCapturer&) = delete;
+ FakeScreenCapturer& operator=(const FakeScreenCapturer&) = delete;
+
~FakeScreenCapturer() override {}
// webrtc::ScreenCapturer implementation.
@@ -90,13 +94,15 @@
protected:
Callback* callback_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeScreenCapturer);
};
class FakeWindowCapturer : public webrtc::DesktopCapturer {
public:
FakeWindowCapturer() : callback_(nullptr) {}
+
+ FakeWindowCapturer(const FakeWindowCapturer&) = delete;
+ FakeWindowCapturer& operator=(const FakeWindowCapturer&) = delete;
+
~FakeWindowCapturer() override {}
void SetWindowList(const SourceList& list) {
@@ -151,8 +157,6 @@
// Frames to be captured per window.
std::map<SourceId, int8_t> frame_values_;
base::Lock frame_values_lock_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeWindowCapturer);
};
} // namespace
diff --git a/chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm b/chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm
index 294d21c..3670d5d 100644
--- a/chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm
+++ b/chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm
@@ -40,6 +40,11 @@
class MediaAuthorizationWrapperImpl final : public MediaAuthorizationWrapper {
public:
MediaAuthorizationWrapperImpl() = default;
+
+ MediaAuthorizationWrapperImpl(const MediaAuthorizationWrapperImpl&) = delete;
+ MediaAuthorizationWrapperImpl& operator=(
+ const MediaAuthorizationWrapperImpl&) = delete;
+
~MediaAuthorizationWrapperImpl() override = default;
NSInteger AuthorizationStatusForMediaType(AVMediaType media_type) override {
@@ -66,9 +71,6 @@
base::PostTask(FROM_HERE, traits, std::move(callback));
}
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MediaAuthorizationWrapperImpl);
};
MediaAuthorizationWrapper& GetMediaAuthorizationWrapper() {
diff --git a/chrome/browser/media/webrtc/tab_desktop_media_list.h b/chrome/browser/media/webrtc/tab_desktop_media_list.h
index 10cd294..92453f97 100644
--- a/chrome/browser/media/webrtc/tab_desktop_media_list.h
+++ b/chrome/browser/media/webrtc/tab_desktop_media_list.h
@@ -15,6 +15,10 @@
TabDesktopMediaList(
DesktopMediaList::WebContentsFilter includable_web_contents_filter,
bool include_chrome_app_windows);
+
+ TabDesktopMediaList(const TabDesktopMediaList&) = delete;
+ TabDesktopMediaList& operator=(const TabDesktopMediaList&) = delete;
+
~TabDesktopMediaList() override;
private:
@@ -30,8 +34,6 @@
scoped_refptr<base::SequencedTaskRunner> thumbnail_task_runner_;
base::WeakPtrFactory<TabDesktopMediaList> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TabDesktopMediaList);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_TAB_DESKTOP_MEDIA_LIST_H_
diff --git a/chrome/browser/media/webrtc/webrtc_disable_encryption_flag_browsertest.cc b/chrome/browser/media/webrtc/webrtc_disable_encryption_flag_browsertest.cc
index 1ca502d0..31999f3 100644
--- a/chrome/browser/media/webrtc/webrtc_disable_encryption_flag_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_disable_encryption_flag_browsertest.cc
@@ -31,6 +31,12 @@
class WebRtcDisableEncryptionFlagBrowserTest : public WebRtcTestBase {
public:
WebRtcDisableEncryptionFlagBrowserTest() {}
+
+ WebRtcDisableEncryptionFlagBrowserTest(
+ const WebRtcDisableEncryptionFlagBrowserTest&) = delete;
+ WebRtcDisableEncryptionFlagBrowserTest& operator=(
+ const WebRtcDisableEncryptionFlagBrowserTest&) = delete;
+
~WebRtcDisableEncryptionFlagBrowserTest() override {}
void SetUpInProcessBrowserTestFixture() override {
@@ -41,9 +47,6 @@
// Disable encryption with the command line flag.
command_line->AppendSwitch(switches::kDisableWebRtcEncryption);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WebRtcDisableEncryptionFlagBrowserTest);
};
// Makes a call and checks that there's encryption or not in the SDP offer.
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_manager.h b/chrome/browser/media/webrtc/webrtc_event_log_manager.h
index 7acecc0..868d6d5d 100644
--- a/chrome/browser/media/webrtc/webrtc_event_log_manager.h
+++ b/chrome/browser/media/webrtc/webrtc_event_log_manager.h
@@ -93,6 +93,9 @@
static base::FilePath GetRemoteBoundWebRtcEventLogsDir(
content::BrowserContext* browser_context);
+ WebRtcEventLogManager(const WebRtcEventLogManager&) = delete;
+ WebRtcEventLogManager& operator=(const WebRtcEventLogManager&) = delete;
+
~WebRtcEventLogManager() override;
void EnableForBrowserContext(content::BrowserContext* browser_context,
@@ -484,8 +487,6 @@
// |remote_logs_manager_| when (and if) produced.
std::unique_ptr<LogFileWriter::Factory>
remote_log_file_writer_factory_for_testing_;
-
- DISALLOW_COPY_AND_ASSIGN(WebRtcEventLogManager);
};
} // namespace webrtc_event_logging
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_manager_keyed_service.h b/chrome/browser/media/webrtc/webrtc_event_log_manager_keyed_service.h
index c12cf66..21ca391 100644
--- a/chrome/browser/media/webrtc/webrtc_event_log_manager_keyed_service.h
+++ b/chrome/browser/media/webrtc/webrtc_event_log_manager_keyed_service.h
@@ -21,6 +21,11 @@
explicit WebRtcEventLogManagerKeyedService(
content::BrowserContext* browser_context);
+ WebRtcEventLogManagerKeyedService(const WebRtcEventLogManagerKeyedService&) =
+ delete;
+ WebRtcEventLogManagerKeyedService& operator=(
+ const WebRtcEventLogManagerKeyedService&) = delete;
+
~WebRtcEventLogManagerKeyedService() override = default;
void Shutdown() override;
@@ -34,8 +39,6 @@
// BrowserContext was loaded.
// See usage for rationale.
bool reported_;
-
- DISALLOW_COPY_AND_ASSIGN(WebRtcEventLogManagerKeyedService);
};
} // namespace webrtc_event_logging
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_manager_local.h b/chrome/browser/media/webrtc/webrtc_event_log_manager_local.h
index 40de613..9587720 100644
--- a/chrome/browser/media/webrtc/webrtc_event_log_manager_local.h
+++ b/chrome/browser/media/webrtc/webrtc_event_log_manager_local.h
@@ -24,6 +24,11 @@
public:
explicit WebRtcLocalEventLogManager(WebRtcLocalEventLogsObserver* observer);
+
+ WebRtcLocalEventLogManager(const WebRtcLocalEventLogManager&) = delete;
+ WebRtcLocalEventLogManager& operator=(const WebRtcLocalEventLogManager&) =
+ delete;
+
~WebRtcLocalEventLogManager();
bool OnPeerConnectionAdded(const PeerConnectionKey& key);
@@ -89,8 +94,6 @@
// The maximum size for local logs, in bytes.
// If !has_value(), the value is unlimited.
absl::optional<size_t> max_log_file_size_bytes_;
-
- DISALLOW_COPY_AND_ASSIGN(WebRtcLocalEventLogManager);
};
} // namespace webrtc_event_logging
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_manager_remote.h b/chrome/browser/media/webrtc/webrtc_event_log_manager_remote.h
index dc0d5d1..f984b1b 100644
--- a/chrome/browser/media/webrtc/webrtc_event_log_manager_remote.h
+++ b/chrome/browser/media/webrtc/webrtc_event_log_manager_remote.h
@@ -33,6 +33,11 @@
WebRtcRemoteEventLogManager(
WebRtcRemoteEventLogsObserver* observer,
scoped_refptr<base::SequencedTaskRunner> task_runner);
+
+ WebRtcRemoteEventLogManager(const WebRtcRemoteEventLogManager&) = delete;
+ WebRtcRemoteEventLogManager& operator=(const WebRtcRemoteEventLogManager&) =
+ delete;
+
~WebRtcRemoteEventLogManager() override;
// Sets a network::NetworkConnectionTracker which will be used to track
@@ -484,8 +489,6 @@
// here. In reality, this is never auto-destroyed; see destructor for details.
std::unique_ptr<base::WeakPtrFactory<WebRtcRemoteEventLogManager>>
weak_ptr_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(WebRtcRemoteEventLogManager);
};
} // namespace webrtc_event_logging
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_manager_unittest.cc b/chrome/browser/media/webrtc/webrtc_event_log_manager_unittest.cc
index 8e45d99..cc2c64f5 100644
--- a/chrome/browser/media/webrtc/webrtc_event_log_manager_unittest.cc
+++ b/chrome/browser/media/webrtc/webrtc_event_log_manager_unittest.cc
@@ -283,6 +283,10 @@
EXPECT_TRUE(profiles_dir_.CreateUniqueTempDir());
}
+ WebRtcEventLogManagerTestBase(const WebRtcEventLogManagerTestBase&) = delete;
+ WebRtcEventLogManagerTestBase& operator=(
+ const WebRtcEventLogManagerTestBase&) = delete;
+
~WebRtcEventLogManagerTestBase() override {
WaitForPendingTasks();
@@ -891,8 +895,6 @@
// callback on the observer).
NiceMock<MockWebRtcLocalEventLogsObserver> local_observer_;
NiceMock<MockWebRtcRemoteEventLogsObserver> remote_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(WebRtcEventLogManagerTestBase);
};
#if !defined(OS_ANDROID)
diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.h b/chrome/browser/media/webrtc/webrtc_log_uploader.h
index 66629d6..ceac29ed 100644
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.h
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.h
@@ -73,6 +73,10 @@
};
WebRtcLogUploader();
+
+ WebRtcLogUploader(const WebRtcLogUploader&) = delete;
+ WebRtcLogUploader& operator=(const WebRtcLogUploader&) = delete;
+
~WebRtcLogUploader();
// Returns true is number of logs limit is not reached yet. Increases log
@@ -230,8 +234,6 @@
// When true, don't create new URL loaders.
bool shutdown_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(WebRtcLogUploader);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_WEBRTC_LOG_UPLOADER_H_
diff --git a/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.h b/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.h
index b92c648de..18b14f8 100644
--- a/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.h
+++ b/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.h
@@ -51,6 +51,10 @@
// which should guarantee the uniqueness across tabs and dump streams in
// practice.
explicit WebRtcRtpDumpHandler(const base::FilePath& dump_dir);
+
+ WebRtcRtpDumpHandler(const WebRtcRtpDumpHandler&) = delete;
+ WebRtcRtpDumpHandler& operator=(const WebRtcRtpDumpHandler&) = delete;
+
~WebRtcRtpDumpHandler();
// Starts the specified type of dumping. Incoming/outgoing dumping can be
@@ -133,8 +137,6 @@
std::unique_ptr<WebRtcRtpDumpWriter> dump_writer_;
base::WeakPtrFactory<WebRtcRtpDumpHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WebRtcRtpDumpHandler);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_WEBRTC_RTP_DUMP_HANDLER_H_
diff --git a/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.cc b/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.cc
index 905b1f7..3d15f2b 100644
--- a/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.cc
+++ b/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.cc
@@ -110,6 +110,9 @@
DCHECK_EQ(Z_OK, result);
}
+ FileWorker(const FileWorker&) = delete;
+ FileWorker& operator=(const FileWorker&) = delete;
+
~FileWorker() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -243,8 +246,6 @@
z_stream stream_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(FileWorker);
};
WebRtcRtpDumpWriter::WebRtcRtpDumpWriter(
diff --git a/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.h b/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.h
index 177d70d..010f7ffc 100644
--- a/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.h
+++ b/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.h
@@ -48,6 +48,9 @@
size_t max_dump_size,
base::RepeatingClosure max_dump_size_reached_callback);
+ WebRtcRtpDumpWriter(const WebRtcRtpDumpWriter&) = delete;
+ WebRtcRtpDumpWriter& operator=(const WebRtcRtpDumpWriter&) = delete;
+
virtual ~WebRtcRtpDumpWriter();
// Adds a RTP packet to the dump. The caller must make sure it's a valid RTP
@@ -139,8 +142,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<WebRtcRtpDumpWriter> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WebRtcRtpDumpWriter);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_WEBRTC_RTP_DUMP_WRITER_H_
diff --git a/chrome/browser/media/webrtc/webrtc_text_log_handler.h b/chrome/browser/media/webrtc/webrtc_text_log_handler.h
index 11cb8f5..f3b43f1 100644
--- a/chrome/browser/media/webrtc/webrtc_text_log_handler.h
+++ b/chrome/browser/media/webrtc/webrtc_text_log_handler.h
@@ -49,6 +49,10 @@
GenericDoneCallback;
explicit WebRtcTextLogHandler(int render_process_id);
+
+ WebRtcTextLogHandler(const WebRtcTextLogHandler&) = delete;
+ WebRtcTextLogHandler& operator=(const WebRtcTextLogHandler&) = delete;
+
~WebRtcTextLogHandler();
// Returns the current state of the log.
@@ -148,8 +152,6 @@
int web_app_id_ = 0;
base::WeakPtrFactory<WebRtcTextLogHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WebRtcTextLogHandler);
};
#endif // CHROME_BROWSER_MEDIA_WEBRTC_WEBRTC_TEXT_LOG_HANDLER_H_
diff --git a/chrome/browser/media/wv_test_license_server_config.h b/chrome/browser/media/wv_test_license_server_config.h
index 274d6b3..bf8a295 100644
--- a/chrome/browser/media/wv_test_license_server_config.h
+++ b/chrome/browser/media/wv_test_license_server_config.h
@@ -18,6 +18,11 @@
class WVTestLicenseServerConfig : public TestLicenseServerConfig {
public:
WVTestLicenseServerConfig();
+
+ WVTestLicenseServerConfig(const WVTestLicenseServerConfig&) = delete;
+ WVTestLicenseServerConfig& operator=(const WVTestLicenseServerConfig&) =
+ delete;
+
~WVTestLicenseServerConfig() override;
std::string GetServerURL() override;
@@ -42,8 +47,6 @@
// Sets the server port to a randomly available port within a limited range.
bool SelectServerPort();
-
- DISALLOW_COPY_AND_ASSIGN(WVTestLicenseServerConfig);
};
#endif // CHROME_BROWSER_MEDIA_WV_TEST_LICENSE_SERVER_CONFIG_H_
diff --git a/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.cc b/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.cc
index 94e60d2e..2e7a9d1 100644
--- a/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.cc
+++ b/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.cc
@@ -417,6 +417,10 @@
const std::string& file_name,
MTPFileNode* parent,
FileIdToMTPFileNodeMap* file_id_to_node_map);
+
+ MTPFileNode(const MTPFileNode&) = delete;
+ MTPFileNode& operator=(const MTPFileNode&) = delete;
+
~MTPFileNode();
const MTPFileNode* GetChild(const std::string& name) const;
@@ -446,8 +450,6 @@
ChildNodes children_;
MTPFileNode* const parent_;
FileIdToMTPFileNodeMap* file_id_to_node_map_;
-
- DISALLOW_COPY_AND_ASSIGN(MTPFileNode);
};
MTPDeviceDelegateImplLinux::MTPFileNode::MTPFileNode(
diff --git a/chrome/browser/media_galleries/chromeos/mtp_device_object_enumerator.h b/chrome/browser/media_galleries/chromeos/mtp_device_object_enumerator.h
index 58adc37..6fbef16 100644
--- a/chrome/browser/media_galleries/chromeos/mtp_device_object_enumerator.h
+++ b/chrome/browser/media_galleries/chromeos/mtp_device_object_enumerator.h
@@ -21,6 +21,10 @@
explicit MTPDeviceObjectEnumerator(
std::vector<device::mojom::MtpFileEntryPtr> entries);
+ MTPDeviceObjectEnumerator(const MTPDeviceObjectEnumerator&) = delete;
+ MTPDeviceObjectEnumerator& operator=(const MTPDeviceObjectEnumerator&) =
+ delete;
+
~MTPDeviceObjectEnumerator();
base::FilePath Next();
@@ -50,8 +54,6 @@
// Initially false. Set to true after Next() has been called.
bool is_index_ready_;
-
- DISALLOW_COPY_AND_ASSIGN(MTPDeviceObjectEnumerator);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_CHROMEOS_MTP_DEVICE_OBJECT_ENUMERATOR_H_
diff --git a/chrome/browser/media_galleries/chromeos/mtp_device_task_helper.h b/chrome/browser/media_galleries/chromeos/mtp_device_task_helper.h
index 5940cc64..e0320cf 100644
--- a/chrome/browser/media_galleries/chromeos/mtp_device_task_helper.h
+++ b/chrome/browser/media_galleries/chromeos/mtp_device_task_helper.h
@@ -64,6 +64,10 @@
typedef MTPDeviceAsyncDelegate::ErrorCallback ErrorCallback;
MTPDeviceTaskHelper();
+
+ MTPDeviceTaskHelper(const MTPDeviceTaskHelper&) = delete;
+ MTPDeviceTaskHelper& operator=(const MTPDeviceTaskHelper&) = delete;
+
~MTPDeviceTaskHelper();
// Dispatches the request to the MediaTransferProtocolManager to open the MTP
@@ -288,8 +292,6 @@
// For callbacks that may run after destruction.
base::WeakPtrFactory<MTPDeviceTaskHelper> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MTPDeviceTaskHelper);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_CHROMEOS_MTP_DEVICE_TASK_HELPER_H_
diff --git a/chrome/browser/media_galleries/chromeos/mtp_read_file_worker.h b/chrome/browser/media_galleries/chromeos/mtp_read_file_worker.h
index 8814bb3..17e33ea 100644
--- a/chrome/browser/media_galleries/chromeos/mtp_read_file_worker.h
+++ b/chrome/browser/media_galleries/chromeos/mtp_read_file_worker.h
@@ -23,6 +23,10 @@
class MTPReadFileWorker {
public:
explicit MTPReadFileWorker(const std::string& device_handle);
+
+ MTPReadFileWorker(const MTPReadFileWorker&) = delete;
+ MTPReadFileWorker& operator=(const MTPReadFileWorker&) = delete;
+
~MTPReadFileWorker();
// Dispatches the request to MediaTransferProtocolManager to get the media
@@ -80,8 +84,6 @@
// For callbacks that may run after destruction.
base::WeakPtrFactory<MTPReadFileWorker> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MTPReadFileWorker);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_CHROMEOS_MTP_READ_FILE_WORKER_H_
diff --git a/chrome/browser/media_galleries/chromeos/snapshot_file_details.h b/chrome/browser/media_galleries/chromeos/snapshot_file_details.h
index 9df76dcd..223f039 100644
--- a/chrome/browser/media_galleries/chromeos/snapshot_file_details.h
+++ b/chrome/browser/media_galleries/chromeos/snapshot_file_details.h
@@ -46,6 +46,9 @@
SnapshotFileDetails(SnapshotRequestInfo request_info,
const base::File::Info& file_info);
+ SnapshotFileDetails(const SnapshotFileDetails&) = delete;
+ SnapshotFileDetails& operator=(const SnapshotFileDetails&) = delete;
+
~SnapshotFileDetails();
uint32_t file_id() const { return request_info_.file_id; }
@@ -101,8 +104,6 @@
// Whether an error occurred during file transfer.
bool error_occurred_;
-
- DISALLOW_COPY_AND_ASSIGN(SnapshotFileDetails);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_CHROMEOS_SNAPSHOT_FILE_DETAILS_H_
diff --git a/chrome/browser/media_galleries/fileapi/av_scanning_file_validator.h b/chrome/browser/media_galleries/fileapi/av_scanning_file_validator.h
index 3a0e9b3..00c863b 100644
--- a/chrome/browser/media_galleries/fileapi/av_scanning_file_validator.h
+++ b/chrome/browser/media_galleries/fileapi/av_scanning_file_validator.h
@@ -16,6 +16,9 @@
// This class supports AV scanning on post write validation.
class AVScanningFileValidator : public storage::CopyOrMoveFileValidator {
public:
+ AVScanningFileValidator(const AVScanningFileValidator&) = delete;
+ AVScanningFileValidator& operator=(const AVScanningFileValidator&) = delete;
+
~AVScanningFileValidator() override;
// Runs AV checks on the resulting file (Windows-only).
@@ -29,8 +32,6 @@
private:
download::QuarantineConnectionCallback quarantine_connection_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(AVScanningFileValidator);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_AV_SCANNING_FILE_VALIDATOR_H_
diff --git a/chrome/browser/media_galleries/fileapi/device_media_async_file_util.h b/chrome/browser/media_galleries/fileapi/device_media_async_file_util.h
index dd026802..55fe3e1 100644
--- a/chrome/browser/media_galleries/fileapi/device_media_async_file_util.h
+++ b/chrome/browser/media_galleries/fileapi/device_media_async_file_util.h
@@ -34,6 +34,9 @@
class DeviceMediaAsyncFileUtil : public storage::AsyncFileUtil {
public:
+ DeviceMediaAsyncFileUtil(const DeviceMediaAsyncFileUtil&) = delete;
+ DeviceMediaAsyncFileUtil& operator=(const DeviceMediaAsyncFileUtil&) = delete;
+
~DeviceMediaAsyncFileUtil() override;
// Returns an instance of DeviceMediaAsyncFileUtil.
@@ -197,8 +200,6 @@
// For callbacks that may run after destruction.
base::WeakPtrFactory<DeviceMediaAsyncFileUtil> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceMediaAsyncFileUtil);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_DEVICE_MEDIA_ASYNC_FILE_UTIL_H_
diff --git a/chrome/browser/media_galleries/fileapi/media_file_system_backend.h b/chrome/browser/media_galleries/fileapi/media_file_system_backend.h
index 47aefe0..62173bf 100644
--- a/chrome/browser/media_galleries/fileapi/media_file_system_backend.h
+++ b/chrome/browser/media_galleries/fileapi/media_file_system_backend.h
@@ -41,6 +41,10 @@
MediaFileSystemBackend(
const base::FilePath& profile_path,
download::QuarantineConnectionCallback quarantine_connection_callback);
+
+ MediaFileSystemBackend(const MediaFileSystemBackend&) = delete;
+ MediaFileSystemBackend& operator=(const MediaFileSystemBackend&) = delete;
+
~MediaFileSystemBackend() override;
// Asserts that the current task is sequenced with any other task that calls
@@ -111,8 +115,6 @@
#if defined(OS_WIN) || defined(OS_MAC) || BUILDFLAG(IS_CHROMEOS_ASH)
std::unique_ptr<DeviceMediaAsyncFileUtil> device_media_async_file_util_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(MediaFileSystemBackend);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_MEDIA_FILE_SYSTEM_BACKEND_H_
diff --git a/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc b/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc
index 868dbf9d..32f596c 100644
--- a/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc
+++ b/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc
@@ -78,6 +78,9 @@
public:
MediaFileValidatorTest() : test_file_size_(0) {}
+ MediaFileValidatorTest(const MediaFileValidatorTest&) = delete;
+ MediaFileValidatorTest& operator=(const MediaFileValidatorTest&) = delete;
+
~MediaFileValidatorTest() override = default;
// Write |content| into |filename| in a test file system and try to move
@@ -264,8 +267,6 @@
base::OnceClosure quit_closure_;
scoped_refptr<base::SequencedTaskRunner> file_system_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaFileValidatorTest);
};
IN_PROC_BROWSER_TEST_F(MediaFileValidatorTest, UnsupportedExtension) {
diff --git a/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc b/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc
index f47e88d9..dbe2a57 100644
--- a/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc
+++ b/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc
@@ -16,6 +16,9 @@
class InvalidFileValidator : public storage::CopyOrMoveFileValidator {
public:
+ InvalidFileValidator(const InvalidFileValidator&) = delete;
+ InvalidFileValidator& operator=(const InvalidFileValidator&) = delete;
+
~InvalidFileValidator() override {}
void StartPreWriteValidation(storage::CopyOrMoveFileValidator::ResultCallback
result_callback) override {
@@ -32,8 +35,6 @@
friend class ::MediaFileValidatorFactory;
InvalidFileValidator() {}
-
- DISALLOW_COPY_AND_ASSIGN(InvalidFileValidator);
};
} // namespace
diff --git a/chrome/browser/media_galleries/fileapi/media_file_validator_factory.h b/chrome/browser/media_galleries/fileapi/media_file_validator_factory.h
index c6f4f957..adab216 100644
--- a/chrome/browser/media_galleries/fileapi/media_file_validator_factory.h
+++ b/chrome/browser/media_galleries/fileapi/media_file_validator_factory.h
@@ -25,6 +25,11 @@
public:
explicit MediaFileValidatorFactory(
download::QuarantineConnectionCallback quarantine_connection_callback);
+
+ MediaFileValidatorFactory(const MediaFileValidatorFactory&) = delete;
+ MediaFileValidatorFactory& operator=(const MediaFileValidatorFactory&) =
+ delete;
+
~MediaFileValidatorFactory() override;
// CopyOrMoveFileValidatorFactory implementation.
@@ -34,8 +39,6 @@
private:
download::QuarantineConnectionCallback quarantine_connection_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaFileValidatorFactory);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_MEDIA_FILE_VALIDATOR_FACTORY_H_
diff --git a/chrome/browser/media_galleries/fileapi/media_path_filter.h b/chrome/browser/media_galleries/fileapi/media_path_filter.h
index cd38f8ab..1c7e8a2 100644
--- a/chrome/browser/media_galleries/fileapi/media_path_filter.h
+++ b/chrome/browser/media_galleries/fileapi/media_path_filter.h
@@ -30,6 +30,10 @@
static bool ShouldSkip(const base::FilePath& path);
MediaPathFilter();
+
+ MediaPathFilter(const MediaPathFilter&) = delete;
+ MediaPathFilter& operator=(const MediaPathFilter&) = delete;
+
~MediaPathFilter();
// Returns true if |path| is a media file.
@@ -63,8 +67,6 @@
base::SequenceChecker sequence_checker_;
bool initialized_;
MediaFileExtensionMap media_file_extensions_map_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaPathFilter);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_MEDIA_PATH_FILTER_H_
diff --git a/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h b/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h
index d7d137c..acb2572 100644
--- a/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h
+++ b/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h
@@ -29,6 +29,9 @@
const base::Time& expected_modification_time,
bool do_media_header_validation);
+ MTPFileStreamReader(const MTPFileStreamReader&) = delete;
+ MTPFileStreamReader& operator=(const MTPFileStreamReader&) = delete;
+
~MTPFileStreamReader() override;
// FileStreamReader overrides.
@@ -69,8 +72,6 @@
bool media_header_validated_;
base::WeakPtrFactory<MTPFileStreamReader> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MTPFileStreamReader);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_MTP_FILE_STREAM_READER_H_
diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util.cc b/chrome/browser/media_galleries/fileapi/native_media_file_util.cc
index 5373421..0956763 100644
--- a/chrome/browser/media_galleries/fileapi/native_media_file_util.cc
+++ b/chrome/browser/media_galleries/fileapi/native_media_file_util.cc
@@ -75,6 +75,10 @@
public:
explicit Core(scoped_refptr<base::SequencedTaskRunner> media_task_runner)
: media_task_runner_(std::move(media_task_runner)) {}
+
+ Core(const Core&) = delete;
+ Core& operator=(const Core&) = delete;
+
~Core() = default;
// The following calls are made on the media TaskRunner, using
@@ -167,8 +171,6 @@
MediaPathFilter media_path_filter_;
scoped_refptr<base::SequencedTaskRunner> media_task_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(Core);
};
NativeMediaFileUtil::NativeMediaFileUtil(
diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util.h b/chrome/browser/media_galleries/fileapi/native_media_file_util.h
index b9096745..df4921b 100644
--- a/chrome/browser/media_galleries/fileapi/native_media_file_util.h
+++ b/chrome/browser/media_galleries/fileapi/native_media_file_util.h
@@ -28,6 +28,10 @@
// be the same TaskRunner passed in each FileSystemOperationContext.
explicit NativeMediaFileUtil(
scoped_refptr<base::SequencedTaskRunner> media_task_runner);
+
+ NativeMediaFileUtil(const NativeMediaFileUtil&) = delete;
+ NativeMediaFileUtil& operator=(const NativeMediaFileUtil&) = delete;
+
~NativeMediaFileUtil() override;
// Uses the MIME sniffer code, which actually looks into the file,
@@ -122,8 +126,6 @@
scoped_refptr<base::SequencedTaskRunner> media_task_runner_;
std::unique_ptr<Core> core_;
-
- DISALLOW_COPY_AND_ASSIGN(NativeMediaFileUtil);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_NATIVE_MEDIA_FILE_UTIL_H_
diff --git a/chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.h b/chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.h
index 10d427f3..07d3c2b1 100644
--- a/chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.h
+++ b/chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.h
@@ -20,6 +20,10 @@
// Takes ownership of |source|.
explicit ReadaheadFileStreamReader(storage::FileStreamReader* source);
+ ReadaheadFileStreamReader(const ReadaheadFileStreamReader&) = delete;
+ ReadaheadFileStreamReader& operator=(const ReadaheadFileStreamReader&) =
+ delete;
+
~ReadaheadFileStreamReader() override;
// FileStreamReader overrides.
@@ -57,8 +61,6 @@
net::CompletionOnceCallback pending_read_callback_;
base::WeakPtrFactory<ReadaheadFileStreamReader> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ReadaheadFileStreamReader);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_READAHEAD_FILE_STREAM_READER_H_
diff --git a/chrome/browser/media_galleries/fileapi/supported_audio_video_checker.h b/chrome/browser/media_galleries/fileapi/supported_audio_video_checker.h
index 40936c3..4b0fda2 100644
--- a/chrome/browser/media_galleries/fileapi/supported_audio_video_checker.h
+++ b/chrome/browser/media_galleries/fileapi/supported_audio_video_checker.h
@@ -23,6 +23,10 @@
// this class does not make the file safe to use in the browser process.
class SupportedAudioVideoChecker : public AVScanningFileValidator {
public:
+ SupportedAudioVideoChecker(const SupportedAudioVideoChecker&) = delete;
+ SupportedAudioVideoChecker& operator=(const SupportedAudioVideoChecker&) =
+ delete;
+
~SupportedAudioVideoChecker() override;
static bool SupportsFileType(const base::FilePath& path);
@@ -42,8 +46,6 @@
storage::CopyOrMoveFileValidator::ResultCallback callback_;
std::unique_ptr<SafeAudioVideoChecker> safe_checker_;
base::WeakPtrFactory<SupportedAudioVideoChecker> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SupportedAudioVideoChecker);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_SUPPORTED_AUDIO_VIDEO_CHECKER_H_
diff --git a/chrome/browser/media_galleries/fileapi/supported_image_type_validator.h b/chrome/browser/media_galleries/fileapi/supported_image_type_validator.h
index 6853015..49cc3fa 100644
--- a/chrome/browser/media_galleries/fileapi/supported_image_type_validator.h
+++ b/chrome/browser/media_galleries/fileapi/supported_image_type_validator.h
@@ -21,6 +21,10 @@
// image files supported by Chrome.
class SupportedImageTypeValidator : public AVScanningFileValidator {
public:
+ SupportedImageTypeValidator(const SupportedImageTypeValidator&) = delete;
+ SupportedImageTypeValidator& operator=(const SupportedImageTypeValidator&) =
+ delete;
+
~SupportedImageTypeValidator() override;
static bool SupportsFileType(const base::FilePath& path);
@@ -39,8 +43,6 @@
base::FilePath path_;
storage::CopyOrMoveFileValidator::ResultCallback callback_;
base::WeakPtrFactory<SupportedImageTypeValidator> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SupportedImageTypeValidator);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_SUPPORTED_IMAGE_TYPE_VALIDATOR_H_
diff --git a/chrome/browser/media_galleries/gallery_watch_manager.cc b/chrome/browser/media_galleries/gallery_watch_manager.cc
index cfd4c8a..80d78c4 100644
--- a/chrome/browser/media_galleries/gallery_watch_manager.cc
+++ b/chrome/browser/media_galleries/gallery_watch_manager.cc
@@ -73,6 +73,10 @@
class GalleryWatchManager::FileWatchManager {
public:
explicit FileWatchManager(const base::FilePathWatcher::Callback& callback);
+
+ FileWatchManager(const FileWatchManager&) = delete;
+ FileWatchManager& operator=(const FileWatchManager&) = delete;
+
~FileWatchManager();
// Posts success or failure via |callback| to the UI thread.
@@ -96,8 +100,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<FileWatchManager> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FileWatchManager);
};
GalleryWatchManager::FileWatchManager::FileWatchManager(
diff --git a/chrome/browser/media_galleries/gallery_watch_manager.h b/chrome/browser/media_galleries/gallery_watch_manager.h
index 4a4e439..e1501ac 100644
--- a/chrome/browser/media_galleries/gallery_watch_manager.h
+++ b/chrome/browser/media_galleries/gallery_watch_manager.h
@@ -51,6 +51,10 @@
static const char kCouldNotWatchGalleryError[];
GalleryWatchManager();
+
+ GalleryWatchManager(const GalleryWatchManager&) = delete;
+ GalleryWatchManager& operator=(const GalleryWatchManager&) = delete;
+
~GalleryWatchManager() override;
// Add or remove observer of change events - this is the only way to
@@ -173,8 +177,6 @@
BrowserContextSubscriptionMap browser_context_subscription_map_;
base::WeakPtrFactory<GalleryWatchManager> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(GalleryWatchManager);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_GALLERY_WATCH_MANAGER_H_
diff --git a/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc b/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc
index fe82538..e196643 100644
--- a/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc
+++ b/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc
@@ -69,6 +69,9 @@
pending_loop_(nullptr) {
}
+ GalleryWatchManagerTest(const GalleryWatchManagerTest&) = delete;
+ GalleryWatchManagerTest& operator=(const GalleryWatchManagerTest&) = delete;
+
~GalleryWatchManagerTest() override {}
void SetUp() override {
@@ -216,8 +219,6 @@
bool expect_gallery_changed_;
bool expect_gallery_watch_dropped_;
base::RunLoop* pending_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(GalleryWatchManagerTest);
};
// TODO(crbug.com/936065): Flaky on ChromeOS.
diff --git a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm
index 6d4f460..c00505f7 100644
--- a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm
+++ b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm
@@ -44,6 +44,10 @@
public:
DeviceListener(MTPDeviceDelegateImplMac* delegate)
: delegate_(delegate) {}
+
+ DeviceListener(const DeviceListener&) = delete;
+ DeviceListener& operator=(const DeviceListener&) = delete;
+
~DeviceListener() override {}
void OpenCameraSession(const std::string& device_id);
@@ -68,8 +72,6 @@
// Weak pointer
MTPDeviceDelegateImplMac* delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceListener);
};
void MTPDeviceDelegateImplMac::DeviceListener::OpenCameraSession(
diff --git a/chrome/browser/media_galleries/media_file_system_registry.cc b/chrome/browser/media_galleries/media_file_system_registry.cc
index 8ad4bea..9809a3b 100644
--- a/chrome/browser/media_galleries/media_file_system_registry.cc
+++ b/chrome/browser/media_galleries/media_file_system_registry.cc
@@ -654,6 +654,11 @@
: public MediaFileSystemContext {
public:
MediaFileSystemContextImpl() {}
+
+ MediaFileSystemContextImpl(const MediaFileSystemContextImpl&) = delete;
+ MediaFileSystemContextImpl& operator=(const MediaFileSystemContextImpl&) =
+ delete;
+
~MediaFileSystemContextImpl() override {}
bool RegisterFileSystem(const std::string& device_id,
@@ -729,8 +734,6 @@
return false;
#endif
}
-
- DISALLOW_COPY_AND_ASSIGN(MediaFileSystemContextImpl);
};
// Constructor in 'private' section because depends on private class definition.
diff --git a/chrome/browser/media_galleries/media_file_system_registry.h b/chrome/browser/media_galleries/media_file_system_registry.h
index de85e321..202cfdd 100644
--- a/chrome/browser/media_galleries/media_file_system_registry.h
+++ b/chrome/browser/media_galleries/media_file_system_registry.h
@@ -70,6 +70,10 @@
public MediaGalleriesPreferences::GalleryChangeObserver {
public:
MediaFileSystemRegistry();
+
+ MediaFileSystemRegistry(const MediaFileSystemRegistry&) = delete;
+ MediaFileSystemRegistry& operator=(const MediaFileSystemRegistry&) = delete;
+
~MediaFileSystemRegistry() override;
// Passes to |callback| the list of media filesystem IDs and paths for a
@@ -140,8 +144,6 @@
std::unique_ptr<MediaFileSystemContext> file_system_context_;
std::unique_ptr<GalleryWatchManager> gallery_watch_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaFileSystemRegistry);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_FILE_SYSTEM_REGISTRY_H_
diff --git a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
index e95984de..b35a8b2 100644
--- a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
+++ b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
@@ -197,6 +197,12 @@
: public content::RenderProcessHostFactory {
public:
MockProfileSharedRenderProcessHostFactory() {}
+
+ MockProfileSharedRenderProcessHostFactory(
+ const MockProfileSharedRenderProcessHostFactory&) = delete;
+ MockProfileSharedRenderProcessHostFactory& operator=(
+ const MockProfileSharedRenderProcessHostFactory&) = delete;
+
~MockProfileSharedRenderProcessHostFactory() override;
// RPH created with this factory are owned by it. If the RPH is destroyed
@@ -227,13 +233,15 @@
mutable std::map<content::BrowserContext*,
std::unique_ptr<content::MockRenderProcessHost>>
rph_map_;
-
- DISALLOW_COPY_AND_ASSIGN(MockProfileSharedRenderProcessHostFactory);
};
class ProfileState {
public:
explicit ProfileState(MockProfileSharedRenderProcessHostFactory* rph_factory);
+
+ ProfileState(const ProfileState&) = delete;
+ ProfileState& operator=(const ProfileState&) = delete;
+
~ProfileState();
MediaGalleriesPreferences* GetMediaGalleriesPrefs();
@@ -281,8 +289,6 @@
std::vector<std::u16string> compare_names_read_;
std::vector<std::u16string> compare_names_all_;
-
- DISALLOW_COPY_AND_ASSIGN(ProfileState);
};
std::u16string GetExpectedFolderName(const base::FilePath& path) {
@@ -299,6 +305,10 @@
public:
MediaFileSystemRegistryTest() = default;
+ MediaFileSystemRegistryTest(const MediaFileSystemRegistryTest&) = delete;
+ MediaFileSystemRegistryTest& operator=(const MediaFileSystemRegistryTest&) =
+ delete;
+
~MediaFileSystemRegistryTest() override = default;
void CreateProfileState(size_t profile_count);
@@ -400,8 +410,6 @@
MockProfileSharedRenderProcessHostFactory rph_factory_;
std::vector<std::unique_ptr<ProfileState>> profile_states_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaFileSystemRegistryTest);
};
namespace {
diff --git a/chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.h b/chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.h
index 2c82cc25..f479bb4 100644
--- a/chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.h
+++ b/chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.h
@@ -14,6 +14,10 @@
typedef base::OnceCallback<void(int update_count)> DialogDestroyedCallback;
explicit MockMediaGalleriesDialog(DialogDestroyedCallback callback);
+
+ MockMediaGalleriesDialog(const MockMediaGalleriesDialog&) = delete;
+ MockMediaGalleriesDialog& operator=(const MockMediaGalleriesDialog&) = delete;
+
~MockMediaGalleriesDialog() override;
// MediaGalleriesDialog implementation.
@@ -29,8 +33,6 @@
int update_count_;
DialogDestroyedCallback dialog_destroyed_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(MockMediaGalleriesDialog);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_DIALOG_CONTROLLER_TEST_UTIL_H_
diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller.h b/chrome/browser/media_galleries/media_galleries_permission_controller.h
index fb9066e..caa835643 100644
--- a/chrome/browser/media_galleries/media_galleries_permission_controller.h
+++ b/chrome/browser/media_galleries/media_galleries_permission_controller.h
@@ -96,6 +96,10 @@
class DialogIdMap {
public:
DialogIdMap();
+
+ DialogIdMap(const DialogIdMap&) = delete;
+ DialogIdMap& operator=(const DialogIdMap&) = delete;
+
~DialogIdMap();
GalleryDialogId GetDialogId(MediaGalleryPrefId pref_id);
MediaGalleryPrefId GetPrefId(GalleryDialogId id) const;
@@ -104,7 +108,6 @@
GalleryDialogId next_dialog_id_;
std::map<MediaGalleryPrefId, GalleryDialogId> back_map_;
std::vector<MediaGalleryPrefId> forward_mapping_;
- DISALLOW_COPY_AND_ASSIGN(DialogIdMap);
};
diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc b/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc
index 4f74915..44c06791 100644
--- a/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc
+++ b/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc
@@ -52,6 +52,11 @@
controller_(nullptr),
profile_(new TestingProfile()) {}
+ MediaGalleriesPermissionControllerTest(
+ const MediaGalleriesPermissionControllerTest&) = delete;
+ MediaGalleriesPermissionControllerTest& operator=(
+ const MediaGalleriesPermissionControllerTest&) = delete;
+
~MediaGalleriesPermissionControllerTest() override {
EXPECT_FALSE(controller_);
EXPECT_FALSE(dialog_);
@@ -164,8 +169,6 @@
base::WeakPtrFactory<MediaGalleriesPermissionControllerTest> weak_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPermissionControllerTest);
};
GalleryDialogId
diff --git a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
index e8768cf..c5fc906 100644
--- a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
+++ b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
@@ -60,6 +60,11 @@
explicit MockGalleryChangeObserver(MediaGalleriesPreferences* pref)
: pref_(pref),
notifications_(0) {}
+
+ MockGalleryChangeObserver(const MockGalleryChangeObserver&) = delete;
+ MockGalleryChangeObserver& operator=(const MockGalleryChangeObserver&) =
+ delete;
+
~MockGalleryChangeObserver() override {}
int notifications() const { return notifications_;}
@@ -100,8 +105,6 @@
MediaGalleriesPreferences* pref_;
int notifications_;
-
- DISALLOW_COPY_AND_ASSIGN(MockGalleryChangeObserver);
};
} // namespace
@@ -114,6 +117,10 @@
MediaGalleriesPreferencesTest()
: profile_(new TestingProfile()), default_galleries_count_(0) {}
+ MediaGalleriesPreferencesTest(const MediaGalleriesPreferencesTest&) = delete;
+ MediaGalleriesPreferencesTest& operator=(
+ const MediaGalleriesPreferencesTest&) = delete;
+
~MediaGalleriesPreferencesTest() override {}
void SetUp() override {
@@ -372,8 +379,6 @@
std::unique_ptr<MediaGalleriesPreferences> gallery_prefs_;
uint64_t default_galleries_count_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPreferencesTest);
};
TEST_F(MediaGalleriesPreferencesTest, GalleryManagement) {
diff --git a/chrome/browser/media_galleries/media_galleries_test_util.h b/chrome/browser/media_galleries/media_galleries_test_util.h
index fe5b125f..8e9e70a 100644
--- a/chrome/browser/media_galleries/media_galleries_test_util.h
+++ b/chrome/browser/media_galleries/media_galleries_test_util.h
@@ -41,6 +41,11 @@
class EnsureMediaDirectoriesExists {
public:
EnsureMediaDirectoriesExists();
+
+ EnsureMediaDirectoriesExists(const EnsureMediaDirectoriesExists&) = delete;
+ EnsureMediaDirectoriesExists& operator=(const EnsureMediaDirectoriesExists&) =
+ delete;
+
~EnsureMediaDirectoriesExists();
int num_galleries() const { return num_galleries_; }
@@ -75,8 +80,6 @@
#if defined(OS_MAC)
std::unique_ptr<MockPreferences> mac_preferences_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(EnsureMediaDirectoriesExists);
};
extern base::FilePath MakeMediaGalleriesTestingPath(const std::string& dir);
diff --git a/chrome/browser/media_galleries/media_gallery_context_menu.h b/chrome/browser/media_galleries/media_gallery_context_menu.h
index a23d658..601e557 100644
--- a/chrome/browser/media_galleries/media_gallery_context_menu.h
+++ b/chrome/browser/media_galleries/media_gallery_context_menu.h
@@ -17,6 +17,10 @@
ForgetGalleryCallback;
explicit MediaGalleryContextMenu(const ForgetGalleryCallback& callback);
+
+ MediaGalleryContextMenu(const MediaGalleryContextMenu&) = delete;
+ MediaGalleryContextMenu& operator=(const MediaGalleryContextMenu&) = delete;
+
~MediaGalleryContextMenu() override;
void set_pref_id(MediaGalleryPrefId pref_id) {
@@ -32,8 +36,6 @@
private:
MediaGalleryPrefId pref_id_;
ForgetGalleryCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaGalleryContextMenu);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERY_CONTEXT_MENU_H_
diff --git a/chrome/browser/media_galleries/win/mtp_device_object_enumerator.h b/chrome/browser/media_galleries/win/mtp_device_object_enumerator.h
index 1401bb8..e7d73611 100644
--- a/chrome/browser/media_galleries/win/mtp_device_object_enumerator.h
+++ b/chrome/browser/media_galleries/win/mtp_device_object_enumerator.h
@@ -24,6 +24,11 @@
class MTPDeviceObjectEnumerator {
public:
explicit MTPDeviceObjectEnumerator(const MTPDeviceObjectEntries& entries);
+
+ MTPDeviceObjectEnumerator(const MTPDeviceObjectEnumerator&) = delete;
+ MTPDeviceObjectEnumerator& operator=(const MTPDeviceObjectEnumerator&) =
+ delete;
+
~MTPDeviceObjectEnumerator();
base::FilePath Next();
@@ -55,8 +60,6 @@
bool is_index_ready_;
base::ThreadChecker thread_checker_;
-
- DISALLOW_COPY_AND_ASSIGN(MTPDeviceObjectEnumerator);
};
#endif // CHROME_BROWSER_MEDIA_GALLERIES_WIN_MTP_DEVICE_OBJECT_ENUMERATOR_H_
diff --git a/chrome/browser/memory/chrome_browser_main_extra_parts_memory.h b/chrome/browser/memory/chrome_browser_main_extra_parts_memory.h
index 188e7a80..f03961a1 100644
--- a/chrome/browser/memory/chrome_browser_main_extra_parts_memory.h
+++ b/chrome/browser/memory/chrome_browser_main_extra_parts_memory.h
@@ -28,6 +28,12 @@
class ChromeBrowserMainExtraPartsMemory : public ChromeBrowserMainExtraParts {
public:
ChromeBrowserMainExtraPartsMemory();
+
+ ChromeBrowserMainExtraPartsMemory(const ChromeBrowserMainExtraPartsMemory&) =
+ delete;
+ ChromeBrowserMainExtraPartsMemory& operator=(
+ const ChromeBrowserMainExtraPartsMemory&) = delete;
+
~ChromeBrowserMainExtraPartsMemory() override;
private:
@@ -50,8 +56,6 @@
#endif
std::unique_ptr<memory::MemoryAblationStudy> memory_ablation_study_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsMemory);
};
#endif // CHROME_BROWSER_MEMORY_CHROME_BROWSER_MAIN_EXTRA_PARTS_MEMORY_H_
diff --git a/chrome/browser/memory/enterprise_memory_limit_evaluator.h b/chrome/browser/memory/enterprise_memory_limit_evaluator.h
index 11167c8..6593aea 100644
--- a/chrome/browser/memory/enterprise_memory_limit_evaluator.h
+++ b/chrome/browser/memory/enterprise_memory_limit_evaluator.h
@@ -27,6 +27,12 @@
public:
explicit EnterpriseMemoryLimitEvaluator(
std::unique_ptr<memory_pressure::MemoryPressureVoter> voter);
+
+ EnterpriseMemoryLimitEvaluator(const EnterpriseMemoryLimitEvaluator&) =
+ delete;
+ EnterpriseMemoryLimitEvaluator& operator=(
+ const EnterpriseMemoryLimitEvaluator&) = delete;
+
~EnterpriseMemoryLimitEvaluator();
// Starts/stops observing the resident set of Chrome processes and notifying
@@ -61,8 +67,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<EnterpriseMemoryLimitEvaluator> weak_ptr_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(EnterpriseMemoryLimitEvaluator);
};
// Instances of this class are constructed and destructed on the main thread.
diff --git a/chrome/browser/memory/memory_kills_monitor.h b/chrome/browser/memory/memory_kills_monitor.h
index 91d9ee7..71ccb2f 100644
--- a/chrome/browser/memory/memory_kills_monitor.h
+++ b/chrome/browser/memory/memory_kills_monitor.h
@@ -30,6 +30,10 @@
class MemoryKillsMonitor : public chromeos::LoginState::Observer {
public:
MemoryKillsMonitor();
+
+ MemoryKillsMonitor(const MemoryKillsMonitor&) = delete;
+ MemoryKillsMonitor& operator=(const MemoryKillsMonitor&) = delete;
+
~MemoryKillsMonitor() override;
// Initializes the global instance, but do not start monitoring until user
@@ -87,8 +91,6 @@
unsigned long last_arc_oom_kills_count_ = 0;
base::RepeatingTimer checking_timer_;
-
- DISALLOW_COPY_AND_ASSIGN(MemoryKillsMonitor);
};
} // namespace memory
diff --git a/chrome/browser/metrics/antivirus_metrics_provider_win.h b/chrome/browser/metrics/antivirus_metrics_provider_win.h
index fbf3012c..78623ed 100644
--- a/chrome/browser/metrics/antivirus_metrics_provider_win.h
+++ b/chrome/browser/metrics/antivirus_metrics_provider_win.h
@@ -25,6 +25,10 @@
"ReportFullAVProductDetails", base::FEATURE_DISABLED_BY_DEFAULT};
AntiVirusMetricsProvider();
+
+ AntiVirusMetricsProvider(const AntiVirusMetricsProvider&) = delete;
+ AntiVirusMetricsProvider& operator=(const AntiVirusMetricsProvider&) = delete;
+
~AntiVirusMetricsProvider() override;
// metrics::MetricsDataProvider:
@@ -51,8 +55,6 @@
std::vector<metrics::SystemProfileProto::AntiVirusProduct> av_products_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(AntiVirusMetricsProvider);
};
#endif // CHROME_BROWSER_METRICS_ANTIVIRUS_METRICS_PROVIDER_WIN_H_
diff --git a/chrome/browser/metrics/assistant_service_metrics_provider.h b/chrome/browser/metrics/assistant_service_metrics_provider.h
index b25bfb36..217f11e 100644
--- a/chrome/browser/metrics/assistant_service_metrics_provider.h
+++ b/chrome/browser/metrics/assistant_service_metrics_provider.h
@@ -10,14 +10,17 @@
class AssistantServiceMetricsProvider : public metrics::MetricsProvider {
public:
AssistantServiceMetricsProvider();
+
+ AssistantServiceMetricsProvider(const AssistantServiceMetricsProvider&) =
+ delete;
+ AssistantServiceMetricsProvider& operator=(
+ const AssistantServiceMetricsProvider&) = delete;
+
~AssistantServiceMetricsProvider() override;
// metrics::MetricsProvider:
void ProvideCurrentSessionData(
metrics::ChromeUserMetricsExtension* uma_proto_unused) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AssistantServiceMetricsProvider);
};
#endif // CHROME_BROWSER_METRICS_ASSISTANT_SERVICE_METRICS_PROVIDER_H_
diff --git a/chrome/browser/metrics/browser_activity_watcher.h b/chrome/browser/metrics/browser_activity_watcher.h
index caed0380..a917f1ae 100644
--- a/chrome/browser/metrics/browser_activity_watcher.h
+++ b/chrome/browser/metrics/browser_activity_watcher.h
@@ -19,6 +19,10 @@
public:
explicit BrowserActivityWatcher(
const base::RepeatingClosure& on_browser_activity);
+
+ BrowserActivityWatcher(const BrowserActivityWatcher&) = delete;
+ BrowserActivityWatcher& operator=(const BrowserActivityWatcher&) = delete;
+
~BrowserActivityWatcher() override;
// BrowserListObserver:
@@ -33,8 +37,6 @@
private:
base::RepeatingClosure on_browser_activity_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserActivityWatcher);
};
#endif // CHROME_BROWSER_METRICS_BROWSER_ACTIVITY_WATCHER_H_
diff --git a/chrome/browser/metrics/chrome_android_metrics_provider.h b/chrome/browser/metrics/chrome_android_metrics_provider.h
index f1d4d98..83704709 100644
--- a/chrome/browser/metrics/chrome_android_metrics_provider.h
+++ b/chrome/browser/metrics/chrome_android_metrics_provider.h
@@ -21,6 +21,11 @@
class ChromeAndroidMetricsProvider : public metrics::MetricsProvider {
public:
explicit ChromeAndroidMetricsProvider(PrefService* local_state);
+
+ ChromeAndroidMetricsProvider(const ChromeAndroidMetricsProvider&) = delete;
+ ChromeAndroidMetricsProvider& operator=(const ChromeAndroidMetricsProvider&) =
+ delete;
+
~ChromeAndroidMetricsProvider() override;
// Registers local state prefs used by this class.
@@ -35,8 +40,6 @@
private:
PrefService* local_state_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeAndroidMetricsProvider);
};
#endif // CHROME_BROWSER_METRICS_CHROME_ANDROID_METRICS_PROVIDER_H_
diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
index 175323a7..e831217 100644
--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -394,13 +394,16 @@
: public ui::InputDeviceEventObserver {
public:
AsynchronousTouchEventStateRecorder();
+
+ AsynchronousTouchEventStateRecorder(
+ const AsynchronousTouchEventStateRecorder&) = delete;
+ AsynchronousTouchEventStateRecorder& operator=(
+ const AsynchronousTouchEventStateRecorder&) = delete;
+
~AsynchronousTouchEventStateRecorder() override;
// ui::InputDeviceEventObserver overrides.
void OnDeviceListsComplete() override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AsynchronousTouchEventStateRecorder);
};
AsynchronousTouchEventStateRecorder::AsynchronousTouchEventStateRecorder() {
diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
index ed2b4b8..32a0a20 100644
--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
@@ -32,6 +32,12 @@
public display::DisplayObserver {
public:
ChromeBrowserMainExtraPartsMetrics();
+
+ ChromeBrowserMainExtraPartsMetrics(
+ const ChromeBrowserMainExtraPartsMetrics&) = delete;
+ ChromeBrowserMainExtraPartsMetrics& operator=(
+ const ChromeBrowserMainExtraPartsMetrics&) = delete;
+
~ChromeBrowserMainExtraPartsMetrics() override;
// Overridden from ChromeBrowserMainExtraParts:
@@ -77,8 +83,6 @@
// scenarios and power consumption.
std::unique_ptr<PowerMetricsReporter> power_metrics_reporter_;
#endif // defined(OS_MAC) || defined (OS_WIN)
-
- DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsMetrics);
};
#endif // CHROME_BROWSER_METRICS_CHROME_BROWSER_MAIN_EXTRA_PARTS_METRICS_H_
diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics_unittest.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics_unittest.cc
index 98919b9..1188ac82 100644
--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics_unittest.cc
+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics_unittest.cc
@@ -35,6 +35,12 @@
class ChromeBrowserMainExtraPartsMetricsTest : public testing::Test {
public:
ChromeBrowserMainExtraPartsMetricsTest();
+
+ ChromeBrowserMainExtraPartsMetricsTest(
+ const ChromeBrowserMainExtraPartsMetricsTest&) = delete;
+ ChromeBrowserMainExtraPartsMetricsTest& operator=(
+ const ChromeBrowserMainExtraPartsMetricsTest&) = delete;
+
~ChromeBrowserMainExtraPartsMetricsTest() override;
protected:
@@ -63,8 +69,6 @@
// Dummy screen required by a ChromeBrowserMainExtraPartsMetrics test target.
display::test::TestScreen test_screen_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsMetricsTest);
};
ChromeBrowserMainExtraPartsMetricsTest::
diff --git a/chrome/browser/metrics/chrome_feature_list_creator.h b/chrome/browser/metrics/chrome_feature_list_creator.h
index 083d1780..be6d5a8 100644
--- a/chrome/browser/metrics/chrome_feature_list_creator.h
+++ b/chrome/browser/metrics/chrome_feature_list_creator.h
@@ -28,6 +28,10 @@
class ChromeFeatureListCreator {
public:
ChromeFeatureListCreator();
+
+ ChromeFeatureListCreator(const ChromeFeatureListCreator&) = delete;
+ ChromeFeatureListCreator& operator=(const ChromeFeatureListCreator&) = delete;
+
~ChromeFeatureListCreator();
// Initializes all necessary parameters to create the feature list and calls
@@ -104,8 +108,6 @@
#if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
std::unique_ptr<installer::InitialPreferences> installer_initial_prefs_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(ChromeFeatureListCreator);
};
#endif // CHROME_BROWSER_METRICS_CHROME_FEATURE_LIST_CREATOR_H_
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.h b/chrome/browser/metrics/chrome_metrics_service_client.h
index 59983177..cc9acfc 100644
--- a/chrome/browser/metrics/chrome_metrics_service_client.h
+++ b/chrome/browser/metrics/chrome_metrics_service_client.h
@@ -48,6 +48,10 @@
public ukm::HistoryDeleteObserver,
public ukm::UkmConsentStateObserver {
public:
+ ChromeMetricsServiceClient(const ChromeMetricsServiceClient&) = delete;
+ ChromeMetricsServiceClient& operator=(const ChromeMetricsServiceClient&) =
+ delete;
+
~ChromeMetricsServiceClient() override;
// Factory function.
@@ -210,8 +214,6 @@
#endif
base::WeakPtrFactory<ChromeMetricsServiceClient> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeMetricsServiceClient);
};
#endif // CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICE_CLIENT_H_
diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
index 4df0c58..f288cb2 100644
--- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
@@ -142,6 +142,11 @@
public:
explicit ChromeEnabledStateProvider(PrefService* local_state)
: local_state_(local_state) {}
+
+ ChromeEnabledStateProvider(const ChromeEnabledStateProvider&) = delete;
+ ChromeEnabledStateProvider& operator=(const ChromeEnabledStateProvider&) =
+ delete;
+
~ChromeEnabledStateProvider() override {}
bool IsConsentGiven() const override {
@@ -156,8 +161,6 @@
private:
PrefService* const local_state_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeEnabledStateProvider);
};
ChromeMetricsServicesManagerClient::ChromeMetricsServicesManagerClient(
diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.h b/chrome/browser/metrics/chrome_metrics_services_manager_client.h
index d99defb..880778ba 100644
--- a/chrome/browser/metrics/chrome_metrics_services_manager_client.h
+++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.h
@@ -40,6 +40,12 @@
: public metrics_services_manager::MetricsServicesManagerClient {
public:
explicit ChromeMetricsServicesManagerClient(PrefService* local_state);
+
+ ChromeMetricsServicesManagerClient(
+ const ChromeMetricsServicesManagerClient&) = delete;
+ ChromeMetricsServicesManagerClient& operator=(
+ const ChromeMetricsServicesManagerClient&) = delete;
+
~ChromeMetricsServicesManagerClient() override;
metrics::MetricsStateManager* GetMetricsStateManagerForTesting();
@@ -109,8 +115,6 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
base::CallbackListSubscription reporting_setting_subscription_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(ChromeMetricsServicesManagerClient);
};
#endif // CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICES_MANAGER_CLIENT_H_
diff --git a/chrome/browser/metrics/chromeos_metrics_provider.h b/chrome/browser/metrics/chromeos_metrics_provider.h
index a68d278..c9e20cd 100644
--- a/chrome/browser/metrics/chromeos_metrics_provider.h
+++ b/chrome/browser/metrics/chromeos_metrics_provider.h
@@ -31,6 +31,10 @@
public:
explicit ChromeOSMetricsProvider(
metrics::MetricsLogUploader::MetricServiceType service_type);
+
+ ChromeOSMetricsProvider(const ChromeOSMetricsProvider&) = delete;
+ ChromeOSMetricsProvider& operator=(const ChromeOSMetricsProvider&) = delete;
+
~ChromeOSMetricsProvider() override;
static void RegisterPrefs(PrefRegistrySimple* registry);
@@ -109,8 +113,6 @@
absl::optional<std::string> arc_release_ = absl::nullopt;
base::WeakPtrFactory<ChromeOSMetricsProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeOSMetricsProvider);
};
#endif // CHROME_BROWSER_METRICS_CHROMEOS_METRICS_PROVIDER_H_
diff --git a/chrome/browser/metrics/desktop_platform_features_metrics_provider.h b/chrome/browser/metrics/desktop_platform_features_metrics_provider.h
index a2d61b0..a39dbafe 100644
--- a/chrome/browser/metrics/desktop_platform_features_metrics_provider.h
+++ b/chrome/browser/metrics/desktop_platform_features_metrics_provider.h
@@ -16,14 +16,17 @@
class DesktopPlatformFeaturesMetricsProvider : public metrics::MetricsProvider {
public:
DesktopPlatformFeaturesMetricsProvider();
+
+ DesktopPlatformFeaturesMetricsProvider(
+ const DesktopPlatformFeaturesMetricsProvider&) = delete;
+ DesktopPlatformFeaturesMetricsProvider& operator=(
+ const DesktopPlatformFeaturesMetricsProvider&) = delete;
+
~DesktopPlatformFeaturesMetricsProvider() override;
// metrics::MetricsProvider
void ProvideCurrentSessionData(
metrics::ChromeUserMetricsExtension* uma_proto) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DesktopPlatformFeaturesMetricsProvider);
};
#endif // CHROME_BROWSER_METRICS_DESKTOP_PLATFORM_FEATURES_METRICS_PROVIDER_H_
diff --git a/chrome/browser/metrics/desktop_session_duration/audible_contents_tracker.h b/chrome/browser/metrics/desktop_session_duration/audible_contents_tracker.h
index 0f295f4bf..296a8ac 100644
--- a/chrome/browser/metrics/desktop_session_duration/audible_contents_tracker.h
+++ b/chrome/browser/metrics/desktop_session_duration/audible_contents_tracker.h
@@ -26,6 +26,10 @@
class Observer {
public:
Observer() {}
+
+ Observer(const Observer&) = delete;
+ Observer& operator=(const Observer&) = delete;
+
virtual ~Observer() {}
// Invoked when a first audio source starts playing after a period of no
@@ -34,14 +38,15 @@
// Invoked when all audio sources stop playing.
virtual void OnAudioEnd() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Observer);
};
// Creates an audible contents tracker that dispatches its messages to the
// provided |observer|.
explicit AudibleContentsTracker(Observer* observer);
+
+ AudibleContentsTracker(const AudibleContentsTracker&) = delete;
+ AudibleContentsTracker& operator=(const AudibleContentsTracker&) = delete;
+
~AudibleContentsTracker() override;
private:
@@ -67,8 +72,6 @@
// The set of WebContents that are currently playing audio.
std::set<content::WebContents*> audible_contents_;
-
- DISALLOW_COPY_AND_ASSIGN(AudibleContentsTracker);
};
} // namespace metrics
diff --git a/chrome/browser/metrics/desktop_session_duration/chrome_visibility_observer.h b/chrome/browser/metrics/desktop_session_duration/chrome_visibility_observer.h
index 51fa803d..e02e1d1 100644
--- a/chrome/browser/metrics/desktop_session_duration/chrome_visibility_observer.h
+++ b/chrome/browser/metrics/desktop_session_duration/chrome_visibility_observer.h
@@ -14,6 +14,10 @@
class ChromeVisibilityObserver : public BrowserListObserver {
public:
ChromeVisibilityObserver();
+
+ ChromeVisibilityObserver(const ChromeVisibilityObserver&) = delete;
+ ChromeVisibilityObserver& operator=(const ChromeVisibilityObserver&) = delete;
+
~ChromeVisibilityObserver() override;
private:
@@ -43,8 +47,6 @@
base::TimeDelta visibility_gap_timeout_;
base::WeakPtrFactory<ChromeVisibilityObserver> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeVisibilityObserver);
};
} // namespace metrics
diff --git a/chrome/browser/metrics/desktop_session_duration/desktop_profile_session_durations_service.h b/chrome/browser/metrics/desktop_session_duration/desktop_profile_session_durations_service.h
index fa069a6..3d8795f 100644
--- a/chrome/browser/metrics/desktop_session_duration/desktop_profile_session_durations_service.h
+++ b/chrome/browser/metrics/desktop_session_duration/desktop_profile_session_durations_service.h
@@ -33,6 +33,12 @@
syncer::SyncService* sync_service,
signin::IdentityManager* identity_manager,
DesktopSessionDurationTracker* tracker);
+
+ DesktopProfileSessionDurationsService(
+ const DesktopProfileSessionDurationsService&) = delete;
+ DesktopProfileSessionDurationsService& operator=(
+ const DesktopProfileSessionDurationsService&) = delete;
+
~DesktopProfileSessionDurationsService() override;
// DesktopSessionDurationtracker::Observer:
@@ -52,8 +58,6 @@
base::ScopedObservation<DesktopSessionDurationTracker,
DesktopSessionDurationTracker::Observer>
session_duration_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DesktopProfileSessionDurationsService);
};
} // namespace metrics
diff --git a/chrome/browser/metrics/desktop_session_duration/desktop_session_duration_observer.h b/chrome/browser/metrics/desktop_session_duration/desktop_session_duration_observer.h
index 5a7051f..f5ba4234 100644
--- a/chrome/browser/metrics/desktop_session_duration/desktop_session_duration_observer.h
+++ b/chrome/browser/metrics/desktop_session_duration/desktop_session_duration_observer.h
@@ -25,6 +25,12 @@
public:
DesktopSessionDurationObserver(content::WebContents* web_contents,
DesktopSessionDurationTracker* service);
+
+ DesktopSessionDurationObserver(const DesktopSessionDurationObserver&) =
+ delete;
+ DesktopSessionDurationObserver& operator=(
+ const DesktopSessionDurationObserver&) = delete;
+
~DesktopSessionDurationObserver() override;
static DesktopSessionDurationObserver* CreateForWebContents(
@@ -47,8 +53,6 @@
DesktopSessionDurationTracker* service_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(DesktopSessionDurationObserver);
};
} // namespace metrics
diff --git a/chrome/browser/metrics/extensions_metrics_provider_unittest.cc b/chrome/browser/metrics/extensions_metrics_provider_unittest.cc
index 0389c6e..25205ab 100644
--- a/chrome/browser/metrics/extensions_metrics_provider_unittest.cc
+++ b/chrome/browser/metrics/extensions_metrics_provider_unittest.cc
@@ -149,6 +149,12 @@
: public extensions::ExtensionServiceTestBase {
public:
ExtensionMetricsProviderInstallsTest() {}
+
+ ExtensionMetricsProviderInstallsTest(
+ const ExtensionMetricsProviderInstallsTest&) = delete;
+ ExtensionMetricsProviderInstallsTest& operator=(
+ const ExtensionMetricsProviderInstallsTest&) = delete;
+
~ExtensionMetricsProviderInstallsTest() override {}
void SetUp() override {
@@ -176,8 +182,6 @@
private:
extensions::ExtensionPrefs* prefs_ = nullptr;
base::Time last_sample_time_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionMetricsProviderInstallsTest);
};
// Tests the various aspects of constructing a relevant proto for a given
diff --git a/chrome/browser/metrics/google_update_metrics_provider_win.h b/chrome/browser/metrics/google_update_metrics_provider_win.h
index e1226bf5..8fb0ba5 100644
--- a/chrome/browser/metrics/google_update_metrics_provider_win.h
+++ b/chrome/browser/metrics/google_update_metrics_provider_win.h
@@ -16,6 +16,12 @@
class GoogleUpdateMetricsProviderWin : public metrics::MetricsProvider {
public:
GoogleUpdateMetricsProviderWin();
+
+ GoogleUpdateMetricsProviderWin(const GoogleUpdateMetricsProviderWin&) =
+ delete;
+ GoogleUpdateMetricsProviderWin& operator=(
+ const GoogleUpdateMetricsProviderWin&) = delete;
+
~GoogleUpdateMetricsProviderWin() override;
// metrics::MetricsProvider
@@ -60,8 +66,6 @@
GoogleUpdateMetrics google_update_metrics_;
base::WeakPtrFactory<GoogleUpdateMetricsProviderWin> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(GoogleUpdateMetricsProviderWin);
};
#endif // CHROME_BROWSER_METRICS_GOOGLE_UPDATE_METRICS_PROVIDER_WIN_H_
diff --git a/chrome/browser/metrics/incognito_observer.h b/chrome/browser/metrics/incognito_observer.h
index 6cdeb13a..73b1af6 100644
--- a/chrome/browser/metrics/incognito_observer.h
+++ b/chrome/browser/metrics/incognito_observer.h
@@ -18,12 +18,13 @@
static std::unique_ptr<IncognitoObserver> Create(
const base::RepeatingClosure& update_closure);
+ IncognitoObserver(const IncognitoObserver&) = delete;
+ IncognitoObserver& operator=(const IncognitoObserver&) = delete;
+
virtual ~IncognitoObserver();
protected:
IncognitoObserver();
-
- DISALLOW_COPY_AND_ASSIGN(IncognitoObserver);
};
#endif // CHROME_BROWSER_METRICS_INCOGNITO_OBSERVER_H_
diff --git a/chrome/browser/metrics/incognito_observer_android.cc b/chrome/browser/metrics/incognito_observer_android.cc
index 6e2d3ef..4cca88c 100644
--- a/chrome/browser/metrics/incognito_observer_android.cc
+++ b/chrome/browser/metrics/incognito_observer_android.cc
@@ -19,6 +19,9 @@
TabModelList::AddObserver(this);
}
+ IncognitoObserverAndroid(const IncognitoObserverAndroid&) = delete;
+ IncognitoObserverAndroid& operator=(const IncognitoObserverAndroid&) = delete;
+
~IncognitoObserverAndroid() override { TabModelList::RemoveObserver(this); }
// TabModelListObserver:
@@ -27,8 +30,6 @@
private:
const base::RepeatingClosure update_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(IncognitoObserverAndroid);
};
} // namespace
diff --git a/chrome/browser/metrics/incognito_observer_desktop.cc b/chrome/browser/metrics/incognito_observer_desktop.cc
index b8f9835..b630a68 100644
--- a/chrome/browser/metrics/incognito_observer_desktop.cc
+++ b/chrome/browser/metrics/incognito_observer_desktop.cc
@@ -19,6 +19,9 @@
BrowserList::AddObserver(this);
}
+ IncognitoObserverDesktop(const IncognitoObserverDesktop&) = delete;
+ IncognitoObserverDesktop& operator=(const IncognitoObserverDesktop&) = delete;
+
~IncognitoObserverDesktop() override { BrowserList::RemoveObserver(this); }
private:
@@ -27,8 +30,6 @@
void OnBrowserRemoved(Browser* browser) override { update_closure_.Run(); }
const base::RepeatingClosure update_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(IncognitoObserverDesktop);
};
} // namespace
diff --git a/chrome/browser/metrics/metrics_reporting_state_browsertest.cc b/chrome/browser/metrics/metrics_reporting_state_browsertest.cc
index 8afe912e..b2affff 100644
--- a/chrome/browser/metrics/metrics_reporting_state_browsertest.cc
+++ b/chrome/browser/metrics/metrics_reporting_state_browsertest.cc
@@ -60,6 +60,11 @@
public testing::WithParamInterface<bool> {
public:
MetricsReportingStateTest() = default;
+
+ MetricsReportingStateTest(const MetricsReportingStateTest&) = delete;
+ MetricsReportingStateTest& operator=(const MetricsReportingStateTest&) =
+ delete;
+
~MetricsReportingStateTest() override = default;
static bool IsMetricsAndCrashReportingEnabled() {
@@ -105,8 +110,6 @@
private:
base::FilePath local_state_path_;
-
- DISALLOW_COPY_AND_ASSIGN(MetricsReportingStateTest);
};
void ChromeBrowserMainExtraPartsChecker::PostEarlyInitialization() {
diff --git a/chrome/browser/metrics/network_quality_estimator_provider_impl.h b/chrome/browser/metrics/network_quality_estimator_provider_impl.h
index aebcf24..9bca8d7 100644
--- a/chrome/browser/metrics/network_quality_estimator_provider_impl.h
+++ b/chrome/browser/metrics/network_quality_estimator_provider_impl.h
@@ -19,6 +19,12 @@
public network::NetworkQualityTracker::EffectiveConnectionTypeObserver {
public:
NetworkQualityEstimatorProviderImpl();
+
+ NetworkQualityEstimatorProviderImpl(
+ const NetworkQualityEstimatorProviderImpl&) = delete;
+ NetworkQualityEstimatorProviderImpl& operator=(
+ const NetworkQualityEstimatorProviderImpl&) = delete;
+
~NetworkQualityEstimatorProviderImpl() override;
private:
@@ -42,8 +48,6 @@
base::WeakPtrFactory<NetworkQualityEstimatorProviderImpl> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(NetworkQualityEstimatorProviderImpl);
};
} // namespace metrics
diff --git a/chrome/browser/metrics/oom/out_of_memory_reporter.h b/chrome/browser/metrics/oom/out_of_memory_reporter.h
index 81e51e40..d2e662d 100644
--- a/chrome/browser/metrics/oom/out_of_memory_reporter.h
+++ b/chrome/browser/metrics/oom/out_of_memory_reporter.h
@@ -42,6 +42,10 @@
virtual void OnForegroundOOMDetected(const GURL& url,
ukm::SourceId source_id) = 0;
};
+
+ OutOfMemoryReporter(const OutOfMemoryReporter&) = delete;
+ OutOfMemoryReporter& operator=(const OutOfMemoryReporter&) = delete;
+
~OutOfMemoryReporter() override;
void AddObserver(Observer* observer);
@@ -82,8 +86,6 @@
scoped_observation_{this};
#endif
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(OutOfMemoryReporter);
};
#endif // CHROME_BROWSER_METRICS_OOM_OUT_OF_MEMORY_REPORTER_H_
diff --git a/chrome/browser/metrics/oom/out_of_memory_reporter_browsertest.cc b/chrome/browser/metrics/oom/out_of_memory_reporter_browsertest.cc
index 984d3f7..37fdde5 100644
--- a/chrome/browser/metrics/oom/out_of_memory_reporter_browsertest.cc
+++ b/chrome/browser/metrics/oom/out_of_memory_reporter_browsertest.cc
@@ -54,6 +54,12 @@
public OutOfMemoryReporter::Observer {
public:
MAYBE_OutOfMemoryReporterBrowserTest() = default;
+
+ MAYBE_OutOfMemoryReporterBrowserTest(
+ const MAYBE_OutOfMemoryReporterBrowserTest&) = delete;
+ MAYBE_OutOfMemoryReporterBrowserTest& operator=(
+ const MAYBE_OutOfMemoryReporterBrowserTest&) = delete;
+
~MAYBE_OutOfMemoryReporterBrowserTest() override = default;
// InProcessBrowserTest:
@@ -78,9 +84,6 @@
protected:
absl::optional<GURL> last_oom_url_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MAYBE_OutOfMemoryReporterBrowserTest);
};
IN_PROC_BROWSER_TEST_F(MAYBE_OutOfMemoryReporterBrowserTest, MemoryExhaust) {
diff --git a/chrome/browser/metrics/oom/out_of_memory_reporter_unittest.cc b/chrome/browser/metrics/oom/out_of_memory_reporter_unittest.cc
index af727c8..13d4189 100644
--- a/chrome/browser/metrics/oom/out_of_memory_reporter_unittest.cc
+++ b/chrome/browser/metrics/oom/out_of_memory_reporter_unittest.cc
@@ -58,6 +58,10 @@
CrashDumpWaiter() {
crash_reporter::CrashMetricsReporter::GetInstance()->AddObserver(this);
}
+
+ CrashDumpWaiter(const CrashDumpWaiter&) = delete;
+ CrashDumpWaiter& operator=(const CrashDumpWaiter&) = delete;
+
~CrashDumpWaiter() {
crash_reporter::CrashMetricsReporter::GetInstance()->RemoveObserver(this);
}
@@ -81,7 +85,6 @@
base::RunLoop waiter_;
crash_reporter::CrashMetricsReporter::ReportedCrashTypeSet reported_counts_;
- DISALLOW_COPY_AND_ASSIGN(CrashDumpWaiter);
};
#endif // defined(OS_ANDROID)
@@ -89,6 +92,10 @@
public OutOfMemoryReporter::Observer {
public:
OutOfMemoryReporterTest() {}
+
+ OutOfMemoryReporterTest(const OutOfMemoryReporterTest&) = delete;
+ OutOfMemoryReporterTest& operator=(const OutOfMemoryReporterTest&) = delete;
+
~OutOfMemoryReporterTest() override {}
// ChromeRenderViewHostTestHarness:
@@ -193,8 +200,6 @@
private:
base::SimpleTestTickClock* test_tick_clock_;
-
- DISALLOW_COPY_AND_ASSIGN(OutOfMemoryReporterTest);
};
TEST_F(OutOfMemoryReporterTest, SimpleOOM) {
diff --git a/chrome/browser/metrics/page_load_metrics_provider.h b/chrome/browser/metrics/page_load_metrics_provider.h
index 63d3a78..f651ea8 100644
--- a/chrome/browser/metrics/page_load_metrics_provider.h
+++ b/chrome/browser/metrics/page_load_metrics_provider.h
@@ -13,13 +13,14 @@
class PageLoadMetricsProvider : public metrics::MetricsProvider {
public:
PageLoadMetricsProvider();
+
+ PageLoadMetricsProvider(const PageLoadMetricsProvider&) = delete;
+ PageLoadMetricsProvider& operator=(const PageLoadMetricsProvider&) = delete;
+
~PageLoadMetricsProvider() override;
// metrics:MetricsProvider:
void OnAppEnterBackground() override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PageLoadMetricsProvider);
};
#endif // CHROME_BROWSER_METRICS_PAGE_LOAD_METRICS_PROVIDER_H_
diff --git a/chrome/browser/metrics/perf/metric_collector.h b/chrome/browser/metrics/perf/metric_collector.h
index 6585c3d..64af618 100644
--- a/chrome/browser/metrics/perf/metric_collector.h
+++ b/chrome/browser/metrics/perf/metric_collector.h
@@ -37,6 +37,9 @@
MetricCollector(const std::string& name,
const CollectionParams& collection_params);
+ MetricCollector(const MetricCollector&) = delete;
+ MetricCollector& operator=(const MetricCollector&) = delete;
+
virtual ~MetricCollector();
virtual const char* ToolName() const = 0;
@@ -186,8 +189,6 @@
// A callback to be Run on each successfully collected profile.
ProfileDoneCallback profile_done_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(MetricCollector);
};
} // namespace internal
diff --git a/chrome/browser/metrics/perf/metric_provider.h b/chrome/browser/metrics/perf/metric_provider.h
index 39a968b8..f32f8c5 100644
--- a/chrome/browser/metrics/perf/metric_provider.h
+++ b/chrome/browser/metrics/perf/metric_provider.h
@@ -36,6 +36,9 @@
MetricProvider(std::unique_ptr<internal::MetricCollector> collector,
ProfileManager* profile_manager);
+ MetricProvider(const MetricProvider&) = delete;
+ MetricProvider& operator=(const MetricProvider&) = delete;
+
virtual ~MetricProvider();
void Init();
@@ -134,8 +137,6 @@
base::RepeatingClosure cache_updated_callback_;
base::WeakPtrFactory<MetricProvider> weak_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(MetricProvider);
};
} // namespace metrics
diff --git a/chrome/browser/metrics/perf/perf_events_collector.h b/chrome/browser/metrics/perf/perf_events_collector.h
index 18a3372..cb2f08d 100644
--- a/chrome/browser/metrics/perf/perf_events_collector.h
+++ b/chrome/browser/metrics/perf/perf_events_collector.h
@@ -35,6 +35,9 @@
public:
PerfCollector();
+ PerfCollector(const PerfCollector&) = delete;
+ PerfCollector& operator=(const PerfCollector&) = delete;
+
// MetricCollector:
~PerfCollector() override;
const char* ToolName() const override;
@@ -140,8 +143,6 @@
std::vector<uint32_t> max_frequencies_mhz_;
base::WeakPtrFactory<PerfCollector> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PerfCollector);
};
// Exposed for unit testing.
diff --git a/chrome/browser/metrics/perf/perf_events_collector_unittest.cc b/chrome/browser/metrics/perf/perf_events_collector_unittest.cc
index 96b4db29..8cce00c 100644
--- a/chrome/browser/metrics/perf/perf_events_collector_unittest.cc
+++ b/chrome/browser/metrics/perf/perf_events_collector_unittest.cc
@@ -114,6 +114,10 @@
collection_done_timer_.Start(FROM_HERE, duration, this,
&FakePerfOutputCall::OnCollectionDone);
}
+
+ FakePerfOutputCall(const FakePerfOutputCall&) = delete;
+ FakePerfOutputCall& operator=(const FakePerfOutputCall&) = delete;
+
~FakePerfOutputCall() override = default;
void Stop() override {
@@ -135,8 +139,6 @@
DoneCallback done_callback_;
base::OneShotTimer collection_done_timer_;
base::OnceClosure on_stop_;
-
- DISALLOW_COPY_AND_ASSIGN(FakePerfOutputCall);
};
// Allows testing of PerfCollector behavior when an incognito window is opened.
diff --git a/chrome/browser/metrics/perf/perf_output.h b/chrome/browser/metrics/perf/perf_output.h
index 53cf601..36b9e43 100644
--- a/chrome/browser/metrics/perf/perf_output.h
+++ b/chrome/browser/metrics/perf/perf_output.h
@@ -39,6 +39,10 @@
base::TimeDelta duration,
const std::vector<std::string>& perf_args,
DoneCallback callback);
+
+ PerfOutputCall(const PerfOutputCall&) = delete;
+ PerfOutputCall& operator=(const PerfOutputCall&) = delete;
+
virtual ~PerfOutputCall();
// Stop() is made virtual for mocks in testing.
@@ -77,8 +81,6 @@
// To pass around the "this" pointer across threads safely.
base::WeakPtrFactory<PerfOutputCall> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PerfOutputCall);
};
} // namespace metrics
diff --git a/chrome/browser/metrics/perf/perf_output_unittest.cc b/chrome/browser/metrics/perf/perf_output_unittest.cc
index 2601d6a..ae4162b 100644
--- a/chrome/browser/metrics/perf/perf_output_unittest.cc
+++ b/chrome/browser/metrics/perf/perf_output_unittest.cc
@@ -65,6 +65,10 @@
public:
FakeDebugDaemonClient()
: task_runner_(base::SequencedTaskRunnerHandle::Get()) {}
+
+ FakeDebugDaemonClient(const FakeDebugDaemonClient&) = delete;
+ FakeDebugDaemonClient& operator=(const FakeDebugDaemonClient&) = delete;
+
~FakeDebugDaemonClient() override {
EXPECT_FALSE(perf_output_file_.IsValid());
}
@@ -119,8 +123,6 @@
base::File perf_output_file_;
chromeos::DBusMethodCallback<uint64_t> get_perf_outjput_callback_;
bool stop_called_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(FakeDebugDaemonClient);
};
} // namespace
diff --git a/chrome/browser/metrics/perf/profile_provider_chromeos.h b/chrome/browser/metrics/perf/profile_provider_chromeos.h
index d87a377..5ac198cb 100644
--- a/chrome/browser/metrics/perf/profile_provider_chromeos.h
+++ b/chrome/browser/metrics/perf/profile_provider_chromeos.h
@@ -27,6 +27,10 @@
public content::JankMonitor::Observer {
public:
ProfileProvider();
+
+ ProfileProvider(const ProfileProvider&) = delete;
+ ProfileProvider& operator=(const ProfileProvider&) = delete;
+
~ProfileProvider() override;
void Init();
@@ -88,8 +92,6 @@
// To pass around the "this" pointer across threads safely.
base::WeakPtrFactory<ProfileProvider> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ProfileProvider);
};
} // namespace metrics
diff --git a/chrome/browser/metrics/perf/random_selector.h b/chrome/browser/metrics/perf/random_selector.h
index e1ba9c6..a1439f1 100644
--- a/chrome/browser/metrics/perf/random_selector.h
+++ b/chrome/browser/metrics/perf/random_selector.h
@@ -48,6 +48,10 @@
};
RandomSelector();
+
+ RandomSelector(const RandomSelector&) = delete;
+ RandomSelector& operator=(const RandomSelector&) = delete;
+
virtual ~RandomSelector();
// Set the probabilities for various strings. Returns false and doesn't
@@ -83,8 +87,6 @@
// Sum of the probability weights.
double sum_of_weights_;
-
- DISALLOW_COPY_AND_ASSIGN(RandomSelector);
};
::std::ostream& operator<<(
diff --git a/chrome/browser/metrics/perf/windowed_incognito_observer.h b/chrome/browser/metrics/perf/windowed_incognito_observer.h
index cea83ddc..2203360 100644
--- a/chrome/browser/metrics/perf/windowed_incognito_observer.h
+++ b/chrome/browser/metrics/perf/windowed_incognito_observer.h
@@ -38,6 +38,11 @@
public:
explicit WindowedIncognitoObserver(WindowedIncognitoMonitor* monitor,
uint64_t incognito_open_count);
+
+ WindowedIncognitoObserver(const WindowedIncognitoObserver&) = delete;
+ WindowedIncognitoObserver& operator=(const WindowedIncognitoObserver&) =
+ delete;
+
virtual ~WindowedIncognitoObserver() = default;
// Made virtual for override in test.
@@ -50,8 +55,6 @@
// The number of incognito windows that has been opened when the observer is
// created.
uint64_t num_incognito_window_opened_;
-
- DISALLOW_COPY_AND_ASSIGN(WindowedIncognitoObserver);
};
// WindowedIncognitoMonitor watches for any incognito window being opened or
diff --git a/chrome/browser/metrics/plugin_metrics_provider.h b/chrome/browser/metrics/plugin_metrics_provider.h
index de977a83..7f3666c 100644
--- a/chrome/browser/metrics/plugin_metrics_provider.h
+++ b/chrome/browser/metrics/plugin_metrics_provider.h
@@ -34,6 +34,10 @@
public content::BrowserChildProcessObserver {
public:
explicit PluginMetricsProvider(PrefService* local_state);
+
+ PluginMetricsProvider(const PluginMetricsProvider&) = delete;
+ PluginMetricsProvider& operator=(const PluginMetricsProvider&) = delete;
+
~PluginMetricsProvider() override;
// metrics::MetricsDataProvider:
@@ -107,8 +111,6 @@
std::map<std::u16string, ChildProcessStats> child_process_stats_buffer_;
base::WeakPtrFactory<PluginMetricsProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PluginMetricsProvider);
};
#endif // CHROME_BROWSER_METRICS_PLUGIN_METRICS_PROVIDER_H_
diff --git a/chrome/browser/metrics/process_memory_metrics_emitter_browsertest.cc b/chrome/browser/metrics/process_memory_metrics_emitter_browsertest.cc
index a826777..4d2004f 100644
--- a/chrome/browser/metrics/process_memory_metrics_emitter_browsertest.cc
+++ b/chrome/browser/metrics/process_memory_metrics_emitter_browsertest.cc
@@ -313,6 +313,11 @@
scoped_feature_list_.InitAndEnableFeature(ukm::kUkmFeature);
}
+ ProcessMemoryMetricsEmitterTest(const ProcessMemoryMetricsEmitterTest&) =
+ delete;
+ ProcessMemoryMetricsEmitterTest& operator=(
+ const ProcessMemoryMetricsEmitterTest&) = delete;
+
~ProcessMemoryMetricsEmitterTest() override {}
void SetUpOnMainThread() override {
@@ -524,8 +529,6 @@
#if BUILDFLAG(ENABLE_EXTENSIONS)
std::vector<std::unique_ptr<TestExtensionDir>> temp_dirs_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(ProcessMemoryMetricsEmitterTest);
};
// TODO(crbug.com/732501): Re-enable on Win once not flaky.
diff --git a/chrome/browser/metrics/process_memory_metrics_emitter_unittest.cc b/chrome/browser/metrics/process_memory_metrics_emitter_unittest.cc
index 29b6466e..356efb1 100644
--- a/chrome/browser/metrics/process_memory_metrics_emitter_unittest.cc
+++ b/chrome/browser/metrics/process_memory_metrics_emitter_unittest.cc
@@ -637,6 +637,12 @@
: public testing::TestWithParam<HistogramProcessType> {
public:
ProcessMemoryMetricsEmitterTest() {}
+
+ ProcessMemoryMetricsEmitterTest(const ProcessMemoryMetricsEmitterTest&) =
+ delete;
+ ProcessMemoryMetricsEmitterTest& operator=(
+ const ProcessMemoryMetricsEmitterTest&) = delete;
+
~ProcessMemoryMetricsEmitterTest() override {}
protected:
@@ -666,9 +672,6 @@
content::BrowserTaskEnvironment task_environment_;
ukm::TestAutoSetUkmRecorder test_ukm_recorder_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ProcessMemoryMetricsEmitterTest);
};
TEST_P(ProcessMemoryMetricsEmitterTest, CollectsSingleProcessUKMs) {
diff --git a/chrome/browser/metrics/tab_stats/tab_stats_data_store.h b/chrome/browser/metrics/tab_stats/tab_stats_data_store.h
index 363539a..8bfa9da 100644
--- a/chrome/browser/metrics/tab_stats/tab_stats_data_store.h
+++ b/chrome/browser/metrics/tab_stats/tab_stats_data_store.h
@@ -84,6 +84,10 @@
base::flat_map<TabID, TabStateDuringInterval>;
explicit TabStatsDataStore(PrefService* pref_service);
+
+ TabStatsDataStore(const TabStatsDataStore&) = delete;
+ TabStatsDataStore& operator=(const TabStatsDataStore&) = delete;
+
~TabStatsDataStore() override;
// TabStatsObserver:
@@ -159,8 +163,6 @@
base::flat_map<content::WebContents*, TabID> existing_tabs_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(TabStatsDataStore);
};
} // namespace metrics
diff --git a/chrome/browser/metrics/tab_stats/tab_stats_tracker.h b/chrome/browser/metrics/tab_stats/tab_stats_tracker.h
index 34698b5..ee4c42c 100644
--- a/chrome/browser/metrics/tab_stats/tab_stats_tracker.h
+++ b/chrome/browser/metrics/tab_stats/tab_stats_tracker.h
@@ -44,6 +44,10 @@
public:
// Constructor. |pref_service| must outlive this object.
explicit TabStatsTracker(PrefService* pref_service);
+
+ TabStatsTracker(const TabStatsTracker&) = delete;
+ TabStatsTracker& operator=(const TabStatsTracker&) = delete;
+
~TabStatsTracker() override;
// Sets the |TabStatsTracker| global instance.
@@ -89,6 +93,10 @@
TabStatsDailyObserver(UmaStatsReportingDelegate* reporting_delegate,
TabStatsDataStore* data_store)
: reporting_delegate_(reporting_delegate), data_store_(data_store) {}
+
+ TabStatsDailyObserver(const TabStatsDailyObserver&) = delete;
+ TabStatsDailyObserver& operator=(const TabStatsDailyObserver&) = delete;
+
~TabStatsDailyObserver() override {}
// Callback called when the daily event happen.
@@ -100,8 +108,6 @@
// The data store that houses the metrics.
TabStatsDataStore* data_store_;
-
- DISALLOW_COPY_AND_ASSIGN(TabStatsDailyObserver);
};
// Accessors, exposed for unittests:
@@ -219,8 +225,6 @@
web_contents_usage_observers_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(TabStatsTracker);
};
// The reporting delegate, which reports metrics via UMA.
@@ -261,6 +265,11 @@
static const char kCollapsedTabHistogramName[];
UmaStatsReportingDelegate() = default;
+
+ UmaStatsReportingDelegate(const UmaStatsReportingDelegate&) = delete;
+ UmaStatsReportingDelegate& operator=(const UmaStatsReportingDelegate&) =
+ delete;
+
virtual ~UmaStatsReportingDelegate() = default;
// Called at resume from sleep/hibernate.
@@ -293,9 +302,6 @@
// Checks if Chrome is running in background with no visible windows, virtual
// for unittesting.
virtual bool IsChromeBackgroundedWithoutWindows();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(UmaStatsReportingDelegate);
};
} // namespace metrics
diff --git a/chrome/browser/metrics/tab_stats/tab_stats_tracker_unittest.cc b/chrome/browser/metrics/tab_stats/tab_stats_tracker_unittest.cc
index f083c2c..50933aa6 100644
--- a/chrome/browser/metrics/tab_stats/tab_stats_tracker_unittest.cc
+++ b/chrome/browser/metrics/tab_stats/tab_stats_tracker_unittest.cc
@@ -64,6 +64,10 @@
using UmaStatsReportingDelegate = TabStatsTracker::UmaStatsReportingDelegate;
explicit TestTabStatsTracker(PrefService* pref_service);
+
+ TestTabStatsTracker(const TestTabStatsTracker&) = delete;
+ TestTabStatsTracker& operator=(const TestTabStatsTracker&) = delete;
+
~TestTabStatsTracker() override {}
// Helper functions to update the number of tabs/windows.
@@ -133,8 +137,6 @@
private:
PrefService* pref_service_;
-
- DISALLOW_COPY_AND_ASSIGN(TestTabStatsTracker);
};
class TestUmaStatsReportingDelegate
diff --git a/chrome/browser/metrics/thread_watcher.h b/chrome/browser/metrics/thread_watcher.h
index 93939935..cefa583 100644
--- a/chrome/browser/metrics/thread_watcher.h
+++ b/chrome/browser/metrics/thread_watcher.h
@@ -95,6 +95,9 @@
crash_on_hang(crash_on_hang_in) {}
};
+ ThreadWatcher(const ThreadWatcher&) = delete;
+ ThreadWatcher& operator=(const ThreadWatcher&) = delete;
+
virtual ~ThreadWatcher();
// This method starts performing health check on the given |thread_id|. It
@@ -293,8 +296,6 @@
// use this during ping-pong messaging between WatchDog thread and watched
// thread.
base::WeakPtrFactory<ThreadWatcher> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ThreadWatcher);
};
// Class with a list of all active thread watchers. A thread watcher is active
@@ -462,6 +463,9 @@
// Constructor.
WatchDogThread();
+ WatchDogThread(const WatchDogThread&) = delete;
+ WatchDogThread& operator=(const WatchDogThread&) = delete;
+
// Destroys the thread and stops the thread.
~WatchDogThread() override;
@@ -490,8 +494,6 @@
static bool PostTaskHelper(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay);
-
- DISALLOW_COPY_AND_ASSIGN(WatchDogThread);
};
// ShutdownWatcherHelper is useless on Android because there is no shutdown,
@@ -504,6 +506,9 @@
// Create an empty holder for |shutdown_watchdog_|.
ShutdownWatcherHelper();
+ ShutdownWatcherHelper(const ShutdownWatcherHelper&) = delete;
+ ShutdownWatcherHelper& operator=(const ShutdownWatcherHelper&) = delete;
+
// Destructor disarm's shutdown_watchdog_ so that alarm doesn't go off.
~ShutdownWatcherHelper();
@@ -521,8 +526,6 @@
// The |thread_id_| on which this object is constructed.
const base::PlatformThreadId thread_id_;
-
- DISALLOW_COPY_AND_ASSIGN(ShutdownWatcherHelper);
};
#endif // !defined(OS_ANDROID)
diff --git a/chrome/browser/metrics/thread_watcher_unittest.cc b/chrome/browser/metrics/thread_watcher_unittest.cc
index 8dca1963..598218e5 100644
--- a/chrome/browser/metrics/thread_watcher_unittest.cc
+++ b/chrome/browser/metrics/thread_watcher_unittest.cc
@@ -368,6 +368,9 @@
}
}
+ ThreadWatcherTest(const ThreadWatcherTest&) = delete;
+ ThreadWatcherTest& operator=(const ThreadWatcherTest&) = delete;
+
~ThreadWatcherTest() override {
ThreadWatcherList::DeleteAll();
io_watcher_ = nullptr;
@@ -384,8 +387,6 @@
base::ConditionVariable setup_complete_;
bool initialized_;
std::unique_ptr<WatchDogThread> watchdog_thread_;
-
- DISALLOW_COPY_AND_ASSIGN(ThreadWatcherTest);
};
class ThreadWatcherTestWithMockTime : public ThreadWatcherTest {
diff --git a/chrome/browser/metrics/ukm_background_recorder_browsertest.cc b/chrome/browser/metrics/ukm_background_recorder_browsertest.cc
index 4250dbc..a5a075d 100644
--- a/chrome/browser/metrics/ukm_background_recorder_browsertest.cc
+++ b/chrome/browser/metrics/ukm_background_recorder_browsertest.cc
@@ -32,6 +32,12 @@
class UkmBackgroundRecorderBrowserTest : public InProcessBrowserTest {
public:
UkmBackgroundRecorderBrowserTest() = default;
+
+ UkmBackgroundRecorderBrowserTest(const UkmBackgroundRecorderBrowserTest&) =
+ delete;
+ UkmBackgroundRecorderBrowserTest& operator=(
+ const UkmBackgroundRecorderBrowserTest&) = delete;
+
~UkmBackgroundRecorderBrowserTest() override = default;
void SetUpOnMainThread() override {
@@ -60,8 +66,6 @@
private:
ukm::UkmBackgroundRecorderService* background_recorder_service_;
-
- DISALLOW_COPY_AND_ASSIGN(UkmBackgroundRecorderBrowserTest);
};
IN_PROC_BROWSER_TEST_F(UkmBackgroundRecorderBrowserTest,
diff --git a/chrome/browser/metrics/ukm_background_recorder_service.h b/chrome/browser/metrics/ukm_background_recorder_service.h
index 08a84e1..0108e081 100644
--- a/chrome/browser/metrics/ukm_background_recorder_service.h
+++ b/chrome/browser/metrics/ukm_background_recorder_service.h
@@ -44,6 +44,11 @@
// |profile| is needed to access the appropriate services |this| depends on.
explicit UkmBackgroundRecorderService(Profile* profile);
+
+ UkmBackgroundRecorderService(const UkmBackgroundRecorderService&) = delete;
+ UkmBackgroundRecorderService& operator=(const UkmBackgroundRecorderService&) =
+ delete;
+
~UkmBackgroundRecorderService() override;
void Shutdown() override;
@@ -73,8 +78,6 @@
base::CancelableTaskTracker task_tracker_;
base::WeakPtrFactory<UkmBackgroundRecorderService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UkmBackgroundRecorderService);
};
class UkmBackgroundRecorderFactory : public BrowserContextKeyedServiceFactory {
diff --git a/chrome/browser/metrics/upgrade_metrics_provider.h b/chrome/browser/metrics/upgrade_metrics_provider.h
index c9ed83f..9a8b656 100644
--- a/chrome/browser/metrics/upgrade_metrics_provider.h
+++ b/chrome/browser/metrics/upgrade_metrics_provider.h
@@ -13,14 +13,15 @@
class UpgradeMetricsProvider : public metrics::MetricsProvider {
public:
UpgradeMetricsProvider();
+
+ UpgradeMetricsProvider(const UpgradeMetricsProvider&) = delete;
+ UpgradeMetricsProvider& operator=(const UpgradeMetricsProvider&) = delete;
+
~UpgradeMetricsProvider() override;
// metrics::MetricsProvider:
void ProvideCurrentSessionData(
metrics::ChromeUserMetricsExtension* uma_proto) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(UpgradeMetricsProvider);
};
#endif // CHROME_BROWSER_METRICS_UPGRADE_METRICS_PROVIDER_H_
diff --git a/chrome/browser/metrics/variations/chrome_variations_service_client.h b/chrome/browser/metrics/variations/chrome_variations_service_client.h
index ff71e98..9cc26b7e0 100644
--- a/chrome/browser/metrics/variations/chrome_variations_service_client.h
+++ b/chrome/browser/metrics/variations/chrome_variations_service_client.h
@@ -21,6 +21,11 @@
: public variations::VariationsServiceClient {
public:
ChromeVariationsServiceClient();
+
+ ChromeVariationsServiceClient(const ChromeVariationsServiceClient&) = delete;
+ ChromeVariationsServiceClient& operator=(
+ const ChromeVariationsServiceClient&) = delete;
+
~ChromeVariationsServiceClient() override;
// variations::VariationsServiceClient:
@@ -34,8 +39,6 @@
private:
// variations::VariationsServiceClient:
version_info::Channel GetChannel() override;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeVariationsServiceClient);
};
#endif // CHROME_BROWSER_METRICS_VARIATIONS_CHROME_VARIATIONS_SERVICE_CLIENT_H_
diff --git a/chrome/browser/metrics/variations/force_field_trials_browsertest.cc b/chrome/browser/metrics/variations/force_field_trials_browsertest.cc
index 28a30c2c..44245666 100644
--- a/chrome/browser/metrics/variations/force_field_trials_browsertest.cc
+++ b/chrome/browser/metrics/variations/force_field_trials_browsertest.cc
@@ -43,6 +43,11 @@
public testing::WithParamInterface<bool> {
public:
ForceFieldTrialsBrowserTest() : metrics_consent_(GetParam()) {}
+
+ ForceFieldTrialsBrowserTest(const ForceFieldTrialsBrowserTest&) = delete;
+ ForceFieldTrialsBrowserTest& operator=(const ForceFieldTrialsBrowserTest&) =
+ delete;
+
~ForceFieldTrialsBrowserTest() override = default;
std::string GetTestTrialName(int trial_number) {
@@ -87,8 +92,6 @@
private:
bool metrics_consent_;
-
- DISALLOW_COPY_AND_ASSIGN(ForceFieldTrialsBrowserTest);
};
IN_PROC_BROWSER_TEST_P(ForceFieldTrialsBrowserTest, PRE_PRE_ForceTrials) {
diff --git a/chrome/browser/metrics/variations/variations_http_headers_browsertest.cc b/chrome/browser/metrics/variations/variations_http_headers_browsertest.cc
index 3b97132..0dd7c2ce 100644
--- a/chrome/browser/metrics/variations/variations_http_headers_browsertest.cc
+++ b/chrome/browser/metrics/variations/variations_http_headers_browsertest.cc
@@ -71,6 +71,10 @@
class VariationHeaderSetter : public ChromeBrowserMainExtraParts {
public:
VariationHeaderSetter() = default;
+
+ VariationHeaderSetter(const VariationHeaderSetter&) = delete;
+ VariationHeaderSetter& operator=(const VariationHeaderSetter&) = delete;
+
~VariationHeaderSetter() override = default;
// ChromeBrowserMainExtraParts:
@@ -80,15 +84,18 @@
variations::VariationsIdsProvider::GetInstance();
variations_provider->ForceVariationIds({"12", "456", "t789"}, "");
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(VariationHeaderSetter);
};
class VariationsHttpHeadersBrowserTest : public IdentityBrowserTestBase {
public:
VariationsHttpHeadersBrowserTest()
: https_server_(net::test_server::EmbeddedTestServer::TYPE_HTTPS) {}
+
+ VariationsHttpHeadersBrowserTest(const VariationsHttpHeadersBrowserTest&) =
+ delete;
+ VariationsHttpHeadersBrowserTest& operator=(
+ const VariationsHttpHeadersBrowserTest&) = delete;
+
~VariationsHttpHeadersBrowserTest() override = default;
void CreatedBrowserMainParts(content::BrowserMainParts* parts) override {
@@ -311,8 +318,6 @@
// For waiting for requests.
std::map<GURL, base::OnceClosure> done_callbacks_;
-
- DISALLOW_COPY_AND_ASSIGN(VariationsHttpHeadersBrowserTest);
};
// Used for testing the kRestrictGoogleWebVisibility feature.
diff --git a/chrome/browser/nacl_host/nacl_browser_delegate_impl.h b/chrome/browser/nacl_host/nacl_browser_delegate_impl.h
index f7b02e6..efd6be2 100644
--- a/chrome/browser/nacl_host/nacl_browser_delegate_impl.h
+++ b/chrome/browser/nacl_host/nacl_browser_delegate_impl.h
@@ -23,6 +23,10 @@
class NaClBrowserDelegateImpl : public NaClBrowserDelegate {
public:
explicit NaClBrowserDelegateImpl(ProfileManager* profile_manager);
+
+ NaClBrowserDelegateImpl(const NaClBrowserDelegateImpl&) = delete;
+ NaClBrowserDelegateImpl& operator=(const NaClBrowserDelegateImpl&) = delete;
+
~NaClBrowserDelegateImpl() override;
void ShowMissingArchInfobar(int render_process_id,
@@ -55,7 +59,6 @@
ProfileManager* profile_manager_;
bool inverse_debug_patterns_;
std::set<std::string> allowed_nonsfi_origins_;
- DISALLOW_COPY_AND_ASSIGN(NaClBrowserDelegateImpl);
};
diff --git a/chrome/browser/navigation_predictor/navigation_predictor.h b/chrome/browser/navigation_predictor/navigation_predictor.h
index a614bd0..6c9bfeb9 100644
--- a/chrome/browser/navigation_predictor/navigation_predictor.h
+++ b/chrome/browser/navigation_predictor/navigation_predictor.h
@@ -36,6 +36,10 @@
public:
NavigationPredictor(content::RenderFrameHost* render_frame_host,
mojo::PendingReceiver<AnchorElementMetricsHost> receiver);
+
+ NavigationPredictor(const NavigationPredictor&) = delete;
+ NavigationPredictor& operator=(const NavigationPredictor&) = delete;
+
~NavigationPredictor() override;
// Create and bind NavigationPredictor.
@@ -97,8 +101,6 @@
base::TimeTicks navigation_start_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(NavigationPredictor);
};
#endif // CHROME_BROWSER_NAVIGATION_PREDICTOR_NAVIGATION_PREDICTOR_H_
diff --git a/chrome/browser/navigation_predictor/navigation_predictor_browsertest.cc b/chrome/browser/navigation_predictor/navigation_predictor_browsertest.cc
index 2c2d4b6..7d1f8f52 100644
--- a/chrome/browser/navigation_predictor/navigation_predictor_browsertest.cc
+++ b/chrome/browser/navigation_predictor/navigation_predictor_browsertest.cc
@@ -117,6 +117,10 @@
class TestObserver : public NavigationPredictorKeyedService::Observer {
public:
TestObserver() = default;
+
+ TestObserver(const TestObserver&) = delete;
+ TestObserver& operator=(const TestObserver&) = delete;
+
~TestObserver() override {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
}
@@ -171,8 +175,6 @@
absl::optional<size_t> expected_notifications_count_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(TestObserver);
};
IN_PROC_BROWSER_TEST_F(NavigationPredictorBrowserTest, Pipeline) {
diff --git a/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.h b/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.h
index af967750..78c07559 100644
--- a/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.h
+++ b/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.h
@@ -25,6 +25,11 @@
: public content::WebContentsObserver,
public content::WebContentsUserData<NavigationPredictorPreconnectClient> {
public:
+ NavigationPredictorPreconnectClient(
+ const NavigationPredictorPreconnectClient&) = delete;
+ NavigationPredictorPreconnectClient& operator=(
+ const NavigationPredictorPreconnectClient&) = delete;
+
~NavigationPredictorPreconnectClient() override;
static void EnablePreconnectsForLocalIPsForTesting(
@@ -82,8 +87,6 @@
SEQUENCE_CHECKER(sequence_checker_);
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(NavigationPredictorPreconnectClient);
};
#endif // CHROME_BROWSER_NAVIGATION_PREDICTOR_NAVIGATION_PREDICTOR_PRECONNECT_CLIENT_H_
diff --git a/chrome/browser/net/chrome_mojo_proxy_resolver_factory.h b/chrome/browser/net/chrome_mojo_proxy_resolver_factory.h
index 0717bca..433451d 100644
--- a/chrome/browser/net/chrome_mojo_proxy_resolver_factory.h
+++ b/chrome/browser/net/chrome_mojo_proxy_resolver_factory.h
@@ -25,6 +25,12 @@
: public proxy_resolver::mojom::ProxyResolverFactory {
public:
ChromeMojoProxyResolverFactory();
+
+ ChromeMojoProxyResolverFactory(const ChromeMojoProxyResolverFactory&) =
+ delete;
+ ChromeMojoProxyResolverFactory& operator=(
+ const ChromeMojoProxyResolverFactory&) = delete;
+
~ChromeMojoProxyResolverFactory() override;
// Convenience method that creates a self-owned ProxyResolverFactory and
@@ -43,8 +49,6 @@
private:
std::unique_ptr<service_manager::Connector> service_manager_connector_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(ChromeMojoProxyResolverFactory);
};
#endif // CHROME_BROWSER_NET_CHROME_MOJO_PROXY_RESOLVER_FACTORY_H_
diff --git a/chrome/browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc b/chrome/browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc
index 06ee495..c37fe62 100644
--- a/chrome/browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc
+++ b/chrome/browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc
@@ -89,6 +89,10 @@
content::ServiceProcessHost::AddObserver(this);
}
+ ProxyResolverProcessObserver(const ProxyResolverProcessObserver&) = delete;
+ ProxyResolverProcessObserver& operator=(const ProxyResolverProcessObserver&) =
+ delete;
+
~ProxyResolverProcessObserver() override {
content::ServiceProcessHost::RemoveObserver(this);
}
@@ -124,8 +128,6 @@
bool is_service_running_ = false;
base::RunLoop launch_loop_;
base::RunLoop death_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(ProxyResolverProcessObserver);
};
// Ensures the proxy resolver service is started correctly and stopped when no
diff --git a/chrome/browser/net/disk_cache_dir_policy_handler.h b/chrome/browser/net/disk_cache_dir_policy_handler.h
index 13854f4..aa18f8fd 100644
--- a/chrome/browser/net/disk_cache_dir_policy_handler.h
+++ b/chrome/browser/net/disk_cache_dir_policy_handler.h
@@ -15,14 +15,16 @@
class DiskCacheDirPolicyHandler : public TypeCheckingPolicyHandler {
public:
DiskCacheDirPolicyHandler();
+
+ DiskCacheDirPolicyHandler(const DiskCacheDirPolicyHandler&) = delete;
+ DiskCacheDirPolicyHandler& operator=(const DiskCacheDirPolicyHandler&) =
+ delete;
+
~DiskCacheDirPolicyHandler() override;
// ConfigurationPolicyHandler methods:
void ApplyPolicySettings(const PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DiskCacheDirPolicyHandler);
};
} // namespace policy
diff --git a/chrome/browser/net/dns_probe_runner.h b/chrome/browser/net/dns_probe_runner.h
index 61bdd9cf..322c1f8 100644
--- a/chrome/browser/net/dns_probe_runner.h
+++ b/chrome/browser/net/dns_probe_runner.h
@@ -48,6 +48,10 @@
// may be called multiple times.
DnsProbeRunner(net::DnsConfigOverrides dns_config_overrides,
const NetworkContextGetter& network_context_getter);
+
+ DnsProbeRunner(const DnsProbeRunner&) = delete;
+ DnsProbeRunner& operator=(const DnsProbeRunner&) = delete;
+
~DnsProbeRunner() override;
// Starts a probe. |callback| will be called asynchronously when the result
@@ -94,8 +98,6 @@
Result result_{UNKNOWN};
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(DnsProbeRunner);
};
} // namespace chrome_browser_net
diff --git a/chrome/browser/net/dns_probe_service_factory.cc b/chrome/browser/net/dns_probe_service_factory.cc
index 8c0d6e06..6081c72 100644
--- a/chrome/browser/net/dns_probe_service_factory.cc
+++ b/chrome/browser/net/dns_probe_service_factory.cc
@@ -98,6 +98,10 @@
const NetworkContextGetter& network_context_getter,
const DnsConfigChangeManagerGetter& dns_config_change_manager_getter,
const base::TickClock* tick_clock);
+
+ DnsProbeServiceImpl(const DnsProbeServiceImpl&) = delete;
+ DnsProbeServiceImpl& operator=(const DnsProbeServiceImpl&) = delete;
+
~DnsProbeServiceImpl() override;
// DnsProbeService implementation:
@@ -162,8 +166,6 @@
const base::TickClock* tick_clock_; // Not owned.
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(DnsProbeServiceImpl);
};
DnsProbeServiceImpl::DnsProbeServiceImpl(content::BrowserContext* context)
diff --git a/chrome/browser/net/errorpage_browsertest.cc b/chrome/browser/net/errorpage_browsertest.cc
index 39418fe..5174ced 100644
--- a/chrome/browser/net/errorpage_browsertest.cc
+++ b/chrome/browser/net/errorpage_browsertest.cc
@@ -238,6 +238,12 @@
public:
explicit TestFailProvisionalLoadObserver(content::WebContents* contents)
: content::WebContentsObserver(contents) {}
+
+ TestFailProvisionalLoadObserver(const TestFailProvisionalLoadObserver&) =
+ delete;
+ TestFailProvisionalLoadObserver& operator=(
+ const TestFailProvisionalLoadObserver&) = delete;
+
~TestFailProvisionalLoadObserver() override {}
void DidFinishNavigation(
@@ -250,8 +256,6 @@
private:
GURL fail_url_;
-
- DISALLOW_COPY_AND_ASSIGN(TestFailProvisionalLoadObserver);
};
class DNSErrorPageTest : public ErrorPageTest {
diff --git a/chrome/browser/net/file_downloader.h b/chrome/browser/net/file_downloader.h
index 17bc383..ee92a6de 100644
--- a/chrome/browser/net/file_downloader.h
+++ b/chrome/browser/net/file_downloader.h
@@ -45,6 +45,10 @@
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
DownloadFinishedCallback callback,
const net::NetworkTrafficAnnotationTag& traffic_annotation);
+
+ FileDownloader(const FileDownloader&) = delete;
+ FileDownloader& operator=(const FileDownloader&) = delete;
+
~FileDownloader();
static bool IsSuccess(Result result) { return result != FAILED; }
@@ -65,8 +69,6 @@
base::FilePath local_path_;
base::WeakPtrFactory<FileDownloader> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FileDownloader);
};
#endif // CHROME_BROWSER_NET_FILE_DOWNLOADER_H_
diff --git a/chrome/browser/net/net_error_diagnostics_dialog_win.cc b/chrome/browser/net/net_error_diagnostics_dialog_win.cc
index 3b677dc..26c249d 100644
--- a/chrome/browser/net/net_error_diagnostics_dialog_win.cc
+++ b/chrome/browser/net/net_error_diagnostics_dialog_win.cc
@@ -35,6 +35,11 @@
class NetErrorDiagnosticsDialog : public ui::BaseShellDialogImpl {
public:
NetErrorDiagnosticsDialog() {}
+
+ NetErrorDiagnosticsDialog(const NetErrorDiagnosticsDialog&) = delete;
+ NetErrorDiagnosticsDialog& operator=(const NetErrorDiagnosticsDialog&) =
+ delete;
+
~NetErrorDiagnosticsDialog() override {}
// NetErrorDiagnosticsDialog implementation.
@@ -78,8 +83,6 @@
EndRun(std::move(run_state));
std::move(callback).Run();
}
-
- DISALLOW_COPY_AND_ASSIGN(NetErrorDiagnosticsDialog);
};
} // namespace
diff --git a/chrome/browser/net/net_error_tab_helper.h b/chrome/browser/net/net_error_tab_helper.h
index 6e28ec1..ca2af7f4 100644
--- a/chrome/browser/net/net_error_tab_helper.h
+++ b/chrome/browser/net/net_error_tab_helper.h
@@ -48,6 +48,9 @@
typedef base::RepeatingCallback<void(error_page::DnsProbeStatus)>
DnsProbeStatusSnoopCallback;
+ NetErrorTabHelper(const NetErrorTabHelper&) = delete;
+ NetErrorTabHelper& operator=(const NetErrorTabHelper&) = delete;
+
~NetErrorTabHelper() override;
static void BindNetErrorPageSupport(
@@ -175,8 +178,6 @@
base::WeakPtrFactory<NetErrorTabHelper> weak_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(NetErrorTabHelper);
};
} // namespace chrome_browser_net
diff --git a/chrome/browser/net/network_connection_tracker_browsertest.cc b/chrome/browser/net/network_connection_tracker_browsertest.cc
index 72a5f1a..d1b2821 100644
--- a/chrome/browser/net/network_connection_tracker_browsertest.cc
+++ b/chrome/browser/net/network_connection_tracker_browsertest.cc
@@ -41,6 +41,10 @@
tracker_->AddNetworkConnectionObserver(this);
}
+ TestNetworkConnectionObserver(const TestNetworkConnectionObserver&) = delete;
+ TestNetworkConnectionObserver& operator=(
+ const TestNetworkConnectionObserver&) = delete;
+
~TestNetworkConnectionObserver() override {
tracker_->RemoveNetworkConnectionObserver(this);
}
@@ -77,8 +81,6 @@
network::mojom::ConnectionType connection_type_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(TestNetworkConnectionObserver);
};
} // namespace
diff --git a/chrome/browser/net/network_context_configuration_browsertest.cc b/chrome/browser/net/network_context_configuration_browsertest.cc
index 7326264..6784f55 100644
--- a/chrome/browser/net/network_context_configuration_browsertest.cc
+++ b/chrome/browser/net/network_context_configuration_browsertest.cc
@@ -237,6 +237,11 @@
return std::move(response);
}
+ NetworkContextConfigurationBrowserTest(
+ const NetworkContextConfigurationBrowserTest&) = delete;
+ NetworkContextConfigurationBrowserTest& operator=(
+ const NetworkContextConfigurationBrowserTest&) = delete;
+
~NetworkContextConfigurationBrowserTest() override {}
void SetUpInProcessBrowserTestFixture() override {
@@ -725,8 +730,6 @@
std::unique_ptr<network::SimpleURLLoader> live_during_shutdown_simple_loader_;
std::unique_ptr<content::SimpleURLLoaderTestHelper>
live_during_shutdown_simple_loader_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkContextConfigurationBrowserTest);
};
IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationBrowserTest,
@@ -1661,6 +1664,12 @@
: public NetworkContextConfigurationBrowserTest {
public:
NetworkContextConfigurationProxyOnStartBrowserTest() {}
+
+ NetworkContextConfigurationProxyOnStartBrowserTest(
+ const NetworkContextConfigurationProxyOnStartBrowserTest&) = delete;
+ NetworkContextConfigurationProxyOnStartBrowserTest& operator=(
+ const NetworkContextConfigurationProxyOnStartBrowserTest&) = delete;
+
~NetworkContextConfigurationProxyOnStartBrowserTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -1668,9 +1677,6 @@
switches::kProxyServer,
embedded_test_server()->host_port_pair().ToString());
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NetworkContextConfigurationProxyOnStartBrowserTest);
};
// Test that when there's a proxy configuration at startup, the initial requests
@@ -1690,6 +1696,11 @@
NetworkContextConfigurationHttpPacBrowserTest()
: pac_test_server_(net::test_server::EmbeddedTestServer::TYPE_HTTP) {}
+ NetworkContextConfigurationHttpPacBrowserTest(
+ const NetworkContextConfigurationHttpPacBrowserTest&) = delete;
+ NetworkContextConfigurationHttpPacBrowserTest& operator=(
+ const NetworkContextConfigurationHttpPacBrowserTest&) = delete;
+
~NetworkContextConfigurationHttpPacBrowserTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -1713,8 +1724,6 @@
private:
net::test_server::EmbeddedTestServer pac_test_server_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkContextConfigurationHttpPacBrowserTest);
};
IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationHttpPacBrowserTest, HttpPac) {
@@ -1730,6 +1739,11 @@
public:
NetworkContextConfigurationFilePacBrowserTest() {}
+ NetworkContextConfigurationFilePacBrowserTest(
+ const NetworkContextConfigurationFilePacBrowserTest&) = delete;
+ NetworkContextConfigurationFilePacBrowserTest& operator=(
+ const NetworkContextConfigurationFilePacBrowserTest&) = delete;
+
~NetworkContextConfigurationFilePacBrowserTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -1748,8 +1762,6 @@
private:
base::ScopedTempDir temp_dir_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkContextConfigurationFilePacBrowserTest);
};
IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationFilePacBrowserTest, FilePac) {
@@ -1764,6 +1776,12 @@
: public NetworkContextConfigurationBrowserTest {
public:
NetworkContextConfigurationDataPacBrowserTest() {}
+
+ NetworkContextConfigurationDataPacBrowserTest(
+ const NetworkContextConfigurationDataPacBrowserTest&) = delete;
+ NetworkContextConfigurationDataPacBrowserTest& operator=(
+ const NetworkContextConfigurationDataPacBrowserTest&) = delete;
+
~NetworkContextConfigurationDataPacBrowserTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -1772,9 +1790,6 @@
command_line->AppendSwitchASCII(switches::kProxyPacUrl,
"data:," + GetPacScript());
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NetworkContextConfigurationDataPacBrowserTest);
};
IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationDataPacBrowserTest, DataPac) {
@@ -1789,6 +1804,12 @@
const size_t kDefaultMaxConnectionsPerProxy = 32;
NetworkContextConfigurationProxySettingsBrowserTest() = default;
+
+ NetworkContextConfigurationProxySettingsBrowserTest(
+ const NetworkContextConfigurationProxySettingsBrowserTest&) = delete;
+ NetworkContextConfigurationProxySettingsBrowserTest& operator=(
+ const NetworkContextConfigurationProxySettingsBrowserTest&) = delete;
+
~NetworkContextConfigurationProxySettingsBrowserTest() override = default;
void SetUpOnMainThread() override {
@@ -1883,8 +1904,6 @@
// records each observed request to ensure we see only as many connections as
// we expect.
std::unordered_set<std::string> observed_request_urls_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkContextConfigurationProxySettingsBrowserTest);
};
IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationProxySettingsBrowserTest,
diff --git a/chrome/browser/net/network_quality_estimator_browsertest.cc b/chrome/browser/net/network_quality_estimator_browsertest.cc
index a345d66..81976cd8 100644
--- a/chrome/browser/net/network_quality_estimator_browsertest.cc
+++ b/chrome/browser/net/network_quality_estimator_browsertest.cc
@@ -37,6 +37,10 @@
tracker_->AddEffectiveConnectionTypeObserver(this);
}
+ TestNetworkQualityObserver(const TestNetworkQualityObserver&) = delete;
+ TestNetworkQualityObserver& operator=(const TestNetworkQualityObserver&) =
+ delete;
+
~TestNetworkQualityObserver() override {
tracker_->RemoveEffectiveConnectionTypeObserver(this);
}
@@ -75,8 +79,6 @@
std::unique_ptr<base::RunLoop> run_loop_;
network::NetworkQualityTracker* tracker_;
net::EffectiveConnectionType effective_connection_type_;
-
- DISALLOW_COPY_AND_ASSIGN(TestNetworkQualityObserver);
};
void CheckEffectiveConnectionType(net::EffectiveConnectionType expected) {
diff --git a/chrome/browser/net/network_quality_estimator_prefs_browsertest.cc b/chrome/browser/net/network_quality_estimator_prefs_browsertest.cc
index 9511946..c766d47 100644
--- a/chrome/browser/net/network_quality_estimator_prefs_browsertest.cc
+++ b/chrome/browser/net/network_quality_estimator_prefs_browsertest.cc
@@ -99,6 +99,10 @@
tracker_->AddEffectiveConnectionTypeObserver(this);
}
+ TestNetworkQualityObserver(const TestNetworkQualityObserver&) = delete;
+ TestNetworkQualityObserver& operator=(const TestNetworkQualityObserver&) =
+ delete;
+
~TestNetworkQualityObserver() override {
tracker_->RemoveEffectiveConnectionTypeObserver(this);
}
@@ -135,8 +139,6 @@
std::unique_ptr<base::RunLoop> run_loop_;
network::NetworkQualityTracker* tracker_;
net::EffectiveConnectionType effective_connection_type_;
-
- DISALLOW_COPY_AND_ASSIGN(TestNetworkQualityObserver);
};
} // namespace
diff --git a/chrome/browser/net/network_quality_tracker_browsertest.cc b/chrome/browser/net/network_quality_tracker_browsertest.cc
index 60eb382..1adff16 100644
--- a/chrome/browser/net/network_quality_tracker_browsertest.cc
+++ b/chrome/browser/net/network_quality_tracker_browsertest.cc
@@ -60,6 +60,10 @@
tracker_->AddEffectiveConnectionTypeObserver(this);
}
+ TestNetworkQualityObserver(const TestNetworkQualityObserver&) = delete;
+ TestNetworkQualityObserver& operator=(const TestNetworkQualityObserver&) =
+ delete;
+
~TestNetworkQualityObserver() override {
tracker_->RemoveEffectiveConnectionTypeObserver(this);
}
@@ -108,8 +112,6 @@
std::unique_ptr<base::RunLoop> run_loop_;
NetworkQualityTracker* tracker_;
net::EffectiveConnectionType effective_connection_type_;
-
- DISALLOW_COPY_AND_ASSIGN(TestNetworkQualityObserver);
};
} // namespace
diff --git a/chrome/browser/net/network_request_metrics_browsertest.cc b/chrome/browser/net/network_request_metrics_browsertest.cc
index 37cd986..1f9919c 100644
--- a/chrome/browser/net/network_request_metrics_browsertest.cc
+++ b/chrome/browser/net/network_request_metrics_browsertest.cc
@@ -76,6 +76,12 @@
public:
explicit WaitForMainFrameResourceObserver(WebContents* web_contents)
: content::WebContentsObserver(web_contents) {}
+
+ WaitForMainFrameResourceObserver(const WaitForMainFrameResourceObserver&) =
+ delete;
+ WaitForMainFrameResourceObserver& operator=(
+ const WaitForMainFrameResourceObserver&) = delete;
+
~WaitForMainFrameResourceObserver() override {}
// content::WebContentsObserver implementation:
@@ -93,8 +99,6 @@
private:
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(WaitForMainFrameResourceObserver);
};
// This test fixture tests code in content/. The fixture itself is in chrome/
diff --git a/chrome/browser/net/nss_context_chromeos_browsertest.cc b/chrome/browser/net/nss_context_chromeos_browsertest.cc
index b783f9d0..0f51e7e 100644
--- a/chrome/browser/net/nss_context_chromeos_browsertest.cc
+++ b/chrome/browser/net/nss_context_chromeos_browsertest.cc
@@ -117,6 +117,9 @@
ash::UserAddingScreen::Get()->AddObserver(this);
}
+ UserAddingFinishObserver(const UserAddingFinishObserver&) = delete;
+ UserAddingFinishObserver& operator=(const UserAddingFinishObserver&) = delete;
+
~UserAddingFinishObserver() override {
ash::UserAddingScreen::Get()->RemoveObserver(this);
}
@@ -145,7 +148,6 @@
private:
bool finished_ = false;
std::unique_ptr<base::RunLoop> run_loop_;
- DISALLOW_COPY_AND_ASSIGN(UserAddingFinishObserver);
};
} // namespace
diff --git a/chrome/browser/net/profile_network_context_service.h b/chrome/browser/net/profile_network_context_service.h
index 2c33bb9..fc7264b 100644
--- a/chrome/browser/net/profile_network_context_service.h
+++ b/chrome/browser/net/profile_network_context_service.h
@@ -59,6 +59,11 @@
public content_settings::CookieSettings::Observer {
public:
explicit ProfileNetworkContextService(Profile* profile);
+
+ ProfileNetworkContextService(const ProfileNetworkContextService&) = delete;
+ ProfileNetworkContextService& operator=(const ProfileNetworkContextService&) =
+ delete;
+
~ProfileNetworkContextService() override;
// Configures the NetworkContextParams and the CertVerifierCreationParams for
@@ -187,8 +192,6 @@
// Used for testing.
base::RepeatingCallback<std::unique_ptr<net::ClientCertStore>()>
client_cert_store_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(ProfileNetworkContextService);
};
#endif // CHROME_BROWSER_NET_PROFILE_NETWORK_CONTEXT_SERVICE_H_
diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc
index f226b284..c76b724 100644
--- a/chrome/browser/net/proxy_browsertest.cc
+++ b/chrome/browser/net/proxy_browsertest.cc
@@ -133,6 +133,12 @@
BaseHttpProxyScriptBrowserTest() {
http_server_.ServeFilesFromSourceDirectory(GetChromeTestDataDir());
}
+
+ BaseHttpProxyScriptBrowserTest(const BaseHttpProxyScriptBrowserTest&) =
+ delete;
+ BaseHttpProxyScriptBrowserTest& operator=(
+ const BaseHttpProxyScriptBrowserTest&) = delete;
+
~BaseHttpProxyScriptBrowserTest() override {}
void SetUp() override {
@@ -149,24 +155,23 @@
protected:
virtual std::string GetPacFilename() = 0;
net::EmbeddedTestServer http_server_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BaseHttpProxyScriptBrowserTest);
};
// Tests the use of a PAC script that rejects requests to http://www.google.com/
class HttpProxyScriptBrowserTest : public BaseHttpProxyScriptBrowserTest {
public:
HttpProxyScriptBrowserTest() = default;
+
+ HttpProxyScriptBrowserTest(const HttpProxyScriptBrowserTest&) = delete;
+ HttpProxyScriptBrowserTest& operator=(const HttpProxyScriptBrowserTest&) =
+ delete;
+
~HttpProxyScriptBrowserTest() override {}
std::string GetPacFilename() override {
// PAC script that sends all requests to an invalid proxy server.
return "bad_server.pac";
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(HttpProxyScriptBrowserTest);
};
IN_PROC_BROWSER_TEST_F(HttpProxyScriptBrowserTest, Verify) {
@@ -180,6 +185,12 @@
class WPADHttpProxyScriptBrowserTest : public HttpProxyScriptBrowserTest {
public:
WPADHttpProxyScriptBrowserTest() = default;
+
+ WPADHttpProxyScriptBrowserTest(const WPADHttpProxyScriptBrowserTest&) =
+ delete;
+ WPADHttpProxyScriptBrowserTest& operator=(
+ const WPADHttpProxyScriptBrowserTest&) = delete;
+
~WPADHttpProxyScriptBrowserTest() override {}
void SetUp() override {
@@ -200,7 +211,6 @@
private:
GURL pac_url_;
- DISALLOW_COPY_AND_ASSIGN(WPADHttpProxyScriptBrowserTest);
};
IN_PROC_BROWSER_TEST_F(WPADHttpProxyScriptBrowserTest, Verify) {
@@ -214,6 +224,12 @@
: public BaseHttpProxyScriptBrowserTest {
public:
MyIpAddressProxyScriptBrowserTest() = default;
+
+ MyIpAddressProxyScriptBrowserTest(const MyIpAddressProxyScriptBrowserTest&) =
+ delete;
+ MyIpAddressProxyScriptBrowserTest& operator=(
+ const MyIpAddressProxyScriptBrowserTest&) = delete;
+
~MyIpAddressProxyScriptBrowserTest() override {}
std::string GetPacFilename() override {
@@ -221,9 +237,6 @@
// myIpAddress() and myIpAddressEx() are not loopback addresses.
return "my_ip_address.pac";
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MyIpAddressProxyScriptBrowserTest);
};
IN_PROC_BROWSER_TEST_F(MyIpAddressProxyScriptBrowserTest, Verify) {
@@ -234,6 +247,12 @@
class HangingPacRequestProxyScriptBrowserTest : public InProcessBrowserTest {
public:
HangingPacRequestProxyScriptBrowserTest() {}
+
+ HangingPacRequestProxyScriptBrowserTest(
+ const HangingPacRequestProxyScriptBrowserTest&) = delete;
+ HangingPacRequestProxyScriptBrowserTest& operator=(
+ const HangingPacRequestProxyScriptBrowserTest&) = delete;
+
~HangingPacRequestProxyScriptBrowserTest() override {}
void SetUp() override {
@@ -268,9 +287,6 @@
protected:
std::unique_ptr<net::test_server::SimpleConnectionListener>
connection_listener_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(HangingPacRequestProxyScriptBrowserTest);
};
// Check that the URLRequest for a PAC that is still alive during shutdown is
diff --git a/chrome/browser/net/proxy_config_monitor.h b/chrome/browser/net/proxy_config_monitor.h
index abffb6db..920a956 100644
--- a/chrome/browser/net/proxy_config_monitor.h
+++ b/chrome/browser/net/proxy_config_monitor.h
@@ -50,6 +50,9 @@
// associated with a profile. Must be destroyed before |local_state|.
explicit ProxyConfigMonitor(PrefService* local_state);
+ ProxyConfigMonitor(const ProxyConfigMonitor&) = delete;
+ ProxyConfigMonitor& operator=(const ProxyConfigMonitor&) = delete;
+
~ProxyConfigMonitor() override;
// Populates proxy-related fields of |network_context_params|. Updated
@@ -93,8 +96,6 @@
mojo::ReceiverSet<network::mojom::ProxyErrorClient> error_receiver_set_;
Profile* profile_ = nullptr;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(ProxyConfigMonitor);
};
#endif // CHROME_BROWSER_NET_PROXY_CONFIG_MONITOR_H_
diff --git a/chrome/browser/net/proxy_test_utils.h b/chrome/browser/net/proxy_test_utils.h
index 22ac7754..23a534e 100644
--- a/chrome/browser/net/proxy_test_utils.h
+++ b/chrome/browser/net/proxy_test_utils.h
@@ -15,6 +15,10 @@
class ProxyBrowserTest : public InProcessBrowserTest {
public:
ProxyBrowserTest();
+
+ ProxyBrowserTest(const ProxyBrowserTest&) = delete;
+ ProxyBrowserTest& operator=(const ProxyBrowserTest&) = delete;
+
~ProxyBrowserTest() override;
// InProcessBrowserTest::
@@ -27,7 +31,6 @@
private:
std::unique_ptr<content::URLLoaderInterceptor> url_loader_interceptor_;
- DISALLOW_COPY_AND_ASSIGN(ProxyBrowserTest);
};
#endif // CHROME_BROWSER_NET_PROXY_TEST_UTILS_H_
diff --git a/chrome/browser/net/reporting_browsertest.cc b/chrome/browser/net/reporting_browsertest.cc
index 33d7dad5..c3769096 100644
--- a/chrome/browser/net/reporting_browsertest.cc
+++ b/chrome/browser/net/reporting_browsertest.cc
@@ -59,6 +59,9 @@
{});
}
+ ReportingBrowserTest(const ReportingBrowserTest&) = delete;
+ ReportingBrowserTest& operator=(const ReportingBrowserTest&) = delete;
+
~ReportingBrowserTest() override = default;
void SetUp() override;
@@ -116,8 +119,6 @@
std::unique_ptr<net::test_server::ControllableHttpResponse>
original_response_;
std::unique_ptr<net::test_server::ControllableHttpResponse> upload_response_;
-
- DISALLOW_COPY_AND_ASSIGN(ReportingBrowserTest);
};
void ReportingBrowserTest::SetUp() {
diff --git a/chrome/browser/net/secure_dns_policy_handler.h b/chrome/browser/net/secure_dns_policy_handler.h
index c7becd1..e847914 100644
--- a/chrome/browser/net/secure_dns_policy_handler.h
+++ b/chrome/browser/net/secure_dns_policy_handler.h
@@ -17,6 +17,10 @@
class SecureDnsPolicyHandler : public ConfigurationPolicyHandler {
public:
SecureDnsPolicyHandler();
+
+ SecureDnsPolicyHandler(const SecureDnsPolicyHandler&) = delete;
+ SecureDnsPolicyHandler& operator=(const SecureDnsPolicyHandler&) = delete;
+
~SecureDnsPolicyHandler() override;
// ConfigurationPolicyHandler methods:
@@ -30,8 +34,6 @@
const base::StringPiece mode_str);
bool ShouldSetTemplatesPref(const base::Value* templates);
-
- DISALLOW_COPY_AND_ASSIGN(SecureDnsPolicyHandler);
};
} // namespace policy
diff --git a/chrome/browser/net/system_network_context_manager.h b/chrome/browser/net/system_network_context_manager.h
index 7253080..ecb7bf7c 100644
--- a/chrome/browser/net/system_network_context_manager.h
+++ b/chrome/browser/net/system_network_context_manager.h
@@ -62,6 +62,10 @@
// to being compatible with the network service.
class SystemNetworkContextManager {
public:
+ SystemNetworkContextManager(const SystemNetworkContextManager&) = delete;
+ SystemNetworkContextManager& operator=(const SystemNetworkContextManager&) =
+ delete;
+
~SystemNetworkContextManager();
// Creates the global instance of SystemNetworkContextManager. If an
@@ -218,8 +222,6 @@
StubResolverConfigReader stub_resolver_config_reader_;
static StubResolverConfigReader* stub_resolver_config_reader_for_testing_;
-
- DISALLOW_COPY_AND_ASSIGN(SystemNetworkContextManager);
};
#endif // CHROME_BROWSER_NET_SYSTEM_NETWORK_CONTEXT_MANAGER_H_
diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.h b/chrome/browser/net/trial_comparison_cert_verifier_controller.h
index f22d29f..2a7a8a9 100644
--- a/chrome/browser/net/trial_comparison_cert_verifier_controller.h
+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.h
@@ -32,6 +32,12 @@
// preferences and reporting.
// |profile| must outlive the TrialComparisonCertVerifierController.
explicit TrialComparisonCertVerifierController(Profile* profile);
+
+ TrialComparisonCertVerifierController(
+ const TrialComparisonCertVerifierController&) = delete;
+ TrialComparisonCertVerifierController& operator=(
+ const TrialComparisonCertVerifierController&) = delete;
+
~TrialComparisonCertVerifierController() override;
// Returns true if the trial could potentially be enabled for |profile|;
@@ -79,8 +85,6 @@
mojo::RemoteSet<cert_verifier::mojom::TrialComparisonCertVerifierConfigClient>
config_client_set_;
-
- DISALLOW_COPY_AND_ASSIGN(TrialComparisonCertVerifierController);
};
#endif // CHROME_BROWSER_NET_TRIAL_COMPARISON_CERT_VERIFIER_CONTROLLER_H_
diff --git a/chrome/browser/net_benchmarking.h b/chrome/browser/net_benchmarking.h
index f8b6c0d..d3ccd065 100644
--- a/chrome/browser/net_benchmarking.h
+++ b/chrome/browser/net_benchmarking.h
@@ -22,6 +22,10 @@
public:
NetBenchmarking(base::WeakPtr<predictors::LoadingPredictor> loading_predictor,
int render_process_id);
+
+ NetBenchmarking(const NetBenchmarking&) = delete;
+ NetBenchmarking& operator=(const NetBenchmarking&) = delete;
+
~NetBenchmarking() override;
// Creates a NetBenchmarking instance and connects it strongly to a mojo pipe.
@@ -45,8 +49,6 @@
// These weak pointers should be dereferenced only on the UI thread.
base::WeakPtr<predictors::LoadingPredictor> loading_predictor_;
const int render_process_id_;
-
- DISALLOW_COPY_AND_ASSIGN(NetBenchmarking);
};
#endif // CHROME_BROWSER_NET_BENCHMARKING_H_
diff --git a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.h b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.h
index 3a472119..f5ea6a54 100644
--- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.h
+++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.h
@@ -28,6 +28,10 @@
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
const std::string& application_locale,
bool account_consistency_mirror_required);
+
+ OneGoogleBarLoaderImpl(const OneGoogleBarLoaderImpl&) = delete;
+ OneGoogleBarLoaderImpl& operator=(const OneGoogleBarLoaderImpl&) = delete;
+
~OneGoogleBarLoaderImpl() override;
void Load(OneGoogleCallback callback) override;
@@ -57,8 +61,6 @@
std::string additional_query_params_;
base::WeakPtrFactory<OneGoogleBarLoaderImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(OneGoogleBarLoaderImpl);
};
#endif // CHROME_BROWSER_NEW_TAB_PAGE_ONE_GOOGLE_BAR_ONE_GOOGLE_BAR_LOADER_IMPL_H_
diff --git a/chrome/browser/no_best_effort_tasks_browsertest.cc b/chrome/browser/no_best_effort_tasks_browsertest.cc
index df0caf42..43750433 100644
--- a/chrome/browser/no_best_effort_tasks_browsertest.cc
+++ b/chrome/browser/no_best_effort_tasks_browsertest.cc
@@ -43,6 +43,10 @@
explicit RunLoopUntilLoadedAndPainted(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents) {}
+ RunLoopUntilLoadedAndPainted(const RunLoopUntilLoadedAndPainted&) = delete;
+ RunLoopUntilLoadedAndPainted& operator=(const RunLoopUntilLoadedAndPainted&) =
+ delete;
+
~RunLoopUntilLoadedAndPainted() override = default;
// Runs a RunLoop on the main thread until the first non-empty frame is
@@ -72,8 +76,6 @@
}
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(RunLoopUntilLoadedAndPainted);
};
class NoBestEffortTasksTest : public InProcessBrowserTest {
diff --git a/chrome/browser/offline_pages/android/auto_fetch_page_load_watcher.h b/chrome/browser/offline_pages/android/auto_fetch_page_load_watcher.h
index 30c9058b..86b108b 100644
--- a/chrome/browser/offline_pages/android/auto_fetch_page_load_watcher.h
+++ b/chrome/browser/offline_pages/android/auto_fetch_page_load_watcher.h
@@ -159,6 +159,9 @@
RequestCoordinator* request_coordinator,
std::unique_ptr<AndroidTabFinder> tab_finder);
+ AutoFetchPageLoadWatcher(const AutoFetchPageLoadWatcher&) = delete;
+ AutoFetchPageLoadWatcher& operator=(const AutoFetchPageLoadWatcher&) = delete;
+
~AutoFetchPageLoadWatcher() override;
// Called when navigation completes, even on errors. This is only called
@@ -191,8 +194,6 @@
auto_fetch_internal::InternalImpl impl_;
std::unique_ptr<TabWatcher> tab_watcher_;
base::WeakPtrFactory<AutoFetchPageLoadWatcher> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AutoFetchPageLoadWatcher);
};
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/android/cct_origin_observer.h b/chrome/browser/offline_pages/android/cct_origin_observer.h
index 83745b0..5469051 100644
--- a/chrome/browser/offline_pages/android/cct_origin_observer.h
+++ b/chrome/browser/offline_pages/android/cct_origin_observer.h
@@ -19,6 +19,10 @@
public:
static void AttachToOfflinePageModel(OfflinePageModel* model);
CctOriginObserver();
+
+ CctOriginObserver(const CctOriginObserver&) = delete;
+ CctOriginObserver& operator=(const CctOriginObserver&) = delete;
+
~CctOriginObserver() override;
// OfflinePageModel::Observer implementation.
@@ -26,9 +30,6 @@
void OfflinePageAdded(OfflinePageModel* model,
const OfflinePageItem& added_page) override;
void OfflinePageDeleted(const OfflinePageItem& item) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CctOriginObserver);
};
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.h b/chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.h
index 88ed3f4..b2976cb 100644
--- a/chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.h
+++ b/chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.h
@@ -22,6 +22,11 @@
public:
OfflinePageDownloadBridge(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj);
+
+ OfflinePageDownloadBridge(const OfflinePageDownloadBridge&) = delete;
+ OfflinePageDownloadBridge& operator=(const OfflinePageDownloadBridge&) =
+ delete;
+
~OfflinePageDownloadBridge();
void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
@@ -30,8 +35,6 @@
private:
JavaObjectWeakGlobalRef weak_java_ref_;
-
- DISALLOW_COPY_AND_ASSIGN(OfflinePageDownloadBridge);
};
} // namespace android
diff --git a/chrome/browser/offline_pages/android/downloads/offline_page_infobar_delegate.h b/chrome/browser/offline_pages/android/downloads/offline_page_infobar_delegate.h
index b6615047..357ee31 100644
--- a/chrome/browser/offline_pages/android/downloads/offline_page_infobar_delegate.h
+++ b/chrome/browser/offline_pages/android/downloads/offline_page_infobar_delegate.h
@@ -32,6 +32,11 @@
const GURL& page_to_download,
bool exists_duplicate_request,
content::WebContents* web_contents);
+
+ OfflinePageInfoBarDelegate(const OfflinePageInfoBarDelegate&) = delete;
+ OfflinePageInfoBarDelegate& operator=(const OfflinePageInfoBarDelegate&) =
+ delete;
+
~OfflinePageInfoBarDelegate() override;
private:
@@ -59,8 +64,6 @@
std::string page_name_;
GURL page_to_download_;
bool duplicate_request_exists_;
-
- DISALLOW_COPY_AND_ASSIGN(OfflinePageInfoBarDelegate);
};
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/android/downloads/offline_page_share_helper.h b/chrome/browser/offline_pages/android/downloads/offline_page_share_helper.h
index c57b032..41855c6 100644
--- a/chrome/browser/offline_pages/android/downloads/offline_page_share_helper.h
+++ b/chrome/browser/offline_pages/android/downloads/offline_page_share_helper.h
@@ -30,6 +30,10 @@
std::unique_ptr<OfflineItemShareInfo>)>;
explicit OfflinePageShareHelper(OfflinePageModel* model);
+
+ OfflinePageShareHelper(const OfflinePageShareHelper&) = delete;
+ OfflinePageShareHelper& operator=(const OfflinePageShareHelper&) = delete;
+
~OfflinePageShareHelper();
// Get the share info. Mainly to retrieve the content URI.
@@ -54,8 +58,6 @@
ContentId content_id_;
base::WeakPtrFactory<OfflinePageShareHelper> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(OfflinePageShareHelper);
};
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/android/evaluation/offline_page_evaluation_bridge.h b/chrome/browser/offline_pages/android/evaluation/offline_page_evaluation_bridge.h
index d23e5b2..0e9ccf7 100644
--- a/chrome/browser/offline_pages/android/evaluation/offline_page_evaluation_bridge.h
+++ b/chrome/browser/offline_pages/android/evaluation/offline_page_evaluation_bridge.h
@@ -34,6 +34,10 @@
OfflinePageModel* offline_page_model,
RequestCoordinator* request_coordinator);
+ OfflinePageEvaluationBridge(const OfflinePageEvaluationBridge&) = delete;
+ OfflinePageEvaluationBridge& operator=(const OfflinePageEvaluationBridge&) =
+ delete;
+
~OfflinePageEvaluationBridge() override;
void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
@@ -101,8 +105,6 @@
OfflinePageModel* offline_page_model_;
// Not owned.
RequestCoordinator* request_coordinator_;
-
- DISALLOW_COPY_AND_ASSIGN(OfflinePageEvaluationBridge);
};
} // namespace android
diff --git a/chrome/browser/offline_pages/android/load_termination_listener_impl.h b/chrome/browser/offline_pages/android/load_termination_listener_impl.h
index e7f0de9..ae52680 100644
--- a/chrome/browser/offline_pages/android/load_termination_listener_impl.h
+++ b/chrome/browser/offline_pages/android/load_termination_listener_impl.h
@@ -15,6 +15,11 @@
class LoadTerminationListenerImpl : public LoadTerminationListener {
public:
LoadTerminationListenerImpl();
+
+ LoadTerminationListenerImpl(const LoadTerminationListenerImpl&) = delete;
+ LoadTerminationListenerImpl& operator=(const LoadTerminationListenerImpl&) =
+ delete;
+
~LoadTerminationListenerImpl() override;
// Callback
@@ -26,8 +31,6 @@
std::unique_ptr<base::android::ApplicationStatusListener> app_listener_;
base::WeakPtrFactory<LoadTerminationListenerImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LoadTerminationListenerImpl);
};
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.h b/chrome/browser/offline_pages/android/offline_page_bridge.h
index 80ff093..12641b0 100644
--- a/chrome/browser/offline_pages/android/offline_page_bridge.h
+++ b/chrome/browser/offline_pages/android/offline_page_bridge.h
@@ -67,6 +67,10 @@
OfflinePageBridge(JNIEnv* env,
SimpleFactoryKey* key,
OfflinePageModel* offline_page_model);
+
+ OfflinePageBridge(const OfflinePageBridge&) = delete;
+ OfflinePageBridge& operator=(const OfflinePageBridge&) = delete;
+
~OfflinePageBridge() override;
// OfflinePageModel::Observer implementation.
@@ -268,8 +272,6 @@
OfflinePageModel* offline_page_model_;
base::WeakPtrFactory<OfflinePageBridge> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(OfflinePageBridge);
};
} // namespace android
diff --git a/chrome/browser/offline_pages/background_loader_offliner.h b/chrome/browser/offline_pages/background_loader_offliner.h
index acd87d1..82e9d1487 100644
--- a/chrome/browser/offline_pages/background_loader_offliner.h
+++ b/chrome/browser/offline_pages/background_loader_offliner.h
@@ -54,6 +54,10 @@
const OfflinerPolicy* policy,
OfflinePageModel* offline_page_model,
std::unique_ptr<LoadTerminationListener> load_termination_listener);
+
+ BackgroundLoaderOffliner(const BackgroundLoaderOffliner&) = delete;
+ BackgroundLoaderOffliner& operator=(const BackgroundLoaderOffliner&) = delete;
+
~BackgroundLoaderOffliner() override;
static BackgroundLoaderOffliner* FromWebContents(
@@ -195,7 +199,6 @@
RequestStats stats_[ResourceDataType::RESOURCE_DATA_TYPE_COUNT];
base::WeakPtrFactory<BackgroundLoaderOffliner> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(BackgroundLoaderOffliner);
};
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/background_loader_offliner_unittest.cc b/chrome/browser/offline_pages/background_loader_offliner_unittest.cc
index 46ee6776..cade447d 100644
--- a/chrome/browser/offline_pages/background_loader_offliner_unittest.cc
+++ b/chrome/browser/offline_pages/background_loader_offliner_unittest.cc
@@ -62,20 +62,26 @@
class TestLoadTerminationListener : public LoadTerminationListener {
public:
TestLoadTerminationListener() = default;
+
+ TestLoadTerminationListener(const TestLoadTerminationListener&) = delete;
+ TestLoadTerminationListener& operator=(const TestLoadTerminationListener&) =
+ delete;
+
~TestLoadTerminationListener() override = default;
void TerminateLoad() { offliner()->TerminateLoadIfInProgress(); }
Offliner* offliner() { return offliner_; }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestLoadTerminationListener);
};
// Mock OfflinePageModel for testing the SavePage calls
class MockOfflinePageModel : public StubOfflinePageModel {
public:
MockOfflinePageModel() : mock_saving_(false), mock_deleting_(false) {}
+
+ MockOfflinePageModel(const MockOfflinePageModel&) = delete;
+ MockOfflinePageModel& operator=(const MockOfflinePageModel&) = delete;
+
~MockOfflinePageModel() override {}
void SavePage(const SavePageParams& save_page_params,
@@ -126,8 +132,6 @@
bool mock_deleting_;
SavePageCallback save_page_callback_;
SavePageParams save_page_params_;
-
- DISALLOW_COPY_AND_ASSIGN(MockOfflinePageModel);
};
} // namespace
@@ -206,6 +210,11 @@
class BackgroundLoaderOfflinerTest : public testing::Test {
public:
BackgroundLoaderOfflinerTest();
+
+ BackgroundLoaderOfflinerTest(const BackgroundLoaderOfflinerTest&) = delete;
+ BackgroundLoaderOfflinerTest& operator=(const BackgroundLoaderOfflinerTest&) =
+ delete;
+
~BackgroundLoaderOfflinerTest() override;
void SetUp() override;
@@ -294,8 +303,6 @@
int64_t progress_;
Offliner::RequestStatus request_status_;
base::HistogramTester histogram_tester_;
-
- DISALLOW_COPY_AND_ASSIGN(BackgroundLoaderOfflinerTest);
};
BackgroundLoaderOfflinerTest::BackgroundLoaderOfflinerTest()
diff --git a/chrome/browser/offline_pages/download_archive_manager.h b/chrome/browser/offline_pages/download_archive_manager.h
index bea2e02..98caf9168 100644
--- a/chrome/browser/offline_pages/download_archive_manager.h
+++ b/chrome/browser/offline_pages/download_archive_manager.h
@@ -27,6 +27,10 @@
const base::FilePath& public_archives_dir,
const scoped_refptr<base::SequencedTaskRunner>& task_runner,
PrefService* prefs);
+
+ DownloadArchiveManager(const DownloadArchiveManager&) = delete;
+ DownloadArchiveManager& operator=(const DownloadArchiveManager&) = delete;
+
~DownloadArchiveManager() override;
const base::FilePath& GetPublicArchivesDir() override;
@@ -34,8 +38,6 @@
private:
PrefService* prefs_;
base::FilePath download_archives_dir_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadArchiveManager);
};
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/download_archive_manager_unittest.cc b/chrome/browser/offline_pages/download_archive_manager_unittest.cc
index 58ee9d7..c99403a 100644
--- a/chrome/browser/offline_pages/download_archive_manager_unittest.cc
+++ b/chrome/browser/offline_pages/download_archive_manager_unittest.cc
@@ -27,6 +27,11 @@
class DownloadArchiveManagerTest : public testing::Test {
public:
DownloadArchiveManagerTest() = default;
+
+ DownloadArchiveManagerTest(const DownloadArchiveManagerTest&) = delete;
+ DownloadArchiveManagerTest& operator=(const DownloadArchiveManagerTest&) =
+ delete;
+
~DownloadArchiveManagerTest() override = default;
void SetUp() override;
@@ -40,7 +45,6 @@
content::BrowserTaskEnvironment task_environment_;
sync_preferences::TestingPrefServiceSyncable prefs_;
std::unique_ptr<DownloadArchiveManager> archive_manager_;
- DISALLOW_COPY_AND_ASSIGN(DownloadArchiveManagerTest);
};
void DownloadArchiveManagerTest::SetUp() {
diff --git a/chrome/browser/offline_pages/offline_page_mhtml_archiver.h b/chrome/browser/offline_pages/offline_page_mhtml_archiver.h
index 7cb3212..86776490 100644
--- a/chrome/browser/offline_pages/offline_page_mhtml_archiver.h
+++ b/chrome/browser/offline_pages/offline_page_mhtml_archiver.h
@@ -47,6 +47,10 @@
class OfflinePageMHTMLArchiver : public OfflinePageArchiver {
public:
OfflinePageMHTMLArchiver();
+
+ OfflinePageMHTMLArchiver(const OfflinePageMHTMLArchiver&) = delete;
+ OfflinePageMHTMLArchiver& operator=(const OfflinePageMHTMLArchiver&) = delete;
+
~OfflinePageMHTMLArchiver() override;
// OfflinePageArchiver implementation:
@@ -87,8 +91,6 @@
CreateArchiveCallback callback_;
base::WeakPtrFactory<OfflinePageMHTMLArchiver> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(OfflinePageMHTMLArchiver);
};
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/offline_page_mhtml_archiver_unittest.cc b/chrome/browser/offline_pages/offline_page_mhtml_archiver_unittest.cc
index 6fedf15..1fe58f3d 100644
--- a/chrome/browser/offline_pages/offline_page_mhtml_archiver_unittest.cc
+++ b/chrome/browser/offline_pages/offline_page_mhtml_archiver_unittest.cc
@@ -57,6 +57,10 @@
TestMHTMLArchiver(const GURL& url,
const TestScenario test_scenario,
TestScopedOfflineClock* clock);
+
+ TestMHTMLArchiver(const TestMHTMLArchiver&) = delete;
+ TestMHTMLArchiver& operator=(const TestMHTMLArchiver&) = delete;
+
~TestMHTMLArchiver() override;
private:
@@ -68,8 +72,6 @@
const TestScenario test_scenario_;
// Not owned.
TestScopedOfflineClock* clock_;
-
- DISALLOW_COPY_AND_ASSIGN(TestMHTMLArchiver);
};
TestMHTMLArchiver::TestMHTMLArchiver(const GURL& url,
@@ -124,6 +126,11 @@
"OfflinePages.SavePage.ComputeDigestTime");
OfflinePageMHTMLArchiverTest();
+
+ OfflinePageMHTMLArchiverTest(const OfflinePageMHTMLArchiverTest&) = delete;
+ OfflinePageMHTMLArchiverTest& operator=(const OfflinePageMHTMLArchiverTest&) =
+ delete;
+
~OfflinePageMHTMLArchiverTest() override;
void SetUp() override;
@@ -173,8 +180,6 @@
base::OnceClosure async_operation_completed_callback_;
TestScopedOfflineClock clock_;
-
- DISALLOW_COPY_AND_ASSIGN(OfflinePageMHTMLArchiverTest);
};
OfflinePageMHTMLArchiverTest::OfflinePageMHTMLArchiverTest()
diff --git a/chrome/browser/offline_pages/offline_page_request_handler_unittest.cc b/chrome/browser/offline_pages/offline_page_request_handler_unittest.cc
index 58ef8ab..8433c27 100644
--- a/chrome/browser/offline_pages/offline_page_request_handler_unittest.cc
+++ b/chrome/browser/offline_pages/offline_page_request_handler_unittest.cc
@@ -127,6 +127,11 @@
class TestNetworkChangeNotifier : public net::NetworkChangeNotifier {
public:
TestNetworkChangeNotifier() : online_(true) {}
+
+ TestNetworkChangeNotifier(const TestNetworkChangeNotifier&) = delete;
+ TestNetworkChangeNotifier& operator=(const TestNetworkChangeNotifier&) =
+ delete;
+
~TestNetworkChangeNotifier() override {}
net::NetworkChangeNotifier::ConnectionType GetCurrentConnectionType()
@@ -140,8 +145,6 @@
private:
bool online_;
-
- DISALLOW_COPY_AND_ASSIGN(TestNetworkChangeNotifier);
};
class TestURLLoaderClient : public network::mojom::URLLoaderClient {
@@ -291,6 +294,11 @@
class OfflinePageRequestHandlerTest : public testing::Test {
public:
OfflinePageRequestHandlerTest();
+
+ OfflinePageRequestHandlerTest(const OfflinePageRequestHandlerTest&) = delete;
+ OfflinePageRequestHandlerTest& operator=(
+ const OfflinePageRequestHandlerTest&) = delete;
+
~OfflinePageRequestHandlerTest() override {}
void SetUp() override;
@@ -456,8 +464,6 @@
base::OnceClosure async_operation_completed_callback_;
OfflinePageURLLoaderBuilder interceptor_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(OfflinePageRequestHandlerTest);
};
OfflinePageRequestHandlerTest::OfflinePageRequestHandlerTest()
diff --git a/chrome/browser/offline_pages/offline_page_tab_helper.h b/chrome/browser/offline_pages/offline_page_tab_helper.h
index cb689db2e..b4f5f831 100644
--- a/chrome/browser/offline_pages/offline_page_tab_helper.h
+++ b/chrome/browser/offline_pages/offline_page_tab_helper.h
@@ -61,6 +61,9 @@
receiver,
content::RenderFrameHost* rfh);
+ OfflinePageTabHelper(const OfflinePageTabHelper&) = delete;
+ OfflinePageTabHelper& operator=(const OfflinePageTabHelper&) = delete;
+
~OfflinePageTabHelper() override;
// MhtmlPageNotifier overrides.
@@ -220,8 +223,6 @@
base::WeakPtrFactory<OfflinePageTabHelper> weak_ptr_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(OfflinePageTabHelper);
};
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/offline_page_tab_helper_unittest.cc b/chrome/browser/offline_pages/offline_page_tab_helper_unittest.cc
index 541ddd4..113b9c1 100644
--- a/chrome/browser/offline_pages/offline_page_tab_helper_unittest.cc
+++ b/chrome/browser/offline_pages/offline_page_tab_helper_unittest.cc
@@ -78,6 +78,10 @@
class OfflinePageTabHelperTest : public content::RenderViewHostTestHarness {
public:
OfflinePageTabHelperTest();
+
+ OfflinePageTabHelperTest(const OfflinePageTabHelperTest&) = delete;
+ OfflinePageTabHelperTest& operator=(const OfflinePageTabHelperTest&) = delete;
+
~OfflinePageTabHelperTest() override {}
void SetUp() override;
@@ -106,7 +110,6 @@
std::unique_ptr<content::NavigationSimulator> navigation_simulator_;
base::WeakPtrFactory<OfflinePageTabHelperTest> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(OfflinePageTabHelperTest);
};
OfflinePageTabHelperTest::OfflinePageTabHelperTest() : tab_helper_(nullptr) {}
diff --git a/chrome/browser/offline_pages/offline_page_url_loader.h b/chrome/browser/offline_pages/offline_page_url_loader.h
index d720262..6c2e2d3 100644
--- a/chrome/browser/offline_pages/offline_page_url_loader.h
+++ b/chrome/browser/offline_pages/offline_page_url_loader.h
@@ -46,6 +46,9 @@
const network::ResourceRequest& tentative_resource_request,
content::URLLoaderRequestInterceptor::LoaderCallback callback);
+ OfflinePageURLLoader(const OfflinePageURLLoader&) = delete;
+ OfflinePageURLLoader& operator=(const OfflinePageURLLoader&) = delete;
+
~OfflinePageURLLoader() override;
void SetTabIdGetterForTesting(
@@ -118,8 +121,6 @@
OfflinePageRequestHandler::Delegate::TabIdGetter tab_id_getter_;
base::WeakPtrFactory<OfflinePageURLLoader> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(OfflinePageURLLoader);
};
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.h b/chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.h
index 1f7e53b3..4c66cbe2 100644
--- a/chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.h
+++ b/chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.h
@@ -21,6 +21,12 @@
OfflinePageURLLoaderRequestInterceptor(
content::NavigationUIData* navigation_ui_data,
int frame_tree_node_id);
+
+ OfflinePageURLLoaderRequestInterceptor(
+ const OfflinePageURLLoaderRequestInterceptor&) = delete;
+ OfflinePageURLLoaderRequestInterceptor& operator=(
+ const OfflinePageURLLoaderRequestInterceptor&) = delete;
+
~OfflinePageURLLoaderRequestInterceptor() override;
void MaybeCreateLoader(
@@ -38,8 +44,6 @@
int frame_tree_node_id_;
std::unique_ptr<OfflinePageURLLoader> url_loader_;
-
- DISALLOW_COPY_AND_ASSIGN(OfflinePageURLLoaderRequestInterceptor);
};
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/prefetch/gcm_token_unittest.cc b/chrome/browser/offline_pages/prefetch/gcm_token_unittest.cc
index 2f8a0c2..03605f43 100644
--- a/chrome/browser/offline_pages/prefetch/gcm_token_unittest.cc
+++ b/chrome/browser/offline_pages/prefetch/gcm_token_unittest.cc
@@ -32,6 +32,11 @@
class PrefetchInstanceIDProxyTest : public testing::Test {
public:
PrefetchInstanceIDProxyTest() = default;
+
+ PrefetchInstanceIDProxyTest(const PrefetchInstanceIDProxyTest&) = delete;
+ PrefetchInstanceIDProxyTest& operator=(const PrefetchInstanceIDProxyTest&) =
+ delete;
+
~PrefetchInstanceIDProxyTest() override = default;
// testing::Test:
@@ -62,8 +67,6 @@
bool async_operation_completed_ = false;
base::OnceClosure async_operation_completed_callback_;
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(PrefetchInstanceIDProxyTest);
};
void PrefetchInstanceIDProxyTest::SetUp() {
diff --git a/chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl.h b/chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl.h
index fa899cb..6c232a84 100644
--- a/chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl.h
+++ b/chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl.h
@@ -82,6 +82,11 @@
};
explicit OfflineMetricsCollectorImpl(PrefService* prefs);
+
+ OfflineMetricsCollectorImpl(const OfflineMetricsCollectorImpl&) = delete;
+ OfflineMetricsCollectorImpl& operator=(const OfflineMetricsCollectorImpl&) =
+ delete;
+
~OfflineMetricsCollectorImpl() override;
// OfflineMetricsCollector implementation.
@@ -146,8 +151,6 @@
// Has the same lifetime as profile, so should outlive this subcomponent
// of profile's PrefetchService.
PrefService* prefs_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(OfflineMetricsCollectorImpl);
};
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl_unittest.cc b/chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl_unittest.cc
index c9df910..e347cb28 100644
--- a/chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl_unittest.cc
+++ b/chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl_unittest.cc
@@ -24,6 +24,11 @@
class OfflineMetricsCollectorTest : public testing::Test {
public:
OfflineMetricsCollectorTest() {}
+
+ OfflineMetricsCollectorTest(const OfflineMetricsCollectorTest&) = delete;
+ OfflineMetricsCollectorTest& operator=(const OfflineMetricsCollectorTest&) =
+ delete;
+
~OfflineMetricsCollectorTest() override {}
// testing::Test:
@@ -76,8 +81,6 @@
std::unique_ptr<OfflineMetricsCollectorImpl> collector_;
base::HistogramTester histogram_tester_;
TestScopedOfflineClock test_clock_;
-
- DISALLOW_COPY_AND_ASSIGN(OfflineMetricsCollectorTest);
};
TEST_F(OfflineMetricsCollectorTest, CheckCleanInit) {
diff --git a/chrome/browser/offline_pages/prefetch/offline_prefetch_download_client.h b/chrome/browser/offline_pages/prefetch/offline_prefetch_download_client.h
index 21e474f3..2db44c7 100644
--- a/chrome/browser/offline_pages/prefetch/offline_prefetch_download_client.h
+++ b/chrome/browser/offline_pages/prefetch/offline_prefetch_download_client.h
@@ -25,6 +25,11 @@
class OfflinePrefetchDownloadClient : public download::Client {
public:
explicit OfflinePrefetchDownloadClient(SimpleFactoryKey* simple_factory_key);
+
+ OfflinePrefetchDownloadClient(const OfflinePrefetchDownloadClient&) = delete;
+ OfflinePrefetchDownloadClient& operator=(
+ const OfflinePrefetchDownloadClient&) = delete;
+
~OfflinePrefetchDownloadClient() override;
private:
@@ -47,8 +52,6 @@
PrefetchDownloader* GetPrefetchDownloader() const;
SimpleFactoryKey* simple_factory_key_;
-
- DISALLOW_COPY_AND_ASSIGN(OfflinePrefetchDownloadClient);
};
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/prefetch/prefetch_background_task_handler_impl.h b/chrome/browser/offline_pages/prefetch/prefetch_background_task_handler_impl.h
index cd74191a..32f3e4e8 100644
--- a/chrome/browser/offline_pages/prefetch/prefetch_background_task_handler_impl.h
+++ b/chrome/browser/offline_pages/prefetch/prefetch_background_task_handler_impl.h
@@ -40,6 +40,12 @@
class PrefetchBackgroundTaskHandlerImpl : public PrefetchBackgroundTaskHandler {
public:
explicit PrefetchBackgroundTaskHandlerImpl(PrefService* profile);
+
+ PrefetchBackgroundTaskHandlerImpl(const PrefetchBackgroundTaskHandlerImpl&) =
+ delete;
+ PrefetchBackgroundTaskHandlerImpl& operator=(
+ const PrefetchBackgroundTaskHandlerImpl&) = delete;
+
~PrefetchBackgroundTaskHandlerImpl() override;
// PrefetchBackgroundTaskHandler implementation.
@@ -63,8 +69,6 @@
PrefService* prefs_;
const base::TickClock* tick_clock_;
-
- DISALLOW_COPY_AND_ASSIGN(PrefetchBackgroundTaskHandlerImpl);
};
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/prefetch/prefetch_background_task_handler_impl_unittest.cc b/chrome/browser/offline_pages/prefetch/prefetch_background_task_handler_impl_unittest.cc
index 8499696..664d92bd 100644
--- a/chrome/browser/offline_pages/prefetch/prefetch_background_task_handler_impl_unittest.cc
+++ b/chrome/browser/offline_pages/prefetch/prefetch_background_task_handler_impl_unittest.cc
@@ -17,6 +17,12 @@
class PrefetchBackgroundTaskHandlerImplTest : public testing::Test {
public:
PrefetchBackgroundTaskHandlerImplTest();
+
+ PrefetchBackgroundTaskHandlerImplTest(
+ const PrefetchBackgroundTaskHandlerImplTest&) = delete;
+ PrefetchBackgroundTaskHandlerImplTest& operator=(
+ const PrefetchBackgroundTaskHandlerImplTest&) = delete;
+
~PrefetchBackgroundTaskHandlerImplTest() override;
void SetUp() override;
@@ -40,9 +46,6 @@
TestingProfile profile_;
scoped_refptr<base::TestMockTimeTaskRunner> task_runner_;
std::unique_ptr<PrefetchBackgroundTaskHandlerImpl> task_handler_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PrefetchBackgroundTaskHandlerImplTest);
};
PrefetchBackgroundTaskHandlerImplTest::PrefetchBackgroundTaskHandlerImplTest()
diff --git a/chrome/browser/offline_pages/recent_tab_helper.h b/chrome/browser/offline_pages/recent_tab_helper.h
index 0b76f12..d9a1a704 100644
--- a/chrome/browser/offline_pages/recent_tab_helper.h
+++ b/chrome/browser/offline_pages/recent_tab_helper.h
@@ -47,6 +47,9 @@
kMaxValue = kSamePageSameQuality,
};
+ RecentTabHelper(const RecentTabHelper&) = delete;
+ RecentTabHelper& operator=(const RecentTabHelper&) = delete;
+
~RecentTabHelper() override;
// content::WebContentsObserver
@@ -185,8 +188,6 @@
base::WeakPtrFactory<RecentTabHelper> weak_ptr_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(RecentTabHelper);
};
} // namespace offline_pages
diff --git a/chrome/browser/offline_pages/recent_tab_helper_unittest.cc b/chrome/browser/offline_pages/recent_tab_helper_unittest.cc
index d6e6afc..cabc43c8 100644
--- a/chrome/browser/offline_pages/recent_tab_helper_unittest.cc
+++ b/chrome/browser/offline_pages/recent_tab_helper_unittest.cc
@@ -87,6 +87,10 @@
public OfflinePageTestArchiver::Observer {
public:
RecentTabHelperTest();
+
+ RecentTabHelperTest(const RecentTabHelperTest&) = delete;
+ RecentTabHelperTest& operator=(const RecentTabHelperTest&) = delete;
+
~RecentTabHelperTest() override {}
void SetUp() override;
@@ -176,8 +180,6 @@
mocked_main_runner_;
base::WeakPtrFactory<RecentTabHelperTest> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(RecentTabHelperTest);
};
TestDelegate::TestDelegate(
diff --git a/chrome/browser/optimization_guide/hints_fetcher_browsertest.cc b/chrome/browser/optimization_guide/hints_fetcher_browsertest.cc
index 5e134beb..86890b6 100644
--- a/chrome/browser/optimization_guide/hints_fetcher_browsertest.cc
+++ b/chrome/browser/optimization_guide/hints_fetcher_browsertest.cc
@@ -125,6 +125,12 @@
class HintsFetcherDisabledBrowserTest : public InProcessBrowserTest {
public:
HintsFetcherDisabledBrowserTest() = default;
+
+ HintsFetcherDisabledBrowserTest(const HintsFetcherDisabledBrowserTest&) =
+ delete;
+ HintsFetcherDisabledBrowserTest& operator=(
+ const HintsFetcherDisabledBrowserTest&) = delete;
+
~HintsFetcherDisabledBrowserTest() override = default;
void SetUpOnMainThread() override {
@@ -432,8 +438,6 @@
expect_hints_request_for_hosts_and_urls_;
std::unique_ptr<ukm::TestAutoSetUkmRecorder> ukm_recorder_;
-
- DISALLOW_COPY_AND_ASSIGN(HintsFetcherDisabledBrowserTest);
};
// This test class enables OnePlatform Hints.
@@ -441,6 +445,9 @@
public:
HintsFetcherBrowserTest() = default;
+ HintsFetcherBrowserTest(const HintsFetcherBrowserTest&) = delete;
+ HintsFetcherBrowserTest& operator=(const HintsFetcherBrowserTest&) = delete;
+
~HintsFetcherBrowserTest() override = default;
void SetUp() override {
@@ -478,9 +485,6 @@
browser()->profile());
return keyed_service->GetTopHostProvider();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(HintsFetcherBrowserTest);
};
// This test creates new browser with no profile and loads a random page with
diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.h b/chrome/browser/optimization_guide/optimization_guide_keyed_service.h
index 5089c56..1c6e33f 100644
--- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.h
+++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.h
@@ -52,6 +52,11 @@
public:
explicit OptimizationGuideKeyedService(
content::BrowserContext* browser_context);
+
+ OptimizationGuideKeyedService(const OptimizationGuideKeyedService&) = delete;
+ OptimizationGuideKeyedService& operator=(
+ const OptimizationGuideKeyedService&) = delete;
+
~OptimizationGuideKeyedService() override;
// optimization_guide::OptimizationGuideDecider implementation:
@@ -156,8 +161,6 @@
// The tab URL provider to use for fetching information for the user's active
// tabs. Will be null if the user is off the record.
std::unique_ptr<optimization_guide::TabUrlProvider> tab_url_provider_;
-
- DISALLOW_COPY_AND_ASSIGN(OptimizationGuideKeyedService);
};
#endif // CHROME_BROWSER_OPTIMIZATION_GUIDE_OPTIMIZATION_GUIDE_KEYED_SERVICE_H_
diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service_browsertest.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service_browsertest.cc
index 45040bd..1602e31 100644
--- a/chrome/browser/optimization_guide/optimization_guide_keyed_service_browsertest.cc
+++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service_browsertest.cc
@@ -127,6 +127,11 @@
{optimization_guide::features::kOptimizationHints}, {});
}
+ OptimizationGuideKeyedServiceBrowserTest(
+ const OptimizationGuideKeyedServiceBrowserTest&) = delete;
+ OptimizationGuideKeyedServiceBrowserTest& operator=(
+ const OptimizationGuideKeyedServiceBrowserTest&) = delete;
+
~OptimizationGuideKeyedServiceBrowserTest() override = default;
void SetUpCommandLine(base::CommandLine* cmd) override {
@@ -269,8 +274,6 @@
// Histogram tester used specifically to capture metrics that are recorded
// during browser initialization.
base::HistogramTester histogram_tester_;
-
- DISALLOW_COPY_AND_ASSIGN(OptimizationGuideKeyedServiceBrowserTest);
};
IN_PROC_BROWSER_TEST_F(OptimizationGuideKeyedServiceBrowserTest,
diff --git a/chrome/browser/optimization_guide/optimization_guide_web_contents_observer.h b/chrome/browser/optimization_guide/optimization_guide_web_contents_observer.h
index 507ecc2e..4392799 100644
--- a/chrome/browser/optimization_guide/optimization_guide_web_contents_observer.h
+++ b/chrome/browser/optimization_guide/optimization_guide_web_contents_observer.h
@@ -35,6 +35,11 @@
public content::WebContentsUserData<
OptimizationGuideWebContentsObserver> {
public:
+ OptimizationGuideWebContentsObserver(
+ const OptimizationGuideWebContentsObserver&) = delete;
+ OptimizationGuideWebContentsObserver& operator=(
+ const OptimizationGuideWebContentsObserver&) = delete;
+
~OptimizationGuideWebContentsObserver() override;
// Notifies |this| to flush |last_navigation_data| so metrics are recorded.
@@ -161,8 +166,6 @@
this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(OptimizationGuideWebContentsObserver);
};
#endif // CHROME_BROWSER_OPTIMIZATION_GUIDE_OPTIMIZATION_GUIDE_WEB_CONTENTS_OBSERVER_H_
diff --git a/chrome/browser/optimization_guide/prediction/prediction_manager.h b/chrome/browser/optimization_guide/prediction/prediction_manager.h
index 740dbab..56b80731 100644
--- a/chrome/browser/optimization_guide/prediction/prediction_manager.h
+++ b/chrome/browser/optimization_guide/prediction/prediction_manager.h
@@ -64,6 +64,9 @@
PrefService* pref_service,
Profile* profile);
+ PredictionManager(const PredictionManager&) = delete;
+ PredictionManager& operator=(const PredictionManager&) = delete;
+
~PredictionManager() override;
// Adds an observer for updates to the model for |optimization_target|.
@@ -386,8 +389,6 @@
// Used to get |weak_ptr_| to self on the UI thread.
base::WeakPtrFactory<PredictionManager> ui_weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PredictionManager);
};
} // namespace optimization_guide
diff --git a/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer_browsertest.cc b/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer_browsertest.cc
index e3b7cc1..f3f6d1e 100644
--- a/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer_browsertest.cc
+++ b/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer_browsertest.cc
@@ -118,6 +118,12 @@
public:
AdsPageLoadMetricsObserverBrowserTest()
: subresource_filter::SubresourceFilterBrowserTest() {}
+
+ AdsPageLoadMetricsObserverBrowserTest(
+ const AdsPageLoadMetricsObserverBrowserTest&) = delete;
+ AdsPageLoadMetricsObserverBrowserTest& operator=(
+ const AdsPageLoadMetricsObserverBrowserTest&) = delete;
+
~AdsPageLoadMetricsObserverBrowserTest() override {}
std::unique_ptr<page_load_metrics::PageLoadMetricsTestWaiter>
@@ -149,8 +155,6 @@
private:
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(AdsPageLoadMetricsObserverBrowserTest);
};
// Test that an embedded ad is same origin.
@@ -2302,6 +2306,12 @@
: public subresource_filter::SubresourceFilterBrowserTest {
public:
AdsMemoryMeasurementBrowserTest() = default;
+
+ AdsMemoryMeasurementBrowserTest(const AdsMemoryMeasurementBrowserTest&) =
+ delete;
+ AdsMemoryMeasurementBrowserTest& operator=(
+ const AdsMemoryMeasurementBrowserTest&) = delete;
+
~AdsMemoryMeasurementBrowserTest() override = default;
void SetUp() override {
@@ -2347,8 +2357,6 @@
private:
std::unique_ptr<page_load_metrics::PageLoadMetricsTestWaiter> waiter_;
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(AdsMemoryMeasurementBrowserTest);
};
IN_PROC_BROWSER_TEST_F(AdsMemoryMeasurementBrowserTest,
diff --git a/chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer.h
index 96da923..c5fc268 100644
--- a/chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer.h
@@ -51,6 +51,11 @@
: public page_load_metrics::PageLoadMetricsObserver {
public:
AMPPageLoadMetricsObserver();
+
+ AMPPageLoadMetricsObserver(const AMPPageLoadMetricsObserver&) = delete;
+ AMPPageLoadMetricsObserver& operator=(const AMPPageLoadMetricsObserver&) =
+ delete;
+
~AMPPageLoadMetricsObserver() override;
// page_load_metrics::PageLoadMetricsObserver:
@@ -139,8 +144,6 @@
bool observed_amp_main_frame_ = false;
bool observed_amp_sub_frame_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(AMPPageLoadMetricsObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_CORE_AMP_PAGE_LOAD_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer_browsertest.cc b/chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer_browsertest.cc
index 5977ae1..4310c29 100644
--- a/chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer_browsertest.cc
+++ b/chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer_browsertest.cc
@@ -27,6 +27,11 @@
class AmpPageLoadMetricsBrowserTest : public InProcessBrowserTest {
public:
AmpPageLoadMetricsBrowserTest() {}
+
+ AmpPageLoadMetricsBrowserTest(const AmpPageLoadMetricsBrowserTest&) = delete;
+ AmpPageLoadMetricsBrowserTest& operator=(
+ const AmpPageLoadMetricsBrowserTest&) = delete;
+
~AmpPageLoadMetricsBrowserTest() override {}
void PreRunTestOnMainThread() override {
@@ -85,8 +90,6 @@
private:
std::unique_ptr<ukm::TestAutoSetUkmRecorder> test_ukm_recorder_;
std::unique_ptr<net::EmbeddedTestServer> https_test_server_;
-
- DISALLOW_COPY_AND_ASSIGN(AmpPageLoadMetricsBrowserTest);
};
IN_PROC_BROWSER_TEST_F(AmpPageLoadMetricsBrowserTest, NoAmp) {
diff --git a/chrome/browser/page_load_metrics/observers/core/ukm_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/core/ukm_page_load_metrics_observer.h
index 6701a641..d7d49be40 100644
--- a/chrome/browser/page_load_metrics/observers/core/ukm_page_load_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/core/ukm_page_load_metrics_observer.h
@@ -54,6 +54,11 @@
explicit UkmPageLoadMetricsObserver(
network::NetworkQualityTracker* network_quality_tracker);
+
+ UkmPageLoadMetricsObserver(const UkmPageLoadMetricsObserver&) = delete;
+ UkmPageLoadMetricsObserver& operator=(const UkmPageLoadMetricsObserver&) =
+ delete;
+
~UkmPageLoadMetricsObserver() override;
// page_load_metrics::PageLoadMetricsObserver implementation:
@@ -302,8 +307,6 @@
base::ReadOnlySharedMemoryMapping ukm_smoothness_data_;
base::WeakPtrFactory<UkmPageLoadMetricsObserver> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UkmPageLoadMetricsObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_CORE_UKM_PAGE_LOAD_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/data_saver_site_breakdown_metrics_observer.h b/chrome/browser/page_load_metrics/observers/data_saver_site_breakdown_metrics_observer.h
index f4dc77b..f6cecd8 100644
--- a/chrome/browser/page_load_metrics/observers/data_saver_site_breakdown_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/data_saver_site_breakdown_metrics_observer.h
@@ -25,6 +25,12 @@
: public page_load_metrics::PageLoadMetricsObserver {
public:
DataSaverSiteBreakdownMetricsObserver();
+
+ DataSaverSiteBreakdownMetricsObserver(
+ const DataSaverSiteBreakdownMetricsObserver&) = delete;
+ DataSaverSiteBreakdownMetricsObserver& operator=(
+ const DataSaverSiteBreakdownMetricsObserver&) = delete;
+
~DataSaverSiteBreakdownMetricsObserver() override;
private:
@@ -48,8 +54,6 @@
content::BrowserContext* browser_context_ = nullptr;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(DataSaverSiteBreakdownMetricsObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_DATA_SAVER_SITE_BREAKDOWN_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/data_use_metrics_observer.h b/chrome/browser/page_load_metrics/observers/data_use_metrics_observer.h
index 19e90b8..c37665f1 100644
--- a/chrome/browser/page_load_metrics/observers/data_use_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/data_use_metrics_observer.h
@@ -22,6 +22,10 @@
: public page_load_metrics::PageLoadMetricsObserver {
public:
DataUseMetricsObserver();
+
+ DataUseMetricsObserver(const DataUseMetricsObserver&) = delete;
+ DataUseMetricsObserver& operator=(const DataUseMetricsObserver&) = delete;
+
~DataUseMetricsObserver() override;
private:
@@ -36,8 +40,6 @@
const std::string& mime_type) const override;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(DataUseMetricsObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_DATA_USE_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/foreground_duration_ukm_observer.h b/chrome/browser/page_load_metrics/observers/foreground_duration_ukm_observer.h
index 0296e14f..aa06a28 100644
--- a/chrome/browser/page_load_metrics/observers/foreground_duration_ukm_observer.h
+++ b/chrome/browser/page_load_metrics/observers/foreground_duration_ukm_observer.h
@@ -17,6 +17,11 @@
: public page_load_metrics::PageLoadMetricsObserver {
public:
ForegroundDurationUKMObserver();
+
+ ForegroundDurationUKMObserver(const ForegroundDurationUKMObserver&) = delete;
+ ForegroundDurationUKMObserver& operator=(
+ const ForegroundDurationUKMObserver&) = delete;
+
~ForegroundDurationUKMObserver() override;
// page_load_metrics::PageLoadMetricsObserver:
@@ -41,8 +46,6 @@
void RecordUkmIfInForeground(base::TimeTicks end_time);
void RecordInputTimingMetrics(
ukm::builders::PageForegroundSession* ukm_builder);
-
- DISALLOW_COPY_AND_ASSIGN(ForegroundDurationUKMObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_FOREGROUND_DURATION_UKM_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/foreground_duration_ukm_observer_browsertest.cc b/chrome/browser/page_load_metrics/observers/foreground_duration_ukm_observer_browsertest.cc
index a47ac5b..ffb7fe20 100644
--- a/chrome/browser/page_load_metrics/observers/foreground_duration_ukm_observer_browsertest.cc
+++ b/chrome/browser/page_load_metrics/observers/foreground_duration_ukm_observer_browsertest.cc
@@ -26,6 +26,12 @@
class ForegroundDurationUKMObserverBrowserTest : public InProcessBrowserTest {
public:
ForegroundDurationUKMObserverBrowserTest() {}
+
+ ForegroundDurationUKMObserverBrowserTest(
+ const ForegroundDurationUKMObserverBrowserTest&) = delete;
+ ForegroundDurationUKMObserverBrowserTest& operator=(
+ const ForegroundDurationUKMObserverBrowserTest&) = delete;
+
~ForegroundDurationUKMObserverBrowserTest() override {}
void PreRunTestOnMainThread() override {
@@ -71,8 +77,6 @@
private:
std::unique_ptr<ukm::TestAutoSetUkmRecorder> test_ukm_recorder_;
std::unique_ptr<net::EmbeddedTestServer> https_test_server_;
-
- DISALLOW_COPY_AND_ASSIGN(ForegroundDurationUKMObserverBrowserTest);
};
IN_PROC_BROWSER_TEST_F(ForegroundDurationUKMObserverBrowserTest, RecordSimple) {
diff --git a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h
index 5206711e..2b1a6a3 100644
--- a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h
@@ -50,6 +50,11 @@
class FromGWSPageLoadMetricsLogger {
public:
FromGWSPageLoadMetricsLogger();
+
+ FromGWSPageLoadMetricsLogger(const FromGWSPageLoadMetricsLogger&) = delete;
+ FromGWSPageLoadMetricsLogger& operator=(const FromGWSPageLoadMetricsLogger&) =
+ delete;
+
~FromGWSPageLoadMetricsLogger();
void SetPreviouslyCommittedUrl(const GURL& url);
@@ -132,8 +137,6 @@
// The time of first user interaction after paint from navigation start.
absl::optional<base::TimeDelta> first_user_interaction_after_paint_;
-
- DISALLOW_COPY_AND_ASSIGN(FromGWSPageLoadMetricsLogger);
};
class FromGWSPageLoadMetricsObserver
diff --git a/chrome/browser/page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer_browsertest.cc b/chrome/browser/page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer_browsertest.cc
index 4df6b6a9..1ce51bc4 100644
--- a/chrome/browser/page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer_browsertest.cc
+++ b/chrome/browser/page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer_browsertest.cc
@@ -29,6 +29,12 @@
public:
HttpsEngagementPageLoadMetricsBrowserTest()
: metrics_provider_(new HttpsEngagementMetricsProvider()) {}
+
+ HttpsEngagementPageLoadMetricsBrowserTest(
+ const HttpsEngagementPageLoadMetricsBrowserTest&) = delete;
+ HttpsEngagementPageLoadMetricsBrowserTest& operator=(
+ const HttpsEngagementPageLoadMetricsBrowserTest&) = delete;
+
~HttpsEngagementPageLoadMetricsBrowserTest() override {}
void StartHttpsServer(bool cert_error) {
@@ -166,8 +172,6 @@
std::unique_ptr<net::EmbeddedTestServer> https_test_server_;
std::unique_ptr<net::EmbeddedTestServer> http_test_server_;
std::unique_ptr<HttpsEngagementMetricsProvider> metrics_provider_;
-
- DISALLOW_COPY_AND_ASSIGN(HttpsEngagementPageLoadMetricsBrowserTest);
};
IN_PROC_BROWSER_TEST_F(HttpsEngagementPageLoadMetricsBrowserTest,
diff --git a/chrome/browser/page_load_metrics/observers/https_engagement_metrics/https_engagement_service.h b/chrome/browser/page_load_metrics/observers/https_engagement_metrics/https_engagement_service.h
index 5f4ed2b..f3a3b6b 100644
--- a/chrome/browser/page_load_metrics/observers/https_engagement_metrics/https_engagement_service.h
+++ b/chrome/browser/page_load_metrics/observers/https_engagement_metrics/https_engagement_service.h
@@ -19,6 +19,10 @@
enum PageScheme { HTTP, HTTPS, OTHER };
HttpsEngagementService();
+
+ HttpsEngagementService(const HttpsEngagementService&) = delete;
+ HttpsEngagementService& operator=(const HttpsEngagementService&) = delete;
+
~HttpsEngagementService() override;
// Save that the user spent |time| on either HTTPS or HTTP.
@@ -30,8 +34,6 @@
private:
base::TimeDelta time_on_https_;
base::TimeDelta time_on_http_;
-
- DISALLOW_COPY_AND_ASSIGN(HttpsEngagementService);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_HTTPS_ENGAGEMENT_METRICS_HTTPS_ENGAGEMENT_SERVICE_H_
diff --git a/chrome/browser/page_load_metrics/observers/javascript_frameworks_ukm_observer.h b/chrome/browser/page_load_metrics/observers/javascript_frameworks_ukm_observer.h
index ca7ba14..38d9aa42 100644
--- a/chrome/browser/page_load_metrics/observers/javascript_frameworks_ukm_observer.h
+++ b/chrome/browser/page_load_metrics/observers/javascript_frameworks_ukm_observer.h
@@ -14,6 +14,12 @@
: public page_load_metrics::PageLoadMetricsObserver {
public:
JavascriptFrameworksUkmObserver();
+
+ JavascriptFrameworksUkmObserver(const JavascriptFrameworksUkmObserver&) =
+ delete;
+ JavascriptFrameworksUkmObserver& operator=(
+ const JavascriptFrameworksUkmObserver&) = delete;
+
~JavascriptFrameworksUkmObserver() override;
// page_load_metrics::PageLoadMetricsObserver
@@ -32,7 +38,6 @@
// Bitmap containing the blink::LoadingBehaviorFlag values corresponding to
// frameworks that are detected.
int32_t frameworks_detected_ = 0;
- DISALLOW_COPY_AND_ASSIGN(JavascriptFrameworksUkmObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_JAVASCRIPT_FRAMEWORKS_UKM_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/javascript_frameworks_ukm_observer_browsertest.cc b/chrome/browser/page_load_metrics/observers/javascript_frameworks_ukm_observer_browsertest.cc
index 55c49a96..5a43368 100644
--- a/chrome/browser/page_load_metrics/observers/javascript_frameworks_ukm_observer_browsertest.cc
+++ b/chrome/browser/page_load_metrics/observers/javascript_frameworks_ukm_observer_browsertest.cc
@@ -65,6 +65,12 @@
class JavascriptFrameworksUkmObserverBrowserTest : public InProcessBrowserTest {
public:
JavascriptFrameworksUkmObserverBrowserTest() = default;
+
+ JavascriptFrameworksUkmObserverBrowserTest(
+ const JavascriptFrameworksUkmObserverBrowserTest&) = delete;
+ JavascriptFrameworksUkmObserverBrowserTest& operator=(
+ const JavascriptFrameworksUkmObserverBrowserTest&) = delete;
+
~JavascriptFrameworksUkmObserverBrowserTest() override = default;
void PreRunTestOnMainThread() override {
InProcessBrowserTest::PreRunTestOnMainThread();
@@ -149,7 +155,6 @@
}
std::unique_ptr<ukm::TestAutoSetUkmRecorder> test_ukm_recorder_;
std::unique_ptr<net::EmbeddedTestServer> https_test_server_;
- DISALLOW_COPY_AND_ASSIGN(JavascriptFrameworksUkmObserverBrowserTest);
};
class ParametrizedJavascriptFrameworksUkmObserverBrowserTest
diff --git a/chrome/browser/page_load_metrics/observers/live_tab_count_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/live_tab_count_page_load_metrics_observer.h
index 3c2f8e87..08370fc 100644
--- a/chrome/browser/page_load_metrics/observers/live_tab_count_page_load_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/live_tab_count_page_load_metrics_observer.h
@@ -21,6 +21,12 @@
: public page_load_metrics::PageLoadMetricsObserver {
public:
LiveTabCountPageLoadMetricsObserver();
+
+ LiveTabCountPageLoadMetricsObserver(
+ const LiveTabCountPageLoadMetricsObserver&) = delete;
+ LiveTabCountPageLoadMetricsObserver& operator=(
+ const LiveTabCountPageLoadMetricsObserver&) = delete;
+
~LiveTabCountPageLoadMetricsObserver() override;
// page_load_metrics::PageLoadMetricsObserver:
@@ -34,9 +40,6 @@
// This is virtual and protected so we can control the live tab count from
// unit tests.
virtual size_t GetLiveTabCount() const;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LiveTabCountPageLoadMetricsObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_LIVE_TAB_COUNT_PAGE_LOAD_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer.h
index 35fd33c..5509337 100644
--- a/chrome/browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer.h
@@ -42,6 +42,11 @@
predictors::ResourcePrefetchPredictor* predictor,
predictors::LoadingPredictorTabHelper* predictor_tab_helper);
+ LoadingPredictorPageLoadMetricsObserver(
+ const LoadingPredictorPageLoadMetricsObserver&) = delete;
+ LoadingPredictorPageLoadMetricsObserver& operator=(
+ const LoadingPredictorPageLoadMetricsObserver&) = delete;
+
~LoadingPredictorPageLoadMetricsObserver() override;
// page_load_metrics::PageLoadMetricsObserver:
@@ -59,8 +64,6 @@
predictors::ResourcePrefetchPredictor* predictor_;
predictors::LoadingPredictorTabHelper* predictor_tab_helper_;
bool record_histogram_preconnectable_;
-
- DISALLOW_COPY_AND_ASSIGN(LoadingPredictorPageLoadMetricsObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_LOADING_PREDICTOR_PAGE_LOAD_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/local_network_requests_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/local_network_requests_page_load_metrics_observer.h
index 475782f4..f10962e1 100644
--- a/chrome/browser/page_load_metrics/observers/local_network_requests_page_load_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/local_network_requests_page_load_metrics_observer.h
@@ -63,6 +63,12 @@
public:
LocalNetworkRequestsPageLoadMetricsObserver();
+
+ LocalNetworkRequestsPageLoadMetricsObserver(
+ const LocalNetworkRequestsPageLoadMetricsObserver&) = delete;
+ LocalNetworkRequestsPageLoadMetricsObserver& operator=(
+ const LocalNetworkRequestsPageLoadMetricsObserver&) = delete;
+
~LocalNetworkRequestsPageLoadMetricsObserver() override;
// page_load_metrics::PageLoadMetricsObserver
@@ -116,8 +122,6 @@
// the page could belong to. Used to distinguish between same subnet and
// different subnet private network queries.
size_t page_ip_prefix_length_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(LocalNetworkRequestsPageLoadMetricsObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_LOCAL_NETWORK_REQUESTS_PAGE_LOAD_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer.h
index 8cc2f366..a733928 100644
--- a/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer.h
@@ -17,6 +17,11 @@
: public page_load_metrics::PageLoadMetricsObserver {
public:
MediaPageLoadMetricsObserver();
+
+ MediaPageLoadMetricsObserver(const MediaPageLoadMetricsObserver&) = delete;
+ MediaPageLoadMetricsObserver& operator=(const MediaPageLoadMetricsObserver&) =
+ delete;
+
~MediaPageLoadMetricsObserver() override;
// page_load_metrics::PageLoadMetricsObserver:
@@ -44,8 +49,6 @@
// Whether the page load played a media element.
bool played_media_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaPageLoadMetricsObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_MEDIA_PAGE_LOAD_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer_unittest.cc
index 076f2fcd..3e560ac 100644
--- a/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer_unittest.cc
+++ b/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer_unittest.cc
@@ -28,6 +28,12 @@
: public page_load_metrics::PageLoadMetricsObserverTestHarness {
public:
MediaPageLoadMetricsObserverTest() {}
+
+ MediaPageLoadMetricsObserverTest(const MediaPageLoadMetricsObserverTest&) =
+ delete;
+ MediaPageLoadMetricsObserverTest& operator=(
+ const MediaPageLoadMetricsObserverTest&) = delete;
+
~MediaPageLoadMetricsObserverTest() override = default;
void ResetTest() {
@@ -87,8 +93,6 @@
private:
page_load_metrics::mojom::PageLoadTiming timing_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaPageLoadMetricsObserverTest);
};
TEST_F(MediaPageLoadMetricsObserverTest, MediaPlayed) {
diff --git a/chrome/browser/page_load_metrics/observers/multi_tab_loading_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/multi_tab_loading_page_load_metrics_observer.h
index 203407d..87f1301 100644
--- a/chrome/browser/page_load_metrics/observers/multi_tab_loading_page_load_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/multi_tab_loading_page_load_metrics_observer.h
@@ -27,6 +27,12 @@
: public page_load_metrics::PageLoadMetricsObserver {
public:
MultiTabLoadingPageLoadMetricsObserver();
+
+ MultiTabLoadingPageLoadMetricsObserver(
+ const MultiTabLoadingPageLoadMetricsObserver&) = delete;
+ MultiTabLoadingPageLoadMetricsObserver& operator=(
+ const MultiTabLoadingPageLoadMetricsObserver&) = delete;
+
~MultiTabLoadingPageLoadMetricsObserver() override;
// page_load_metrics::PageLoadMetricsObserver:
@@ -51,8 +57,6 @@
private:
int num_loading_tabs_when_started_;
-
- DISALLOW_COPY_AND_ASSIGN(MultiTabLoadingPageLoadMetricsObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_MULTI_TAB_LOADING_PAGE_LOAD_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/omnibox_suggestion_used_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/omnibox_suggestion_used_page_load_metrics_observer.h
index b7f9a6c..cfc1b9d 100644
--- a/chrome/browser/page_load_metrics/observers/omnibox_suggestion_used_page_load_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/omnibox_suggestion_used_page_load_metrics_observer.h
@@ -14,6 +14,12 @@
: public page_load_metrics::PageLoadMetricsObserver {
public:
OmniboxSuggestionUsedMetricsObserver();
+
+ OmniboxSuggestionUsedMetricsObserver(
+ const OmniboxSuggestionUsedMetricsObserver&) = delete;
+ OmniboxSuggestionUsedMetricsObserver& operator=(
+ const OmniboxSuggestionUsedMetricsObserver&) = delete;
+
~OmniboxSuggestionUsedMetricsObserver() override;
// page_load_metrics::PageLoadMetricsObserver:
@@ -28,8 +34,6 @@
private:
ui::PageTransition transition_type_ = ui::PAGE_TRANSITION_LINK;
-
- DISALLOW_COPY_AND_ASSIGN(OmniboxSuggestionUsedMetricsObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_OMNIBOX_SUGGESTION_USED_PAGE_LOAD_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/optimization_guide_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/optimization_guide_page_load_metrics_observer.h
index 0c090540..7e207371 100644
--- a/chrome/browser/page_load_metrics/observers/optimization_guide_page_load_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/optimization_guide_page_load_metrics_observer.h
@@ -15,6 +15,12 @@
: public page_load_metrics::PageLoadMetricsObserver {
public:
OptimizationGuidePageLoadMetricsObserver();
+
+ OptimizationGuidePageLoadMetricsObserver(
+ const OptimizationGuidePageLoadMetricsObserver&) = delete;
+ OptimizationGuidePageLoadMetricsObserver& operator=(
+ const OptimizationGuidePageLoadMetricsObserver&) = delete;
+
~OptimizationGuidePageLoadMetricsObserver() override;
// page_load_metrics::PageLoadMetricsObserver:
@@ -33,8 +39,6 @@
// needed for the Optimization Guide. Not owned.
OptimizationGuideWebContentsObserver*
optimization_guide_web_contents_observer_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(OptimizationGuidePageLoadMetricsObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_OPTIMIZATION_GUIDE_PAGE_LOAD_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h b/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h
index e114e174..b023f2c 100644
--- a/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h
+++ b/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h
@@ -26,6 +26,12 @@
static const char kResourceUrl[];
PageLoadMetricsObserverTestHarness();
+
+ PageLoadMetricsObserverTestHarness(
+ const PageLoadMetricsObserverTestHarness&) = delete;
+ PageLoadMetricsObserverTestHarness& operator=(
+ const PageLoadMetricsObserverTestHarness&) = delete;
+
~PageLoadMetricsObserverTestHarness() override;
void SetUp() override;
@@ -37,8 +43,6 @@
private:
std::unique_ptr<PageLoadMetricsObserverTester> tester_;
-
- DISALLOW_COPY_AND_ASSIGN(PageLoadMetricsObserverTestHarness);
};
} // namespace page_load_metrics
diff --git a/chrome/browser/page_load_metrics/observers/prefetch_proxy_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/prefetch_proxy_page_load_metrics_observer.h
index d2006ce..bfb64e2 100644
--- a/chrome/browser/page_load_metrics/observers/prefetch_proxy_page_load_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/prefetch_proxy_page_load_metrics_observer.h
@@ -31,6 +31,12 @@
: public page_load_metrics::PageLoadMetricsObserver {
public:
PrefetchProxyPageLoadMetricsObserver();
+
+ PrefetchProxyPageLoadMetricsObserver(
+ const PrefetchProxyPageLoadMetricsObserver&) = delete;
+ PrefetchProxyPageLoadMetricsObserver& operator=(
+ const PrefetchProxyPageLoadMetricsObserver&) = delete;
+
~PrefetchProxyPageLoadMetricsObserver() override;
protected:
@@ -99,8 +105,6 @@
base::WeakPtrFactory<PrefetchProxyPageLoadMetricsObserver> weak_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(PrefetchProxyPageLoadMetricsObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_PREFETCH_PROXY_PAGE_LOAD_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/previews_ukm_observer.h b/chrome/browser/page_load_metrics/observers/previews_ukm_observer.h
index 18a3a14..1028636 100644
--- a/chrome/browser/page_load_metrics/observers/previews_ukm_observer.h
+++ b/chrome/browser/page_load_metrics/observers/previews_ukm_observer.h
@@ -21,6 +21,10 @@
class PreviewsUKMObserver : public page_load_metrics::PageLoadMetricsObserver {
public:
PreviewsUKMObserver();
+
+ PreviewsUKMObserver(const PreviewsUKMObserver&) = delete;
+ PreviewsUKMObserver& operator=(const PreviewsUKMObserver&) = delete;
+
~PreviewsUKMObserver() override;
// page_load_metrics::PageLoadMetricsObserver:
@@ -48,8 +52,6 @@
bool save_data_enabled_ = false;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(PreviewsUKMObserver);
};
} // namespace previews
diff --git a/chrome/browser/page_load_metrics/observers/previews_ukm_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/previews_ukm_observer_unittest.cc
index e4aaf2e69..42223dc5 100644
--- a/chrome/browser/page_load_metrics/observers/previews_ukm_observer_unittest.cc
+++ b/chrome/browser/page_load_metrics/observers/previews_ukm_observer_unittest.cc
@@ -40,6 +40,9 @@
explicit TestPreviewsUKMObserver(bool save_data_enabled)
: save_data_enabled_(save_data_enabled) {}
+ TestPreviewsUKMObserver(const TestPreviewsUKMObserver&) = delete;
+ TestPreviewsUKMObserver& operator=(const TestPreviewsUKMObserver&) = delete;
+
~TestPreviewsUKMObserver() override {}
// page_load_metrics::PageLoadMetricsObserver implementation:
@@ -55,14 +58,16 @@
}
const bool save_data_enabled_;
-
- DISALLOW_COPY_AND_ASSIGN(TestPreviewsUKMObserver);
};
class PreviewsUKMObserverTest
: public page_load_metrics::PageLoadMetricsObserverTestHarness {
public:
PreviewsUKMObserverTest() {}
+
+ PreviewsUKMObserverTest(const PreviewsUKMObserverTest&) = delete;
+ PreviewsUKMObserverTest& operator=(const PreviewsUKMObserverTest&) = delete;
+
~PreviewsUKMObserverTest() override {}
void RunTest(bool save_data_enabled) {
@@ -104,8 +109,6 @@
private:
bool save_data_enabled_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(PreviewsUKMObserverTest);
};
diff --git a/chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer.h
index 0c82c99d..041ff2c 100644
--- a/chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer.h
@@ -50,6 +50,12 @@
explicit SecurityStatePageLoadMetricsObserver(
site_engagement::SiteEngagementService* engagement_service);
+
+ SecurityStatePageLoadMetricsObserver(
+ const SecurityStatePageLoadMetricsObserver&) = delete;
+ SecurityStatePageLoadMetricsObserver& operator=(
+ const SecurityStatePageLoadMetricsObserver&) = delete;
+
~SecurityStatePageLoadMetricsObserver() override;
// page_load_metrics::PageLoadMetricsObserver:
@@ -73,8 +79,6 @@
security_state::SecurityLevel initial_security_level_ = security_state::NONE;
security_state::SecurityLevel current_security_level_ = security_state::NONE;
ukm::SourceId source_id_ = ukm::kInvalidSourceId;
-
- DISALLOW_COPY_AND_ASSIGN(SecurityStatePageLoadMetricsObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_SECURITY_STATE_PAGE_LOAD_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer_browsertest.cc b/chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer_browsertest.cc
index 9c64248..8916a2b7 100644
--- a/chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer_browsertest.cc
+++ b/chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer_browsertest.cc
@@ -41,6 +41,11 @@
public:
explicit SecurityStyleTestObserver(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents) {}
+
+ SecurityStyleTestObserver(const SecurityStyleTestObserver&) = delete;
+ SecurityStyleTestObserver& operator=(const SecurityStyleTestObserver&) =
+ delete;
+
~SecurityStyleTestObserver() override {}
void DidChangeVisibleSecurityState() override { run_loop_.Quit(); }
@@ -49,12 +54,17 @@
private:
base::RunLoop run_loop_;
- DISALLOW_COPY_AND_ASSIGN(SecurityStyleTestObserver);
};
class SecurityStatePageLoadMetricsBrowserTest : public InProcessBrowserTest {
public:
SecurityStatePageLoadMetricsBrowserTest() {}
+
+ SecurityStatePageLoadMetricsBrowserTest(
+ const SecurityStatePageLoadMetricsBrowserTest&) = delete;
+ SecurityStatePageLoadMetricsBrowserTest& operator=(
+ const SecurityStatePageLoadMetricsBrowserTest&) = delete;
+
~SecurityStatePageLoadMetricsBrowserTest() override {}
void PreRunTestOnMainThread() override {
@@ -130,8 +140,6 @@
std::unique_ptr<ukm::TestAutoSetUkmRecorder> test_ukm_recorder_;
std::unique_ptr<net::EmbeddedTestServer> https_test_server_;
std::unique_ptr<net::EmbeddedTestServer> http_test_server_;
-
- DISALLOW_COPY_AND_ASSIGN(SecurityStatePageLoadMetricsBrowserTest);
};
IN_PROC_BROWSER_TEST_F(SecurityStatePageLoadMetricsBrowserTest, Simple_Https) {
diff --git a/chrome/browser/page_load_metrics/observers/signed_exchange_page_load_metrics_browsertest.cc b/chrome/browser/page_load_metrics/observers/signed_exchange_page_load_metrics_browsertest.cc
index f315160..005b019 100644
--- a/chrome/browser/page_load_metrics/observers/signed_exchange_page_load_metrics_browsertest.cc
+++ b/chrome/browser/page_load_metrics/observers/signed_exchange_page_load_metrics_browsertest.cc
@@ -24,6 +24,12 @@
feature_list_.InitWithFeatures(
{ukm::kUkmFeature, features::kSignedHTTPExchange}, {});
}
+
+ SignedExchangePageLoadMetricsBrowserTest(
+ const SignedExchangePageLoadMetricsBrowserTest&) = delete;
+ SignedExchangePageLoadMetricsBrowserTest& operator=(
+ const SignedExchangePageLoadMetricsBrowserTest&) = delete;
+
~SignedExchangePageLoadMetricsBrowserTest() override {}
protected:
@@ -123,8 +129,6 @@
std::unique_ptr<ukm::TestAutoSetUkmRecorder> test_ukm_recorder_;
content::SignedExchangeBrowserTestHelper sxg_test_helper_;
net::EmbeddedTestServer https_server_;
-
- DISALLOW_COPY_AND_ASSIGN(SignedExchangePageLoadMetricsBrowserTest);
};
IN_PROC_BROWSER_TEST_F(SignedExchangePageLoadMetricsBrowserTest,
diff --git a/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer.h
index 87de4e1..570dabc 100644
--- a/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer.h
@@ -20,6 +20,12 @@
: public page_load_metrics::PageLoadMetricsObserver {
public:
TabRestorePageLoadMetricsObserver();
+
+ TabRestorePageLoadMetricsObserver(const TabRestorePageLoadMetricsObserver&) =
+ delete;
+ TabRestorePageLoadMetricsObserver& operator=(
+ const TabRestorePageLoadMetricsObserver&) = delete;
+
~TabRestorePageLoadMetricsObserver() override;
// page_load_metrics::PageLoadMetricsObserver:
@@ -50,8 +56,6 @@
// the page.
int64_t cache_bytes_;
int64_t network_bytes_;
-
- DISALLOW_COPY_AND_ASSIGN(TabRestorePageLoadMetricsObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_TAB_RESTORE_PAGE_LOAD_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer_unittest.cc
index 87f52cb..ad484c4 100644
--- a/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer_unittest.cc
+++ b/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer_unittest.cc
@@ -31,6 +31,12 @@
public:
explicit TestTabRestorePageLoadMetricsObserver(bool is_restore)
: is_restore_(is_restore) {}
+
+ TestTabRestorePageLoadMetricsObserver(
+ const TestTabRestorePageLoadMetricsObserver&) = delete;
+ TestTabRestorePageLoadMetricsObserver& operator=(
+ const TestTabRestorePageLoadMetricsObserver&) = delete;
+
~TestTabRestorePageLoadMetricsObserver() override {}
private:
@@ -39,8 +45,6 @@
}
const bool is_restore_;
-
- DISALLOW_COPY_AND_ASSIGN(TestTabRestorePageLoadMetricsObserver);
};
} // namespace
diff --git a/chrome/browser/page_load_metrics/observers/third_party_metrics_observer.h b/chrome/browser/page_load_metrics/observers/third_party_metrics_observer.h
index 666e279..813f223 100644
--- a/chrome/browser/page_load_metrics/observers/third_party_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/third_party_metrics_observer.h
@@ -32,6 +32,11 @@
};
ThirdPartyMetricsObserver();
+
+ ThirdPartyMetricsObserver(const ThirdPartyMetricsObserver&) = delete;
+ ThirdPartyMetricsObserver& operator=(const ThirdPartyMetricsObserver&) =
+ delete;
+
~ThirdPartyMetricsObserver() override;
// page_load_metrics::PageLoadMetricsObserver:
@@ -116,8 +121,6 @@
// True if this page loaded a third-party font.
bool third_party_font_loaded_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ThirdPartyMetricsObserver);
};
#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_THIRD_PARTY_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
index 9c7ed8bc..92bb548 100644
--- a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
+++ b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
@@ -143,6 +143,10 @@
{});
}
+ PageLoadMetricsBrowserTest(const PageLoadMetricsBrowserTest&) = delete;
+ PageLoadMetricsBrowserTest& operator=(const PageLoadMetricsBrowserTest&) =
+ delete;
+
~PageLoadMetricsBrowserTest() override {}
protected:
@@ -530,9 +534,6 @@
base::test::ScopedFeatureList scoped_feature_list_;
std::unique_ptr<base::HistogramTester> histogram_tester_;
std::unique_ptr<ukm::TestAutoSetUkmRecorder> test_ukm_recorder_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PageLoadMetricsBrowserTest);
};
IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, NoNavigation) {
@@ -2120,6 +2121,11 @@
class SessionRestorePaintWaiter : public SessionRestoreObserver {
public:
SessionRestorePaintWaiter() { SessionRestore::AddObserver(this); }
+
+ SessionRestorePaintWaiter(const SessionRestorePaintWaiter&) = delete;
+ SessionRestorePaintWaiter& operator=(const SessionRestorePaintWaiter&) =
+ delete;
+
~SessionRestorePaintWaiter() { SessionRestore::RemoveObserver(this); }
// SessionRestoreObserver implementation:
@@ -2148,8 +2154,6 @@
std::unordered_map<content::WebContents*,
std::unique_ptr<PageLoadMetricsTestWaiter>>
waiters_;
-
- DISALLOW_COPY_AND_ASSIGN(SessionRestorePaintWaiter);
};
IN_PROC_BROWSER_TEST_F(SessionRestorePageLoadMetricsBrowserTest,
diff --git a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc
index b14438a..967a5ab 100644
--- a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc
+++ b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc
@@ -81,6 +81,10 @@
: public page_load_metrics::PageLoadMetricsEmbedderBase {
public:
explicit PageLoadMetricsEmbedder(content::WebContents* web_contents);
+
+ PageLoadMetricsEmbedder(const PageLoadMetricsEmbedder&) = delete;
+ PageLoadMetricsEmbedder& operator=(const PageLoadMetricsEmbedder&) = delete;
+
~PageLoadMetricsEmbedder() override;
// page_load_metrics::PageLoadMetricsEmbedderBase:
@@ -95,9 +99,6 @@
// page_load_metrics::PageLoadMetricsEmbedderBase:
void RegisterEmbedderObservers(
page_load_metrics::PageLoadTracker* tracker) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PageLoadMetricsEmbedder);
};
PageLoadMetricsEmbedder::PageLoadMetricsEmbedder(
diff --git a/chrome/browser/password_manager/android/account_chooser_dialog_android.h b/chrome/browser/password_manager/android/account_chooser_dialog_android.h
index 07ea1e7..ad97138 100644
--- a/chrome/browser/password_manager/android/account_chooser_dialog_android.h
+++ b/chrome/browser/password_manager/android/account_chooser_dialog_android.h
@@ -32,6 +32,10 @@
const url::Origin& origin,
ManagePasswordsState::CredentialsCallback callback);
+ AccountChooserDialogAndroid(const AccountChooserDialogAndroid&) = delete;
+ AccountChooserDialogAndroid& operator=(const AccountChooserDialogAndroid&) =
+ delete;
+
~AccountChooserDialogAndroid() override;
// Returns true if the dialog is shown. Otherwise, the instance is deleted.
bool ShowDialog();
@@ -91,8 +95,6 @@
ManagePasswordsState passwords_data_;
url::Origin origin_;
base::android::ScopedJavaGlobalRef<jobject> dialog_jobject_;
-
- DISALLOW_COPY_AND_ASSIGN(AccountChooserDialogAndroid);
};
#endif // CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_ACCOUNT_CHOOSER_DIALOG_ANDROID_H_
diff --git a/chrome/browser/password_manager/android/account_chooser_dialog_android_unittest.cc b/chrome/browser/password_manager/android/account_chooser_dialog_android_unittest.cc
index 1803b37..740af29d 100644
--- a/chrome/browser/password_manager/android/account_chooser_dialog_android_unittest.cc
+++ b/chrome/browser/password_manager/android/account_chooser_dialog_android_unittest.cc
@@ -79,6 +79,12 @@
class AccountChooserDialogAndroidTest : public ChromeRenderViewHostTestHarness {
public:
AccountChooserDialogAndroidTest();
+
+ AccountChooserDialogAndroidTest(const AccountChooserDialogAndroidTest&) =
+ delete;
+ AccountChooserDialogAndroidTest& operator=(
+ const AccountChooserDialogAndroidTest&) = delete;
+
~AccountChooserDialogAndroidTest() override {}
void SetUp() override;
@@ -100,7 +106,6 @@
private:
base::test::ScopedFeatureList scoped_feature_list_;
- DISALLOW_COPY_AND_ASSIGN(AccountChooserDialogAndroidTest);
};
AccountChooserDialogAndroidTest::AccountChooserDialogAndroidTest() {
diff --git a/chrome/browser/password_manager/android/auto_signin_first_run_dialog_android_unittest.cc b/chrome/browser/password_manager/android/auto_signin_first_run_dialog_android_unittest.cc
index ba091aa..4fbc905 100644
--- a/chrome/browser/password_manager/android/auto_signin_first_run_dialog_android_unittest.cc
+++ b/chrome/browser/password_manager/android/auto_signin_first_run_dialog_android_unittest.cc
@@ -19,15 +19,18 @@
: public ChromeRenderViewHostTestHarness {
public:
AutoSigninFirstRunDialogAndroidTest() {}
+
+ AutoSigninFirstRunDialogAndroidTest(
+ const AutoSigninFirstRunDialogAndroidTest&) = delete;
+ AutoSigninFirstRunDialogAndroidTest& operator=(
+ const AutoSigninFirstRunDialogAndroidTest&) = delete;
+
~AutoSigninFirstRunDialogAndroidTest() override {}
PrefService* prefs();
protected:
AutoSigninFirstRunDialogAndroid* CreateDialog();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AutoSigninFirstRunDialogAndroidTest);
};
AutoSigninFirstRunDialogAndroid*
diff --git a/chrome/browser/password_manager/android/credential_leak_controller_android.h b/chrome/browser/password_manager/android/credential_leak_controller_android.h
index fd2a7d9..85963912 100644
--- a/chrome/browser/password_manager/android/credential_leak_controller_android.h
+++ b/chrome/browser/password_manager/android/credential_leak_controller_android.h
@@ -26,6 +26,12 @@
const GURL& origin,
const std::u16string& username,
ui::WindowAndroid* window_android);
+
+ CredentialLeakControllerAndroid(const CredentialLeakControllerAndroid&) =
+ delete;
+ CredentialLeakControllerAndroid& operator=(
+ const CredentialLeakControllerAndroid&) = delete;
+
~CredentialLeakControllerAndroid();
// Called when a leaked credential was detected.
@@ -78,8 +84,6 @@
ui::WindowAndroid* window_android_;
std::unique_ptr<CredentialLeakDialogViewAndroid> dialog_view_;
-
- DISALLOW_COPY_AND_ASSIGN(CredentialLeakControllerAndroid);
};
#endif // CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_CREDENTIAL_LEAK_CONTROLLER_ANDROID_H_
diff --git a/chrome/browser/password_manager/android/generated_password_saved_infobar_delegate_android.h b/chrome/browser/password_manager/android/generated_password_saved_infobar_delegate_android.h
index 9efb718..d1d6af2 100644
--- a/chrome/browser/password_manager/android/generated_password_saved_infobar_delegate_android.h
+++ b/chrome/browser/password_manager/android/generated_password_saved_infobar_delegate_android.h
@@ -23,6 +23,11 @@
// GeneratedPasswordSavedInfoBar.
static void Create(content::WebContents* web_contents);
+ GeneratedPasswordSavedInfoBarDelegateAndroid(
+ const GeneratedPasswordSavedInfoBarDelegateAndroid&) = delete;
+ GeneratedPasswordSavedInfoBarDelegateAndroid& operator=(
+ const GeneratedPasswordSavedInfoBarDelegateAndroid&) = delete;
+
~GeneratedPasswordSavedInfoBarDelegateAndroid() override;
// Returns the translated text of the message to display.
@@ -61,8 +66,6 @@
// The translated label of the button.
std::u16string button_label_;
-
- DISALLOW_COPY_AND_ASSIGN(GeneratedPasswordSavedInfoBarDelegateAndroid);
};
#endif // CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_GENERATED_PASSWORD_SAVED_INFOBAR_DELEGATE_ANDROID_H_
diff --git a/chrome/browser/password_manager/android/password_accessory_controller.h b/chrome/browser/password_manager/android/password_accessory_controller.h
index 74ad4aec..83b70ec 100644
--- a/chrome/browser/password_manager/android/password_accessory_controller.h
+++ b/chrome/browser/password_manager/android/password_accessory_controller.h
@@ -27,6 +27,11 @@
public AccessoryController {
public:
PasswordAccessoryController() = default;
+
+ PasswordAccessoryController(const PasswordAccessoryController&) = delete;
+ PasswordAccessoryController& operator=(const PasswordAccessoryController&) =
+ delete;
+
~PasswordAccessoryController() override = default;
// Returns true if the accessory controller may exist for |web_contents|.
@@ -61,9 +66,6 @@
// the automatically provided button.
virtual void OnGenerationRequested(
autofill::password_generation::PasswordGenerationType type) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PasswordAccessoryController);
};
#endif // CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_PASSWORD_ACCESSORY_CONTROLLER_H_
diff --git a/chrome/browser/password_manager/android/password_accessory_controller_impl.h b/chrome/browser/password_manager/android/password_accessory_controller_impl.h
index 4cb5a28..9b2c8a2 100644
--- a/chrome/browser/password_manager/android/password_accessory_controller_impl.h
+++ b/chrome/browser/password_manager/android/password_accessory_controller_impl.h
@@ -45,6 +45,12 @@
using PasswordDriverSupplierForFocusedFrame =
base::RepeatingCallback<password_manager::PasswordManagerDriver*(
content::WebContents*)>;
+
+ PasswordAccessoryControllerImpl(const PasswordAccessoryControllerImpl&) =
+ delete;
+ PasswordAccessoryControllerImpl& operator=(
+ const PasswordAccessoryControllerImpl&) = delete;
+
~PasswordAccessoryControllerImpl() override;
// AccessoryController:
@@ -220,8 +226,6 @@
security_state::NONE;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(PasswordAccessoryControllerImpl);
};
#endif // CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_PASSWORD_ACCESSORY_CONTROLLER_IMPL_H_
diff --git a/chrome/browser/password_manager/android/password_generation_controller.h b/chrome/browser/password_manager/android/password_generation_controller.h
index 2259dbf..bc41898 100644
--- a/chrome/browser/password_manager/android/password_generation_controller.h
+++ b/chrome/browser/password_manager/android/password_generation_controller.h
@@ -30,6 +30,11 @@
class PasswordGenerationController {
public:
PasswordGenerationController() = default;
+
+ PasswordGenerationController(const PasswordGenerationController&) = delete;
+ PasswordGenerationController& operator=(const PasswordGenerationController&) =
+ delete;
+
virtual ~PasswordGenerationController() = default;
// Returns true if the generation controller may exist for |web_contents|.
@@ -109,9 +114,6 @@
// -----------------
virtual gfx::NativeWindow top_level_native_window() const = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PasswordGenerationController);
};
#endif // CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_PASSWORD_GENERATION_CONTROLLER_H_
diff --git a/chrome/browser/password_manager/android/password_generation_controller_impl.h b/chrome/browser/password_manager/android/password_generation_controller_impl.h
index 05b943e..bf97bbe 100644
--- a/chrome/browser/password_manager/android/password_generation_controller_impl.h
+++ b/chrome/browser/password_manager/android/password_generation_controller_impl.h
@@ -33,6 +33,12 @@
public:
using CreateDialogFactory = base::RepeatingCallback<std::unique_ptr<
PasswordGenerationDialogViewInterface>(PasswordGenerationController*)>;
+
+ PasswordGenerationControllerImpl(const PasswordGenerationControllerImpl&) =
+ delete;
+ PasswordGenerationControllerImpl& operator=(
+ const PasswordGenerationControllerImpl&) = delete;
+
~PasswordGenerationControllerImpl() override;
// PasswordGenerationController:
@@ -131,8 +137,6 @@
bool manual_generation_requested_ = false;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(PasswordGenerationControllerImpl);
};
#endif // CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_PASSWORD_GENERATION_CONTROLLER_IMPL_H_
diff --git a/chrome/browser/password_manager/android/password_generation_controller_impl_unittest.cc b/chrome/browser/password_manager/android/password_generation_controller_impl_unittest.cc
index b84472d..63d7252f 100644
--- a/chrome/browser/password_manager/android/password_generation_controller_impl_unittest.cc
+++ b/chrome/browser/password_manager/android/password_generation_controller_impl_unittest.cc
@@ -116,10 +116,12 @@
PasswordGenerationType));
MOCK_METHOD0(Destroy, void());
- virtual ~MockPasswordGenerationDialogView() { Destroy(); }
+ MockPasswordGenerationDialogView(const MockPasswordGenerationDialogView&) =
+ delete;
+ MockPasswordGenerationDialogView& operator=(
+ const MockPasswordGenerationDialogView&) = delete;
- private:
- DISALLOW_COPY_AND_ASSIGN(MockPasswordGenerationDialogView);
+ virtual ~MockPasswordGenerationDialogView() { Destroy(); }
};
PasswordGenerationUIData GetTestGenerationUIData1() {
diff --git a/chrome/browser/password_manager/android/password_manager_infobar_delegate_android.h b/chrome/browser/password_manager/android/password_manager_infobar_delegate_android.h
index 2e4cd4f1..8c47f3a 100644
--- a/chrome/browser/password_manager/android/password_manager_infobar_delegate_android.h
+++ b/chrome/browser/password_manager/android/password_manager_infobar_delegate_android.h
@@ -12,6 +12,11 @@
// SavePasswordInfoBarDelegate.
class PasswordManagerInfoBarDelegate : public ConfirmInfoBarDelegate {
public:
+ PasswordManagerInfoBarDelegate(const PasswordManagerInfoBarDelegate&) =
+ delete;
+ PasswordManagerInfoBarDelegate& operator=(
+ const PasswordManagerInfoBarDelegate&) = delete;
+
~PasswordManagerInfoBarDelegate() override;
// Getter for the message displayed in adition to the title. If no message
@@ -39,8 +44,6 @@
// Used to display aditional information about where the passwords were saved.
std::u16string details_message_;
-
- DISALLOW_COPY_AND_ASSIGN(PasswordManagerInfoBarDelegate);
};
#endif // CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_PASSWORD_MANAGER_INFOBAR_DELEGATE_ANDROID_H_
diff --git a/chrome/browser/password_manager/android/password_ui_view_android.h b/chrome/browser/password_manager/android/password_ui_view_android.h
index 062fada..31ea4b9 100644
--- a/chrome/browser/password_manager/android/password_ui_view_android.h
+++ b/chrome/browser/password_manager/android/password_ui_view_android.h
@@ -48,6 +48,10 @@
};
PasswordUIViewAndroid(JNIEnv* env, jobject);
+
+ PasswordUIViewAndroid(const PasswordUIViewAndroid&) = delete;
+ PasswordUIViewAndroid& operator=(const PasswordUIViewAndroid&) = delete;
+
~PasswordUIViewAndroid() override;
// PasswordUIView implementation.
@@ -178,8 +182,6 @@
// Used to open the view/edit/delete UI.
std::unique_ptr<CredentialEditBridge> credential_edit_bridge_;
-
- DISALLOW_COPY_AND_ASSIGN(PasswordUIViewAndroid);
};
#endif // CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_PASSWORD_UI_VIEW_ANDROID_H_
diff --git a/chrome/browser/password_manager/android/password_ui_view_android_unittest.cc b/chrome/browser/password_manager/android/password_ui_view_android_unittest.cc
index 7add053..68b9b71 100644
--- a/chrome/browser/password_manager/android/password_ui_view_android_unittest.cc
+++ b/chrome/browser/password_manager/android/password_ui_view_android_unittest.cc
@@ -58,6 +58,10 @@
: public password_manager::CredentialProviderInterface {
public:
FakeCredentialProvider() = default;
+
+ FakeCredentialProvider(const FakeCredentialProvider&) = delete;
+ FakeCredentialProvider& operator=(const FakeCredentialProvider&) = delete;
+
~FakeCredentialProvider() override = default;
// password_manager::CredentialProviderInterface
@@ -71,8 +75,6 @@
private:
std::vector<std::unique_ptr<PasswordForm>> passwords_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeCredentialProvider);
};
std::vector<std::unique_ptr<PasswordForm>>
diff --git a/chrome/browser/password_manager/android/save_password_infobar_delegate_android.h b/chrome/browser/password_manager/android/save_password_infobar_delegate_android.h
index 3df79eba..44ccd81 100644
--- a/chrome/browser/password_manager/android/save_password_infobar_delegate_android.h
+++ b/chrome/browser/password_manager/android/save_password_infobar_delegate_android.h
@@ -34,6 +34,10 @@
content::WebContents* web_contents,
std::unique_ptr<password_manager::PasswordFormManagerForUI> form_to_save);
+ SavePasswordInfoBarDelegate(const SavePasswordInfoBarDelegate&) = delete;
+ SavePasswordInfoBarDelegate& operator=(const SavePasswordInfoBarDelegate&) =
+ delete;
+
~SavePasswordInfoBarDelegate() override;
// ConfirmInfoBarDelegate:
@@ -61,8 +65,6 @@
// Measures the "Save password?" prompt lifetime. Used to report an UMA
// signal.
base::ElapsedTimer timer_;
-
- DISALLOW_COPY_AND_ASSIGN(SavePasswordInfoBarDelegate);
};
// Creates the platform-specific SavePassword InfoBar. This function is defined
diff --git a/chrome/browser/password_manager/android/save_password_infobar_delegate_android_unittest.cc b/chrome/browser/password_manager/android/save_password_infobar_delegate_android_unittest.cc
index 9ff8921..2d73e582 100644
--- a/chrome/browser/password_manager/android/save_password_infobar_delegate_android_unittest.cc
+++ b/chrome/browser/password_manager/android/save_password_infobar_delegate_android_unittest.cc
@@ -74,10 +74,10 @@
CreatePendingCredentials();
}
- ~MockPasswordFormManager() override = default;
+ MockPasswordFormManager(const MockPasswordFormManager&) = delete;
+ MockPasswordFormManager& operator=(const MockPasswordFormManager&) = delete;
- private:
- DISALLOW_COPY_AND_ASSIGN(MockPasswordFormManager);
+ ~MockPasswordFormManager() override = default;
};
class TestSavePasswordInfoBarDelegate : public SavePasswordInfoBarDelegate {
@@ -98,6 +98,12 @@
class SavePasswordInfoBarDelegateTest : public ChromeRenderViewHostTestHarness {
public:
SavePasswordInfoBarDelegateTest();
+
+ SavePasswordInfoBarDelegateTest(const SavePasswordInfoBarDelegateTest&) =
+ delete;
+ SavePasswordInfoBarDelegateTest& operator=(
+ const SavePasswordInfoBarDelegateTest&) = delete;
+
~SavePasswordInfoBarDelegateTest() override = default;
void SetUp() override;
@@ -123,8 +129,6 @@
private:
password_manager::FakeFormFetcher fetcher_;
-
- DISALLOW_COPY_AND_ASSIGN(SavePasswordInfoBarDelegateTest);
};
SavePasswordInfoBarDelegateTest::SavePasswordInfoBarDelegateTest() {
diff --git a/chrome/browser/password_manager/android/update_password_infobar_delegate_android.h b/chrome/browser/password_manager/android/update_password_infobar_delegate_android.h
index a35d914..0744582 100644
--- a/chrome/browser/password_manager/android/update_password_infobar_delegate_android.h
+++ b/chrome/browser/password_manager/android/update_password_infobar_delegate_android.h
@@ -30,6 +30,10 @@
std::unique_ptr<password_manager::PasswordFormManagerForUI>
form_to_update);
+ UpdatePasswordInfoBarDelegate(const UpdatePasswordInfoBarDelegate&) = delete;
+ UpdatePasswordInfoBarDelegate& operator=(
+ const UpdatePasswordInfoBarDelegate&) = delete;
+
~UpdatePasswordInfoBarDelegate() override;
std::u16string GetBranding() const;
@@ -82,8 +86,6 @@
ManagePasswordsState passwords_state_;
std::u16string branding_;
bool is_smartlock_branding_enabled_;
-
- DISALLOW_COPY_AND_ASSIGN(UpdatePasswordInfoBarDelegate);
};
#endif // CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_UPDATE_PASSWORD_INFOBAR_DELEGATE_ANDROID_H_
diff --git a/chrome/browser/password_manager/android/update_password_infobar_delegate_android_unittest.cc b/chrome/browser/password_manager/android/update_password_infobar_delegate_android_unittest.cc
index c48c0e0..7fea9a60f 100644
--- a/chrome/browser/password_manager/android/update_password_infobar_delegate_android_unittest.cc
+++ b/chrome/browser/password_manager/android/update_password_infobar_delegate_android_unittest.cc
@@ -48,6 +48,12 @@
: public ChromeRenderViewHostTestHarness {
public:
UpdatePasswordInfoBarDelegateTest();
+
+ UpdatePasswordInfoBarDelegateTest(const UpdatePasswordInfoBarDelegateTest&) =
+ delete;
+ UpdatePasswordInfoBarDelegateTest& operator=(
+ const UpdatePasswordInfoBarDelegateTest&) = delete;
+
~UpdatePasswordInfoBarDelegateTest() override {}
void SetUp() override;
@@ -74,8 +80,6 @@
private:
password_manager::FakeFormFetcher fetcher_;
-
- DISALLOW_COPY_AND_ASSIGN(UpdatePasswordInfoBarDelegateTest);
};
UpdatePasswordInfoBarDelegateTest::UpdatePasswordInfoBarDelegateTest() {
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.h b/chrome/browser/password_manager/chrome_password_manager_client.h
index 51bed3b2..c162fe4 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.h
+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
@@ -95,6 +95,10 @@
receiver,
content::RenderFrameHost* rfh);
+ ChromePasswordManagerClient(const ChromePasswordManagerClient&) = delete;
+ ChromePasswordManagerClient& operator=(const ChromePasswordManagerClient&) =
+ delete;
+
~ChromePasswordManagerClient() override;
// PasswordManagerClient implementation.
@@ -433,8 +437,6 @@
password_manager::PasswordManagerClientHelper helper_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(ChromePasswordManagerClient);
};
#endif // CHROME_BROWSER_PASSWORD_MANAGER_CHROME_PASSWORD_MANAGER_CLIENT_H_
diff --git a/chrome/browser/password_manager/password_manager_test_base.h b/chrome/browser/password_manager/password_manager_test_base.h
index 80020183..f423aeeb 100644
--- a/chrome/browser/password_manager/password_manager_test_base.h
+++ b/chrome/browser/password_manager/password_manager_test_base.h
@@ -25,6 +25,10 @@
class NavigationObserver : public content::WebContentsObserver {
public:
explicit NavigationObserver(content::WebContents* web_contents);
+
+ NavigationObserver(const NavigationObserver&) = delete;
+ NavigationObserver& operator=(const NavigationObserver&) = delete;
+
~NavigationObserver() override;
// Normally Wait() will not return until a main frame navigation occurs.
@@ -55,8 +59,6 @@
content::RenderFrameHost* render_frame_host_;
bool quit_on_entry_committed_ = false;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(NavigationObserver);
};
// Checks the save password prompt for a specified WebContents and allows
@@ -144,6 +146,11 @@
: public password_manager::PasswordStoreConsumer {
public:
PasswordStoreResultsObserver();
+
+ PasswordStoreResultsObserver(const PasswordStoreResultsObserver&) = delete;
+ PasswordStoreResultsObserver& operator=(const PasswordStoreResultsObserver&) =
+ delete;
+
~PasswordStoreResultsObserver() override;
// Waits for OnGetPasswordStoreResults() and returns the result.
@@ -156,13 +163,17 @@
base::RunLoop run_loop_;
std::vector<std::unique_ptr<password_manager::PasswordForm>> results_;
-
- DISALLOW_COPY_AND_ASSIGN(PasswordStoreResultsObserver);
};
class PasswordManagerBrowserTestBase : public CertVerifierBrowserTest {
public:
PasswordManagerBrowserTestBase();
+
+ PasswordManagerBrowserTestBase(const PasswordManagerBrowserTestBase&) =
+ delete;
+ PasswordManagerBrowserTestBase& operator=(
+ const PasswordManagerBrowserTestBase&) = delete;
+
~PasswordManagerBrowserTestBase() override;
// InProcessBrowserTest:
@@ -247,8 +258,6 @@
content::WebContents* web_contents_;
base::CallbackListSubscription create_services_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(PasswordManagerBrowserTestBase);
};
#endif // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_TEST_BASE_H_
diff --git a/chrome/browser/password_manager/password_manager_util_win.cc b/chrome/browser/password_manager/password_manager_util_win.cc
index 6242402e..968de97 100644
--- a/chrome/browser/password_manager/password_manager_util_win.cc
+++ b/chrome/browser/password_manager/password_manager_util_win.cc
@@ -78,6 +78,11 @@
class CredentialBufferValidator {
public:
CredentialBufferValidator();
+
+ CredentialBufferValidator(const CredentialBufferValidator&) = delete;
+ CredentialBufferValidator& operator=(const CredentialBufferValidator&) =
+ delete;
+
~CredentialBufferValidator();
// Returns ERROR_SUCCESS if the credential buffer given matches the
@@ -96,8 +101,6 @@
// Buffer holding information about the current process token.
std::unique_ptr<char[]> cur_token_info_;
-
- DISALLOW_COPY_AND_ASSIGN(CredentialBufferValidator);
};
CredentialBufferValidator::CredentialBufferValidator() {
diff --git a/chrome/browser/payments/chrome_payment_request_delegate.h b/chrome/browser/payments/chrome_payment_request_delegate.h
index 3e5d4b9..d09779ec 100644
--- a/chrome/browser/payments/chrome_payment_request_delegate.h
+++ b/chrome/browser/payments/chrome_payment_request_delegate.h
@@ -28,6 +28,11 @@
public:
explicit ChromePaymentRequestDelegate(
content::RenderFrameHost* render_frame_host);
+
+ ChromePaymentRequestDelegate(const ChromePaymentRequestDelegate&) = delete;
+ ChromePaymentRequestDelegate& operator=(const ChromePaymentRequestDelegate&) =
+ delete;
+
~ChromePaymentRequestDelegate() override;
// PaymentRequestDelegate:
@@ -89,8 +94,6 @@
std::unique_ptr<SecurePaymentConfirmationNoCreds> spc_no_creds_dialog_;
content::GlobalRenderFrameHostId frame_routing_id_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromePaymentRequestDelegate);
};
} // namespace payments
diff --git a/chrome/browser/payments/has_enrolled_instrument_browsertest.cc b/chrome/browser/payments/has_enrolled_instrument_browsertest.cc
index 3eef9a0..72b9b9a7 100644
--- a/chrome/browser/payments/has_enrolled_instrument_browsertest.cc
+++ b/chrome/browser/payments/has_enrolled_instrument_browsertest.cc
@@ -36,6 +36,10 @@
}
}
+ HasEnrolledInstrumentTest(const HasEnrolledInstrumentTest&) = delete;
+ HasEnrolledInstrumentTest& operator=(const HasEnrolledInstrumentTest&) =
+ delete;
+
~HasEnrolledInstrumentTest() override = default;
void SetUpOnMainThread() override {
@@ -104,8 +108,6 @@
private:
base::test::ScopedFeatureList feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(HasEnrolledInstrumentTest);
};
IN_PROC_BROWSER_TEST_P(HasEnrolledInstrumentTest, NoCard) {
diff --git a/chrome/browser/payments/has_enrolled_instrument_query_quota_browsertest.cc b/chrome/browser/payments/has_enrolled_instrument_query_quota_browsertest.cc
index 9fecf17..27b5a44 100644
--- a/chrome/browser/payments/has_enrolled_instrument_query_quota_browsertest.cc
+++ b/chrome/browser/payments/has_enrolled_instrument_query_quota_browsertest.cc
@@ -17,6 +17,11 @@
public:
HasEnrolledInstrumentQueryQuotaTest() = default;
+ HasEnrolledInstrumentQueryQuotaTest(
+ const HasEnrolledInstrumentQueryQuotaTest&) = delete;
+ HasEnrolledInstrumentQueryQuotaTest& operator=(
+ const HasEnrolledInstrumentQueryQuotaTest&) = delete;
+
~HasEnrolledInstrumentQueryQuotaTest() override = default;
void SetUpOnMainThread() override {
@@ -25,9 +30,6 @@
// quota for localhost and file:/// scheme to ease web development.
NavigateTo("a.com", "/has_enrolled_instrument.html");
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(HasEnrolledInstrumentQueryQuotaTest);
};
class HasEnrolledInstrumentQueryQuotaTestNoFlags
diff --git a/chrome/browser/payments/journey_logger_browsertest.cc b/chrome/browser/payments/journey_logger_browsertest.cc
index 4604e13..5490407 100644
--- a/chrome/browser/payments/journey_logger_browsertest.cc
+++ b/chrome/browser/payments/journey_logger_browsertest.cc
@@ -16,6 +16,9 @@
public:
JourneyLoggerTest() : gpay_server_(net::EmbeddedTestServer::TYPE_HTTPS) {}
+ JourneyLoggerTest(const JourneyLoggerTest&) = delete;
+ JourneyLoggerTest& operator=(const JourneyLoggerTest&) = delete;
+
~JourneyLoggerTest() override = default;
void PreRunTestOnMainThread() override {
@@ -55,8 +58,6 @@
GURL main_frame_url_;
GURL gpay_scope_url_;
std::unique_ptr<ukm::TestAutoSetUkmRecorder> test_ukm_recorder_;
-
- DISALLOW_COPY_AND_ASSIGN(JourneyLoggerTest);
};
IN_PROC_BROWSER_TEST_F(JourneyLoggerTest, NoPaymentMethodSupported) {
diff --git a/chrome/browser/payments/manifest_verifier_browsertest.cc b/chrome/browser/payments/manifest_verifier_browsertest.cc
index 71e36b6..e93932f 100644
--- a/chrome/browser/payments/manifest_verifier_browsertest.cc
+++ b/chrome/browser/payments/manifest_verifier_browsertest.cc
@@ -32,6 +32,11 @@
class ManifestVerifierBrowserTest : public InProcessBrowserTest {
public:
ManifestVerifierBrowserTest() {}
+
+ ManifestVerifierBrowserTest(const ManifestVerifierBrowserTest&) = delete;
+ ManifestVerifierBrowserTest& operator=(const ManifestVerifierBrowserTest&) =
+ delete;
+
~ManifestVerifierBrowserTest() override {}
// Starts the HTTPS test server on localhost.
@@ -116,8 +121,6 @@
content::InstalledPaymentAppsFinder::PaymentApps verified_apps_;
std::string error_message_;
-
- DISALLOW_COPY_AND_ASSIGN(ManifestVerifierBrowserTest);
};
// Absence of payment handlers should result in absence of verified payment
diff --git a/chrome/browser/payments/payment_handler_enable_delegations_browsertest.cc b/chrome/browser/payments/payment_handler_enable_delegations_browsertest.cc
index cb24b9b..0a0cccd6 100644
--- a/chrome/browser/payments/payment_handler_enable_delegations_browsertest.cc
+++ b/chrome/browser/payments/payment_handler_enable_delegations_browsertest.cc
@@ -13,15 +13,18 @@
: public PaymentRequestPlatformBrowserTestBase {
public:
PaymentHandlerEnableDelegationsTest() = default;
+
+ PaymentHandlerEnableDelegationsTest(
+ const PaymentHandlerEnableDelegationsTest&) = delete;
+ PaymentHandlerEnableDelegationsTest& operator=(
+ const PaymentHandlerEnableDelegationsTest&) = delete;
+
~PaymentHandlerEnableDelegationsTest() override = default;
void SetUpOnMainThread() override {
PaymentRequestPlatformBrowserTestBase::SetUpOnMainThread();
NavigateTo("/payment_handler.html");
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PaymentHandlerEnableDelegationsTest);
};
IN_PROC_BROWSER_TEST_F(PaymentHandlerEnableDelegationsTest, EnableDelegations) {
diff --git a/chrome/browser/payments/payment_manifest_parser_browsertest.cc b/chrome/browser/payments/payment_manifest_parser_browsertest.cc
index c0a6610..8d0c5d2 100644
--- a/chrome/browser/payments/payment_manifest_parser_browsertest.cc
+++ b/chrome/browser/payments/payment_manifest_parser_browsertest.cc
@@ -50,6 +50,11 @@
class PaymentManifestParserTest : public InProcessBrowserTest {
public:
PaymentManifestParserTest() : parser_(std::make_unique<ErrorLogger>()) {}
+
+ PaymentManifestParserTest(const PaymentManifestParserTest&) = delete;
+ PaymentManifestParserTest& operator=(const PaymentManifestParserTest&) =
+ delete;
+
~PaymentManifestParserTest() override = default;
// Sends the |content| to the utility process to parse as a web app manifest
@@ -114,8 +119,6 @@
std::vector<WebAppManifestSection> web_app_manifest_;
std::vector<GURL> web_app_manifest_urls_;
std::vector<url::Origin> supported_origins_;
-
- DISALLOW_COPY_AND_ASSIGN(PaymentManifestParserTest);
};
// Handles a a manifest with 100 web app URLs.
diff --git a/chrome/browser/payments/service_worker_payment_app_finder_browsertest.cc b/chrome/browser/payments/service_worker_payment_app_finder_browsertest.cc
index d89ee46..c2cee1b 100644
--- a/chrome/browser/payments/service_worker_payment_app_finder_browsertest.cc
+++ b/chrome/browser/payments/service_worker_payment_app_finder_browsertest.cc
@@ -64,6 +64,11 @@
{});
}
+ ServiceWorkerPaymentAppFinderBrowserTest(
+ const ServiceWorkerPaymentAppFinderBrowserTest&) = delete;
+ ServiceWorkerPaymentAppFinderBrowserTest& operator=(
+ const ServiceWorkerPaymentAppFinderBrowserTest&) = delete;
+
~ServiceWorkerPaymentAppFinderBrowserTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -358,8 +363,6 @@
std::string error_message_;
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(ServiceWorkerPaymentAppFinderBrowserTest);
};
// A payment app has to be installed first.
diff --git a/chrome/browser/payments/site_per_process_payments_browsertest.cc b/chrome/browser/payments/site_per_process_payments_browsertest.cc
index 97af3e4..710abba2 100644
--- a/chrome/browser/payments/site_per_process_payments_browsertest.cc
+++ b/chrome/browser/payments/site_per_process_payments_browsertest.cc
@@ -29,6 +29,12 @@
class SitePerProcessPaymentsBrowserTest : public InProcessBrowserTest {
public:
SitePerProcessPaymentsBrowserTest() {}
+
+ SitePerProcessPaymentsBrowserTest(const SitePerProcessPaymentsBrowserTest&) =
+ delete;
+ SitePerProcessPaymentsBrowserTest& operator=(
+ const SitePerProcessPaymentsBrowserTest&) = delete;
+
~SitePerProcessPaymentsBrowserTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -52,9 +58,6 @@
}
std::unique_ptr<net::EmbeddedTestServer> https_server_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SitePerProcessPaymentsBrowserTest);
};
IN_PROC_BROWSER_TEST_F(SitePerProcessPaymentsBrowserTest,
diff --git a/chrome/browser/performance_hints/performance_hints_observer_unittest.cc b/chrome/browser/performance_hints/performance_hints_observer_unittest.cc
index c8fcd3e8..1583b00 100644
--- a/chrome/browser/performance_hints/performance_hints_observer_unittest.cc
+++ b/chrome/browser/performance_hints/performance_hints_observer_unittest.cc
@@ -68,6 +68,11 @@
{// Need to disable model downloading for these tests.
optimization_guide::features::kOptimizationGuideModelDownloading});
}
+
+ PerformanceHintsObserverTest(const PerformanceHintsObserverTest&) = delete;
+ PerformanceHintsObserverTest& operator=(const PerformanceHintsObserverTest&) =
+ delete;
+
~PerformanceHintsObserverTest() override = default;
virtual void SetUpCommandLine() {
@@ -144,8 +149,6 @@
mock_optimization_guide_keyed_service_ = nullptr;
MockOptimizationGuideKeyedService*
mock_otr_optimization_guide_keyed_service_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(PerformanceHintsObserverTest);
};
TEST_F(PerformanceHintsObserverTest, IncognitoDoesNotRegisterPerformanceHints) {
diff --git a/chrome/browser/performance_manager/browser_child_process_watcher.h b/chrome/browser/performance_manager/browser_child_process_watcher.h
index 9d6b0af1..cfe099e 100644
--- a/chrome/browser/performance_manager/browser_child_process_watcher.h
+++ b/chrome/browser/performance_manager/browser_child_process_watcher.h
@@ -22,6 +22,11 @@
class BrowserChildProcessWatcher : public content::BrowserChildProcessObserver {
public:
BrowserChildProcessWatcher();
+
+ BrowserChildProcessWatcher(const BrowserChildProcessWatcher&) = delete;
+ BrowserChildProcessWatcher& operator=(const BrowserChildProcessWatcher&) =
+ delete;
+
~BrowserChildProcessWatcher() override;
// Initialize this watcher.
@@ -54,8 +59,6 @@
// secondaries are very transient. This map keeps track of all GPU processes
// by their unique ID from |content::ChildProcessData|.
base::flat_map<int, std::unique_ptr<ProcessNodeImpl>> gpu_process_nodes_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserChildProcessWatcher);
};
} // namespace performance_manager
diff --git a/chrome/browser/performance_manager/chrome_browser_main_extra_parts_performance_manager.h b/chrome/browser/performance_manager/chrome_browser_main_extra_parts_performance_manager.h
index 8405790..ba056b85 100644
--- a/chrome/browser/performance_manager/chrome_browser_main_extra_parts_performance_manager.h
+++ b/chrome/browser/performance_manager/chrome_browser_main_extra_parts_performance_manager.h
@@ -40,6 +40,12 @@
public ProfileObserver {
public:
ChromeBrowserMainExtraPartsPerformanceManager();
+
+ ChromeBrowserMainExtraPartsPerformanceManager(
+ const ChromeBrowserMainExtraPartsPerformanceManager&) = delete;
+ ChromeBrowserMainExtraPartsPerformanceManager& operator=(
+ const ChromeBrowserMainExtraPartsPerformanceManager&) = delete;
+
~ChromeBrowserMainExtraPartsPerformanceManager() override;
// Returns the only instance of this class.
@@ -89,8 +95,6 @@
// Needed to maintain the PageNode::IsLoading() property.
std::unique_ptr<performance_manager::PageLoadTrackerDecoratorHelper>
page_load_tracker_decorator_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsPerformanceManager);
};
#endif // CHROME_BROWSER_PERFORMANCE_MANAGER_CHROME_BROWSER_MAIN_EXTRA_PARTS_PERFORMANCE_MANAGER_H_
diff --git a/chrome/browser/performance_manager/chrome_content_browser_client_performance_manager_part.h b/chrome/browser/performance_manager/chrome_content_browser_client_performance_manager_part.h
index 8db693f..5e9abd2 100644
--- a/chrome/browser/performance_manager/chrome_content_browser_client_performance_manager_part.h
+++ b/chrome/browser/performance_manager/chrome_content_browser_client_performance_manager_part.h
@@ -15,6 +15,12 @@
: public ChromeContentBrowserClientParts {
public:
ChromeContentBrowserClientPerformanceManagerPart();
+
+ ChromeContentBrowserClientPerformanceManagerPart(
+ const ChromeContentBrowserClientPerformanceManagerPart&) = delete;
+ ChromeContentBrowserClientPerformanceManagerPart& operator=(
+ const ChromeContentBrowserClientPerformanceManagerPart&) = delete;
+
~ChromeContentBrowserClientPerformanceManagerPart() override;
// ChromeContentBrowserClientParts overrides.
@@ -22,9 +28,6 @@
service_manager::BinderRegistry* registry,
blink::AssociatedInterfaceRegistry* associated_registry,
content::RenderProcessHost* render_process_host) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClientPerformanceManagerPart);
};
#endif // CHROME_BROWSER_PERFORMANCE_MANAGER_CHROME_CONTENT_BROWSER_CLIENT_PERFORMANCE_MANAGER_PART_H_
diff --git a/chrome/browser/performance_manager/decorators/frozen_frame_aggregator.cc b/chrome/browser/performance_manager/decorators/frozen_frame_aggregator.cc
index 6cb61ce..d408a7b 100644
--- a/chrome/browser/performance_manager/decorators/frozen_frame_aggregator.cc
+++ b/chrome/browser/performance_manager/decorators/frozen_frame_aggregator.cc
@@ -59,6 +59,10 @@
explicit FrozenDataImpl(const PageNodeImpl* page_node) {}
explicit FrozenDataImpl(const ProcessNodeImpl* process_node) {}
+
+ FrozenDataImpl(const FrozenDataImpl&) = delete;
+ FrozenDataImpl& operator=(const FrozenDataImpl&) = delete;
+
~FrozenDataImpl() override = default;
static StorageType* GetInternalStorage(PageNodeImpl* page_node) {
@@ -102,9 +106,6 @@
return IsFrozen() != was_frozen;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FrozenDataImpl);
};
bool IsFrozen(const FrameNodeImpl* frame_node) {
diff --git a/chrome/browser/performance_manager/decorators/frozen_frame_aggregator.h b/chrome/browser/performance_manager/decorators/frozen_frame_aggregator.h
index ec0ffec..22ce081 100644
--- a/chrome/browser/performance_manager/decorators/frozen_frame_aggregator.h
+++ b/chrome/browser/performance_manager/decorators/frozen_frame_aggregator.h
@@ -32,6 +32,10 @@
// TODO(chrisha): Check that the graph is empty when this observer is added!
// https://www.crbug.com/952891
FrozenFrameAggregator();
+
+ FrozenFrameAggregator(const FrozenFrameAggregator&) = delete;
+ FrozenFrameAggregator& operator=(const FrozenFrameAggregator&) = delete;
+
~FrozenFrameAggregator() override;
// FrameNodeObserver implementation:
@@ -70,9 +74,6 @@
void UpdateFrameCounts(FrameNodeImpl* frame_node,
int32_t current_frame_delta,
int32_t frozen_frame_delta);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FrozenFrameAggregator);
};
// This struct is stored internally on page and process nodes using
diff --git a/chrome/browser/performance_manager/decorators/frozen_frame_aggregator_unittest.cc b/chrome/browser/performance_manager/decorators/frozen_frame_aggregator_unittest.cc
index 0c0a7c6..24bb467 100644
--- a/chrome/browser/performance_manager/decorators/frozen_frame_aggregator_unittest.cc
+++ b/chrome/browser/performance_manager/decorators/frozen_frame_aggregator_unittest.cc
@@ -23,12 +23,15 @@
class LenientMockProcessNodeObserver : public ProcessNode::ObserverDefaultImpl {
public:
LenientMockProcessNodeObserver() = default;
+
+ LenientMockProcessNodeObserver(const LenientMockProcessNodeObserver&) =
+ delete;
+ LenientMockProcessNodeObserver& operator=(
+ const LenientMockProcessNodeObserver&) = delete;
+
~LenientMockProcessNodeObserver() override = default;
MOCK_METHOD1(OnAllFramesInProcessFrozen, void(const ProcessNode*));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LenientMockProcessNodeObserver);
};
using MockProcessNodeObserver =
diff --git a/chrome/browser/performance_manager/decorators/page_aggregator.cc b/chrome/browser/performance_manager/decorators/page_aggregator.cc
index d22b7693..9162ef9c 100644
--- a/chrome/browser/performance_manager/decorators/page_aggregator.cc
+++ b/chrome/browser/performance_manager/decorators/page_aggregator.cc
@@ -57,6 +57,10 @@
struct Traits : public NodeAttachedDataInternalOnNodeType<PageNodeImpl> {};
explicit Data(const PageNodeImpl* page_node) {}
+
+ Data(const Data&) = delete;
+ Data& operator=(const Data&) = delete;
+
~Data() override {
DCHECK_EQ(num_frames_holding_web_lock_, 0U);
DCHECK_EQ(num_frames_holding_indexeddb_lock_, 0U);
@@ -96,8 +100,6 @@
// The number of current frames which have received some form interaction.
uint32_t num_current_frames_with_form_interaction_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(Data);
};
#pragma pack(pop)
diff --git a/chrome/browser/performance_manager/decorators/page_aggregator.h b/chrome/browser/performance_manager/decorators/page_aggregator.h
index f321967..07e6a17 100644
--- a/chrome/browser/performance_manager/decorators/page_aggregator.h
+++ b/chrome/browser/performance_manager/decorators/page_aggregator.h
@@ -22,6 +22,10 @@
public NodeDataDescriberDefaultImpl {
public:
PageAggregator();
+
+ PageAggregator(const PageAggregator&) = delete;
+ PageAggregator& operator=(const PageAggregator&) = delete;
+
~PageAggregator() override;
private:
@@ -42,8 +46,6 @@
// NodeDataDescriber implementation:
base::Value DescribePageNodeData(const PageNode* node) const override;
-
- DISALLOW_COPY_AND_ASSIGN(PageAggregator);
};
} // namespace performance_manager
diff --git a/chrome/browser/performance_manager/decorators/process_priority_aggregator.h b/chrome/browser/performance_manager/decorators/process_priority_aggregator.h
index 9b829d92..65062ce 100644
--- a/chrome/browser/performance_manager/decorators/process_priority_aggregator.h
+++ b/chrome/browser/performance_manager/decorators/process_priority_aggregator.h
@@ -29,6 +29,11 @@
class Data;
ProcessPriorityAggregator();
+
+ ProcessPriorityAggregator(const ProcessPriorityAggregator&) = delete;
+ ProcessPriorityAggregator& operator=(const ProcessPriorityAggregator&) =
+ delete;
+
~ProcessPriorityAggregator() override;
// GraphObserver implementation:
@@ -54,9 +59,6 @@
const execution_context::ExecutionContext* ec,
const execution_context_priority::PriorityAndReason& previous_value)
override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ProcessPriorityAggregator);
};
// This struct is attached to process nodes using NodeAttachedData.
diff --git a/chrome/browser/performance_manager/mechanisms/userspace_swap_chromeos.h b/chrome/browser/performance_manager/mechanisms/userspace_swap_chromeos.h
index 703bab9..09437fd 100644
--- a/chrome/browser/performance_manager/mechanisms/userspace_swap_chromeos.h
+++ b/chrome/browser/performance_manager/mechanisms/userspace_swap_chromeos.h
@@ -51,6 +51,12 @@
using MemoryRegionPtr = ::userspace_swap::mojom::MemoryRegionPtr;
explicit UserspaceSwapInitializationImpl(int render_process_host_id);
+
+ UserspaceSwapInitializationImpl(const UserspaceSwapInitializationImpl&) =
+ delete;
+ UserspaceSwapInitializationImpl& operator=(
+ const UserspaceSwapInitializationImpl&) = delete;
+
~UserspaceSwapInitializationImpl() override;
static bool UserspaceSwapSupportedAndEnabled();
@@ -69,8 +75,6 @@
private:
int render_process_host_id_ = 0;
bool received_transfer_cb_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(UserspaceSwapInitializationImpl);
};
} // namespace userspace_swap
diff --git a/chrome/browser/performance_manager/mechanisms/working_set_trimmer.h b/chrome/browser/performance_manager/mechanisms/working_set_trimmer.h
index eab5544..48bebd8 100644
--- a/chrome/browser/performance_manager/mechanisms/working_set_trimmer.h
+++ b/chrome/browser/performance_manager/mechanisms/working_set_trimmer.h
@@ -19,6 +19,9 @@
// trimmed.
class WorkingSetTrimmer {
public:
+ WorkingSetTrimmer(const WorkingSetTrimmer&) = delete;
+ WorkingSetTrimmer& operator=(const WorkingSetTrimmer&) = delete;
+
virtual ~WorkingSetTrimmer() = default;
// GetInstance will return the singleton instance of a working set trimmer for
@@ -38,7 +41,6 @@
private:
friend class base::NoDestructor<WorkingSetTrimmer>;
- DISALLOW_COPY_AND_ASSIGN(WorkingSetTrimmer);
};
} // namespace mechanism
diff --git a/chrome/browser/performance_manager/mechanisms/working_set_trimmer_chromeos.h b/chrome/browser/performance_manager/mechanisms/working_set_trimmer_chromeos.h
index ec28aad..1d6bbc4 100644
--- a/chrome/browser/performance_manager/mechanisms/working_set_trimmer_chromeos.h
+++ b/chrome/browser/performance_manager/mechanisms/working_set_trimmer_chromeos.h
@@ -28,6 +28,10 @@
// should be used via the WorkingSetTrimmer::GetInstance() method.
class WorkingSetTrimmerChromeOS : public WorkingSetTrimmer {
public:
+ WorkingSetTrimmerChromeOS(const WorkingSetTrimmerChromeOS&) = delete;
+ WorkingSetTrimmerChromeOS& operator=(const WorkingSetTrimmerChromeOS&) =
+ delete;
+
~WorkingSetTrimmerChromeOS() override;
// WorkingSetTrimmer implementation:
@@ -61,8 +65,6 @@
content::BrowserContext* context_for_testing_ = nullptr;
base::WeakPtrFactory<WorkingSetTrimmerChromeOS> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WorkingSetTrimmerChromeOS);
};
} // namespace mechanism
diff --git a/chrome/browser/performance_manager/mechanisms/working_set_trimmer_win.h b/chrome/browser/performance_manager/mechanisms/working_set_trimmer_win.h
index a495b34..d3284b7f 100644
--- a/chrome/browser/performance_manager/mechanisms/working_set_trimmer_win.h
+++ b/chrome/browser/performance_manager/mechanisms/working_set_trimmer_win.h
@@ -15,6 +15,9 @@
// should be used via the WorkingSetTrimmer::GetIntsance() method.
class WorkingSetTrimmerWin : public WorkingSetTrimmer {
public:
+ WorkingSetTrimmerWin(const WorkingSetTrimmerWin&) = delete;
+ WorkingSetTrimmerWin& operator=(const WorkingSetTrimmerWin&) = delete;
+
~WorkingSetTrimmerWin() override;
bool PlatformSupportsWorkingSetTrim() override;
@@ -27,8 +30,6 @@
// directly, it should always be retrieved via
// WorkingSetTrimmer::GetIntsance().
WorkingSetTrimmerWin();
-
- DISALLOW_COPY_AND_ASSIGN(WorkingSetTrimmerWin);
};
} // namespace mechanism
diff --git a/chrome/browser/performance_manager/observers/isolation_context_metrics.h b/chrome/browser/performance_manager/observers/isolation_context_metrics.h
index fa487ec5..18c016c 100644
--- a/chrome/browser/performance_manager/observers/isolation_context_metrics.h
+++ b/chrome/browser/performance_manager/observers/isolation_context_metrics.h
@@ -32,6 +32,10 @@
public ProcessNode::ObserverDefaultImpl {
public:
IsolationContextMetrics();
+
+ IsolationContextMetrics(const IsolationContextMetrics&) = delete;
+ IsolationContextMetrics& operator=(const IsolationContextMetrics&) = delete;
+
~IsolationContextMetrics() override;
// Starts the timer for periodic reporting.
@@ -153,9 +157,6 @@
// TODO(chrisha): Migrate away if metrics team provides a convenient API.
// https://crbug.com/961468
base::RepeatingTimer reporting_timer_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(IsolationContextMetrics);
};
} // namespace performance_manager
diff --git a/chrome/browser/performance_manager/observers/metrics_collector.h b/chrome/browser/performance_manager/observers/metrics_collector.h
index eb7104d..8328985 100644
--- a/chrome/browser/performance_manager/observers/metrics_collector.h
+++ b/chrome/browser/performance_manager/observers/metrics_collector.h
@@ -32,6 +32,10 @@
public ProcessNode::ObserverDefaultImpl {
public:
MetricsCollector();
+
+ MetricsCollector(const MetricsCollector&) = delete;
+ MetricsCollector& operator=(const MetricsCollector&) = delete;
+
~MetricsCollector() override;
// FrameNodeObserver implementation:
@@ -98,8 +102,6 @@
// The graph to which this object belongs.
Graph* graph_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(MetricsCollector);
};
} // namespace performance_manager
diff --git a/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade.h b/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade.h
index 196a9a9c..271d485 100644
--- a/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade.h
+++ b/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade.h
@@ -27,6 +27,10 @@
public history::HistoryServiceObserver {
public:
explicit SiteDataCacheFacade(content::BrowserContext* browser_context);
+
+ SiteDataCacheFacade(const SiteDataCacheFacade&) = delete;
+ SiteDataCacheFacade& operator=(const SiteDataCacheFacade&) = delete;
+
~SiteDataCacheFacade() override;
void IsDataCacheRecordingForTesting(base::OnceCallback<void(bool)> cb);
@@ -46,8 +50,6 @@
base::ScopedObservation<history::HistoryService,
history::HistoryServiceObserver>
history_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SiteDataCacheFacade);
};
} // namespace performance_manager
diff --git a/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_factory.h b/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_factory.h
index f02821b..1f7fa2e 100644
--- a/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_factory.h
+++ b/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_factory.h
@@ -49,6 +49,10 @@
// sequence.
class SiteDataCacheFacadeFactory : public BrowserContextKeyedServiceFactory {
public:
+ SiteDataCacheFacadeFactory(const SiteDataCacheFacadeFactory&) = delete;
+ SiteDataCacheFacadeFactory& operator=(const SiteDataCacheFacadeFactory&) =
+ delete;
+
~SiteDataCacheFacadeFactory() override;
static SiteDataCacheFacadeFactory* GetInstance();
@@ -89,8 +93,6 @@
// The number of SiteDataCacheFacade currently in existence.
size_t service_instance_count_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(SiteDataCacheFacadeFactory);
};
} // namespace performance_manager
diff --git a/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_unittest.cc b/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_unittest.cc
index af15c541..95224df 100644
--- a/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_unittest.cc
+++ b/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_unittest.cc
@@ -40,6 +40,11 @@
public:
explicit LenientMockSiteDataCacheImpl(const std::string& browser_context_id)
: SiteDataCacheImpl(browser_context_id) {}
+
+ LenientMockSiteDataCacheImpl(const LenientMockSiteDataCacheImpl&) = delete;
+ LenientMockSiteDataCacheImpl& operator=(const LenientMockSiteDataCacheImpl&) =
+ delete;
+
~LenientMockSiteDataCacheImpl() override = default;
// The 2 following functions allow setting the expectations for the mocked
@@ -82,8 +87,6 @@
MOCK_METHOD0(ClearAllSiteData, void());
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(LenientMockSiteDataCacheImpl);
};
using MockSiteDataCache = ::testing::StrictMock<LenientMockSiteDataCacheImpl>;
diff --git a/chrome/browser/performance_manager/persistence/site_data/unittest_utils.h b/chrome/browser/performance_manager/persistence/site_data/unittest_utils.h
index 2c7fd31..6472e1c 100644
--- a/chrome/browser/performance_manager/persistence/site_data/unittest_utils.h
+++ b/chrome/browser/performance_manager/persistence/site_data/unittest_utils.h
@@ -18,6 +18,11 @@
class TestWithPerformanceManager : public ::testing::Test {
public:
TestWithPerformanceManager();
+
+ TestWithPerformanceManager(const TestWithPerformanceManager&) = delete;
+ TestWithPerformanceManager& operator=(const TestWithPerformanceManager&) =
+ delete;
+
~TestWithPerformanceManager() override;
void SetUp() override;
@@ -26,8 +31,6 @@
private:
std::unique_ptr<PerformanceManagerImpl> performance_manager_;
content::BrowserTaskEnvironment task_environment_;
-
- DISALLOW_COPY_AND_ASSIGN(TestWithPerformanceManager);
};
} // namespace testing
diff --git a/chrome/browser/performance_manager/policies/dynamic_tcmalloc_policy_chromeos.h b/chrome/browser/performance_manager/policies/dynamic_tcmalloc_policy_chromeos.h
index de81a198..877c14a 100644
--- a/chrome/browser/performance_manager/policies/dynamic_tcmalloc_policy_chromeos.h
+++ b/chrome/browser/performance_manager/policies/dynamic_tcmalloc_policy_chromeos.h
@@ -21,6 +21,10 @@
class DynamicTcmallocPolicy : public GraphOwned {
public:
DynamicTcmallocPolicy();
+
+ DynamicTcmallocPolicy(const DynamicTcmallocPolicy&) = delete;
+ DynamicTcmallocPolicy& operator=(const DynamicTcmallocPolicy&) = delete;
+
~DynamicTcmallocPolicy() override;
// GraphOwned implementation:
@@ -38,8 +42,6 @@
private:
Graph* graph_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(DynamicTcmallocPolicy);
};
} // namespace policies
diff --git a/chrome/browser/performance_manager/policies/dynamic_tcmalloc_policy_chromeos_unittest.cc b/chrome/browser/performance_manager/policies/dynamic_tcmalloc_policy_chromeos_unittest.cc
index 74fb663..ba9272a8 100644
--- a/chrome/browser/performance_manager/policies/dynamic_tcmalloc_policy_chromeos_unittest.cc
+++ b/chrome/browser/performance_manager/policies/dynamic_tcmalloc_policy_chromeos_unittest.cc
@@ -41,6 +41,11 @@
class MockDynamicTcmallocPolicy : public DynamicTcmallocPolicy {
public:
MockDynamicTcmallocPolicy() {}
+
+ MockDynamicTcmallocPolicy(const MockDynamicTcmallocPolicy&) = delete;
+ MockDynamicTcmallocPolicy& operator=(const MockDynamicTcmallocPolicy&) =
+ delete;
+
~MockDynamicTcmallocPolicy() override {}
MOCK_METHOD0(CheckAndUpdateTunables, void(void));
@@ -57,9 +62,6 @@
float DefaultCalculateFreeMemoryRatio() {
return DynamicTcmallocPolicy::CalculateFreeMemoryRatio();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockDynamicTcmallocPolicy);
};
class MockTcmallocTunablesImpl : public tcmalloc::mojom::TcmallocTunables {
@@ -67,19 +69,27 @@
explicit MockTcmallocTunablesImpl(
mojo::PendingReceiver<tcmalloc::mojom::TcmallocTunables> receiver)
: receiver_(this, std::move(receiver)) {}
+
+ MockTcmallocTunablesImpl(const MockTcmallocTunablesImpl&) = delete;
+ MockTcmallocTunablesImpl& operator=(const MockTcmallocTunablesImpl&) = delete;
+
~MockTcmallocTunablesImpl() override {}
MOCK_METHOD1(SetMaxTotalThreadCacheBytes, void(uint32_t));
private:
mojo::Receiver<tcmalloc::mojom::TcmallocTunables> receiver_{this};
- DISALLOW_COPY_AND_ASSIGN(MockTcmallocTunablesImpl);
};
class DynamicTcmallocPolicyTest : public ::testing::Test {
public:
DynamicTcmallocPolicyTest()
: browser_env_(base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
+
+ DynamicTcmallocPolicyTest(const DynamicTcmallocPolicyTest&) = delete;
+ DynamicTcmallocPolicyTest& operator=(const DynamicTcmallocPolicyTest&) =
+ delete;
+
~DynamicTcmallocPolicyTest() override {}
void SetUp() override {
@@ -142,8 +152,6 @@
TestNodeWrapper<ProcessNodeImpl> process_node_;
TestNodeWrapper<PageNodeImpl> page_node_;
TestNodeWrapper<FrameNodeImpl> frame_node_;
-
- DISALLOW_COPY_AND_ASSIGN(DynamicTcmallocPolicyTest);
};
TEST_F(DynamicTcmallocPolicyTest, PeriodicPressureCheck) {
diff --git a/chrome/browser/performance_manager/policies/userspace_swap_policy_chromeos.h b/chrome/browser/performance_manager/policies/userspace_swap_policy_chromeos.h
index 97448af..f3671ee1 100644
--- a/chrome/browser/performance_manager/policies/userspace_swap_policy_chromeos.h
+++ b/chrome/browser/performance_manager/policies/userspace_swap_policy_chromeos.h
@@ -33,6 +33,10 @@
public SystemNode::ObserverDefaultImpl {
public:
UserspaceSwapPolicy();
+
+ UserspaceSwapPolicy(const UserspaceSwapPolicy&) = delete;
+ UserspaceSwapPolicy& operator=(const UserspaceSwapPolicy&) = delete;
+
~UserspaceSwapPolicy() override;
// GraphOwned implementation:
@@ -110,7 +114,6 @@
std::make_unique<base::RepeatingTimer>();
base::WeakPtrFactory<UserspaceSwapPolicy> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(UserspaceSwapPolicy);
};
} // namespace policies
diff --git a/chrome/browser/performance_manager/policies/userspace_swap_policy_chromeos_unittest.cc b/chrome/browser/performance_manager/policies/userspace_swap_policy_chromeos_unittest.cc
index 1b1562c..c6ecd0e 100644
--- a/chrome/browser/performance_manager/policies/userspace_swap_policy_chromeos_unittest.cc
+++ b/chrome/browser/performance_manager/policies/userspace_swap_policy_chromeos_unittest.cc
@@ -37,6 +37,10 @@
class MockUserspaceSwapPolicy : public UserspaceSwapPolicy {
public:
MockUserspaceSwapPolicy() : UserspaceSwapPolicy(InitTestConfig()) {}
+
+ MockUserspaceSwapPolicy(const MockUserspaceSwapPolicy&) = delete;
+ MockUserspaceSwapPolicy& operator=(const MockUserspaceSwapPolicy&) = delete;
+
~MockUserspaceSwapPolicy() override {}
MOCK_METHOD0(SwapNodesOnGraph, void(void));
@@ -89,14 +93,16 @@
}
UserspaceSwapConfig test_config_ = {};
-
- DISALLOW_COPY_AND_ASSIGN(MockUserspaceSwapPolicy);
};
class UserspaceSwapPolicyTest : public ::testing::Test {
public:
UserspaceSwapPolicyTest()
: browser_env_(base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
+
+ UserspaceSwapPolicyTest(const UserspaceSwapPolicyTest&) = delete;
+ UserspaceSwapPolicyTest& operator=(const UserspaceSwapPolicyTest&) = delete;
+
~UserspaceSwapPolicyTest() override {}
void SetUp() override {
@@ -172,8 +178,6 @@
TestNodeWrapper<PageNodeImpl> page_node_;
TestNodeWrapper<FrameNodeImpl> frame_node_;
std::unique_ptr<TestNodeWrapper<SystemNodeImpl>> system_node_;
-
- DISALLOW_COPY_AND_ASSIGN(UserspaceSwapPolicyTest);
};
// This test validates that we only initialize a ProcessNode once.
diff --git a/chrome/browser/performance_manager/policies/working_set_trimmer_policy.h b/chrome/browser/performance_manager/policies/working_set_trimmer_policy.h
index 82bce73..dbf5e3a8 100644
--- a/chrome/browser/performance_manager/policies/working_set_trimmer_policy.h
+++ b/chrome/browser/performance_manager/policies/working_set_trimmer_policy.h
@@ -37,6 +37,10 @@
public NodeDataDescriberDefaultImpl {
public:
WorkingSetTrimmerPolicy();
+
+ WorkingSetTrimmerPolicy(const WorkingSetTrimmerPolicy&) = delete;
+ WorkingSetTrimmerPolicy& operator=(const WorkingSetTrimmerPolicy&) = delete;
+
~WorkingSetTrimmerPolicy() override;
// CreatePolicyForPlatform will create a working set trimmer policy for a
@@ -80,8 +84,6 @@
// NodeDataDescriber implementation:
base::Value DescribeProcessNodeData(const ProcessNode* node) const override;
-
- DISALLOW_COPY_AND_ASSIGN(WorkingSetTrimmerPolicy);
};
} // namespace policies
diff --git a/chrome/browser/performance_manager/policies/working_set_trimmer_policy_chromeos.h b/chrome/browser/performance_manager/policies/working_set_trimmer_policy_chromeos.h
index 5fb3912..ed4caca7 100644
--- a/chrome/browser/performance_manager/policies/working_set_trimmer_policy_chromeos.h
+++ b/chrome/browser/performance_manager/policies/working_set_trimmer_policy_chromeos.h
@@ -51,6 +51,11 @@
bool trim_once_after_arcvm_boot) = 0;
};
+ WorkingSetTrimmerPolicyChromeOS(const WorkingSetTrimmerPolicyChromeOS&) =
+ delete;
+ WorkingSetTrimmerPolicyChromeOS& operator=(
+ const WorkingSetTrimmerPolicyChromeOS&) = delete;
+
~WorkingSetTrimmerPolicyChromeOS() override;
WorkingSetTrimmerPolicyChromeOS();
@@ -161,8 +166,6 @@
base::ElapsedTimer time_since_last_arcvm_trim_metric_report_;
base::WeakPtrFactory<WorkingSetTrimmerPolicyChromeOS> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WorkingSetTrimmerPolicyChromeOS);
};
} // namespace policies
diff --git a/chrome/browser/performance_manager/policies/working_set_trimmer_policy_chromeos_unittest.cc b/chrome/browser/performance_manager/policies/working_set_trimmer_policy_chromeos_unittest.cc
index c1b1661b..fbd6868 100644
--- a/chrome/browser/performance_manager/policies/working_set_trimmer_policy_chromeos_unittest.cc
+++ b/chrome/browser/performance_manager/policies/working_set_trimmer_policy_chromeos_unittest.cc
@@ -113,6 +113,11 @@
&MockWorkingSetTrimmerPolicyChromeOS::DefaultOnTrimArcVmProcesses));
}
+ MockWorkingSetTrimmerPolicyChromeOS(
+ const MockWorkingSetTrimmerPolicyChromeOS&) = delete;
+ MockWorkingSetTrimmerPolicyChromeOS& operator=(
+ const MockWorkingSetTrimmerPolicyChromeOS&) = delete;
+
~MockWorkingSetTrimmerPolicyChromeOS() override {}
base::MemoryPressureListener& listener() {
@@ -185,9 +190,6 @@
void trim_arcvm_on_memory_pressure(bool enabled) {
set_trim_arcvm_on_memory_pressure(enabled);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockWorkingSetTrimmerPolicyChromeOS);
};
class WorkingSetTrimmerPolicyChromeOSTest : public GraphTestHarness {
@@ -195,6 +197,12 @@
WorkingSetTrimmerPolicyChromeOSTest()
: GraphTestHarness(base::test::TaskEnvironment::TimeSource::MOCK_TIME),
run_loop_(std::make_unique<base::RunLoop>()) {}
+
+ WorkingSetTrimmerPolicyChromeOSTest(
+ const WorkingSetTrimmerPolicyChromeOSTest&) = delete;
+ WorkingSetTrimmerPolicyChromeOSTest& operator=(
+ const WorkingSetTrimmerPolicyChromeOSTest&) = delete;
+
~WorkingSetTrimmerPolicyChromeOSTest() override {}
void SetUp() override {
@@ -263,8 +271,6 @@
private:
std::unique_ptr<base::RunLoop> run_loop_;
MockWorkingSetTrimmerPolicyChromeOS* policy_ = nullptr; // Not owned.
-
- DISALLOW_COPY_AND_ASSIGN(WorkingSetTrimmerPolicyChromeOSTest);
};
// Validate that we don't walk again before the backoff period has expired.
diff --git a/chrome/browser/performance_manager/policies/working_set_trimmer_policy_unittest.cc b/chrome/browser/performance_manager/policies/working_set_trimmer_policy_unittest.cc
index 7eab875..b587785b 100644
--- a/chrome/browser/performance_manager/policies/working_set_trimmer_policy_unittest.cc
+++ b/chrome/browser/performance_manager/policies/working_set_trimmer_policy_unittest.cc
@@ -17,12 +17,14 @@
class MockWorkingSetTrimmerPolicy : public WorkingSetTrimmerPolicy {
public:
MockWorkingSetTrimmerPolicy() {}
+
+ MockWorkingSetTrimmerPolicy(const MockWorkingSetTrimmerPolicy&) = delete;
+ MockWorkingSetTrimmerPolicy& operator=(const MockWorkingSetTrimmerPolicy&) =
+ delete;
+
~MockWorkingSetTrimmerPolicy() override {}
MOCK_METHOD1(TrimWorkingSet, bool(const ProcessNode*));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockWorkingSetTrimmerPolicy);
};
class WorkingSetTrimmerPolicyTest : public GraphTestHarness {
@@ -30,6 +32,11 @@
using Super = GraphTestHarness;
WorkingSetTrimmerPolicyTest() {}
+
+ WorkingSetTrimmerPolicyTest(const WorkingSetTrimmerPolicyTest&) = delete;
+ WorkingSetTrimmerPolicyTest& operator=(const WorkingSetTrimmerPolicyTest&) =
+ delete;
+
~WorkingSetTrimmerPolicyTest() override {}
void SetUp() override {
@@ -47,9 +54,6 @@
protected:
std::unique_ptr<WorkingSetTrimmerPolicy> policy_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WorkingSetTrimmerPolicyTest);
};
// Validate that we can set and get the last trim time on a ProcessNode.
diff --git a/chrome/browser/performance_manager/policies/working_set_trimmer_policy_win.h b/chrome/browser/performance_manager/policies/working_set_trimmer_policy_win.h
index 3076949d..6cdeee6 100644
--- a/chrome/browser/performance_manager/policies/working_set_trimmer_policy_win.h
+++ b/chrome/browser/performance_manager/policies/working_set_trimmer_policy_win.h
@@ -15,6 +15,10 @@
// feature.
class WorkingSetTrimmerPolicyWin : public WorkingSetTrimmerPolicy {
public:
+ WorkingSetTrimmerPolicyWin(const WorkingSetTrimmerPolicyWin&) = delete;
+ WorkingSetTrimmerPolicyWin& operator=(const WorkingSetTrimmerPolicyWin&) =
+ delete;
+
~WorkingSetTrimmerPolicyWin() override;
WorkingSetTrimmerPolicyWin();
@@ -22,9 +26,6 @@
// Windows this will check that the appropriate flags are set for working set
// trim.
static bool PlatformSupportsWorkingSetTrim();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WorkingSetTrimmerPolicyWin);
};
} // namespace policies
diff --git a/chrome/browser/performance_monitor/metric_evaluator_helper_posix.h b/chrome/browser/performance_monitor/metric_evaluator_helper_posix.h
index 16b561a..b05fd74 100644
--- a/chrome/browser/performance_monitor/metric_evaluator_helper_posix.h
+++ b/chrome/browser/performance_monitor/metric_evaluator_helper_posix.h
@@ -12,13 +12,15 @@
class MetricEvaluatorsHelperPosix : public MetricEvaluatorsHelper {
public:
MetricEvaluatorsHelperPosix();
+
+ MetricEvaluatorsHelperPosix(const MetricEvaluatorsHelperPosix&) = delete;
+ MetricEvaluatorsHelperPosix& operator=(const MetricEvaluatorsHelperPosix&) =
+ delete;
+
~MetricEvaluatorsHelperPosix() override;
// MetricEvaluatorsHelper:
absl::optional<int> GetFreePhysicalMemoryMb() override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MetricEvaluatorsHelperPosix);
};
} // namespace performance_monitor
diff --git a/chrome/browser/performance_monitor/metric_evaluator_helper_win.h b/chrome/browser/performance_monitor/metric_evaluator_helper_win.h
index 58bc8f4..676229bc 100644
--- a/chrome/browser/performance_monitor/metric_evaluator_helper_win.h
+++ b/chrome/browser/performance_monitor/metric_evaluator_helper_win.h
@@ -14,6 +14,10 @@
class MetricEvaluatorsHelperWin : public MetricEvaluatorsHelper {
public:
+ MetricEvaluatorsHelperWin(const MetricEvaluatorsHelperWin&) = delete;
+ MetricEvaluatorsHelperWin& operator=(const MetricEvaluatorsHelperWin&) =
+ delete;
+
~MetricEvaluatorsHelperWin() override;
// MetricEvaluatorsHelper:
@@ -29,8 +33,6 @@
MetricEvaluatorsHelperWin();
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(MetricEvaluatorsHelperWin);
};
} // namespace performance_monitor
diff --git a/chrome/browser/performance_monitor/metric_evaluator_helper_win_unittest.cc b/chrome/browser/performance_monitor/metric_evaluator_helper_win_unittest.cc
index 712fb9f7..160d5a3 100644
--- a/chrome/browser/performance_monitor/metric_evaluator_helper_win_unittest.cc
+++ b/chrome/browser/performance_monitor/metric_evaluator_helper_win_unittest.cc
@@ -15,14 +15,16 @@
class MetricEvaluatorsHelperWinTest : public testing::Test {
public:
MetricEvaluatorsHelperWinTest() = default;
+
+ MetricEvaluatorsHelperWinTest(const MetricEvaluatorsHelperWinTest&) = delete;
+ MetricEvaluatorsHelperWinTest& operator=(
+ const MetricEvaluatorsHelperWinTest&) = delete;
+
~MetricEvaluatorsHelperWinTest() override = default;
protected:
base::test::TaskEnvironment task_environment_;
MetricEvaluatorsHelperWin metric_evaluator_helper_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MetricEvaluatorsHelperWinTest);
};
TEST_F(MetricEvaluatorsHelperWinTest, GetFreeMemory) {
diff --git a/chrome/browser/performance_monitor/process_monitor.h b/chrome/browser/performance_monitor/process_monitor.h
index 7b9bfa33..009f079 100644
--- a/chrome/browser/performance_monitor/process_monitor.h
+++ b/chrome/browser/performance_monitor/process_monitor.h
@@ -104,6 +104,9 @@
// returns nullptr.
static ProcessMonitor* Get();
+ ProcessMonitor(const ProcessMonitor&) = delete;
+ ProcessMonitor& operator=(const ProcessMonitor&) = delete;
+
virtual ~ProcessMonitor();
// Start the cycle of metrics gathering.
@@ -159,8 +162,6 @@
#endif
base::WeakPtrFactory<ProcessMonitor> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ProcessMonitor);
};
} // namespace performance_monitor
diff --git a/chrome/browser/performance_monitor/system_monitor.h b/chrome/browser/performance_monitor/system_monitor.h
index 63669a4..cf87826a 100644
--- a/chrome/browser/performance_monitor/system_monitor.h
+++ b/chrome/browser/performance_monitor/system_monitor.h
@@ -46,6 +46,9 @@
kDefaultFrequency,
};
+ SystemMonitor(const SystemMonitor&) = delete;
+ SystemMonitor& operator=(const SystemMonitor&) = delete;
+
virtual ~SystemMonitor();
// Creates and returns the application-wide SystemMonitor. Can only be called
@@ -128,6 +131,10 @@
};
explicit MetricEvaluator(Type type);
+
+ MetricEvaluator(const MetricEvaluator&) = delete;
+ MetricEvaluator& operator=(const MetricEvaluator&) = delete;
+
virtual ~MetricEvaluator();
// Called when the metric needs to be evaluated.
@@ -145,8 +152,6 @@
private:
const Type type_;
-
- DISALLOW_COPY_AND_ASSIGN(MetricEvaluator);
};
// Templated implementation of the MetricEvaluator interface.
@@ -160,6 +165,10 @@
Type type,
base::OnceCallback<absl::optional<T>()> evaluate_function,
void (SystemObserver::*notify_function)(ObserverArgType));
+
+ MetricEvaluatorImpl(const MetricEvaluatorImpl&) = delete;
+ MetricEvaluatorImpl& operator=(const MetricEvaluatorImpl&) = delete;
+
virtual ~MetricEvaluatorImpl();
// Called when the metrics needs to be refreshed.
@@ -183,8 +192,6 @@
// The value, initialized in |Evaluate|.
absl::optional<T> value_;
-
- DISALLOW_COPY_AND_ASSIGN(MetricEvaluatorImpl);
};
// Structure storing all the functions specific to a metric.
@@ -276,14 +283,16 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<SystemMonitor> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SystemMonitor);
};
// A builder class used to easily create a MetricRefreshFrequencies object.
class SystemMonitor::SystemObserver::MetricRefreshFrequencies::Builder {
public:
Builder() = default;
+
+ Builder(const Builder&) = delete;
+ Builder& operator=(const Builder&) = delete;
+
~Builder() = default;
Builder& SetFreePhysMemoryMbFrequency(SamplingFrequency freq);
@@ -294,8 +303,6 @@
private:
MetricRefreshFrequencies metrics_and_frequencies_ = {};
-
- DISALLOW_COPY_AND_ASSIGN(Builder);
};
// An helper class used by the MetricEvaluator object to retrieve the info
@@ -303,6 +310,10 @@
class MetricEvaluatorsHelper {
public:
MetricEvaluatorsHelper() = default;
+
+ MetricEvaluatorsHelper(const MetricEvaluatorsHelper&) = delete;
+ MetricEvaluatorsHelper& operator=(const MetricEvaluatorsHelper&) = delete;
+
virtual ~MetricEvaluatorsHelper() = default;
// Returns the free physical memory, in megabytes.
@@ -313,9 +324,6 @@
// NOTE: This function doesn't have to be virtual, the base::SystemMetrics
// struct is an abstraction that already has a per-platform definition.
absl::optional<base::SystemMetrics> GetSystemMetricsStruct();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MetricEvaluatorsHelper);
};
} // namespace performance_monitor
diff --git a/chrome/browser/performance_monitor/system_monitor_unittest.cc b/chrome/browser/performance_monitor/system_monitor_unittest.cc
index c8ec6fd..4d388c62 100644
--- a/chrome/browser/performance_monitor/system_monitor_unittest.cc
+++ b/chrome/browser/performance_monitor/system_monitor_unittest.cc
@@ -32,14 +32,16 @@
class TestMetricEvaluatorsHelper : public MetricEvaluatorsHelper {
public:
TestMetricEvaluatorsHelper() = default;
+
+ TestMetricEvaluatorsHelper(const TestMetricEvaluatorsHelper&) = delete;
+ TestMetricEvaluatorsHelper& operator=(const TestMetricEvaluatorsHelper&) =
+ delete;
+
~TestMetricEvaluatorsHelper() override = default;
absl::optional<int> GetFreePhysicalMemoryMb() override {
return kFakeFreePhysMemoryMb;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestMetricEvaluatorsHelper);
};
} // namespace
diff --git a/chrome/browser/permissions/abusive_origin_permission_revocation_request_unittests.cc b/chrome/browser/permissions/abusive_origin_permission_revocation_request_unittests.cc
index 91f5ba0..3fdb591 100644
--- a/chrome/browser/permissions/abusive_origin_permission_revocation_request_unittests.cc
+++ b/chrome/browser/permissions/abusive_origin_permission_revocation_request_unittests.cc
@@ -29,6 +29,11 @@
AbusiveOriginPermissionRevocationRequestTestBase() = default;
+ AbusiveOriginPermissionRevocationRequestTestBase(
+ const AbusiveOriginPermissionRevocationRequestTestBase&) = delete;
+ AbusiveOriginPermissionRevocationRequestTestBase& operator=(
+ const AbusiveOriginPermissionRevocationRequestTestBase&) = delete;
+
~AbusiveOriginPermissionRevocationRequestTestBase() override = default;
protected:
@@ -129,8 +134,6 @@
fake_database_manager_;
std::unique_ptr<safe_browsing::TestSafeBrowsingServiceFactory>
safe_browsing_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(AbusiveOriginPermissionRevocationRequestTestBase);
};
class AbusiveOriginPermissionRevocationRequestTest
diff --git a/chrome/browser/permissions/contextual_notification_permission_ui_selector_unittest.cc b/chrome/browser/permissions/contextual_notification_permission_ui_selector_unittest.cc
index 3f51d92..ad99257bc 100644
--- a/chrome/browser/permissions/contextual_notification_permission_ui_selector_unittest.cc
+++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector_unittest.cc
@@ -79,6 +79,12 @@
public:
ContextualNotificationPermissionUiSelectorTest()
: testing_profile_(std::make_unique<TestingProfile>()) {}
+
+ ContextualNotificationPermissionUiSelectorTest(
+ const ContextualNotificationPermissionUiSelectorTest&) = delete;
+ ContextualNotificationPermissionUiSelectorTest& operator=(
+ const ContextualNotificationPermissionUiSelectorTest&) = delete;
+
~ContextualNotificationPermissionUiSelectorTest() override = default;
protected:
@@ -222,8 +228,6 @@
safe_browsing_factory_;
ContextualNotificationPermissionUiSelector contextual_selector_;
-
- DISALLOW_COPY_AND_ASSIGN(ContextualNotificationPermissionUiSelectorTest);
};
// With all the field trials enabled, test all combinations of:
diff --git a/chrome/browser/permissions/crowd_deny_preload_data.h b/chrome/browser/permissions/crowd_deny_preload_data.h
index f34e697..d41607bc 100644
--- a/chrome/browser/permissions/crowd_deny_preload_data.h
+++ b/chrome/browser/permissions/crowd_deny_preload_data.h
@@ -56,6 +56,10 @@
base::OnceCallback<void(const SiteReputation*)>;
CrowdDenyPreloadData();
+
+ CrowdDenyPreloadData(const CrowdDenyPreloadData&) = delete;
+ CrowdDenyPreloadData& operator=(const CrowdDenyPreloadData&) = delete;
+
~CrowdDenyPreloadData();
static CrowdDenyPreloadData* GetInstance();
@@ -103,8 +107,6 @@
scoped_refptr<base::SequencedTaskRunner> loading_task_runner_;
absl::optional<base::Version> version_on_disk_;
std::queue<PendingOrigin> origins_pending_verification_;
-
- DISALLOW_COPY_AND_ASSIGN(CrowdDenyPreloadData);
};
namespace testing {
diff --git a/chrome/browser/permissions/crowd_deny_preload_data_unittest.cc b/chrome/browser/permissions/crowd_deny_preload_data_unittest.cc
index a491de302..7fd9cc26 100644
--- a/chrome/browser/permissions/crowd_deny_preload_data_unittest.cc
+++ b/chrome/browser/permissions/crowd_deny_preload_data_unittest.cc
@@ -47,6 +47,10 @@
using SiteReputation = chrome_browser_crowd_deny::SiteReputation;
CrowdDenyPreloadDataTest() {}
+
+ CrowdDenyPreloadDataTest(const CrowdDenyPreloadDataTest&) = delete;
+ CrowdDenyPreloadDataTest& operator=(const CrowdDenyPreloadDataTest&) = delete;
+
~CrowdDenyPreloadDataTest() override = default;
protected:
@@ -139,8 +143,6 @@
base::test::TaskEnvironment task_environment_;
base::ScopedTempDir scoped_temp_dir_;
CrowdDenyPreloadData preload_data_;
-
- DISALLOW_COPY_AND_ASSIGN(CrowdDenyPreloadDataTest);
};
TEST_F(CrowdDenyPreloadDataTest, NoData) {
diff --git a/chrome/browser/permissions/crowd_deny_safe_browsing_request_unittest.cc b/chrome/browser/permissions/crowd_deny_safe_browsing_request_unittest.cc
index a5ac367..b3e60b72 100644
--- a/chrome/browser/permissions/crowd_deny_safe_browsing_request_unittest.cc
+++ b/chrome/browser/permissions/crowd_deny_safe_browsing_request_unittest.cc
@@ -30,6 +30,12 @@
CrowdDenySafeBrowsingRequestTest()
: fake_database_manager_(
base::MakeRefCounted<CrowdDenyFakeSafeBrowsingDatabaseManager>()) {}
+
+ CrowdDenySafeBrowsingRequestTest(const CrowdDenySafeBrowsingRequestTest&) =
+ delete;
+ CrowdDenySafeBrowsingRequestTest& operator=(
+ const CrowdDenySafeBrowsingRequestTest&) = delete;
+
~CrowdDenySafeBrowsingRequestTest() override = default;
protected:
@@ -65,8 +71,6 @@
scoped_refptr<CrowdDenyFakeSafeBrowsingDatabaseManager>
fake_database_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(CrowdDenySafeBrowsingRequestTest);
};
TEST_F(CrowdDenySafeBrowsingRequestTest, Acceptable_SynchronousCompletion) {
diff --git a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.h b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.h
index 128a0d3..90efdbb2 100644
--- a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.h
+++ b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.h
@@ -29,6 +29,11 @@
// permission requests and has nothing to do with grouped permissions anymore.
class GroupedPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
public:
+ GroupedPermissionInfoBarDelegate(const GroupedPermissionInfoBarDelegate&) =
+ delete;
+ GroupedPermissionInfoBarDelegate& operator=(
+ const GroupedPermissionInfoBarDelegate&) = delete;
+
// Public so we can have std::unique_ptr<GroupedPermissionInfoBarDelegate>.
~GroupedPermissionInfoBarDelegate() override;
@@ -84,8 +89,6 @@
base::WeakPtr<permissions::PermissionPromptAndroid> permission_prompt_;
infobars::ContentInfoBarManager* infobar_manager_;
bool details_expanded_;
-
- DISALLOW_COPY_AND_ASSIGN(GroupedPermissionInfoBarDelegate);
};
#endif // CHROME_BROWSER_PERMISSIONS_GROUPED_PERMISSION_INFOBAR_DELEGATE_ANDROID_H_
diff --git a/chrome/browser/permissions/permission_delegation_browsertest.cc b/chrome/browser/permissions/permission_delegation_browsertest.cc
index 6ea93f0..1594929 100644
--- a/chrome/browser/permissions/permission_delegation_browsertest.cc
+++ b/chrome/browser/permissions/permission_delegation_browsertest.cc
@@ -25,6 +25,11 @@
: geolocation_overrider_(
std::make_unique<device::ScopedGeolocationOverrider>(0, 0)) {}
+ PermissionDelegationBrowserTest(const PermissionDelegationBrowserTest&) =
+ delete;
+ PermissionDelegationBrowserTest& operator=(
+ const PermissionDelegationBrowserTest&) = delete;
+
~PermissionDelegationBrowserTest() override = default;
void SetUpOnMainThread() override {
@@ -71,8 +76,6 @@
mock_permission_prompt_factory_;
std::unique_ptr<net::EmbeddedTestServer> https_embedded_test_server_;
std::unique_ptr<device::ScopedGeolocationOverrider> geolocation_overrider_;
-
- DISALLOW_COPY_AND_ASSIGN(PermissionDelegationBrowserTest);
};
IN_PROC_BROWSER_TEST_F(PermissionDelegationBrowserTest, DelegatedToTwoFrames) {
diff --git a/chrome/browser/permissions/permission_manager_browsertest.cc b/chrome/browser/permissions/permission_manager_browsertest.cc
index 77e3b39..eb07b51 100644
--- a/chrome/browser/permissions/permission_manager_browsertest.cc
+++ b/chrome/browser/permissions/permission_manager_browsertest.cc
@@ -74,6 +74,10 @@
public:
PermissionManagerBrowserTest() = default;
+ PermissionManagerBrowserTest(const PermissionManagerBrowserTest&) = delete;
+ PermissionManagerBrowserTest& operator=(const PermissionManagerBrowserTest&) =
+ delete;
+
~PermissionManagerBrowserTest() override = default;
static std::unique_ptr<KeyedService> CreateTestingPermissionManager(
@@ -98,7 +102,6 @@
private:
Browser* incognito_browser_ = nullptr;
- DISALLOW_COPY_AND_ASSIGN(PermissionManagerBrowserTest);
};
IN_PROC_BROWSER_TEST_F(PermissionManagerBrowserTest,
diff --git a/chrome/browser/permissions/permission_request_manager_browsertest.cc b/chrome/browser/permissions/permission_request_manager_browsertest.cc
index 7f5860e..7dd90e6 100644
--- a/chrome/browser/permissions/permission_request_manager_browsertest.cc
+++ b/chrome/browser/permissions/permission_request_manager_browsertest.cc
@@ -69,6 +69,12 @@
explicit TestQuietNotificationPermissionUiSelector(
const Decision& canned_decision)
: canned_decision_(canned_decision) {}
+
+ TestQuietNotificationPermissionUiSelector(
+ const TestQuietNotificationPermissionUiSelector&) = delete;
+ TestQuietNotificationPermissionUiSelector& operator=(
+ const TestQuietNotificationPermissionUiSelector&) = delete;
+
~TestQuietNotificationPermissionUiSelector() override = default;
protected:
@@ -85,8 +91,6 @@
private:
Decision canned_decision_;
-
- DISALLOW_COPY_AND_ASSIGN(TestQuietNotificationPermissionUiSelector);
};
class PermissionRequestManagerBrowserTest : public InProcessBrowserTest {
@@ -96,6 +100,11 @@
permissions::features::kBlockRepeatedNotificationPermissionPrompts);
}
+ PermissionRequestManagerBrowserTest(
+ const PermissionRequestManagerBrowserTest&) = delete;
+ PermissionRequestManagerBrowserTest& operator=(
+ const PermissionRequestManagerBrowserTest&) = delete;
+
~PermissionRequestManagerBrowserTest() override = default;
void SetUpOnMainThread() override {
@@ -208,8 +217,6 @@
base::test::ScopedFeatureList scoped_feature_list_;
std::unique_ptr<permissions::MockPermissionPromptFactory>
mock_permission_prompt_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(PermissionRequestManagerBrowserTest);
};
class PermissionRequestManagerWithBackForwardCacheBrowserTest
diff --git a/chrome/browser/picture_in_picture/picture_in_picture_window_controller_browsertest.cc b/chrome/browser/picture_in_picture/picture_in_picture_window_controller_browsertest.cc
index f51984b6..5592aff 100644
--- a/chrome/browser/picture_in_picture/picture_in_picture_window_controller_browsertest.cc
+++ b/chrome/browser/picture_in_picture/picture_in_picture_window_controller_browsertest.cc
@@ -1933,6 +1933,12 @@
: public web_app::WebAppControllerBrowserTest {
public:
WebAppPictureInPictureWindowControllerBrowserTest() = default;
+
+ WebAppPictureInPictureWindowControllerBrowserTest(
+ const WebAppPictureInPictureWindowControllerBrowserTest&) = delete;
+ WebAppPictureInPictureWindowControllerBrowserTest& operator=(
+ const WebAppPictureInPictureWindowControllerBrowserTest&) = delete;
+
~WebAppPictureInPictureWindowControllerBrowserTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -1963,8 +1969,6 @@
private:
content::WebContents* web_contents_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(WebAppPictureInPictureWindowControllerBrowserTest);
};
// Hide pwa page and check that Picture-in-Picture is entered automatically.
diff --git a/chrome/browser/plugins/chrome_content_browser_client_plugins_part.h b/chrome/browser/plugins/chrome_content_browser_client_plugins_part.h
index 4df086f..952d500 100644
--- a/chrome/browser/plugins/chrome_content_browser_client_plugins_part.h
+++ b/chrome/browser/plugins/chrome_content_browser_client_plugins_part.h
@@ -17,6 +17,12 @@
: public ChromeContentBrowserClientParts {
public:
ChromeContentBrowserClientPluginsPart();
+
+ ChromeContentBrowserClientPluginsPart(
+ const ChromeContentBrowserClientPluginsPart&) = delete;
+ ChromeContentBrowserClientPluginsPart& operator=(
+ const ChromeContentBrowserClientPluginsPart&) = delete;
+
~ChromeContentBrowserClientPluginsPart() override;
// Corresponding to the ChromeContentBrowserClient function of the same name.
@@ -45,8 +51,6 @@
service_manager::BinderRegistry* registry,
blink::AssociatedInterfaceRegistry* associated_registry,
content::RenderProcessHost* render_process_host) override;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClientPluginsPart);
};
} // namespace plugins
diff --git a/chrome/browser/plugins/plugin_installer.h b/chrome/browser/plugins/plugin_installer.h
index a965f92..9120a82 100644
--- a/chrome/browser/plugins/plugin_installer.h
+++ b/chrome/browser/plugins/plugin_installer.h
@@ -22,6 +22,10 @@
class PluginInstaller {
public:
PluginInstaller();
+
+ PluginInstaller(const PluginInstaller&) = delete;
+ PluginInstaller& operator=(const PluginInstaller&) = delete;
+
~PluginInstaller();
void AddObserver(PluginInstallerObserver* observer);
@@ -43,7 +47,6 @@
base::ObserverList<PluginInstallerObserver>::Unchecked observers_;
int strong_observer_count_;
base::ObserverList<WeakPluginInstallerObserver>::Unchecked weak_observers_;
- DISALLOW_COPY_AND_ASSIGN(PluginInstaller);
};
#endif // CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_H_
diff --git a/chrome/browser/plugins/plugin_metadata.h b/chrome/browser/plugins/plugin_metadata.h
index 602dbd10..802801a 100644
--- a/chrome/browser/plugins/plugin_metadata.h
+++ b/chrome/browser/plugins/plugin_metadata.h
@@ -57,6 +57,10 @@
const std::u16string& group_name_matcher,
const std::string& language,
bool plugin_is_deprecated);
+
+ PluginMetadata(const PluginMetadata&) = delete;
+ PluginMetadata& operator=(const PluginMetadata&) = delete;
+
~PluginMetadata();
// Unique identifier for the plugin.
@@ -119,8 +123,6 @@
std::vector<std::string> all_mime_types_;
std::vector<std::string> matching_mime_types_;
const bool plugin_is_deprecated_;
-
- DISALLOW_COPY_AND_ASSIGN(PluginMetadata);
};
#endif // CHROME_BROWSER_PLUGINS_PLUGIN_METADATA_H_
diff --git a/chrome/browser/plugins/plugin_observer.h b/chrome/browser/plugins/plugin_observer.h
index 4f123ee..7da46ed 100644
--- a/chrome/browser/plugins/plugin_observer.h
+++ b/chrome/browser/plugins/plugin_observer.h
@@ -39,6 +39,9 @@
mojo::PendingAssociatedReceiver<chrome::mojom::PluginHost> receiver,
content::RenderFrameHost* rfh);
+ PluginObserver(const PluginObserver&) = delete;
+ PluginObserver& operator=(const PluginObserver&) = delete;
+
~PluginObserver() override;
// content::WebContentsObserver implementation.
@@ -76,8 +79,6 @@
base::WeakPtrFactory<PluginObserver> weak_ptr_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(PluginObserver);
};
#endif // CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_
diff --git a/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.h b/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.h
index 496e1a7..691a4d5 100644
--- a/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.h
+++ b/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.h
@@ -24,6 +24,12 @@
PluginResponseInterceptorURLLoaderThrottle(
network::mojom::RequestDestination request_destination,
int frame_tree_node_id);
+
+ PluginResponseInterceptorURLLoaderThrottle(
+ const PluginResponseInterceptorURLLoaderThrottle&) = delete;
+ PluginResponseInterceptorURLLoaderThrottle& operator=(
+ const PluginResponseInterceptorURLLoaderThrottle&) = delete;
+
~PluginResponseInterceptorURLLoaderThrottle() override;
private:
@@ -40,8 +46,6 @@
base::WeakPtrFactory<PluginResponseInterceptorURLLoaderThrottle>
weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PluginResponseInterceptorURLLoaderThrottle);
};
#endif // CHROME_BROWSER_PLUGINS_PLUGIN_RESPONSE_INTERCEPTOR_URL_LOADER_THROTTLE_H_
diff --git a/chrome/browser/plugins/plugins_resource_service.h b/chrome/browser/plugins/plugins_resource_service.h
index 29452d5..beca3003 100644
--- a/chrome/browser/plugins/plugins_resource_service.h
+++ b/chrome/browser/plugins/plugins_resource_service.h
@@ -16,6 +16,10 @@
class PluginsResourceService : public web_resource::WebResourceService {
public:
explicit PluginsResourceService(PrefService* local_state);
+
+ PluginsResourceService(const PluginsResourceService&) = delete;
+ PluginsResourceService& operator=(const PluginsResourceService&) = delete;
+
~PluginsResourceService() override;
void Init();
@@ -25,8 +29,6 @@
private:
// WebResourceService override to process the parsed information.
void Unpack(const base::DictionaryValue& parsed_json) override;
-
- DISALLOW_COPY_AND_ASSIGN(PluginsResourceService);
};
#endif // CHROME_BROWSER_PLUGINS_PLUGINS_RESOURCE_SERVICE_H_
diff --git a/chrome/browser/predictors/autocomplete_action_predictor.h b/chrome/browser/predictors/autocomplete_action_predictor.h
index c9a66a30..f5ee4858 100644
--- a/chrome/browser/predictors/autocomplete_action_predictor.h
+++ b/chrome/browser/predictors/autocomplete_action_predictor.h
@@ -74,6 +74,11 @@
};
explicit AutocompleteActionPredictor(Profile* profile);
+
+ AutocompleteActionPredictor(const AutocompleteActionPredictor&) = delete;
+ AutocompleteActionPredictor& operator=(const AutocompleteActionPredictor&) =
+ delete;
+
~AutocompleteActionPredictor() override;
// Registers an AutocompleteResult for a given |user_text|. This will be used
@@ -267,8 +272,6 @@
base::ScopedObservation<history::HistoryService,
history::HistoryServiceObserver>
history_service_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AutocompleteActionPredictor);
};
} // namespace predictors
diff --git a/chrome/browser/predictors/loading_predictor.h b/chrome/browser/predictors/loading_predictor.h
index 57d1e9521..1f8b0007 100644
--- a/chrome/browser/predictors/loading_predictor.h
+++ b/chrome/browser/predictors/loading_predictor.h
@@ -47,6 +47,10 @@
public PrefetchManager::Delegate {
public:
LoadingPredictor(const LoadingPredictorConfig& config, Profile* profile);
+
+ LoadingPredictor(const LoadingPredictor&) = delete;
+ LoadingPredictor& operator=(const LoadingPredictor&) = delete;
+
~LoadingPredictor() override;
// Hints that a page load is expected for |url|, with the hint coming from a
@@ -202,8 +206,6 @@
FRIEND_TEST_ALL_PREFIXES(LoadingPredictorTest, TestDontPredictOmniboxHints);
base::WeakPtrFactory<LoadingPredictor> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LoadingPredictor);
};
} // namespace predictors
diff --git a/chrome/browser/predictors/loading_predictor_browsertest.cc b/chrome/browser/predictors/loading_predictor_browsertest.cc
index 54c49d5..350b05e 100644
--- a/chrome/browser/predictors/loading_predictor_browsertest.cc
+++ b/chrome/browser/predictors/loading_predictor_browsertest.cc
@@ -370,6 +370,11 @@
features::kNavigationPredictorPreconnectHoldback},
{});
}
+
+ LoadingPredictorBrowserTest(const LoadingPredictorBrowserTest&) = delete;
+ LoadingPredictorBrowserTest& operator=(const LoadingPredictorBrowserTest&) =
+ delete;
+
~LoadingPredictorBrowserTest() override {}
void SetUp() override {
@@ -531,8 +536,6 @@
std::unique_ptr<TestPreconnectManagerObserver> preconnect_manager_observer_;
std::unique_ptr<TestPrefetchManagerObserver> prefetch_manager_observer_;
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(LoadingPredictorBrowserTest);
};
// Tests that a navigation triggers the LoadingPredictor.
diff --git a/chrome/browser/predictors/loading_predictor_tab_helper.h b/chrome/browser/predictors/loading_predictor_tab_helper.h
index 931a4b5..94f1651 100644
--- a/chrome/browser/predictors/loading_predictor_tab_helper.h
+++ b/chrome/browser/predictors/loading_predictor_tab_helper.h
@@ -40,6 +40,10 @@
: public content::WebContentsObserver,
public content::WebContentsUserData<LoadingPredictorTabHelper> {
public:
+ LoadingPredictorTabHelper(const LoadingPredictorTabHelper&) = delete;
+ LoadingPredictorTabHelper& operator=(const LoadingPredictorTabHelper&) =
+ delete;
+
~LoadingPredictorTabHelper() override;
// content::WebContentsObserver implementation
@@ -168,8 +172,6 @@
base::WeakPtrFactory<LoadingPredictorTabHelper> weak_ptr_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(LoadingPredictorTabHelper);
};
} // namespace predictors
diff --git a/chrome/browser/predictors/loading_stats_collector.h b/chrome/browser/predictors/loading_stats_collector.h
index 6bbde05..ec31bdb 100644
--- a/chrome/browser/predictors/loading_stats_collector.h
+++ b/chrome/browser/predictors/loading_stats_collector.h
@@ -50,6 +50,10 @@
public:
LoadingStatsCollector(ResourcePrefetchPredictor* predictor,
const LoadingPredictorConfig& config);
+
+ LoadingStatsCollector(const LoadingStatsCollector&) = delete;
+ LoadingStatsCollector& operator=(const LoadingStatsCollector&) = delete;
+
~LoadingStatsCollector();
// Records statistics about a finished preconnect operation.
@@ -71,8 +75,6 @@
ResourcePrefetchPredictor* predictor_;
base::TimeDelta max_stats_age_;
std::map<GURL, std::unique_ptr<PreconnectStats>> preconnect_stats_;
-
- DISALLOW_COPY_AND_ASSIGN(LoadingStatsCollector);
};
} // namespace predictors
diff --git a/chrome/browser/predictors/network_hints_handler_impl.h b/chrome/browser/predictors/network_hints_handler_impl.h
index f6cc72b6..c0d37ab8 100644
--- a/chrome/browser/predictors/network_hints_handler_impl.h
+++ b/chrome/browser/predictors/network_hints_handler_impl.h
@@ -18,6 +18,9 @@
class NetworkHintsHandlerImpl
: public network_hints::mojom::NetworkHintsHandler {
public:
+ NetworkHintsHandlerImpl(const NetworkHintsHandlerImpl&) = delete;
+ NetworkHintsHandlerImpl& operator=(const NetworkHintsHandlerImpl&) = delete;
+
~NetworkHintsHandlerImpl() override;
static void Create(
@@ -35,8 +38,6 @@
const int32_t render_process_id_;
const int32_t render_frame_id_;
base::WeakPtr<PreconnectManager> preconnect_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkHintsHandlerImpl);
};
} // namespace predictors
diff --git a/chrome/browser/predictors/preconnect_manager.h b/chrome/browser/predictors/preconnect_manager.h
index 6493cdec..840c0cd 100644
--- a/chrome/browser/predictors/preconnect_manager.h
+++ b/chrome/browser/predictors/preconnect_manager.h
@@ -149,6 +149,10 @@
PreconnectManager(base::WeakPtr<Delegate> delegate,
content::BrowserContext* browser_context);
+
+ PreconnectManager(const PreconnectManager&) = delete;
+ PreconnectManager& operator=(const PreconnectManager&) = delete;
+
virtual ~PreconnectManager();
// Starts preconnect and preresolve jobs keyed by |url|.
@@ -224,8 +228,6 @@
Observer* observer_ = nullptr;
base::WeakPtrFactory<PreconnectManager> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PreconnectManager);
};
} // namespace predictors
diff --git a/chrome/browser/predictors/preconnect_manager_unittest.cc b/chrome/browser/predictors/preconnect_manager_unittest.cc
index 7dd603c8..c5bf0e9 100644
--- a/chrome/browser/predictors/preconnect_manager_unittest.cc
+++ b/chrome/browser/predictors/preconnect_manager_unittest.cc
@@ -181,6 +181,10 @@
class PreconnectManagerTest : public testing::Test {
public:
PreconnectManagerTest();
+
+ PreconnectManagerTest(const PreconnectManagerTest&) = delete;
+ PreconnectManagerTest& operator=(const PreconnectManagerTest&) = delete;
+
~PreconnectManagerTest() override;
void VerifyAndClearExpectations() const {
@@ -195,9 +199,6 @@
std::unique_ptr<StrictMock<MockNetworkContext>> mock_network_context_;
std::unique_ptr<StrictMock<MockPreconnectManagerDelegate>> mock_delegate_;
std::unique_ptr<PreconnectManager> preconnect_manager_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PreconnectManagerTest);
};
PreconnectManagerTest::PreconnectManagerTest()
diff --git a/chrome/browser/predictors/predictor_database.h b/chrome/browser/predictors/predictor_database.h
index d0459fd..3a05a31 100644
--- a/chrome/browser/predictors/predictor_database.h
+++ b/chrome/browser/predictors/predictor_database.h
@@ -29,6 +29,10 @@
public:
PredictorDatabase(Profile* profile,
scoped_refptr<base::SequencedTaskRunner> db_task_runner);
+
+ PredictorDatabase(const PredictorDatabase&) = delete;
+ PredictorDatabase& operator=(const PredictorDatabase&) = delete;
+
~PredictorDatabase() override;
scoped_refptr<AutocompleteActionPredictorTable> autocomplete_table();
@@ -42,8 +46,6 @@
void Shutdown() override;
scoped_refptr<PredictorDatabaseInternal> db_;
-
- DISALLOW_COPY_AND_ASSIGN(PredictorDatabase);
};
} // namespace predictors
diff --git a/chrome/browser/predictors/proxy_lookup_client_impl.h b/chrome/browser/predictors/proxy_lookup_client_impl.h
index 2da2825d7..7fac92b8 100644
--- a/chrome/browser/predictors/proxy_lookup_client_impl.h
+++ b/chrome/browser/predictors/proxy_lookup_client_impl.h
@@ -37,6 +37,10 @@
const net::NetworkIsolationKey& network_isolation_key,
ProxyLookupCallback callback,
network::mojom::NetworkContext* network_context);
+
+ ProxyLookupClientImpl(const ProxyLookupClientImpl&) = delete;
+ ProxyLookupClientImpl& operator=(const ProxyLookupClientImpl&) = delete;
+
// Cancels the request if it hasn't been completed yet.
~ProxyLookupClientImpl() override;
@@ -48,8 +52,6 @@
private:
mojo::Receiver<network::mojom::ProxyLookupClient> receiver_{this};
ProxyLookupCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ProxyLookupClientImpl);
};
} // namespace predictors
diff --git a/chrome/browser/predictors/resolve_host_client_impl.h b/chrome/browser/predictors/resolve_host_client_impl.h
index 488d3c1..8f755990 100644
--- a/chrome/browser/predictors/resolve_host_client_impl.h
+++ b/chrome/browser/predictors/resolve_host_client_impl.h
@@ -39,6 +39,10 @@
const net::NetworkIsolationKey& network_isolation_key,
ResolveHostCallback callback,
network::mojom::NetworkContext* network_context);
+
+ ResolveHostClientImpl(const ResolveHostClientImpl&) = delete;
+ ResolveHostClientImpl& operator=(const ResolveHostClientImpl&) = delete;
+
// Cancels the request if it hasn't been completed yet.
~ResolveHostClientImpl() override;
@@ -53,8 +57,6 @@
private:
mojo::Receiver<network::mojom::ResolveHostClient> receiver_{this};
ResolveHostCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ResolveHostClientImpl);
};
} // namespace predictors
diff --git a/chrome/browser/predictors/resource_prefetch_predictor.h b/chrome/browser/predictors/resource_prefetch_predictor.h
index 110b913..3ea9ada 100644
--- a/chrome/browser/predictors/resource_prefetch_predictor.h
+++ b/chrome/browser/predictors/resource_prefetch_predictor.h
@@ -164,6 +164,11 @@
ResourcePrefetchPredictor(const LoadingPredictorConfig& config,
Profile* profile);
+
+ ResourcePrefetchPredictor(const ResourcePrefetchPredictor&) = delete;
+ ResourcePrefetchPredictor& operator=(const ResourcePrefetchPredictor&) =
+ delete;
+
~ResourcePrefetchPredictor() override;
// Starts initialization by posting a task to the DB sequence of the
@@ -321,14 +326,15 @@
bool delete_all_data_requested_ = false;
base::WeakPtrFactory<ResourcePrefetchPredictor> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ResourcePrefetchPredictor);
};
// An interface used to notify that data in the ResourcePrefetchPredictor
// has changed. All methods are invoked on the UI thread.
class TestObserver {
public:
+ TestObserver(const TestObserver&) = delete;
+ TestObserver& operator=(const TestObserver&) = delete;
+
// De-registers itself from |predictor_| on destruction.
virtual ~TestObserver();
@@ -343,8 +349,6 @@
private:
ResourcePrefetchPredictor* predictor_;
-
- DISALLOW_COPY_AND_ASSIGN(TestObserver);
};
} // namespace predictors
diff --git a/chrome/browser/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc b/chrome/browser/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc
index 4b9d9acd..0cf89ef 100644
--- a/chrome/browser/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc
+++ b/chrome/browser/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc
@@ -227,6 +227,11 @@
browser->tab_strip_model()->AddObserver(this);
}
+ NewTabNavigationOrSwapObserver(const NewTabNavigationOrSwapObserver&) =
+ delete;
+ NewTabNavigationOrSwapObserver& operator=(
+ const NewTabNavigationOrSwapObserver&) = delete;
+
~NewTabNavigationOrSwapObserver() override {
BrowserList::RemoveObserver(this);
}
@@ -260,8 +265,6 @@
private:
base::RunLoop new_tab_run_loop_;
std::unique_ptr<NavigationOrSwapObserver> swap_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(NewTabNavigationOrSwapObserver);
};
class NoStatePrefetchBrowserTest
diff --git a/chrome/browser/prefetch/no_state_prefetch/prerender_test_utils.h b/chrome/browser/prefetch/no_state_prefetch/prerender_test_utils.h
index c601db0..6677dcc 100644
--- a/chrome/browser/prefetch/no_state_prefetch/prerender_test_utils.h
+++ b/chrome/browser/prefetch/no_state_prefetch/prerender_test_utils.h
@@ -47,6 +47,10 @@
FinalStatus expected_final_status,
bool ignore_final_status);
+ TestNoStatePrefetchContents(const TestNoStatePrefetchContents&) = delete;
+ TestNoStatePrefetchContents& operator=(const TestNoStatePrefetchContents&) =
+ delete;
+
~TestNoStatePrefetchContents() override;
bool CheckURL(const GURL& url) override;
@@ -79,8 +83,6 @@
// If true, |expected_final_status_| and other shutdown checks are skipped.
bool skip_final_checks_;
-
- DISALLOW_COPY_AND_ASSIGN(TestNoStatePrefetchContents);
};
// A handle to a TestNoStatePrefetchContents whose lifetime is under the
@@ -90,6 +92,10 @@
public base::SupportsWeakPtr<TestPrerender> {
public:
TestPrerender();
+
+ TestPrerender(const TestPrerender&) = delete;
+ TestPrerender& operator=(const TestPrerender&) = delete;
+
~TestPrerender() override;
TestNoStatePrefetchContents* contents() const { return contents_; }
@@ -129,8 +135,6 @@
base::RunLoop create_loop_;
base::RunLoop start_loop_;
base::RunLoop stop_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(TestPrerender);
};
// Blocks until a TestNoStatePrefetchContents has been destroyed with the given
@@ -143,6 +147,9 @@
DestructionWaiter(TestNoStatePrefetchContents* no_state_prefetch_contents,
FinalStatus expected_final_status);
+ DestructionWaiter(const DestructionWaiter&) = delete;
+ DestructionWaiter& operator=(const DestructionWaiter&) = delete;
+
~DestructionWaiter();
// Returns true if the TestNoStatePrefetchContents was destroyed with the
@@ -158,14 +165,15 @@
// TestNoStatePrefetchContents.
explicit DestructionMarker(DestructionWaiter* waiter);
+ DestructionMarker(const DestructionMarker&) = delete;
+ DestructionMarker& operator=(const DestructionMarker&) = delete;
+
~DestructionMarker() override;
void OnPrefetchStop(NoStatePrefetchContents* contents) override;
private:
DestructionWaiter* waiter_;
-
- DISALLOW_COPY_AND_ASSIGN(DestructionMarker);
};
// To be called by a DestructionMarker.
@@ -175,8 +183,6 @@
FinalStatus expected_final_status_;
bool saw_correct_status_;
std::unique_ptr<DestructionMarker> marker_;
-
- DISALLOW_COPY_AND_ASSIGN(DestructionWaiter);
};
// Wait until a NoStatePrefetchManager has seen a first contentful paint.
@@ -188,6 +194,11 @@
static FirstContentfulPaintManagerWaiter* Create(
NoStatePrefetchManager* manager);
+ FirstContentfulPaintManagerWaiter(const FirstContentfulPaintManagerWaiter&) =
+ delete;
+ FirstContentfulPaintManagerWaiter& operator=(
+ const FirstContentfulPaintManagerWaiter&) = delete;
+
~FirstContentfulPaintManagerWaiter() override;
void OnFirstContentfulPaint() override;
@@ -200,8 +211,6 @@
std::unique_ptr<base::RunLoop> waiter_;
bool saw_fcp_;
-
- DISALLOW_COPY_AND_ASSIGN(FirstContentfulPaintManagerWaiter);
};
// NoStatePrefetchContentsFactory that uses TestNoStatePrefetchContents.
@@ -210,6 +219,11 @@
public:
TestNoStatePrefetchContentsFactory();
+ TestNoStatePrefetchContentsFactory(
+ const TestNoStatePrefetchContentsFactory&) = delete;
+ TestNoStatePrefetchContentsFactory& operator=(
+ const TestNoStatePrefetchContentsFactory&) = delete;
+
~TestNoStatePrefetchContentsFactory() override;
std::unique_ptr<TestPrerender> ExpectNoStatePrefetchContents(
@@ -241,14 +255,16 @@
};
base::circular_deque<ExpectedContents> expected_contents_queue_;
-
- DISALLOW_COPY_AND_ASSIGN(TestNoStatePrefetchContentsFactory);
};
class PrerenderInProcessBrowserTest : virtual public InProcessBrowserTest {
public:
PrerenderInProcessBrowserTest();
+ PrerenderInProcessBrowserTest(const PrerenderInProcessBrowserTest&) = delete;
+ PrerenderInProcessBrowserTest& operator=(
+ const PrerenderInProcessBrowserTest&) = delete;
+
~PrerenderInProcessBrowserTest() override;
void CreatedBrowserMainParts(
@@ -360,8 +376,6 @@
uint32_t waiting_count_ = 0;
base::OnceClosure waiting_closure_;
base::Lock lock_;
-
- DISALLOW_COPY_AND_ASSIGN(PrerenderInProcessBrowserTest);
};
} // namespace test_utils
diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_from_string_url_loader.h b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_from_string_url_loader.h
index 2a2b2cd..48dfd398 100644
--- a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_from_string_url_loader.h
+++ b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_from_string_url_loader.h
@@ -39,6 +39,11 @@
std::unique_ptr<PrefetchedMainframeResponseContainer> response,
const network::ResourceRequest& tentative_resource_request);
+ PrefetchProxyFromStringURLLoader(const PrefetchProxyFromStringURLLoader&) =
+ delete;
+ PrefetchProxyFromStringURLLoader& operator=(
+ const PrefetchProxyFromStringURLLoader&) = delete;
+
~PrefetchProxyFromStringURLLoader() override;
// Called when the response should be served to the user. Returns a handler.
@@ -97,8 +102,6 @@
base::WeakPtrFactory<PrefetchProxyFromStringURLLoader> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(PrefetchProxyFromStringURLLoader);
};
#endif // CHROME_BROWSER_PREFETCH_PREFETCH_PROXY_PREFETCH_PROXY_FROM_STRING_URL_LOADER_H_
diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_proxying_url_loader_factory.h b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_proxying_url_loader_factory.h
index 3ea6c82..69b34db 100644
--- a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_proxying_url_loader_factory.h
+++ b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_proxying_url_loader_factory.h
@@ -74,6 +74,12 @@
mojo::PendingRemote<network::mojom::URLLoaderFactory> isolated_factory,
DisconnectCallback on_disconnect,
ResourceLoadSuccessfulCallback on_resource_load_successful);
+
+ PrefetchProxyProxyingURLLoaderFactory(
+ const PrefetchProxyProxyingURLLoaderFactory&) = delete;
+ PrefetchProxyProxyingURLLoaderFactory& operator=(
+ const PrefetchProxyProxyingURLLoaderFactory&) = delete;
+
~PrefetchProxyProxyingURLLoaderFactory() override;
// Informs |this| that new subresource loads are being done after the user
@@ -110,6 +116,10 @@
const network::ResourceRequest& request,
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation);
+
+ InProgressRequest(const InProgressRequest&) = delete;
+ InProgressRequest& operator=(const InProgressRequest&) = delete;
+
~InProgressRequest() override;
// Sets a callback that will be run during |OnComplete| to record metrics.
@@ -187,8 +197,6 @@
// |target_loader_|.
mojo::Remote<network::mojom::URLLoader> target_loader_;
mojo::Receiver<network::mojom::URLLoaderClient> client_receiver_{this};
-
- DISALLOW_COPY_AND_ASSIGN(InProgressRequest);
};
// Terminates the request when constructed.
@@ -197,6 +205,10 @@
AbortRequest(
mojo::PendingReceiver<network::mojom::URLLoader> loader_receiver,
mojo::PendingRemote<network::mojom::URLLoaderClient> client);
+
+ AbortRequest(const AbortRequest&) = delete;
+ AbortRequest& operator=(const AbortRequest&) = delete;
+
~AbortRequest() override;
// network::mojom::URLLoader:
@@ -219,8 +231,6 @@
mojo::Receiver<network::mojom::URLLoader> loader_receiver_;
base::WeakPtrFactory<AbortRequest> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AbortRequest);
};
// Used as a callback for determining the eligibility of a resource to be
@@ -292,8 +302,6 @@
base::WeakPtrFactory<PrefetchProxyProxyingURLLoaderFactory> weak_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(PrefetchProxyProxyingURLLoaderFactory);
};
#endif // CHROME_BROWSER_PREFETCH_PREFETCH_PROXY_PREFETCH_PROXY_PROXYING_URL_LOADER_FACTORY_H_
diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_test_utils.h b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_test_utils.h
index 6ae5c26a..56858b6 100644
--- a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_test_utils.h
+++ b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_test_utils.h
@@ -27,6 +27,9 @@
net::StreamSocket* to_socket,
base::OnceClosure on_done_callback);
+ TestProxySocketDataPump(const TestProxySocketDataPump&) = delete;
+ TestProxySocketDataPump& operator=(const TestProxySocketDataPump&) = delete;
+
~TestProxySocketDataPump();
void Start();
@@ -47,8 +50,6 @@
base::OnceClosure on_done_callback_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(TestProxySocketDataPump);
};
// Represents a single CONNECT proxy tunnel connection used for browser tests.
@@ -56,6 +57,11 @@
class TestProxyTunnelConnection {
public:
TestProxyTunnelConnection();
+
+ TestProxyTunnelConnection(const TestProxyTunnelConnection&) = delete;
+ TestProxyTunnelConnection& operator=(const TestProxyTunnelConnection&) =
+ delete;
+
~TestProxyTunnelConnection();
base::WeakPtr<TestProxyTunnelConnection> GetWeakPtr();
@@ -96,8 +102,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<TestProxyTunnelConnection> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TestProxyTunnelConnection);
};
#endif // CHROME_BROWSER_PREFETCH_PREFETCH_PROXY_PREFETCH_PROXY_TEST_UTILS_H_
diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_url_loader_interceptor.h b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_url_loader_interceptor.h
index dfe8776..45c8c8e 100644
--- a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_url_loader_interceptor.h
+++ b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_url_loader_interceptor.h
@@ -31,6 +31,12 @@
: public content::URLLoaderRequestInterceptor {
public:
explicit PrefetchProxyURLLoaderInterceptor(int frame_tree_node_id);
+
+ PrefetchProxyURLLoaderInterceptor(const PrefetchProxyURLLoaderInterceptor&) =
+ delete;
+ PrefetchProxyURLLoaderInterceptor& operator=(
+ const PrefetchProxyURLLoaderInterceptor&) = delete;
+
~PrefetchProxyURLLoaderInterceptor() override;
// content::URLLaoderRequestInterceptor:
@@ -88,8 +94,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<PrefetchProxyURLLoaderInterceptor> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PrefetchProxyURLLoaderInterceptor);
};
#endif // CHROME_BROWSER_PREFETCH_PREFETCH_PROXY_PREFETCH_PROXY_URL_LOADER_INTERCEPTOR_H_
diff --git a/chrome/browser/prefs/pref_metrics_service.h b/chrome/browser/prefs/pref_metrics_service.h
index 5d7616e2..b7fd22c 100644
--- a/chrome/browser/prefs/pref_metrics_service.h
+++ b/chrome/browser/prefs/pref_metrics_service.h
@@ -19,6 +19,10 @@
class PrefMetricsService : public KeyedService {
public:
explicit PrefMetricsService(Profile* profile);
+
+ PrefMetricsService(const PrefMetricsService&) = delete;
+ PrefMetricsService& operator=(const PrefMetricsService&) = delete;
+
~PrefMetricsService() override;
// Records metrics about the state of the homepage on launch.
@@ -52,8 +56,6 @@
PrefService* prefs_;
base::WeakPtrFactory<PrefMetricsService> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PrefMetricsService);
};
#endif // CHROME_BROWSER_PREFS_PREF_METRICS_SERVICE_H_
diff --git a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc
index 5ea3f13..f1a11d1 100644
--- a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc
+++ b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc
@@ -86,6 +86,9 @@
pref_store_->AddObserver(this);
}
+ PrefStoreReadObserver(const PrefStoreReadObserver&) = delete;
+ PrefStoreReadObserver& operator=(const PrefStoreReadObserver&) = delete;
+
~PrefStoreReadObserver() override { pref_store_->RemoveObserver(this); }
PersistentPrefStore::PrefReadError Read() {
@@ -108,8 +111,6 @@
private:
scoped_refptr<PersistentPrefStore> pref_store_;
base::OnceClosure stop_waiting_;
-
- DISALLOW_COPY_AND_ASSIGN(PrefStoreReadObserver);
};
const char kUnprotectedPref[] = "unprotected_pref";
diff --git a/chrome/browser/printing/background_printing_manager.h b/chrome/browser/printing/background_printing_manager.h
index 99a6406..d04d601e 100644
--- a/chrome/browser/printing/background_printing_manager.h
+++ b/chrome/browser/printing/background_printing_manager.h
@@ -29,6 +29,11 @@
class Observer;
BackgroundPrintingManager();
+
+ BackgroundPrintingManager(const BackgroundPrintingManager&) = delete;
+ BackgroundPrintingManager& operator=(const BackgroundPrintingManager&) =
+ delete;
+
~BackgroundPrintingManager();
// Takes ownership of |preview_dialog| and deletes it when |preview_dialog|
@@ -71,8 +76,6 @@
std::map<content::WebContents*, PrintingContents> printing_contents_map_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(BackgroundPrintingManager);
};
} // namespace printing
diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h
index b9b94402..46ffa15b 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h
@@ -32,6 +32,10 @@
class CloudPrintProxyService : public KeyedService {
public:
explicit CloudPrintProxyService(Profile* profile);
+
+ CloudPrintProxyService(const CloudPrintProxyService&) = delete;
+ CloudPrintProxyService& operator=(const CloudPrintProxyService&) = delete;
+
~CloudPrintProxyService() override;
using PrintersCallback =
@@ -102,8 +106,6 @@
mojo::Remote<cloud_print::mojom::CloudPrint> cloud_print_proxy_;
base::WeakPtrFactory<CloudPrintProxyService> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CloudPrintProxyService);
};
#endif // CHROME_BROWSER_PRINTING_CLOUD_PRINT_CLOUD_PRINT_PROXY_SERVICE_H_
diff --git a/chrome/browser/printing/pdf_nup_converter_client.h b/chrome/browser/printing/pdf_nup_converter_client.h
index be81660..a2bdaed 100644
--- a/chrome/browser/printing/pdf_nup_converter_client.h
+++ b/chrome/browser/printing/pdf_nup_converter_client.h
@@ -22,6 +22,10 @@
: public content::WebContentsUserData<PdfNupConverterClient> {
public:
explicit PdfNupConverterClient(content::WebContents* web_contents);
+
+ PdfNupConverterClient(const PdfNupConverterClient&) = delete;
+ PdfNupConverterClient& operator=(const PdfNupConverterClient&) = delete;
+
~PdfNupConverterClient() override;
void DoNupPdfConvert(
@@ -62,8 +66,6 @@
content::WebContents* web_contents_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(PdfNupConverterClient);
};
} // namespace printing
diff --git a/chrome/browser/printing/pdf_to_emf_converter.cc b/chrome/browser/printing/pdf_to_emf_converter.cc
index 87e05779..26668f8e 100644
--- a/chrome/browser/printing/pdf_to_emf_converter.cc
+++ b/chrome/browser/printing/pdf_to_emf_converter.cc
@@ -97,13 +97,15 @@
class PostScriptMetaFile : public Emf {
public:
PostScriptMetaFile() {}
+
+ PostScriptMetaFile(const PostScriptMetaFile&) = delete;
+ PostScriptMetaFile& operator=(const PostScriptMetaFile&) = delete;
+
~PostScriptMetaFile() override {}
private:
// Emf:
bool SafePlayback(HDC hdc) const override;
-
- DISALLOW_COPY_AND_ASSIGN(PostScriptMetaFile);
};
// Class for converting PDF to another format for printing (Emf, Postscript).
@@ -121,6 +123,10 @@
PdfConverterImpl(scoped_refptr<base::RefCountedMemory> data,
const PdfRenderSettings& conversion_settings,
StartCallback start_callback);
+
+ PdfConverterImpl(const PdfConverterImpl&) = delete;
+ PdfConverterImpl& operator=(const PdfConverterImpl&) = delete;
+
~PdfConverterImpl() override;
static void set_fail_when_initializing_conversion_for_tests(bool fail) {
@@ -205,8 +211,6 @@
base::WeakPtrFactory<PdfConverterImpl> weak_ptr_factory_{this};
static bool simulate_failure_initializing_conversion_;
-
- DISALLOW_COPY_AND_ASSIGN(PdfConverterImpl);
};
// static
diff --git a/chrome/browser/printing/print_browsertest.cc b/chrome/browser/printing/print_browsertest.cc
index e902e1d..7389bb95 100644
--- a/chrome/browser/printing/print_browsertest.cc
+++ b/chrome/browser/printing/print_browsertest.cc
@@ -151,6 +151,9 @@
PrintPreviewUI::SetDelegateForTesting(this);
}
+ PrintPreviewObserver(const PrintPreviewObserver&) = delete;
+ PrintPreviewObserver& operator=(const PrintPreviewObserver&) = delete;
+
~PrintPreviewObserver() override {
PrintPreviewUI::SetDelegateForTesting(nullptr);
}
@@ -203,8 +206,6 @@
uint32_t rendered_page_count_ = 0;
content::WebContents* preview_dialog_ = nullptr;
base::RunLoop* run_loop_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(PrintPreviewObserver);
};
class TestPrintRenderFrame
diff --git a/chrome/browser/printing/print_job_manager.h b/chrome/browser/printing/print_job_manager.h
index bdeba84..6e3322a2 100644
--- a/chrome/browser/printing/print_job_manager.h
+++ b/chrome/browser/printing/print_job_manager.h
@@ -60,6 +60,10 @@
class PrintJobManager : public content::NotificationObserver {
public:
PrintJobManager();
+
+ PrintJobManager(const PrintJobManager&) = delete;
+ PrintJobManager& operator=(const PrintJobManager&) = delete;
+
~PrintJobManager() override;
// On browser quit, we should wait to have the print job finished.
@@ -96,8 +100,6 @@
scoped_refptr<PrintQueriesQueue> queue_;
bool is_shutdown_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(PrintJobManager);
};
} // namespace printing
diff --git a/chrome/browser/printing/print_job_unittest.cc b/chrome/browser/printing/print_job_unittest.cc
index d2d2907..01d13e4 100644
--- a/chrome/browser/printing/print_job_unittest.cc
+++ b/chrome/browser/printing/print_job_unittest.cc
@@ -45,6 +45,9 @@
FAIL();
}
+ TestQuery(const TestQuery&) = delete;
+ TestQuery& operator=(const TestQuery&) = delete;
+
~TestQuery() override {}
std::unique_ptr<PrintJobWorker> DetachWorker() override {
@@ -62,9 +65,6 @@
return std::move(worker);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestQuery);
};
class TestPrintJob : public PrintJob {
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
index 2824b97..43059434 100644
--- a/chrome/browser/printing/print_job_worker.cc
+++ b/chrome/browser/printing/print_job_worker.cc
@@ -56,6 +56,10 @@
class PrintingContextDelegate : public PrintingContext::Delegate {
public:
PrintingContextDelegate(int render_process_id, int render_frame_id);
+
+ PrintingContextDelegate(const PrintingContextDelegate&) = delete;
+ PrintingContextDelegate& operator=(const PrintingContextDelegate&) = delete;
+
~PrintingContextDelegate() override;
gfx::NativeView GetParentView() override;
@@ -70,8 +74,6 @@
private:
const int render_process_id_;
const int render_frame_id_;
-
- DISALLOW_COPY_AND_ASSIGN(PrintingContextDelegate);
};
PrintingContextDelegate::PrintingContextDelegate(int render_process_id,
diff --git a/chrome/browser/printing/print_job_worker.h b/chrome/browser/printing/print_job_worker.h
index 4c03b36..553277b 100644
--- a/chrome/browser/printing/print_job_worker.h
+++ b/chrome/browser/printing/print_job_worker.h
@@ -40,6 +40,10 @@
PrintingContext::Result)>;
PrintJobWorker(int render_process_id, int render_frame_id);
+
+ PrintJobWorker(const PrintJobWorker&) = delete;
+ PrintJobWorker& operator=(const PrintJobWorker&) = delete;
+
virtual ~PrintJobWorker();
void SetPrintJob(PrintJob* print_job);
@@ -189,8 +193,6 @@
// Used to generate a WeakPtr for callbacks.
base::WeakPtrFactory<PrintJobWorker> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PrintJobWorker);
};
} // namespace printing
diff --git a/chrome/browser/printing/print_preview_context_menu_observer.h b/chrome/browser/printing/print_preview_context_menu_observer.h
index 1ada0bf3..e5f67b91 100644
--- a/chrome/browser/printing/print_preview_context_menu_observer.h
+++ b/chrome/browser/printing/print_preview_context_menu_observer.h
@@ -16,6 +16,12 @@
class PrintPreviewContextMenuObserver : public RenderViewContextMenuObserver {
public:
explicit PrintPreviewContextMenuObserver(content::WebContents* contents);
+
+ PrintPreviewContextMenuObserver(const PrintPreviewContextMenuObserver&) =
+ delete;
+ PrintPreviewContextMenuObserver& operator=(
+ const PrintPreviewContextMenuObserver&) = delete;
+
~PrintPreviewContextMenuObserver() override;
// RenderViewContextMenuObserver implementation.
@@ -26,8 +32,6 @@
bool IsPrintPreviewDialog();
content::WebContents* contents_;
-
- DISALLOW_COPY_AND_ASSIGN(PrintPreviewContextMenuObserver);
};
#endif // CHROME_BROWSER_PRINTING_PRINT_PREVIEW_CONTEXT_MENU_OBSERVER_H_
diff --git a/chrome/browser/printing/print_preview_data_service.cc b/chrome/browser/printing/print_preview_data_service.cc
index b866ea8..8c2a2d0 100644
--- a/chrome/browser/printing/print_preview_data_service.cc
+++ b/chrome/browser/printing/print_preview_data_service.cc
@@ -46,6 +46,10 @@
class PrintPreviewDataStore {
public:
PrintPreviewDataStore() {}
+
+ PrintPreviewDataStore(const PrintPreviewDataStore&) = delete;
+ PrintPreviewDataStore& operator=(const PrintPreviewDataStore&) = delete;
+
~PrintPreviewDataStore() {}
// Get the preview page for the specified |index|.
@@ -88,8 +92,6 @@
}
PreviewPageDataMap page_data_map_;
-
- DISALLOW_COPY_AND_ASSIGN(PrintPreviewDataStore);
};
// static
diff --git a/chrome/browser/printing/print_preview_dialog_controller.cc b/chrome/browser/printing/print_preview_dialog_controller.cc
index 4ff73fd2..14924d3 100644
--- a/chrome/browser/printing/print_preview_dialog_controller.cc
+++ b/chrome/browser/printing/print_preview_dialog_controller.cc
@@ -77,6 +77,11 @@
public content::WebContentsObserver {
public:
explicit PrintPreviewDialogDelegate(WebContents* initiator);
+
+ PrintPreviewDialogDelegate(const PrintPreviewDialogDelegate&) = delete;
+ PrintPreviewDialogDelegate& operator=(const PrintPreviewDialogDelegate&) =
+ delete;
+
~PrintPreviewDialogDelegate() override;
ui::ModalType GetDialogModalType() const override;
@@ -96,8 +101,6 @@
WebContents* initiator() const { return web_contents(); }
bool on_dialog_closed_called_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(PrintPreviewDialogDelegate);
};
PrintPreviewDialogDelegate::PrintPreviewDialogDelegate(WebContents* initiator)
diff --git a/chrome/browser/printing/print_preview_pdf_generated_browsertest.cc b/chrome/browser/printing/print_preview_pdf_generated_browsertest.cc
index 4c3b7e2..d9e03763 100644
--- a/chrome/browser/printing/print_preview_pdf_generated_browsertest.cc
+++ b/chrome/browser/printing/print_preview_pdf_generated_browsertest.cc
@@ -292,6 +292,12 @@
class PrintPreviewPdfGeneratedBrowserTest : public InProcessBrowserTest {
public:
PrintPreviewPdfGeneratedBrowserTest() {}
+
+ PrintPreviewPdfGeneratedBrowserTest(
+ const PrintPreviewPdfGeneratedBrowserTest&) = delete;
+ PrintPreviewPdfGeneratedBrowserTest& operator=(
+ const PrintPreviewPdfGeneratedBrowserTest&) = delete;
+
~PrintPreviewPdfGeneratedBrowserTest() override {}
// Navigates to the given web page, then initiates print preview and waits
@@ -539,8 +545,6 @@
// TODO(ivandavid): Keep it as a ScopedTempDir and change the layout test
// framework so that it tells the browser test how many test files there are.
base::ScopedTempDir tmp_dir_;
-
- DISALLOW_COPY_AND_ASSIGN(PrintPreviewPdfGeneratedBrowserTest);
};
// This test acts as a driver for the layout test framework.
diff --git a/chrome/browser/printing/print_preview_test.h b/chrome/browser/printing/print_preview_test.h
index 6df87850..131d772 100644
--- a/chrome/browser/printing/print_preview_test.h
+++ b/chrome/browser/printing/print_preview_test.h
@@ -11,15 +11,15 @@
class PrintPreviewTest : public BrowserWithTestWindowTest {
public:
PrintPreviewTest();
+
+ PrintPreviewTest(const PrintPreviewTest&) = delete;
+ PrintPreviewTest& operator=(const PrintPreviewTest&) = delete;
+
~PrintPreviewTest() override;
protected:
// Create a browser window to provide parenting for web contents modal dialog.
std::unique_ptr<BrowserWindow> CreateBrowserWindow() override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PrintPreviewTest);
};
#endif // CHROME_BROWSER_PRINTING_PRINT_PREVIEW_TEST_H_
-
diff --git a/chrome/browser/printing/print_view_manager.h b/chrome/browser/printing/print_view_manager.h
index 2736b69..96f9566 100644
--- a/chrome/browser/printing/print_view_manager.h
+++ b/chrome/browser/printing/print_view_manager.h
@@ -23,6 +23,9 @@
class PrintViewManager : public PrintViewManagerBase,
public content::WebContentsUserData<PrintViewManager> {
public:
+ PrintViewManager(const PrintViewManager&) = delete;
+ PrintViewManager& operator=(const PrintViewManager&) = delete;
+
~PrintViewManager() override;
static void BindPrintManagerHost(
@@ -167,8 +170,6 @@
// beginning of destruction. Note that PrintViewManagerBase has its own
// base::WeakPtrFactory as well, but PrintViewManager should use this one.
base::WeakPtrFactory<PrintViewManager> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PrintViewManager);
};
} // namespace printing
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
index eaa0e162..24ffeb0 100644
--- a/chrome/browser/printing/print_view_manager_base.h
+++ b/chrome/browser/printing/print_view_manager_base.h
@@ -42,6 +42,9 @@
class PrintViewManagerBase : public content::NotificationObserver,
public PrintManager {
public:
+ PrintViewManagerBase(const PrintViewManagerBase&) = delete;
+ PrintViewManagerBase& operator=(const PrintViewManagerBase&) = delete;
+
~PrintViewManagerBase() override;
// Prints the current document immediately. Since the rendering is
@@ -248,8 +251,6 @@
const scoped_refptr<PrintQueriesQueue> queue_;
base::WeakPtrFactory<PrintViewManagerBase> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PrintViewManagerBase);
};
} // namespace printing
diff --git a/chrome/browser/printing/print_view_manager_basic.h b/chrome/browser/printing/print_view_manager_basic.h
index 98eb975..b96e69dd9 100644
--- a/chrome/browser/printing/print_view_manager_basic.h
+++ b/chrome/browser/printing/print_view_manager_basic.h
@@ -17,6 +17,9 @@
: public PrintViewManagerBase,
public content::WebContentsUserData<PrintViewManagerBasic> {
public:
+ PrintViewManagerBasic(const PrintViewManagerBasic&) = delete;
+ PrintViewManagerBasic& operator=(const PrintViewManagerBasic&) = delete;
+
~PrintViewManagerBasic() override;
static void BindPrintManagerHost(
@@ -33,8 +36,6 @@
friend class content::WebContentsUserData<PrintViewManagerBasic>;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(PrintViewManagerBasic);
};
} // namespace printing
diff --git a/chrome/browser/printing/printer_query.h b/chrome/browser/printing/printer_query.h
index a9e24a7..c936e39 100644
--- a/chrome/browser/printing/printer_query.h
+++ b/chrome/browser/printing/printer_query.h
@@ -33,6 +33,10 @@
// Can only be called on the IO thread.
PrinterQuery(int render_process_id, int render_frame_id);
+
+ PrinterQuery(const PrinterQuery&) = delete;
+ PrinterQuery& operator=(const PrinterQuery&) = delete;
+
virtual ~PrinterQuery();
// Detach the PrintJobWorker associated to this object. Virtual so that tests
@@ -114,8 +118,6 @@
// are blocking and enters a message loop without your consent. There is one
// worker thread per print job.
std::unique_ptr<PrintJobWorker> worker_;
-
- DISALLOW_COPY_AND_ASSIGN(PrinterQuery);
};
} // namespace printing
diff --git a/chrome/browser/printing/pwg_raster_converter.cc b/chrome/browser/printing/pwg_raster_converter.cc
index 8ed000ad..7fb148e 100644
--- a/chrome/browser/printing/pwg_raster_converter.cc
+++ b/chrome/browser/printing/pwg_raster_converter.cc
@@ -126,6 +126,10 @@
class PwgRasterConverterImpl : public PwgRasterConverter {
public:
PwgRasterConverterImpl();
+
+ PwgRasterConverterImpl(const PwgRasterConverterImpl&) = delete;
+ PwgRasterConverterImpl& operator=(const PwgRasterConverterImpl&) = delete;
+
~PwgRasterConverterImpl() override;
void Start(const base::RefCountedMemory* data,
@@ -139,8 +143,6 @@
// Cancelable version of PwgRasterConverter::ResultCallback.
base::CancelableOnceCallback<void(base::ReadOnlySharedMemoryRegion)>
cancelable_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(PwgRasterConverterImpl);
};
PwgRasterConverterImpl::PwgRasterConverterImpl() = default;
diff --git a/chrome/browser/process_resource_usage.h b/chrome/browser/process_resource_usage.h
index 65011a7..630de899 100644
--- a/chrome/browser/process_resource_usage.h
+++ b/chrome/browser/process_resource_usage.h
@@ -62,6 +62,10 @@
// Must be called from the same thread that created |service|.
explicit ProcessResourceUsage(
mojo::PendingRemote<content::mojom::ResourceUsageReporter> service);
+
+ ProcessResourceUsage(const ProcessResourceUsage&) = delete;
+ ProcessResourceUsage& operator=(const ProcessResourceUsage&) = delete;
+
~ProcessResourceUsage();
// Refresh the resource usage information. |callback| is invoked when the
@@ -89,8 +93,6 @@
content::mojom::ResourceUsageDataPtr stats_;
base::ThreadChecker thread_checker_;
-
- DISALLOW_COPY_AND_ASSIGN(ProcessResourceUsage);
};
#endif // CHROME_BROWSER_PROCESS_RESOURCE_USAGE_H_
diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
index 0291db0..0d7c1db6 100644
--- a/chrome/browser/process_singleton.h
+++ b/chrome/browser/process_singleton.h
@@ -105,6 +105,10 @@
ProcessSingleton(const base::FilePath& user_data_dir,
const NotificationCallback& notification_callback);
+
+ ProcessSingleton(const ProcessSingleton&) = delete;
+ ProcessSingleton& operator=(const ProcessSingleton&) = delete;
+
~ProcessSingleton();
// Notify another process, if available. Otherwise sets ourselves as the
@@ -232,8 +236,6 @@
#endif
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(ProcessSingleton);
};
#endif // CHROME_BROWSER_PROCESS_SINGLETON_H_
diff --git a/chrome/browser/process_singleton_modal_dialog_lock.h b/chrome/browser/process_singleton_modal_dialog_lock.h
index 318e2a3..854e4d3 100644
--- a/chrome/browser/process_singleton_modal_dialog_lock.h
+++ b/chrome/browser/process_singleton_modal_dialog_lock.h
@@ -27,6 +27,11 @@
explicit ProcessSingletonModalDialogLock(
const ProcessSingleton::NotificationCallback& original_callback);
+ ProcessSingletonModalDialogLock(const ProcessSingletonModalDialogLock&) =
+ delete;
+ ProcessSingletonModalDialogLock& operator=(
+ const ProcessSingletonModalDialogLock&) = delete;
+
~ProcessSingletonModalDialogLock();
// Receives a callback to be run to close the active modal dialog, or an empty
@@ -45,8 +50,6 @@
base::RepeatingClosure notification_handler_;
ProcessSingleton::NotificationCallback original_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ProcessSingletonModalDialogLock);
};
#endif // CHROME_BROWSER_PROCESS_SINGLETON_MODAL_DIALOG_LOCK_H_
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
index dc9c1b7..6ae3d8b 100644
--- a/chrome/browser/process_singleton_posix.cc
+++ b/chrome/browser/process_singleton_posix.cc
@@ -487,6 +487,9 @@
this, &SocketReader::CleanupAndDeleteSelf);
}
+ SocketReader(const SocketReader&) = delete;
+ SocketReader& operator=(const SocketReader&) = delete;
+
~SocketReader() { CloseSocket(fd_); }
// Finish handling the incoming message by optionally sending back an ACK
@@ -524,8 +527,6 @@
size_t bytes_read_;
base::OneShotTimer timer_;
-
- DISALLOW_COPY_AND_ASSIGN(SocketReader);
};
// We expect to only be constructed on the UI thread.
diff --git a/chrome/browser/process_singleton_startup_lock.h b/chrome/browser/process_singleton_startup_lock.h
index eb3d1fc..8fbd6e7 100644
--- a/chrome/browser/process_singleton_startup_lock.h
+++ b/chrome/browser/process_singleton_startup_lock.h
@@ -27,6 +27,11 @@
public:
explicit ProcessSingletonStartupLock(
const ProcessSingleton::NotificationCallback& original_callback);
+
+ ProcessSingletonStartupLock(const ProcessSingletonStartupLock&) = delete;
+ ProcessSingletonStartupLock& operator=(const ProcessSingletonStartupLock&) =
+ delete;
+
~ProcessSingletonStartupLock();
// Returns the ProcessSingleton::NotificationCallback.
@@ -52,8 +57,6 @@
ProcessSingleton::NotificationCallback original_callback_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(ProcessSingletonStartupLock);
};
#endif // CHROME_BROWSER_PROCESS_SINGLETON_STARTUP_LOCK_H_
diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
index 8a72b51..e7cc3c5 100644
--- a/chrome/browser/process_singleton_win.cc
+++ b/chrome/browser/process_singleton_win.cc
@@ -53,6 +53,9 @@
DPCHECK(result == WAIT_OBJECT_0) << "Result = " << result;
}
+ AutoLockMutex(const AutoLockMutex&) = delete;
+ AutoLockMutex& operator=(const AutoLockMutex&) = delete;
+
~AutoLockMutex() {
BOOL released = ::ReleaseMutex(mutex_);
DPCHECK(released);
@@ -60,7 +63,6 @@
private:
HANDLE mutex_;
- DISALLOW_COPY_AND_ASSIGN(AutoLockMutex);
};
// A helper class that releases the given |mutex| while the AutoUnlockMutex is
@@ -72,6 +74,9 @@
DPCHECK(released);
}
+ AutoUnlockMutex(const AutoUnlockMutex&) = delete;
+ AutoUnlockMutex& operator=(const AutoUnlockMutex&) = delete;
+
~AutoUnlockMutex() {
DWORD result = ::WaitForSingleObject(mutex_, INFINITE);
DPCHECK(result == WAIT_OBJECT_0) << "Result = " << result;
@@ -79,7 +84,6 @@
private:
HANDLE mutex_;
- DISALLOW_COPY_AND_ASSIGN(AutoUnlockMutex);
};
// Checks the visibility of the enumerated window and signals once a visible
diff --git a/chrome/browser/process_singleton_win_unittest.cc b/chrome/browser/process_singleton_win_unittest.cc
index 8256affd..1865d98 100644
--- a/chrome/browser/process_singleton_win_unittest.cc
+++ b/chrome/browser/process_singleton_win_unittest.cc
@@ -55,6 +55,10 @@
class ScopedVisibleWindow {
public:
ScopedVisibleWindow() : class_(0), window_(NULL) {}
+
+ ScopedVisibleWindow(const ScopedVisibleWindow&) = delete;
+ ScopedVisibleWindow& operator=(const ScopedVisibleWindow&) = delete;
+
~ScopedVisibleWindow() {
if (window_)
::DestroyWindow(window_);
@@ -92,8 +96,6 @@
private:
ATOM class_;
HWND window_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedVisibleWindow);
};
MULTIPROCESS_TEST_MAIN(ProcessSingletonTestProcessMain) {
diff --git a/chrome/browser/profile_resetter/brandcode_config_fetcher.h b/chrome/browser/profile_resetter/brandcode_config_fetcher.h
index 5b99945..2ca6640 100644
--- a/chrome/browser/profile_resetter/brandcode_config_fetcher.h
+++ b/chrome/browser/profile_resetter/brandcode_config_fetcher.h
@@ -35,6 +35,10 @@
FetchCallback callback,
const GURL& url,
const std::string& brandcode);
+
+ BrandcodeConfigFetcher(const BrandcodeConfigFetcher&) = delete;
+ BrandcodeConfigFetcher& operator=(const BrandcodeConfigFetcher&) = delete;
+
~BrandcodeConfigFetcher();
bool IsActive() const { return !!simple_url_loader_; }
@@ -67,8 +71,6 @@
std::unique_ptr<BrandcodedDefaultSettings> default_settings_;
base::WeakPtrFactory<BrandcodeConfigFetcher> weak_ptr_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(BrandcodeConfigFetcher);
};
#endif // CHROME_BROWSER_PROFILE_RESETTER_BRANDCODE_CONFIG_FETCHER_H_
diff --git a/chrome/browser/profile_resetter/brandcoded_default_settings.h b/chrome/browser/profile_resetter/brandcoded_default_settings.h
index 905833c..212e4d1 100644
--- a/chrome/browser/profile_resetter/brandcoded_default_settings.h
+++ b/chrome/browser/profile_resetter/brandcoded_default_settings.h
@@ -19,6 +19,11 @@
BrandcodedDefaultSettings();
// Constructs BrandcodedDefaultSettings directly from preferences.
explicit BrandcodedDefaultSettings(const std::string& prefs);
+
+ BrandcodedDefaultSettings(const BrandcodedDefaultSettings&) = delete;
+ BrandcodedDefaultSettings& operator=(const BrandcodedDefaultSettings&) =
+ delete;
+
~BrandcodedDefaultSettings();
// The following methods return non-zero value if the default value was
@@ -41,8 +46,6 @@
std::unique_ptr<base::ListValue> ExtractList(const char* pref_name) const;
std::unique_ptr<base::DictionaryValue> master_dictionary_;
-
- DISALLOW_COPY_AND_ASSIGN(BrandcodedDefaultSettings);
};
#endif // CHROME_BROWSER_PROFILE_RESETTER_BRANDCODED_DEFAULT_SETTINGS_H_
diff --git a/chrome/browser/profile_resetter/profile_resetter.h b/chrome/browser/profile_resetter/profile_resetter.h
index 39e61e5dc..4b61cf20 100644
--- a/chrome/browser/profile_resetter/profile_resetter.h
+++ b/chrome/browser/profile_resetter/profile_resetter.h
@@ -65,6 +65,10 @@
"ResettableFlags should be the same size as Resettable");
explicit ProfileResetter(Profile* profile);
+
+ ProfileResetter(const ProfileResetter&) = delete;
+ ProfileResetter& operator=(const ProfileResetter&) = delete;
+
~ProfileResetter() override;
// Resets |resettable_flags| and calls |callback| on the UI thread on
@@ -120,8 +124,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<ProfileResetter> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ProfileResetter);
};
// Path to shortcut and command line arguments.
diff --git a/chrome/browser/profile_resetter/profile_resetter_browsertest.cc b/chrome/browser/profile_resetter/profile_resetter_browsertest.cc
index 3c69edb..26ebb83 100644
--- a/chrome/browser/profile_resetter/profile_resetter_browsertest.cc
+++ b/chrome/browser/profile_resetter/profile_resetter_browsertest.cc
@@ -36,6 +36,10 @@
class RemoveCookieTester {
public:
explicit RemoveCookieTester(Profile* profile);
+
+ RemoveCookieTester(const RemoveCookieTester&) = delete;
+ RemoveCookieTester& operator=(const RemoveCookieTester&) = delete;
+
~RemoveCookieTester();
bool GetCookie(const std::string& host, net::CanonicalCookie* cookie);
@@ -57,8 +61,6 @@
Profile* profile_;
mojo::Remote<network::mojom::CookieManager> cookie_manager_;
scoped_refptr<content::MessageLoopRunner> runner_;
-
- DISALLOW_COPY_AND_ASSIGN(RemoveCookieTester);
};
RemoveCookieTester::RemoveCookieTester(Profile* profile)
diff --git a/chrome/browser/profile_resetter/profile_resetter_test_base.h b/chrome/browser/profile_resetter/profile_resetter_test_base.h
index 22fab88a..19897ea 100644
--- a/chrome/browser/profile_resetter/profile_resetter_test_base.h
+++ b/chrome/browser/profile_resetter/profile_resetter_test_base.h
@@ -30,6 +30,11 @@
class ProfileResetterMockObject {
public:
ProfileResetterMockObject();
+
+ ProfileResetterMockObject(const ProfileResetterMockObject&) = delete;
+ ProfileResetterMockObject& operator=(const ProfileResetterMockObject&) =
+ delete;
+
~ProfileResetterMockObject();
void RunLoop();
@@ -39,14 +44,16 @@
MOCK_METHOD0(Callback, void(void));
scoped_refptr<content::MessageLoopRunner> runner_;
-
- DISALLOW_COPY_AND_ASSIGN(ProfileResetterMockObject);
};
// Base class for all ProfileResetter unit tests.
class ProfileResetterTestBase {
public:
ProfileResetterTestBase();
+
+ ProfileResetterTestBase(const ProfileResetterTestBase&) = delete;
+ ProfileResetterTestBase& operator=(const ProfileResetterTestBase&) = delete;
+
~ProfileResetterTestBase();
void ResetAndWait(ProfileResetter::ResettableFlags resettable_flags);
@@ -55,9 +62,6 @@
protected:
testing::StrictMock<ProfileResetterMockObject> mock_object_;
std::unique_ptr<ProfileResetter> resetter_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ProfileResetterTestBase);
};
std::unique_ptr<KeyedService> CreateTemplateURLServiceForTesting(
diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
index d8ecc99..c0f5e46 100644
--- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc
+++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
@@ -233,6 +233,10 @@
class ShortcutHandler {
public:
ShortcutHandler();
+
+ ShortcutHandler(const ShortcutHandler&) = delete;
+ ShortcutHandler& operator=(const ShortcutHandler&) = delete;
+
~ShortcutHandler();
static bool IsSupported();
@@ -247,7 +251,6 @@
#if defined(OS_WIN)
base::FilePath shortcut_path_;
#endif
- DISALLOW_COPY_AND_ASSIGN(ShortcutHandler);
};
#if defined(OS_WIN)
diff --git a/chrome/browser/profile_resetter/reset_report_uploader.h b/chrome/browser/profile_resetter/reset_report_uploader.h
index 7b05ef0..77bb70d 100644
--- a/chrome/browser/profile_resetter/reset_report_uploader.h
+++ b/chrome/browser/profile_resetter/reset_report_uploader.h
@@ -26,6 +26,10 @@
public:
explicit ResetReportUploader(
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory);
+
+ ResetReportUploader(const ResetReportUploader&) = delete;
+ ResetReportUploader& operator=(const ResetReportUploader&) = delete;
+
~ResetReportUploader() override;
void DispatchReport(const reset_report::ChromeResetReport& report);
@@ -43,8 +47,6 @@
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
SimpleURLLoaderList simple_url_loaders_;
-
- DISALLOW_COPY_AND_ASSIGN(ResetReportUploader);
};
#endif // CHROME_BROWSER_PROFILE_RESETTER_RESET_REPORT_UPLOADER_H_
diff --git a/chrome/browser/profile_resetter/resettable_settings_snapshot.h b/chrome/browser/profile_resetter/resettable_settings_snapshot.h
index ef1ff0a5..dde9cae 100644
--- a/chrome/browser/profile_resetter/resettable_settings_snapshot.h
+++ b/chrome/browser/profile_resetter/resettable_settings_snapshot.h
@@ -42,6 +42,11 @@
};
explicit ResettableSettingsSnapshot(Profile* profile);
+
+ ResettableSettingsSnapshot(const ResettableSettingsSnapshot&) = delete;
+ ResettableSettingsSnapshot& operator=(const ResettableSettingsSnapshot&) =
+ delete;
+
~ResettableSettingsSnapshot();
// Getters.
@@ -118,8 +123,6 @@
scoped_refptr<SharedCancellationFlag> cancellation_flag_;
base::WeakPtrFactory<ResettableSettingsSnapshot> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ResettableSettingsSnapshot);
};
// Serializes specified |snapshot| members to a protobuf. |field_mask| is a bit
diff --git a/chrome/browser/profile_resetter/triggered_profile_resetter.h b/chrome/browser/profile_resetter/triggered_profile_resetter.h
index c3c44c4..2ec6121 100644
--- a/chrome/browser/profile_resetter/triggered_profile_resetter.h
+++ b/chrome/browser/profile_resetter/triggered_profile_resetter.h
@@ -47,6 +47,10 @@
enum : size_t { kMaxToolNameLength = 100 };
explicit TriggeredProfileResetter(Profile* profile);
+
+ TriggeredProfileResetter(const TriggeredProfileResetter&) = delete;
+ TriggeredProfileResetter& operator=(const TriggeredProfileResetter&) = delete;
+
~TriggeredProfileResetter() override;
// Causes the TriggeredProfileResetter to look for the presence of a trigger.
@@ -77,8 +81,6 @@
bool activate_called_ = false;
std::u16string tool_name_;
-
- DISALLOW_COPY_AND_ASSIGN(TriggeredProfileResetter);
};
// Exposed for testing.
diff --git a/chrome/browser/profiles/avatar_menu.h b/chrome/browser/profiles/avatar_menu.h
index 399a696..c40c767 100644
--- a/chrome/browser/profiles/avatar_menu.h
+++ b/chrome/browser/profiles/avatar_menu.h
@@ -103,6 +103,10 @@
AvatarMenu(ProfileAttributesStorage* profile_storage,
AvatarMenuObserver* observer,
Browser* browser);
+
+ AvatarMenu(const AvatarMenu&) = delete;
+ AvatarMenu& operator=(const AvatarMenu&) = delete;
+
~AvatarMenu() override;
// Sets |image| to the avatar corresponding to the profile at |profile_path|.
@@ -200,8 +204,6 @@
// Browser in which this avatar menu resides. Weak.
Browser* browser_;
-
- DISALLOW_COPY_AND_ASSIGN(AvatarMenu);
};
#endif // CHROME_BROWSER_PROFILES_AVATAR_MENU_H_
diff --git a/chrome/browser/profiles/avatar_menu_actions_desktop.h b/chrome/browser/profiles/avatar_menu_actions_desktop.h
index 8973e50..b719e2f 100644
--- a/chrome/browser/profiles/avatar_menu_actions_desktop.h
+++ b/chrome/browser/profiles/avatar_menu_actions_desktop.h
@@ -18,6 +18,10 @@
class AvatarMenuActionsDesktop : public AvatarMenuActions {
public:
AvatarMenuActionsDesktop();
+
+ AvatarMenuActionsDesktop(const AvatarMenuActionsDesktop&) = delete;
+ AvatarMenuActionsDesktop& operator=(const AvatarMenuActionsDesktop&) = delete;
+
~AvatarMenuActionsDesktop() override;
// AvatarMenuActions overrides:
@@ -33,8 +37,6 @@
// Special "override" logout URL used to let tests work.
std::string logout_override_;
-
- DISALLOW_COPY_AND_ASSIGN(AvatarMenuActionsDesktop);
};
#endif // CHROME_BROWSER_PROFILES_AVATAR_MENU_ACTIONS_DESKTOP_H_
diff --git a/chrome/browser/profiles/force_safe_search_policy_handler.h b/chrome/browser/profiles/force_safe_search_policy_handler.h
index b81d799..9ed1ce87 100644
--- a/chrome/browser/profiles/force_safe_search_policy_handler.h
+++ b/chrome/browser/profiles/force_safe_search_policy_handler.h
@@ -22,15 +22,17 @@
class ForceSafeSearchPolicyHandler : public TypeCheckingPolicyHandler {
public:
ForceSafeSearchPolicyHandler();
+
+ ForceSafeSearchPolicyHandler(const ForceSafeSearchPolicyHandler&) = delete;
+ ForceSafeSearchPolicyHandler& operator=(const ForceSafeSearchPolicyHandler&) =
+ delete;
+
~ForceSafeSearchPolicyHandler() override;
protected:
// ConfigurationPolicyHandler:
void ApplyPolicySettings(const PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ForceSafeSearchPolicyHandler);
};
} // namespace policy
diff --git a/chrome/browser/profiles/force_youtube_safety_mode_policy_handler.h b/chrome/browser/profiles/force_youtube_safety_mode_policy_handler.h
index cd2c159..df2232d 100644
--- a/chrome/browser/profiles/force_youtube_safety_mode_policy_handler.h
+++ b/chrome/browser/profiles/force_youtube_safety_mode_policy_handler.h
@@ -22,15 +22,18 @@
class ForceYouTubeSafetyModePolicyHandler : public TypeCheckingPolicyHandler {
public:
ForceYouTubeSafetyModePolicyHandler();
+
+ ForceYouTubeSafetyModePolicyHandler(
+ const ForceYouTubeSafetyModePolicyHandler&) = delete;
+ ForceYouTubeSafetyModePolicyHandler& operator=(
+ const ForceYouTubeSafetyModePolicyHandler&) = delete;
+
~ForceYouTubeSafetyModePolicyHandler() override;
protected:
// ConfigurationPolicyHandler:
void ApplyPolicySettings(const PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ForceYouTubeSafetyModePolicyHandler);
};
} // namespace policy
diff --git a/chrome/browser/profiles/gaia_info_update_service.h b/chrome/browser/profiles/gaia_info_update_service.h
index 5922d315..f863903 100644
--- a/chrome/browser/profiles/gaia_info_update_service.h
+++ b/chrome/browser/profiles/gaia_info_update_service.h
@@ -25,6 +25,9 @@
ProfileAttributesStorage* profile_attributes_storage,
const base::FilePath& profile_path);
+ GAIAInfoUpdateService(const GAIAInfoUpdateService&) = delete;
+ GAIAInfoUpdateService& operator=(const GAIAInfoUpdateService&) = delete;
+
~GAIAInfoUpdateService() override;
// Updates the GAIA info for the profile associated with this instance.
@@ -54,8 +57,6 @@
// TODO(msalama): remove when |SigninProfileAttributesUpdater| is folded into
// |GAIAInfoUpdateService|.
std::string gaia_id_of_profile_attribute_entry_;
-
- DISALLOW_COPY_AND_ASSIGN(GAIAInfoUpdateService);
};
#endif // CHROME_BROWSER_PROFILES_GAIA_INFO_UPDATE_SERVICE_H_
diff --git a/chrome/browser/profiles/guest_mode_policy_handler.h b/chrome/browser/profiles/guest_mode_policy_handler.h
index 0f7b20e..35399622 100644
--- a/chrome/browser/profiles/guest_mode_policy_handler.h
+++ b/chrome/browser/profiles/guest_mode_policy_handler.h
@@ -17,13 +17,14 @@
class GuestModePolicyHandler : public TypeCheckingPolicyHandler {
public:
GuestModePolicyHandler();
+
+ GuestModePolicyHandler(const GuestModePolicyHandler&) = delete;
+ GuestModePolicyHandler& operator=(const GuestModePolicyHandler&) = delete;
+
~GuestModePolicyHandler() override;
void ApplyPolicySettings(const PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(GuestModePolicyHandler);
};
} // namespace policy
diff --git a/chrome/browser/profiles/incognito_mode_policy_handler.h b/chrome/browser/profiles/incognito_mode_policy_handler.h
index bdf812f3..de55182 100644
--- a/chrome/browser/profiles/incognito_mode_policy_handler.h
+++ b/chrome/browser/profiles/incognito_mode_policy_handler.h
@@ -19,6 +19,11 @@
class IncognitoModePolicyHandler : public ConfigurationPolicyHandler {
public:
IncognitoModePolicyHandler();
+
+ IncognitoModePolicyHandler(const IncognitoModePolicyHandler&) = delete;
+ IncognitoModePolicyHandler& operator=(const IncognitoModePolicyHandler&) =
+ delete;
+
~IncognitoModePolicyHandler() override;
// ConfigurationPolicyHandler methods:
@@ -26,9 +31,6 @@
PolicyErrorMap* errors) override;
void ApplyPolicySettings(const PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(IncognitoModePolicyHandler);
};
} // namespace policy
diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc
index 6e67b950..969995c82 100644
--- a/chrome/browser/profiles/profile_avatar_icon_util.cc
+++ b/chrome/browser/profiles/profile_avatar_icon_util.cc
@@ -138,6 +138,9 @@
AvatarPosition position,
AvatarBorder border);
+ AvatarImageSource(const AvatarImageSource&) = delete;
+ AvatarImageSource& operator=(const AvatarImageSource&) = delete;
+
~AvatarImageSource() override;
// CanvasImageSource override:
@@ -151,8 +154,6 @@
const AvatarPosition position_;
const AvatarBorder border_;
const profiles::AvatarShape shape_;
-
- DISALLOW_COPY_AND_ASSIGN(AvatarImageSource);
};
AvatarImageSource::AvatarImageSource(gfx::ImageSkia avatar,
@@ -298,6 +299,10 @@
image_(image),
background_(background) {}
+ ImageWithBackgroundSource(const ImageWithBackgroundSource&) = delete;
+ ImageWithBackgroundSource& operator=(const ImageWithBackgroundSource&) =
+ delete;
+
~ImageWithBackgroundSource() override = default;
// gfx::CanvasImageSource override.
@@ -309,8 +314,6 @@
private:
const gfx::ImageSkia image_;
const SkColor background_;
-
- DISALLOW_COPY_AND_ASSIGN(ImageWithBackgroundSource);
};
} // namespace
diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc
index d7fd9dd..9403fd56 100644
--- a/chrome/browser/profiles/profile_browsertest.cc
+++ b/chrome/browser/profiles/profile_browsertest.cc
@@ -162,6 +162,11 @@
class ProfileDestructionWatcher : public ProfileObserver {
public:
ProfileDestructionWatcher() = default;
+
+ ProfileDestructionWatcher(const ProfileDestructionWatcher&) = delete;
+ ProfileDestructionWatcher& operator=(const ProfileDestructionWatcher&) =
+ delete;
+
~ProfileDestructionWatcher() override = default;
void Watch(Profile* profile) { observed_profiles_.AddObservation(profile); }
@@ -183,8 +188,6 @@
base::RunLoop run_loop_;
base::ScopedMultiSourceObservation<Profile, ProfileObserver>
observed_profiles_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ProfileDestructionWatcher);
};
// Creates a prefs file in the given directory.
@@ -235,6 +238,10 @@
explicit BrowserCloseObserver(Browser* browser) : browser_(browser) {
BrowserList::AddObserver(this);
}
+
+ BrowserCloseObserver(const BrowserCloseObserver&) = delete;
+ BrowserCloseObserver& operator=(const BrowserCloseObserver&) = delete;
+
~BrowserCloseObserver() override { BrowserList::RemoveObserver(this); }
void Wait() { run_loop_.Run(); }
@@ -248,8 +255,6 @@
private:
Browser* browser_;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserCloseObserver);
};
} // namespace
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index 29f88e1..6a9b3f2c 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -16,6 +16,10 @@
class ProfileIOData {
public:
ProfileIOData() = delete;
+
+ ProfileIOData(const ProfileIOData&) = delete;
+ ProfileIOData& operator=(const ProfileIOData&) = delete;
+
~ProfileIOData() = delete;
// Returns true if |scheme| is handled in Chrome, or by default handlers in
@@ -25,9 +29,6 @@
// Returns true if |url| is handled in Chrome, or by default handlers in
// net::URLRequest.
static bool IsHandledURL(const GURL& url);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
};
#endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
diff --git a/chrome/browser/profiles/profile_key.h b/chrome/browser/profiles/profile_key.h
index d3ff46ce..b37773e 100644
--- a/chrome/browser/profiles/profile_key.h
+++ b/chrome/browser/profiles/profile_key.h
@@ -23,6 +23,10 @@
public:
ProfileKey(const base::FilePath& path,
ProfileKey* original_key = nullptr);
+
+ ProfileKey(const ProfileKey&) = delete;
+ ProfileKey& operator=(const ProfileKey&) = delete;
+
~ProfileKey() override;
// Profile-specific APIs needed in reduced mode:
@@ -53,8 +57,6 @@
#if defined(OS_ANDROID)
std::unique_ptr<ProfileKeyAndroid> profile_key_android_;
#endif // OS_ANDROID
-
- DISALLOW_COPY_AND_ASSIGN(ProfileKey);
};
#endif // CHROME_BROWSER_PROFILES_PROFILE_KEY_H_
diff --git a/chrome/browser/profiles/profile_list_desktop.h b/chrome/browser/profiles/profile_list_desktop.h
index 9bc4cdda..ebd3f17 100644
--- a/chrome/browser/profiles/profile_list_desktop.h
+++ b/chrome/browser/profiles/profile_list_desktop.h
@@ -21,6 +21,10 @@
class ProfileListDesktop : public ProfileList {
public:
explicit ProfileListDesktop(ProfileAttributesStorage* profile_storage);
+
+ ProfileListDesktop(const ProfileListDesktop&) = delete;
+ ProfileListDesktop& operator=(const ProfileListDesktop&) = delete;
+
~ProfileListDesktop() override;
private:
@@ -43,8 +47,6 @@
// List of built "menu items."
std::vector<std::unique_ptr<AvatarMenu::Item>> items_;
-
- DISALLOW_COPY_AND_ASSIGN(ProfileListDesktop);
};
#endif // CHROME_BROWSER_PROFILES_PROFILE_LIST_DESKTOP_H_
diff --git a/chrome/browser/profiles/profile_list_desktop_unittest.cc b/chrome/browser/profiles/profile_list_desktop_unittest.cc
index ca59722..0092491 100644
--- a/chrome/browser/profiles/profile_list_desktop_unittest.cc
+++ b/chrome/browser/profiles/profile_list_desktop_unittest.cc
@@ -35,6 +35,10 @@
class MockObserver : public AvatarMenuObserver {
public:
MockObserver() : count_(0) {}
+
+ MockObserver(const MockObserver&) = delete;
+ MockObserver& operator=(const MockObserver&) = delete;
+
~MockObserver() override {}
void OnAvatarMenuChanged(AvatarMenu* avatar_menu) override { ++count_; }
@@ -43,8 +47,6 @@
private:
int count_;
-
- DISALLOW_COPY_AND_ASSIGN(MockObserver);
};
class ProfileListDesktopTest : public testing::Test {
diff --git a/chrome/browser/profiles/profile_manager_browsertest.cc b/chrome/browser/profiles/profile_manager_browsertest.cc
index 4a123b4..1b25274 100644
--- a/chrome/browser/profiles/profile_manager_browsertest.cc
+++ b/chrome/browser/profiles/profile_manager_browsertest.cc
@@ -103,6 +103,11 @@
}
}
+ MultipleProfileDeletionObserver(const MultipleProfileDeletionObserver&) =
+ delete;
+ MultipleProfileDeletionObserver& operator=(
+ const MultipleProfileDeletionObserver&) = delete;
+
~MultipleProfileDeletionObserver() override {
g_browser_process->profile_manager()->GetProfileAttributesStorage().
RemoveObserver(this);
@@ -148,8 +153,6 @@
size_t expected_count_;
size_t profiles_removed_count_;
size_t profiles_data_removed_count_;
-
- DISALLOW_COPY_AND_ASSIGN(MultipleProfileDeletionObserver);
};
void EphemeralProfileCreationComplete(base::OnceClosure completion_callback,
@@ -167,6 +170,9 @@
AddObserver(this);
}
+ ProfileRemovalObserver(const ProfileRemovalObserver&) = delete;
+ ProfileRemovalObserver& operator=(const ProfileRemovalObserver&) = delete;
+
~ProfileRemovalObserver() override {
g_browser_process->profile_manager()->GetProfileAttributesStorage().
RemoveObserver(this);
@@ -182,8 +188,6 @@
private:
std::string last_used_profile_name_;
-
- DISALLOW_COPY_AND_ASSIGN(ProfileRemovalObserver);
};
// The class serves to retrieve passwords from PasswordStore asynchronously. It
diff --git a/chrome/browser/profiling_host/chrome_browser_main_extra_parts_profiling.h b/chrome/browser/profiling_host/chrome_browser_main_extra_parts_profiling.h
index 9ebf132..5323a73 100644
--- a/chrome/browser/profiling_host/chrome_browser_main_extra_parts_profiling.h
+++ b/chrome/browser/profiling_host/chrome_browser_main_extra_parts_profiling.h
@@ -13,13 +13,17 @@
: public ChromeBrowserMainExtraParts {
public:
ChromeBrowserMainExtraPartsProfiling();
+
+ ChromeBrowserMainExtraPartsProfiling(
+ const ChromeBrowserMainExtraPartsProfiling&) = delete;
+ ChromeBrowserMainExtraPartsProfiling& operator=(
+ const ChromeBrowserMainExtraPartsProfiling&) = delete;
+
~ChromeBrowserMainExtraPartsProfiling() override;
private:
// ChromeBrowserMainExtraParts overrides.
void PostCreateThreads() override;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsProfiling);
};
#endif // CHROME_BROWSER_PROFILING_HOST_CHROME_BROWSER_MAIN_EXTRA_PARTS_PROFILING_H_
diff --git a/chrome/browser/push_messaging/budget_database.h b/chrome/browser/push_messaging/budget_database.h
index 3bbc9631..3af2cc3a 100644
--- a/chrome/browser/push_messaging/budget_database.h
+++ b/chrome/browser/push_messaging/budget_database.h
@@ -62,6 +62,10 @@
// The database_dir specifies the location of the budget information on disk.
explicit BudgetDatabase(Profile* profile);
+
+ BudgetDatabase(const BudgetDatabase&) = delete;
+ BudgetDatabase& operator=(const BudgetDatabase&) = delete;
+
~BudgetDatabase();
// Get the full budget expectation for the origin. This will return a
@@ -170,8 +174,6 @@
std::unique_ptr<base::Clock> clock_;
base::WeakPtrFactory<BudgetDatabase> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BudgetDatabase);
};
#endif // CHROME_BROWSER_PUSH_MESSAGING_BUDGET_DATABASE_H_
diff --git a/chrome/browser/push_messaging/push_messaging_notification_manager.h b/chrome/browser/push_messaging/push_messaging_notification_manager.h
index 7f7de31..a872249 100644
--- a/chrome/browser/push_messaging/push_messaging_notification_manager.h
+++ b/chrome/browser/push_messaging/push_messaging_notification_manager.h
@@ -45,6 +45,12 @@
base::OnceCallback<void(bool did_show_generic_notification)>;
explicit PushMessagingNotificationManager(Profile* profile);
+
+ PushMessagingNotificationManager(const PushMessagingNotificationManager&) =
+ delete;
+ PushMessagingNotificationManager& operator=(
+ const PushMessagingNotificationManager&) = delete;
+
~PushMessagingNotificationManager();
// Enforces the requirements implied for push subscriptions which must display
@@ -111,8 +117,6 @@
#endif
base::WeakPtrFactory<PushMessagingNotificationManager> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PushMessagingNotificationManager);
};
#endif // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_NOTIFICATION_MANAGER_H_
diff --git a/chrome/browser/push_messaging/push_messaging_refresher.h b/chrome/browser/push_messaging/push_messaging_refresher.h
index f0675930..c049a14 100644
--- a/chrome/browser/push_messaging/push_messaging_refresher.h
+++ b/chrome/browser/push_messaging/push_messaging_refresher.h
@@ -24,6 +24,10 @@
class PushMessagingRefresher {
public:
PushMessagingRefresher();
+
+ PushMessagingRefresher(const PushMessagingRefresher&) = delete;
+ PushMessagingRefresher& operator=(const PushMessagingRefresher&) = delete;
+
~PushMessagingRefresher();
// Return number of objects that are currently being refreshed
@@ -90,7 +94,6 @@
RefreshMap refresh_map_;
base::WeakPtrFactory<PushMessagingRefresher> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(PushMessagingRefresher);
};
#endif // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_REFRESHER_H_
diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.h b/chrome/browser/push_messaging/push_messaging_service_impl.h
index 96f9d0a..b3eb71f7 100644
--- a/chrome/browser/push_messaging/push_messaging_service_impl.h
+++ b/chrome/browser/push_messaging/push_messaging_service_impl.h
@@ -91,6 +91,10 @@
static void InitializeForProfile(Profile* profile);
explicit PushMessagingServiceImpl(Profile* profile);
+
+ PushMessagingServiceImpl(const PushMessagingServiceImpl&) = delete;
+ PushMessagingServiceImpl& operator=(const PushMessagingServiceImpl&) = delete;
+
~PushMessagingServiceImpl() override;
// Check and remove subscriptions that are expired when |this| is initialized
@@ -466,8 +470,6 @@
bool shutdown_started_ = false;
base::WeakPtrFactory<PushMessagingServiceImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PushMessagingServiceImpl);
};
#endif // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
diff --git a/chrome/browser/push_messaging/push_messaging_service_unittest.cc b/chrome/browser/push_messaging/push_messaging_service_unittest.cc
index 977b4472..f7e9fc4 100644
--- a/chrome/browser/push_messaging/push_messaging_service_unittest.cc
+++ b/chrome/browser/push_messaging/push_messaging_service_unittest.cc
@@ -74,6 +74,11 @@
class PushMessagingTestingProfile : public TestingProfile {
public:
PushMessagingTestingProfile() = default;
+
+ PushMessagingTestingProfile(const PushMessagingTestingProfile&) = delete;
+ PushMessagingTestingProfile& operator=(const PushMessagingTestingProfile&) =
+ delete;
+
~PushMessagingTestingProfile() override = default;
PushMessagingServiceImpl* GetPushMessagingService() override {
@@ -83,9 +88,6 @@
permissions::PermissionManager* GetPermissionControllerDelegate() override {
return PermissionManagerFactory::GetForProfile(this);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PushMessagingTestingProfile);
};
std::unique_ptr<KeyedService> BuildFakeGCMProfileService(
diff --git a/chrome/browser/recovery/recovery_install_global_error.h b/chrome/browser/recovery/recovery_install_global_error.h
index e46c4cd2a..38ca8d9 100644
--- a/chrome/browser/recovery/recovery_install_global_error.h
+++ b/chrome/browser/recovery/recovery_install_global_error.h
@@ -20,6 +20,11 @@
public KeyedService {
public:
explicit RecoveryInstallGlobalError(Profile* profile);
+
+ RecoveryInstallGlobalError(const RecoveryInstallGlobalError&) = delete;
+ RecoveryInstallGlobalError& operator=(const RecoveryInstallGlobalError&) =
+ delete;
+
~RecoveryInstallGlobalError() override;
private:
@@ -59,8 +64,6 @@
PrefChangeRegistrar pref_registrar_;
bool has_shown_bubble_view_;
-
- DISALLOW_COPY_AND_ASSIGN(RecoveryInstallGlobalError);
};
#endif // CHROME_BROWSER_RECOVERY_RECOVERY_INSTALL_GLOBAL_ERROR_H_
diff --git a/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer.h b/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer.h
index 6f9734669..72a6021 100644
--- a/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer.h
+++ b/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer.h
@@ -21,6 +21,12 @@
class AccessibilityLabelsMenuObserver : public RenderViewContextMenuObserver {
public:
explicit AccessibilityLabelsMenuObserver(RenderViewContextMenuProxy* proxy);
+
+ AccessibilityLabelsMenuObserver(const AccessibilityLabelsMenuObserver&) =
+ delete;
+ AccessibilityLabelsMenuObserver& operator=(
+ const AccessibilityLabelsMenuObserver&) = delete;
+
~AccessibilityLabelsMenuObserver() override;
// RenderViewContextMenuObserver implementation.
@@ -40,8 +46,6 @@
// The interface to add a context-menu item and update it. This class uses
// this interface to avoid accessing context-menu items directly.
RenderViewContextMenuProxy* proxy_;
-
- DISALLOW_COPY_AND_ASSIGN(AccessibilityLabelsMenuObserver);
};
#endif // CHROME_BROWSER_RENDERER_CONTEXT_MENU_ACCESSIBILITY_LABELS_MENU_OBSERVER_H_
diff --git a/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer_browsertest.cc b/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer_browsertest.cc
index 1c14440..63ed017 100644
--- a/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer_browsertest.cc
+++ b/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer_browsertest.cc
@@ -57,6 +57,11 @@
observer_->InitMenu(params);
}
+ AccessibilityLabelsMenuObserverTest(
+ const AccessibilityLabelsMenuObserverTest&) = delete;
+ AccessibilityLabelsMenuObserverTest& operator=(
+ const AccessibilityLabelsMenuObserverTest&) = delete;
+
~AccessibilityLabelsMenuObserverTest() override;
MockRenderViewContextMenu* menu() { return menu_.get(); }
AccessibilityLabelsMenuObserver* observer() { return observer_.get(); }
@@ -65,7 +70,6 @@
base::test::ScopedFeatureList scoped_feature_list_;
std::unique_ptr<AccessibilityLabelsMenuObserver> observer_;
std::unique_ptr<MockRenderViewContextMenu> menu_;
- DISALLOW_COPY_AND_ASSIGN(AccessibilityLabelsMenuObserverTest);
};
AccessibilityLabelsMenuObserverTest::AccessibilityLabelsMenuObserverTest() {}
diff --git a/chrome/browser/renderer_context_menu/context_menu_content_type_app_mode.h b/chrome/browser/renderer_context_menu/context_menu_content_type_app_mode.h
index 27ca8d8..bd09d557 100644
--- a/chrome/browser/renderer_context_menu/context_menu_content_type_app_mode.h
+++ b/chrome/browser/renderer_context_menu/context_menu_content_type_app_mode.h
@@ -10,6 +10,10 @@
class ContextMenuContentTypeAppMode : public ContextMenuContentType {
public:
+ ContextMenuContentTypeAppMode(const ContextMenuContentTypeAppMode&) = delete;
+ ContextMenuContentTypeAppMode& operator=(
+ const ContextMenuContentTypeAppMode&) = delete;
+
~ContextMenuContentTypeAppMode() override;
// ContextMenuContentType overrides.
@@ -21,8 +25,6 @@
private:
friend class ContextMenuContentTypeFactory;
-
- DISALLOW_COPY_AND_ASSIGN(ContextMenuContentTypeAppMode);
};
#endif // CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_APP_MODE_H_
diff --git a/chrome/browser/renderer_context_menu/context_menu_content_type_extension_popup.h b/chrome/browser/renderer_context_menu/context_menu_content_type_extension_popup.h
index 5d765a2..25b6514 100644
--- a/chrome/browser/renderer_context_menu/context_menu_content_type_extension_popup.h
+++ b/chrome/browser/renderer_context_menu/context_menu_content_type_extension_popup.h
@@ -10,6 +10,11 @@
class ContextMenuContentTypeExtensionPopup : public ContextMenuContentType {
public:
+ ContextMenuContentTypeExtensionPopup(
+ const ContextMenuContentTypeExtensionPopup&) = delete;
+ ContextMenuContentTypeExtensionPopup& operator=(
+ const ContextMenuContentTypeExtensionPopup&) = delete;
+
~ContextMenuContentTypeExtensionPopup() override;
// ContextMenuContentType overrides.
@@ -22,8 +27,6 @@
private:
friend class ContextMenuContentTypeFactory;
-
- DISALLOW_COPY_AND_ASSIGN(ContextMenuContentTypeExtensionPopup);
};
#endif // CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_EXTENSION_POPUP_H_
diff --git a/chrome/browser/renderer_context_menu/context_menu_content_type_factory.cc b/chrome/browser/renderer_context_menu/context_menu_content_type_factory.cc
index 452b7ce..f9e9710 100644
--- a/chrome/browser/renderer_context_menu/context_menu_content_type_factory.cc
+++ b/chrome/browser/renderer_context_menu/context_menu_content_type_factory.cc
@@ -49,12 +49,14 @@
NullContextMenuContentType(content::WebContents* web_contents,
const content::ContextMenuParams& params)
: ContextMenuContentType(web_contents, params, false) {}
+
+ NullContextMenuContentType(const NullContextMenuContentType&) = delete;
+ NullContextMenuContentType& operator=(const NullContextMenuContentType&) =
+ delete;
+
~NullContextMenuContentType() override = default;
bool SupportsGroup(int group) override { return false; }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NullContextMenuContentType);
};
} // namespace
diff --git a/chrome/browser/renderer_context_menu/context_menu_content_type_platform_app.h b/chrome/browser/renderer_context_menu/context_menu_content_type_platform_app.h
index 407a930..565b971d 100644
--- a/chrome/browser/renderer_context_menu/context_menu_content_type_platform_app.h
+++ b/chrome/browser/renderer_context_menu/context_menu_content_type_platform_app.h
@@ -14,6 +14,11 @@
class ContextMenuContentTypePlatformApp : public ContextMenuContentType {
public:
+ ContextMenuContentTypePlatformApp(const ContextMenuContentTypePlatformApp&) =
+ delete;
+ ContextMenuContentTypePlatformApp& operator=(
+ const ContextMenuContentTypePlatformApp&) = delete;
+
~ContextMenuContentTypePlatformApp() override;
// ContextMenuContentType overrides.
@@ -27,8 +32,6 @@
friend class ContextMenuContentTypeFactory;
const extensions::Extension* GetExtension();
-
- DISALLOW_COPY_AND_ASSIGN(ContextMenuContentTypePlatformApp);
};
#endif // CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_PLATFORM_APP_H_
diff --git a/chrome/browser/renderer_context_menu/link_to_text_menu_observer_interactive_uitest.cc b/chrome/browser/renderer_context_menu/link_to_text_menu_observer_interactive_uitest.cc
index 14bbadf..23e977a 100644
--- a/chrome/browser/renderer_context_menu/link_to_text_menu_observer_interactive_uitest.cc
+++ b/chrome/browser/renderer_context_menu/link_to_text_menu_observer_interactive_uitest.cc
@@ -81,6 +81,10 @@
bool ShouldPreemptivelyGenerateLink() { return GetParam(); }
+ LinkToTextMenuObserverTest(const LinkToTextMenuObserverTest&) = delete;
+ LinkToTextMenuObserverTest& operator=(const LinkToTextMenuObserverTest&) =
+ delete;
+
~LinkToTextMenuObserverTest() override;
MockRenderViewContextMenu* menu() { return menu_.get(); }
LinkToTextMenuObserver* observer() { return observer_.get(); }
@@ -93,7 +97,6 @@
private:
std::unique_ptr<LinkToTextMenuObserver> observer_;
std::unique_ptr<MockRenderViewContextMenu> menu_;
- DISALLOW_COPY_AND_ASSIGN(LinkToTextMenuObserverTest);
};
LinkToTextMenuObserverTest::LinkToTextMenuObserverTest() = default;
diff --git a/chrome/browser/renderer_context_menu/mock_render_view_context_menu.h b/chrome/browser/renderer_context_menu/mock_render_view_context_menu.h
index c3019fd1..131b9c2 100644
--- a/chrome/browser/renderer_context_menu/mock_render_view_context_menu.h
+++ b/chrome/browser/renderer_context_menu/mock_render_view_context_menu.h
@@ -43,6 +43,11 @@
};
explicit MockRenderViewContextMenu(bool incognito);
+
+ MockRenderViewContextMenu(const MockRenderViewContextMenu&) = delete;
+ MockRenderViewContextMenu& operator=(const MockRenderViewContextMenu&) =
+ delete;
+
~MockRenderViewContextMenu() override;
// SimpleMenuModel::Delegate implementation.
@@ -117,8 +122,6 @@
// A list of menu items added.
std::vector<MockMenuItem> items_;
-
- DISALLOW_COPY_AND_ASSIGN(MockRenderViewContextMenu);
};
#endif // CHROME_BROWSER_RENDERER_CONTEXT_MENU_MOCK_RENDER_VIEW_CONTEXT_MENU_H_
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h
index 196a699..879d7ca4 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -92,6 +92,9 @@
RenderViewContextMenu(content::RenderFrameHost* render_frame_host,
const content::ContextMenuParams& params);
+ RenderViewContextMenu(const RenderViewContextMenu&) = delete;
+ RenderViewContextMenu& operator=(const RenderViewContextMenu&) = delete;
+
~RenderViewContextMenu() override;
// Adds the spell check service item to the context menu.
@@ -375,8 +378,6 @@
std::unique_ptr<lens::LensRegionSearchController>
lens_region_search_controller_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenu);
};
#endif // CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_H_
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc
index 64b5c61..6bfac708 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc
@@ -309,6 +309,12 @@
class PdfPluginContextMenuBrowserTest : public InProcessBrowserTest {
public:
PdfPluginContextMenuBrowserTest() = default;
+
+ PdfPluginContextMenuBrowserTest(const PdfPluginContextMenuBrowserTest&) =
+ delete;
+ PdfPluginContextMenuBrowserTest& operator=(
+ const PdfPluginContextMenuBrowserTest&) = delete;
+
~PdfPluginContextMenuBrowserTest() override = default;
void SetUpOnMainThread() override {
@@ -400,8 +406,6 @@
private:
guest_view::TestGuestViewManagerFactory factory_;
guest_view::TestGuestViewManager* test_guest_view_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(PdfPluginContextMenuBrowserTest);
};
IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest,
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h
index 6eaf0e0..f7dc72e2 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h
@@ -17,6 +17,12 @@
public:
// Wait for a context menu to be shown, and then execute |command_to_execute|.
explicit ContextMenuNotificationObserver(int command_to_execute);
+
+ ContextMenuNotificationObserver(const ContextMenuNotificationObserver&) =
+ delete;
+ ContextMenuNotificationObserver& operator=(
+ const ContextMenuNotificationObserver&) = delete;
+
~ContextMenuNotificationObserver();
private:
@@ -25,14 +31,16 @@
void ExecuteCommand(RenderViewContextMenu* context_menu);
int command_to_execute_;
-
- DISALLOW_COPY_AND_ASSIGN(ContextMenuNotificationObserver);
};
class ContextMenuWaiter {
public:
ContextMenuWaiter();
explicit ContextMenuWaiter(int command_to_execute);
+
+ ContextMenuWaiter(const ContextMenuWaiter&) = delete;
+ ContextMenuWaiter& operator=(const ContextMenuWaiter&) = delete;
+
~ContextMenuWaiter();
content::ContextMenuParams& params();
@@ -51,8 +59,6 @@
base::RunLoop run_loop_;
absl::optional<int> maybe_command_to_execute_;
-
- DISALLOW_COPY_AND_ASSIGN(ContextMenuWaiter);
};
#endif // CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BROWSERTEST_UTIL_H_
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h b/chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h
index 6de0086..a01a907 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h
@@ -36,6 +36,11 @@
public:
TestRenderViewContextMenu(content::RenderFrameHost* render_frame_host,
content::ContextMenuParams params);
+
+ TestRenderViewContextMenu(const TestRenderViewContextMenu&) = delete;
+ TestRenderViewContextMenu& operator=(const TestRenderViewContextMenu&) =
+ delete;
+
~TestRenderViewContextMenu() override;
// Factory.
@@ -98,8 +103,6 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
policy::DlpRulesManager* dlp_rules_manager_ = nullptr;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(TestRenderViewContextMenu);
};
#endif // CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_TEST_UTIL_H_
diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer.h b/chrome/browser/renderer_context_menu/spelling_menu_observer.h
index 471ab4b..50662be 100644
--- a/chrome/browser/renderer_context_menu/spelling_menu_observer.h
+++ b/chrome/browser/renderer_context_menu/spelling_menu_observer.h
@@ -48,6 +48,10 @@
class SpellingMenuObserver : public RenderViewContextMenuObserver {
public:
explicit SpellingMenuObserver(RenderViewContextMenuProxy* proxy);
+
+ SpellingMenuObserver(const SpellingMenuObserver&) = delete;
+ SpellingMenuObserver& operator=(const SpellingMenuObserver&) = delete;
+
~SpellingMenuObserver() override;
// RenderViewContextMenuObserver implementation.
@@ -178,8 +182,6 @@
#endif // defined(OS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
base::WeakPtrFactory<SpellingMenuObserver> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SpellingMenuObserver);
};
#endif // CHROME_BROWSER_RENDERER_CONTEXT_MENU_SPELLING_MENU_OBSERVER_H_
diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc b/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc
index 91b88bb..a8bb2c3 100644
--- a/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc
+++ b/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc
@@ -155,6 +155,9 @@
menu()->GetBrowserContext(), SpellingServiceClient::SPELLCHECK));
}
+ SpellingMenuObserverTest(const SpellingMenuObserverTest&) = delete;
+ SpellingMenuObserverTest& operator=(const SpellingMenuObserverTest&) = delete;
+
~SpellingMenuObserverTest() override;
MockRenderViewContextMenu* menu() { return menu_.get(); }
SpellingMenuObserver* observer() { return observer_.get(); }
@@ -171,8 +174,6 @@
base::test::ScopedFeatureList feature_list_;
#endif // defined(OS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
-
- DISALLOW_COPY_AND_ASSIGN(SpellingMenuObserverTest);
};
#if defined(OS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
diff --git a/chrome/browser/renderer_context_menu/spelling_options_submenu_observer.h b/chrome/browser/renderer_context_menu/spelling_options_submenu_observer.h
index 8757b7f..573c217 100644
--- a/chrome/browser/renderer_context_menu/spelling_options_submenu_observer.h
+++ b/chrome/browser/renderer_context_menu/spelling_options_submenu_observer.h
@@ -23,6 +23,12 @@
SpellingOptionsSubMenuObserver(RenderViewContextMenuProxy* proxy,
ui::SimpleMenuModel::Delegate* delegate,
int group_id);
+
+ SpellingOptionsSubMenuObserver(const SpellingOptionsSubMenuObserver&) =
+ delete;
+ SpellingOptionsSubMenuObserver& operator=(
+ const SpellingOptionsSubMenuObserver&) = delete;
+
~SpellingOptionsSubMenuObserver() override;
// RenderViewContextMenuObserver implementation.
@@ -51,8 +57,6 @@
// Flag indicating whether the server-powered spellcheck service is enabled.
BooleanPrefMember use_spelling_service_;
-
- DISALLOW_COPY_AND_ASSIGN(SpellingOptionsSubMenuObserver);
};
#endif // CHROME_BROWSER_RENDERER_CONTEXT_MENU_SPELLING_OPTIONS_SUBMENU_OBSERVER_H_
diff --git a/chrome/browser/renderer_context_menu/spelling_options_submenu_observer_browsertest.cc b/chrome/browser/renderer_context_menu/spelling_options_submenu_observer_browsertest.cc
index ce41a1c8..1beaf9b 100644
--- a/chrome/browser/renderer_context_menu/spelling_options_submenu_observer_browsertest.cc
+++ b/chrome/browser/renderer_context_menu/spelling_options_submenu_observer_browsertest.cc
@@ -24,6 +24,12 @@
class SpellingOptionsSubMenuObserverTest : public InProcessBrowserTest {
public:
SpellingOptionsSubMenuObserverTest() {}
+
+ SpellingOptionsSubMenuObserverTest(
+ const SpellingOptionsSubMenuObserverTest&) = delete;
+ SpellingOptionsSubMenuObserverTest& operator=(
+ const SpellingOptionsSubMenuObserverTest&) = delete;
+
~SpellingOptionsSubMenuObserverTest() override {}
void SetUpOnMainThread() override {
@@ -79,8 +85,6 @@
private:
std::unique_ptr<MockRenderViewContextMenu> menu_;
std::unique_ptr<SpellingOptionsSubMenuObserver> observer_;
-
- DISALLOW_COPY_AND_ASSIGN(SpellingOptionsSubMenuObserverTest);
};
// Tests that selecting the "Use basic spell check" item toggles the value
diff --git a/chrome/browser/renderer_host/chrome_navigation_ui_data.h b/chrome/browser/renderer_host/chrome_navigation_ui_data.h
index ac4d04f..1ec5d6e 100644
--- a/chrome/browser/renderer_host/chrome_navigation_ui_data.h
+++ b/chrome/browser/renderer_host/chrome_navigation_ui_data.h
@@ -28,6 +28,10 @@
public:
ChromeNavigationUIData();
explicit ChromeNavigationUIData(content::NavigationHandle* navigation_handle);
+
+ ChromeNavigationUIData(const ChromeNavigationUIData&) = delete;
+ ChromeNavigationUIData& operator=(const ChromeNavigationUIData&) = delete;
+
~ChromeNavigationUIData() override;
// Creates an instance of ChromeNavigationUIData associated with the given
@@ -95,8 +99,6 @@
// TypedNavigationUpgradeThrottle to determine if the navigation should be
// observed and fall back to using http scheme if necessary.
bool is_using_https_as_default_scheme_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeNavigationUIData);
};
#endif // CHROME_BROWSER_RENDERER_HOST_CHROME_NAVIGATION_UI_DATA_H_
diff --git a/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h b/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h
index 735da93c3..69eb48ff 100644
--- a/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h
+++ b/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h
@@ -16,6 +16,12 @@
public:
// Non-owning pointer to the filter must outlive this class.
explicit ChromeBrowserPepperHostFactory(content::BrowserPpapiHost* host);
+
+ ChromeBrowserPepperHostFactory(const ChromeBrowserPepperHostFactory&) =
+ delete;
+ ChromeBrowserPepperHostFactory& operator=(
+ const ChromeBrowserPepperHostFactory&) = delete;
+
~ChromeBrowserPepperHostFactory() override;
std::unique_ptr<ppapi::host::ResourceHost> CreateResourceHost(
@@ -27,8 +33,6 @@
private:
// Non-owning pointer.
content::BrowserPpapiHost* host_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeBrowserPepperHostFactory);
};
#endif // CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
diff --git a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
index 4cf5d722..ba6178e9 100644
--- a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
+++ b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
@@ -253,6 +253,12 @@
: public ChromeRenderProcessHostTest {
public:
ChromeRenderProcessHostTestWithCommandLine() = default;
+
+ ChromeRenderProcessHostTestWithCommandLine(
+ const ChromeRenderProcessHostTestWithCommandLine&) = delete;
+ ChromeRenderProcessHostTestWithCommandLine& operator=(
+ const ChromeRenderProcessHostTestWithCommandLine&) = delete;
+
~ChromeRenderProcessHostTestWithCommandLine() override = default;
protected:
@@ -260,9 +266,6 @@
ChromeRenderProcessHostTest::SetUpCommandLine(command_line);
command_line->AppendSwitchASCII(switches::kRendererProcessLimit, "1");
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeRenderProcessHostTestWithCommandLine);
};
// TODO(crbug.com/1241506): Enable this test on macOS after the issue is fixed.
@@ -344,6 +347,12 @@
: public ChromeRenderProcessHostTest {
public:
ChromeRenderProcessHostBackgroundingTest() = default;
+
+ ChromeRenderProcessHostBackgroundingTest(
+ const ChromeRenderProcessHostBackgroundingTest&) = delete;
+ ChromeRenderProcessHostBackgroundingTest& operator=(
+ const ChromeRenderProcessHostBackgroundingTest&) = delete;
+
~ChromeRenderProcessHostBackgroundingTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -387,8 +396,6 @@
#endif
}
}
-
- DISALLOW_COPY_AND_ASSIGN(ChromeRenderProcessHostBackgroundingTest);
};
#define EXPECT_PROCESS_IS_BACKGROUNDED(process_or_tab) \
diff --git a/chrome/browser/repost_form_warning_browsertest.cc b/chrome/browser/repost_form_warning_browsertest.cc
index 48eec2f..9c27b7c 100644
--- a/chrome/browser/repost_form_warning_browsertest.cc
+++ b/chrome/browser/repost_form_warning_browsertest.cc
@@ -23,6 +23,10 @@
class RepostFormWarningTest : public DialogBrowserTest {
public:
RepostFormWarningTest() {}
+
+ RepostFormWarningTest(const RepostFormWarningTest&) = delete;
+ RepostFormWarningTest& operator=(const RepostFormWarningTest&) = delete;
+
~RepostFormWarningTest() override {}
// BrowserTestBase:
@@ -33,9 +37,6 @@
protected:
content::WebContents* TryReload();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(RepostFormWarningTest);
};
void RepostFormWarningTest::SetUpOnMainThread() {
diff --git a/chrome/browser/repost_form_warning_controller.h b/chrome/browser/repost_form_warning_controller.h
index 032f6d70..1480b17 100644
--- a/chrome/browser/repost_form_warning_controller.h
+++ b/chrome/browser/repost_form_warning_controller.h
@@ -15,6 +15,11 @@
class RepostFormWarningController : public TabModalConfirmDialogDelegate {
public:
explicit RepostFormWarningController(content::WebContents* web_contents);
+
+ RepostFormWarningController(const RepostFormWarningController&) = delete;
+ RepostFormWarningController& operator=(const RepostFormWarningController&) =
+ delete;
+
~RepostFormWarningController() override;
private:
@@ -28,8 +33,6 @@
// content::WebContentsObserver methods via TabModalConfirmDialogDelegate:
void BeforeFormRepostWarningShow() override;
-
- DISALLOW_COPY_AND_ASSIGN(RepostFormWarningController);
};
#endif // CHROME_BROWSER_REPOST_FORM_WARNING_CONTROLLER_H_
diff --git a/chrome/browser/reputation/reputation_service.h b/chrome/browser/reputation/reputation_service.h
index cbd3941e..62c58dd4 100644
--- a/chrome/browser/reputation/reputation_service.h
+++ b/chrome/browser/reputation/reputation_service.h
@@ -57,6 +57,10 @@
class ReputationService : public KeyedService {
public:
explicit ReputationService(Profile* profile);
+
+ ReputationService(const ReputationService&) = delete;
+ ReputationService& operator=(const ReputationService&) = delete;
+
~ReputationService() override;
static ReputationService* Get(Profile* profile);
@@ -111,7 +115,6 @@
size_t num_sensitive_keywords_;
base::WeakPtrFactory<ReputationService> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(ReputationService);
};
#endif // CHROME_BROWSER_REPUTATION_REPUTATION_SERVICE_H_
diff --git a/chrome/browser/reputation/safety_tip_infobar.h b/chrome/browser/reputation/safety_tip_infobar.h
index 8836ea8b..1d9b302 100644
--- a/chrome/browser/reputation/safety_tip_infobar.h
+++ b/chrome/browser/reputation/safety_tip_infobar.h
@@ -17,6 +17,10 @@
public:
static std::unique_ptr<infobars::InfoBar> CreateInfoBar(
std::unique_ptr<SafetyTipInfoBarDelegate> delegate);
+
+ SafetyTipInfoBar(const SafetyTipInfoBar&) = delete;
+ SafetyTipInfoBar& operator=(const SafetyTipInfoBar&) = delete;
+
~SafetyTipInfoBar() override;
private:
@@ -28,8 +32,6 @@
const ResourceIdMapper& resource_id_mapper) override;
SafetyTipInfoBarDelegate* GetDelegate();
-
- DISALLOW_COPY_AND_ASSIGN(SafetyTipInfoBar);
};
#endif // CHROME_BROWSER_REPUTATION_SAFETY_TIP_INFOBAR_H_
diff --git a/chrome/browser/resource_coordinator/discard_before_unload_helper.cc b/chrome/browser/resource_coordinator/discard_before_unload_helper.cc
index 74f7f69..e69a1f5 100644
--- a/chrome/browser/resource_coordinator/discard_before_unload_helper.cc
+++ b/chrome/browser/resource_coordinator/discard_before_unload_helper.cc
@@ -33,6 +33,10 @@
static void HasBeforeUnloadHandler(content::WebContents* contents,
HasBeforeUnloadHandlerCallback&& callback);
+ DiscardBeforeUnloadHelper(const DiscardBeforeUnloadHelper&) = delete;
+ DiscardBeforeUnloadHelper& operator=(const DiscardBeforeUnloadHelper&) =
+ delete;
+
~DiscardBeforeUnloadHelper() override;
private:
@@ -55,8 +59,6 @@
std::unique_ptr<DiscardBeforeUnloadHelper> self_;
HasBeforeUnloadHandlerCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(DiscardBeforeUnloadHelper);
};
void DiscardBeforeUnloadHelper::HasBeforeUnloadHandler(
diff --git a/chrome/browser/resource_coordinator/discard_metrics_lifecycle_unit_observer.h b/chrome/browser/resource_coordinator/discard_metrics_lifecycle_unit_observer.h
index 73862c4..79f04d14 100644
--- a/chrome/browser/resource_coordinator/discard_metrics_lifecycle_unit_observer.h
+++ b/chrome/browser/resource_coordinator/discard_metrics_lifecycle_unit_observer.h
@@ -19,6 +19,12 @@
class DiscardMetricsLifecycleUnitObserver : public LifecycleUnitObserver {
public:
DiscardMetricsLifecycleUnitObserver();
+
+ DiscardMetricsLifecycleUnitObserver(
+ const DiscardMetricsLifecycleUnitObserver&) = delete;
+ DiscardMetricsLifecycleUnitObserver& operator=(
+ const DiscardMetricsLifecycleUnitObserver&) = delete;
+
~DiscardMetricsLifecycleUnitObserver() override;
// LifecycleUnitObserver:
@@ -50,8 +56,6 @@
// The last time at which the LifecycleUnit was reloaded after being
// discarded.
base::TimeTicks reload_time_;
-
- DISALLOW_COPY_AND_ASSIGN(DiscardMetricsLifecycleUnitObserver);
};
} // namespace resource_coordinator
diff --git a/chrome/browser/resource_coordinator/intervention_policy_database.h b/chrome/browser/resource_coordinator/intervention_policy_database.h
index 40604ee..bfde5f5 100644
--- a/chrome/browser/resource_coordinator/intervention_policy_database.h
+++ b/chrome/browser/resource_coordinator/intervention_policy_database.h
@@ -38,6 +38,11 @@
};
InterventionPolicyDatabase();
+
+ InterventionPolicyDatabase(const InterventionPolicyDatabase&) = delete;
+ InterventionPolicyDatabase& operator=(const InterventionPolicyDatabase&) =
+ delete;
+
~InterventionPolicyDatabase();
InterventionPolicy GetDiscardingPolicy(const url::Origin& origin) const;
@@ -75,8 +80,6 @@
InterventionsMap database_;
base::WeakPtrFactory<InterventionPolicyDatabase> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(InterventionPolicyDatabase);
};
} // namespace resource_coordinator
diff --git a/chrome/browser/resource_coordinator/lifecycle_unit_base.h b/chrome/browser/resource_coordinator/lifecycle_unit_base.h
index 5cdc9b7..dd3293921 100644
--- a/chrome/browser/resource_coordinator/lifecycle_unit_base.h
+++ b/chrome/browser/resource_coordinator/lifecycle_unit_base.h
@@ -26,6 +26,10 @@
explicit LifecycleUnitBase(LifecycleUnitSourceBase* source,
content::Visibility visibility,
UsageClock* usage_clock);
+
+ LifecycleUnitBase(const LifecycleUnitBase&) = delete;
+ LifecycleUnitBase& operator=(const LifecycleUnitBase&) = delete;
+
~LifecycleUnitBase() override;
// LifecycleUnit:
@@ -100,8 +104,6 @@
int discard_count_ = 0;
base::ObserverList<LifecycleUnitObserver>::Unchecked observers_;
-
- DISALLOW_COPY_AND_ASSIGN(LifecycleUnitBase);
};
} // namespace resource_coordinator
diff --git a/chrome/browser/resource_coordinator/lifecycle_unit_source_base.h b/chrome/browser/resource_coordinator/lifecycle_unit_source_base.h
index e648895..071ae57 100644
--- a/chrome/browser/resource_coordinator/lifecycle_unit_source_base.h
+++ b/chrome/browser/resource_coordinator/lifecycle_unit_source_base.h
@@ -17,6 +17,10 @@
class LifecycleUnitSourceBase : public LifecycleUnitSource {
public:
LifecycleUnitSourceBase();
+
+ LifecycleUnitSourceBase(const LifecycleUnitSourceBase&) = delete;
+ LifecycleUnitSourceBase& operator=(const LifecycleUnitSourceBase&) = delete;
+
~LifecycleUnitSourceBase() override;
// LifecycleUnitSource:
@@ -58,8 +62,6 @@
// The count of lifecycle units associated with this source.
size_t lifecycle_unit_count_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(LifecycleUnitSourceBase);
};
} // namespace resource_coordinator
diff --git a/chrome/browser/resource_coordinator/resource_coordinator_parts.h b/chrome/browser/resource_coordinator/resource_coordinator_parts.h
index 788e4bd..a2a9fdff 100644
--- a/chrome/browser/resource_coordinator/resource_coordinator_parts.h
+++ b/chrome/browser/resource_coordinator/resource_coordinator_parts.h
@@ -28,6 +28,10 @@
class ResourceCoordinatorParts {
public:
ResourceCoordinatorParts();
+
+ ResourceCoordinatorParts(const ResourceCoordinatorParts&) = delete;
+ ResourceCoordinatorParts& operator=(const ResourceCoordinatorParts&) = delete;
+
~ResourceCoordinatorParts();
TabMemoryMetricsReporter* tab_memory_metrics_reporter() {
@@ -72,8 +76,6 @@
TabManager tab_manager_;
TabLifecycleUnitSource tab_lifecycle_unit_source_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(ResourceCoordinatorParts);
};
} // namespace resource_coordinator
diff --git a/chrome/browser/resource_coordinator/session_restore_policy.h b/chrome/browser/resource_coordinator/session_restore_policy.h
index 2576460c..4acf95e 100644
--- a/chrome/browser/resource_coordinator/session_restore_policy.h
+++ b/chrome/browser/resource_coordinator/session_restore_policy.h
@@ -49,6 +49,9 @@
SessionRestorePolicy();
+ SessionRestorePolicy(const SessionRestorePolicy&) = delete;
+ SessionRestorePolicy& operator=(const SessionRestorePolicy&) = delete;
+
// Overridden for testing.
virtual ~SessionRestorePolicy();
@@ -312,8 +315,6 @@
// notifications in flight. The messages are bound to a weak pointer so that
// they are not delivered after the policy object is destroyed.
base::WeakPtrFactory<SessionRestorePolicy> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SessionRestorePolicy);
};
// Abstracts away testing seams for the policy engine. In production code the
@@ -322,6 +323,10 @@
class SessionRestorePolicy::Delegate {
public:
Delegate();
+
+ Delegate(const Delegate&) = delete;
+ Delegate& operator=(const Delegate&) = delete;
+
virtual ~Delegate();
virtual size_t GetNumberOfCores() const = 0;
@@ -329,9 +334,6 @@
virtual base::TimeTicks NowTicks() const = 0;
virtual size_t GetSiteEngagementScore(
content::WebContents* contents) const = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Delegate);
};
} // namespace resource_coordinator
diff --git a/chrome/browser/resource_coordinator/session_restore_policy_unittest.cc b/chrome/browser/resource_coordinator/session_restore_policy_unittest.cc
index ab08121..0089272 100644
--- a/chrome/browser/resource_coordinator/session_restore_policy_unittest.cc
+++ b/chrome/browser/resource_coordinator/session_restore_policy_unittest.cc
@@ -39,6 +39,9 @@
public:
explicit TestDelegate(base::TickClock* clock) : clock_(clock) {}
+ TestDelegate(const TestDelegate&) = delete;
+ TestDelegate& operator=(const TestDelegate&) = delete;
+
~TestDelegate() override {}
size_t GetNumberOfCores() const override { return number_of_cores_; }
@@ -67,8 +70,6 @@
size_t free_memory_mb_ = 0;
base::TickClock* clock_ = nullptr;
size_t site_engagement_score_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(TestDelegate);
};
class LenientTabScoreChangeMock {
@@ -107,6 +108,9 @@
TestSessionRestorePolicy(bool policy_enabled, const Delegate* delegate)
: SessionRestorePolicy(policy_enabled, delegate) {}
+ TestSessionRestorePolicy(const TestSessionRestorePolicy&) = delete;
+ TestSessionRestorePolicy& operator=(const TestSessionRestorePolicy&) = delete;
+
~TestSessionRestorePolicy() override {}
using RescoreTabCallback =
@@ -132,8 +136,6 @@
private:
RescoreTabCallback rescore_tab_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(TestSessionRestorePolicy);
};
} // namespace
@@ -142,6 +144,9 @@
public:
SessionRestorePolicyTest() : delegate_(&clock_) {}
+ SessionRestorePolicyTest(const SessionRestorePolicyTest&) = delete;
+ SessionRestorePolicyTest& operator=(const SessionRestorePolicyTest&) = delete;
+
~SessionRestorePolicyTest() override {}
void SetUp() override {
@@ -274,9 +279,6 @@
std::unique_ptr<content::WebContents> contents3_;
std::vector<content::WebContents*> tab_for_scoring_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SessionRestorePolicyTest);
};
TEST_F(SessionRestorePolicyTest, CalculateSimultaneousTabLoads) {
diff --git a/chrome/browser/resource_coordinator/tab_activity_watcher.cc b/chrome/browser/resource_coordinator/tab_activity_watcher.cc
index 559f584..10e17b7 100644
--- a/chrome/browser/resource_coordinator/tab_activity_watcher.cc
+++ b/chrome/browser/resource_coordinator/tab_activity_watcher.cc
@@ -66,6 +66,9 @@
public content::WebContentsUserData<WebContentsData>,
public content::RenderWidgetHost::InputEventObserver {
public:
+ WebContentsData(const WebContentsData&) = delete;
+ WebContentsData& operator=(const WebContentsData&) = delete;
+
~WebContentsData() override = default;
// Calculates the tab reactivation score for a background tab. Returns nullopt
@@ -482,8 +485,6 @@
FrecencyScore frecency_score_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(WebContentsData);
};
WEB_CONTENTS_USER_DATA_KEY_IMPL(TabActivityWatcher::WebContentsData)
diff --git a/chrome/browser/resource_coordinator/tab_activity_watcher.h b/chrome/browser/resource_coordinator/tab_activity_watcher.h
index 13b01d4..21e9fe83 100644
--- a/chrome/browser/resource_coordinator/tab_activity_watcher.h
+++ b/chrome/browser/resource_coordinator/tab_activity_watcher.h
@@ -29,6 +29,10 @@
public BrowserTabStripTrackerDelegate {
public:
TabActivityWatcher();
+
+ TabActivityWatcher(const TabActivityWatcher&) = delete;
+ TabActivityWatcher& operator=(const TabActivityWatcher&) = delete;
+
~TabActivityWatcher() override;
// Uses the Tab Ranker model to predict a score for the tab, where a higher
@@ -83,8 +87,6 @@
// Loads the Tab Ranker model on first use and calculates tab scores.
std::unique_ptr<tab_ranker::TabScorePredictor> predictor_;
-
- DISALLOW_COPY_AND_ASSIGN(TabActivityWatcher);
};
} // namespace resource_coordinator
diff --git a/chrome/browser/resource_coordinator/tab_activity_watcher_unittest.cc b/chrome/browser/resource_coordinator/tab_activity_watcher_unittest.cc
index 89c1d02e..d627e24 100644
--- a/chrome/browser/resource_coordinator/tab_activity_watcher_unittest.cc
+++ b/chrome/browser/resource_coordinator/tab_activity_watcher_unittest.cc
@@ -91,6 +91,10 @@
params);
TabActivityWatcher::GetInstance()->ResetForTesting();
}
+
+ TabActivityWatcherTest(const TabActivityWatcherTest&) = delete;
+ TabActivityWatcherTest& operator=(const TabActivityWatcherTest&) = delete;
+
~TabActivityWatcherTest() override = default;
LifecycleUnit* AddNewTab(TabStripModel* tab_strip_model, int i) {
@@ -116,9 +120,6 @@
UkmEntryChecker ukm_entry_checker_;
TabActivitySimulator tab_activity_simulator_;
base::test::ScopedFeatureList feature_list_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TabActivityWatcherTest);
};
class TabActivityWatcherScorerType0Test : public TabActivityWatcherTest {
@@ -324,6 +325,10 @@
SetParams({{"scorer_type", "0"},
{"disable_background_log_with_TabRanker", "false"}});
}
+
+ TabMetricsTest(const TabMetricsTest&) = delete;
+ TabMetricsTest& operator=(const TabMetricsTest&) = delete;
+
~TabMetricsTest() override = default;
protected:
@@ -340,9 +345,6 @@
protected:
const char* kEntryName = TabManager_TabMetrics::kEntryName;
size_t num_previous_entries = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TabMetricsTest);
};
TEST_F(TabMetricsTest, Basic) {
@@ -814,6 +816,10 @@
SetParams({{"scorer_type", "0"},
{"disable_background_log_with_TabRanker", "false"}});
}
+
+ ForegroundedOrClosedTest(const ForegroundedOrClosedTest&) = delete;
+ ForegroundedOrClosedTest& operator=(const ForegroundedOrClosedTest&) = delete;
+
~ForegroundedOrClosedTest() override = default;
protected:
@@ -825,8 +831,6 @@
base::SimpleTestTickClock test_clock_;
resource_coordinator::ScopedSetTickClockForTesting
scoped_set_tick_clock_for_testing_;
-
- DISALLOW_COPY_AND_ASSIGN(ForegroundedOrClosedTest);
};
// Tests TabManager.Backgrounded.ForegroundedOrClosed UKM logging.
diff --git a/chrome/browser/resource_coordinator/tab_helper.h b/chrome/browser/resource_coordinator/tab_helper.h
index 184c0ed63..5482acd 100644
--- a/chrome/browser/resource_coordinator/tab_helper.h
+++ b/chrome/browser/resource_coordinator/tab_helper.h
@@ -20,6 +20,10 @@
: public content::WebContentsObserver,
public content::WebContentsUserData<ResourceCoordinatorTabHelper> {
public:
+ ResourceCoordinatorTabHelper(const ResourceCoordinatorTabHelper&) = delete;
+ ResourceCoordinatorTabHelper& operator=(const ResourceCoordinatorTabHelper&) =
+ delete;
+
~ResourceCoordinatorTabHelper() override;
// Helper function to check if a given WebContents is loaded. Returns true by
@@ -45,8 +49,6 @@
friend class content::WebContentsUserData<ResourceCoordinatorTabHelper>;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(ResourceCoordinatorTabHelper);
};
} // namespace resource_coordinator
diff --git a/chrome/browser/resource_coordinator/tab_lifecycle_unit.h b/chrome/browser/resource_coordinator/tab_lifecycle_unit.h
index 30d2ae4..6d35986 100644
--- a/chrome/browser/resource_coordinator/tab_lifecycle_unit.h
+++ b/chrome/browser/resource_coordinator/tab_lifecycle_unit.h
@@ -57,6 +57,10 @@
UsageClock* usage_clock,
content::WebContents* web_contents,
TabStripModel* tab_strip_model);
+
+ TabLifecycleUnit(const TabLifecycleUnit&) = delete;
+ TabLifecycleUnit& operator=(const TabLifecycleUnit&) = delete;
+
~TabLifecycleUnit() override;
// Sets the TabStripModel associated with this tab. The source that created
@@ -168,8 +172,6 @@
base::TimeTicks recently_audible_time_;
std::unique_ptr<TabLifecycleUnitExternalImpl> external_impl_;
-
- DISALLOW_COPY_AND_ASSIGN(TabLifecycleUnit);
};
} // 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 5704966..edac697 100644
--- a/chrome/browser/resource_coordinator/tab_lifecycle_unit_source.cc
+++ b/chrome/browser/resource_coordinator/tab_lifecycle_unit_source.cc
@@ -37,6 +37,9 @@
: public content::WebContentsUserData<
TabLifecycleUnitSource::TabLifecycleUnitHolder> {
public:
+ TabLifecycleUnitHolder(const TabLifecycleUnitHolder&) = delete;
+ TabLifecycleUnitHolder& operator=(const TabLifecycleUnitHolder&) = delete;
+
~TabLifecycleUnitHolder() override = default;
TabLifecycleUnit* lifecycle_unit() const { return lifecycle_unit_.get(); }
@@ -53,8 +56,6 @@
explicit TabLifecycleUnitHolder(content::WebContents*) {}
std::unique_ptr<TabLifecycleUnit> lifecycle_unit_;
-
- DISALLOW_COPY_AND_ASSIGN(TabLifecycleUnitHolder);
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
@@ -72,6 +73,11 @@
using WebContentsProxy = performance_manager::WebContentsProxy;
TabLifecycleStateObserver() = default;
+
+ TabLifecycleStateObserver(const TabLifecycleStateObserver&) = delete;
+ TabLifecycleStateObserver& operator=(const TabLifecycleStateObserver&) =
+ delete;
+
~TabLifecycleStateObserver() override = default;
private:
@@ -102,8 +108,6 @@
void OnTakenFromGraph(Graph* graph) override {
graph->RemovePageNodeObserver(this);
}
-
- DISALLOW_COPY_AND_ASSIGN(TabLifecycleStateObserver);
};
TabLifecycleUnitSource::TabLifecycleUnitSource(
diff --git a/chrome/browser/resource_coordinator/tab_lifecycle_unit_source.h b/chrome/browser/resource_coordinator/tab_lifecycle_unit_source.h
index c9e3cfaf..5796d5e 100644
--- a/chrome/browser/resource_coordinator/tab_lifecycle_unit_source.h
+++ b/chrome/browser/resource_coordinator/tab_lifecycle_unit_source.h
@@ -38,6 +38,10 @@
class LifecycleStateObserver;
explicit TabLifecycleUnitSource(UsageClock* usage_clock);
+
+ TabLifecycleUnitSource(const TabLifecycleUnitSource&) = delete;
+ TabLifecycleUnitSource& operator=(const TabLifecycleUnitSource&) = delete;
+
~TabLifecycleUnitSource() override;
// Should be called once all the dependencies of this class have been created
@@ -148,8 +152,6 @@
// The enterprise policy for setting a limit on total physical memory usage.
bool memory_limit_enterprise_policy_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(TabLifecycleUnitSource);
};
} // namespace resource_coordinator
diff --git a/chrome/browser/resource_coordinator/tab_load_tracker.h b/chrome/browser/resource_coordinator/tab_load_tracker.h
index 8e5534a..40974a0 100644
--- a/chrome/browser/resource_coordinator/tab_load_tracker.h
+++ b/chrome/browser/resource_coordinator/tab_load_tracker.h
@@ -52,6 +52,9 @@
using LoadingState = ::mojom::LifecycleUnitLoadingState;
+ TabLoadTracker(const TabLoadTracker&) = delete;
+ TabLoadTracker& operator=(const TabLoadTracker&) = delete;
+
// A brief note around loading states specifically as they are defined in the
// context of a WebContents:
//
@@ -196,8 +199,6 @@
base::ObserverList<Observer>::Unchecked observers_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(TabLoadTracker);
};
// A class for observing loading state changes of WebContents under observation
@@ -208,6 +209,10 @@
using LoadingState = TabLoadTracker::LoadingState;
Observer();
+
+ Observer(const Observer&) = delete;
+ Observer& operator=(const Observer&) = delete;
+
virtual ~Observer();
// Called when a |web_contents| is starting to be tracked.
@@ -222,9 +227,6 @@
// Called when a |web_contents| is no longer being tracked.
virtual void OnStopTracking(content::WebContents* web_contents,
LoadingState loading_state) {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Observer);
};
} // namespace resource_coordinator
diff --git a/chrome/browser/resource_coordinator/tab_load_tracker_test_support.cc b/chrome/browser/resource_coordinator/tab_load_tracker_test_support.cc
index 506f9672..0bd6cb8 100644
--- a/chrome/browser/resource_coordinator/tab_load_tracker_test_support.cc
+++ b/chrome/browser/resource_coordinator/tab_load_tracker_test_support.cc
@@ -48,6 +48,10 @@
wait_successful_(false) {}
#endif // !defined(OS_ANDROID)
+ WaitForLoadingStateHelper(const WaitForLoadingStateHelper&) = delete;
+ WaitForLoadingStateHelper& operator=(const WaitForLoadingStateHelper&) =
+ delete;
+
~WaitForLoadingStateHelper() override = default;
bool Wait() {
@@ -139,8 +143,6 @@
bool wait_successful_;
base::OnceClosure run_loop_quit_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(WaitForLoadingStateHelper);
};
} // namespace
diff --git a/chrome/browser/resource_coordinator/tab_load_tracker_unittest.cc b/chrome/browser/resource_coordinator/tab_load_tracker_unittest.cc
index 02caf6d..5d36c4e 100644
--- a/chrome/browser/resource_coordinator/tab_load_tracker_unittest.cc
+++ b/chrome/browser/resource_coordinator/tab_load_tracker_unittest.cc
@@ -81,6 +81,10 @@
class LenientMockObserver : public TabLoadTracker::Observer {
public:
LenientMockObserver() {}
+
+ LenientMockObserver(const LenientMockObserver&) = delete;
+ LenientMockObserver& operator=(const LenientMockObserver&) = delete;
+
~LenientMockObserver() override {}
// TabLoadTracker::Observer implementation:
@@ -88,9 +92,6 @@
MOCK_METHOD3(OnLoadingStateChange,
void(content::WebContents*, LoadingState, LoadingState));
MOCK_METHOD2(OnStopTracking, void(content::WebContents*, LoadingState));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LenientMockObserver);
};
using MockObserver = testing::StrictMock<LenientMockObserver>;
diff --git a/chrome/browser/resource_coordinator/tab_manager.h b/chrome/browser/resource_coordinator/tab_manager.h
index 5cd3318..af060da 100644
--- a/chrome/browser/resource_coordinator/tab_manager.h
+++ b/chrome/browser/resource_coordinator/tab_manager.h
@@ -71,6 +71,10 @@
using TabDiscardDoneCB = base::ScopedClosureRunner;
explicit TabManager(TabLoadTracker* tab_load_tracker);
+
+ TabManager(const TabManager&) = delete;
+ TabManager& operator=(const TabManager&) = delete;
+
~TabManager() override;
// Start the Tab Manager.
@@ -255,8 +259,6 @@
// Weak pointer factory used for posting delayed tasks.
base::WeakPtrFactory<TabManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TabManager);
};
} // namespace resource_coordinator
diff --git a/chrome/browser/resource_coordinator/tab_manager_browsertest.cc b/chrome/browser/resource_coordinator/tab_manager_browsertest.cc
index 134678e..5187e10a 100644
--- a/chrome/browser/resource_coordinator/tab_manager_browsertest.cc
+++ b/chrome/browser/resource_coordinator/tab_manager_browsertest.cc
@@ -76,6 +76,10 @@
lifecycle_unit_->AddObserver(this);
}
+ ExpectStateTransitionObserver(const ExpectStateTransitionObserver&) = delete;
+ ExpectStateTransitionObserver& operator=(
+ const ExpectStateTransitionObserver&) = delete;
+
~ExpectStateTransitionObserver() override {
lifecycle_unit_->RemoveObserver(this);
}
@@ -110,8 +114,6 @@
const LifecycleUnitState expected_state_;
std::set<LifecycleUnitState> allowed_states_;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(ExpectStateTransitionObserver);
};
class DiscardWaiter : public TabLifecycleObserver {
diff --git a/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.h b/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.h
index 462ba66..035b8a49 100644
--- a/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.h
+++ b/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.h
@@ -66,6 +66,9 @@
TabManagerDelegate(const base::WeakPtr<TabManager>& tab_manager,
TabManagerDelegate::MemoryStat* mem_stat);
+ TabManagerDelegate(const TabManagerDelegate&) = delete;
+ TabManagerDelegate& operator=(const TabManagerDelegate&) = delete;
+
~TabManagerDelegate() override;
void OnBrowserSetLastActive(Browser* browser) override;
@@ -219,8 +222,6 @@
// Weak pointer factory used for posting tasks to other threads.
base::WeakPtrFactory<TabManagerDelegate> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TabManagerDelegate);
};
// On ARC enabled machines, either a tab or an app could be a possible
diff --git a/chrome/browser/resource_coordinator/tab_manager_resource_coordinator_signal_observer.h b/chrome/browser/resource_coordinator/tab_manager_resource_coordinator_signal_observer.h
index da8e548..87f4f4bd 100644
--- a/chrome/browser/resource_coordinator/tab_manager_resource_coordinator_signal_observer.h
+++ b/chrome/browser/resource_coordinator/tab_manager_resource_coordinator_signal_observer.h
@@ -30,6 +30,12 @@
explicit ResourceCoordinatorSignalObserver(
const base::WeakPtr<TabManager>& tab_manager);
+
+ ResourceCoordinatorSignalObserver(const ResourceCoordinatorSignalObserver&) =
+ delete;
+ ResourceCoordinatorSignalObserver& operator=(
+ const ResourceCoordinatorSignalObserver&) = delete;
+
~ResourceCoordinatorSignalObserver() override;
// PageNode::ObserverDefaultImpl:
@@ -58,8 +64,6 @@
// we'd also then tear down this observer on the perf manager sequence itself,
// but when one dies they're both about to die.
base::WeakPtr<TabManager> tab_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(ResourceCoordinatorSignalObserver);
};
} // namespace resource_coordinator
diff --git a/chrome/browser/resource_coordinator/tab_manager_web_contents_data.h b/chrome/browser/resource_coordinator/tab_manager_web_contents_data.h
index 977d280..4af22e5 100644
--- a/chrome/browser/resource_coordinator/tab_manager_web_contents_data.h
+++ b/chrome/browser/resource_coordinator/tab_manager_web_contents_data.h
@@ -30,6 +30,10 @@
using LoadingState = resource_coordinator::TabLoadTracker::LoadingState;
explicit WebContentsData(content::WebContents* web_contents);
+
+ WebContentsData(const WebContentsData&) = delete;
+ WebContentsData& operator=(const WebContentsData&) = delete;
+
~WebContentsData() override;
// WebContentsObserver implementation:
@@ -87,8 +91,6 @@
// Contains all the needed data for the tab.
Data tab_data_;
-
- DISALLOW_COPY_AND_ASSIGN(WebContentsData);
WEB_CONTENTS_USER_DATA_KEY_DECL();
};
diff --git a/chrome/browser/resource_coordinator/tab_memory_metrics_reporter.h b/chrome/browser/resource_coordinator/tab_memory_metrics_reporter.h
index 064257887..2f0ada8 100644
--- a/chrome/browser/resource_coordinator/tab_memory_metrics_reporter.h
+++ b/chrome/browser/resource_coordinator/tab_memory_metrics_reporter.h
@@ -24,6 +24,10 @@
class TabMemoryMetricsReporter : public TabLoadTracker::Observer {
public:
TabMemoryMetricsReporter();
+
+ TabMemoryMetricsReporter(const TabMemoryMetricsReporter&) = delete;
+ TabMemoryMetricsReporter& operator=(const TabMemoryMetricsReporter&) = delete;
+
~TabMemoryMetricsReporter() override;
void StartReporting(TabLoadTracker* tracker);
@@ -96,8 +100,6 @@
// A list of web contents to be reported their memory usage, sorted by
// next_emit_time.
std::set<WebContentsData, WebContentsDataComparator> monitored_contents_;
-
- DISALLOW_COPY_AND_ASSIGN(TabMemoryMetricsReporter);
};
} // namespace resource_coordinator
diff --git a/chrome/browser/resource_coordinator/tab_metrics_logger.h b/chrome/browser/resource_coordinator/tab_metrics_logger.h
index c5be073..f751d0f 100644
--- a/chrome/browser/resource_coordinator/tab_metrics_logger.h
+++ b/chrome/browser/resource_coordinator/tab_metrics_logger.h
@@ -54,6 +54,10 @@
};
TabMetricsLogger();
+
+ TabMetricsLogger(const TabMetricsLogger&) = delete;
+ TabMetricsLogger& operator=(const TabMetricsLogger&) = delete;
+
~TabMetricsLogger();
// Logs metrics for the tab with the given |tab_features|. Does nothing if
@@ -95,8 +99,6 @@
// query_id should be set whenever a new tabRanker query happens, so all logs
// that happened within the same query will have same query_id_.
int64_t query_id_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(TabMetricsLogger);
};
#endif // CHROME_BROWSER_RESOURCE_COORDINATOR_TAB_METRICS_LOGGER_H_
diff --git a/chrome/browser/resource_coordinator/tab_metrics_logger_unittest.cc b/chrome/browser/resource_coordinator/tab_metrics_logger_unittest.cc
index 43a00ec..a2bae442 100644
--- a/chrome/browser/resource_coordinator/tab_metrics_logger_unittest.cc
+++ b/chrome/browser/resource_coordinator/tab_metrics_logger_unittest.cc
@@ -46,6 +46,10 @@
class FakeBrowserWindow : public TestBrowserWindow {
public:
FakeBrowserWindow() = default;
+
+ FakeBrowserWindow(const FakeBrowserWindow&) = delete;
+ FakeBrowserWindow& operator=(const FakeBrowserWindow&) = delete;
+
~FakeBrowserWindow() override = default;
// Helper function to handle FakeBrowserWindow lifetime. Modeled after
@@ -106,8 +110,6 @@
Browser* browser_ = nullptr;
bool is_active_ = false;
ui::WindowShowState show_state_ = ui::SHOW_STATE_NORMAL;
-
- DISALLOW_COPY_AND_ASSIGN(FakeBrowserWindow);
};
} // namespace
diff --git a/chrome/browser/resource_coordinator/tab_ranker/tab_score_predictor.h b/chrome/browser/resource_coordinator/tab_ranker/tab_score_predictor.h
index 0706390..b67e4a9 100644
--- a/chrome/browser/resource_coordinator/tab_ranker/tab_score_predictor.h
+++ b/chrome/browser/resource_coordinator/tab_ranker/tab_score_predictor.h
@@ -51,6 +51,10 @@
kMaxValue = kFrecencyScorer
};
TabScorePredictor();
+
+ TabScorePredictor(const TabScorePredictor&) = delete;
+ TabScorePredictor& operator=(const TabScorePredictor&) = delete;
+
~TabScorePredictor();
// Scores the tab using the tab reactivation model. A higher score indicates
@@ -104,8 +108,6 @@
const float discard_count_penalty_ = 0.0f;
const float mru_scorer_penalty_ = 1.0f;
const ScorerType type_ = kMLScorer;
-
- DISALLOW_COPY_AND_ASSIGN(TabScorePredictor);
};
} // namespace tab_ranker
diff --git a/chrome/browser/resource_coordinator/tab_ranker/tab_score_predictor_unittest.cc b/chrome/browser/resource_coordinator/tab_ranker/tab_score_predictor_unittest.cc
index 425834bc..41db6a04 100644
--- a/chrome/browser/resource_coordinator/tab_ranker/tab_score_predictor_unittest.cc
+++ b/chrome/browser/resource_coordinator/tab_ranker/tab_score_predictor_unittest.cc
@@ -21,6 +21,10 @@
class TabScorePredictorTest : public testing::Test {
public:
TabScorePredictorTest() = default;
+
+ TabScorePredictorTest(const TabScorePredictorTest&) = delete;
+ TabScorePredictorTest& operator=(const TabScorePredictorTest&) = delete;
+
~TabScorePredictorTest() override = default;
protected:
@@ -33,9 +37,6 @@
}
base::test::ScopedFeatureList scoped_feature_list_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TabScorePredictorTest);
};
} // namespace
diff --git a/chrome/browser/resource_coordinator/test_lifecycle_unit.h b/chrome/browser/resource_coordinator/test_lifecycle_unit.h
index d6b1fb01a..7ad3a95 100644
--- a/chrome/browser/resource_coordinator/test_lifecycle_unit.h
+++ b/chrome/browser/resource_coordinator/test_lifecycle_unit.h
@@ -23,6 +23,10 @@
bool can_discard = true);
TestLifecycleUnit(content::Visibility visibility, UsageClock* usage_clock);
explicit TestLifecycleUnit(LifecycleUnitSourceBase* source);
+
+ TestLifecycleUnit(const TestLifecycleUnit&) = delete;
+ TestLifecycleUnit& operator=(const TestLifecycleUnit&) = delete;
+
~TestLifecycleUnit() override;
void SetLastFocusedTime(base::TimeTicks last_focused_time) {
@@ -54,8 +58,6 @@
base::ProcessHandle process_handle_;
LifecycleUnit::SortKey sort_key_;
bool can_discard_ = true;
-
- DISALLOW_COPY_AND_ASSIGN(TestLifecycleUnit);
};
// Helper funtions for testing CanDiscard policy.
diff --git a/chrome/browser/resource_coordinator/time.h b/chrome/browser/resource_coordinator/time.h
index 8825776..32b3c356 100644
--- a/chrome/browser/resource_coordinator/time.h
+++ b/chrome/browser/resource_coordinator/time.h
@@ -25,10 +25,12 @@
class ScopedSetTickClockForTesting {
public:
explicit ScopedSetTickClockForTesting(const base::TickClock* tick_clock);
- ~ScopedSetTickClockForTesting();
- private:
- DISALLOW_COPY_AND_ASSIGN(ScopedSetTickClockForTesting);
+ ScopedSetTickClockForTesting(const ScopedSetTickClockForTesting&) = delete;
+ ScopedSetTickClockForTesting& operator=(const ScopedSetTickClockForTesting&) =
+ delete;
+
+ ~ScopedSetTickClockForTesting();
};
} // namespace resource_coordinator
diff --git a/chrome/browser/resource_coordinator/usage_clock.h b/chrome/browser/resource_coordinator/usage_clock.h
index 064e3bed..7b68ce1 100644
--- a/chrome/browser/resource_coordinator/usage_clock.h
+++ b/chrome/browser/resource_coordinator/usage_clock.h
@@ -23,6 +23,10 @@
{
public:
UsageClock();
+
+ UsageClock(const UsageClock&) = delete;
+ UsageClock& operator=(const UsageClock&) = delete;
+
~UsageClock() override;
// Returns the amount of Chrome usage time since this was instantiated.
@@ -44,8 +48,6 @@
// The time at which the current session started, or a null TimeTicks if not
// currently in a session.
base::TimeTicks current_usage_session_start_time_;
-
- DISALLOW_COPY_AND_ASSIGN(UsageClock);
};
} // namespace resource_coordinator
diff --git a/chrome/browser/rlz/chrome_rlz_tracker_delegate.h b/chrome/browser/rlz/chrome_rlz_tracker_delegate.h
index 8a9993b..f59e5b19 100644
--- a/chrome/browser/rlz/chrome_rlz_tracker_delegate.h
+++ b/chrome/browser/rlz/chrome_rlz_tracker_delegate.h
@@ -24,6 +24,10 @@
public content::NotificationObserver {
public:
ChromeRLZTrackerDelegate();
+
+ ChromeRLZTrackerDelegate(const ChromeRLZTrackerDelegate&) = delete;
+ ChromeRLZTrackerDelegate& operator=(const ChromeRLZTrackerDelegate&) = delete;
+
~ChromeRLZTrackerDelegate() override;
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
@@ -63,8 +67,6 @@
// Subscription for receiving callbacks that a URL was opened from the
// omnibox.
base::CallbackListSubscription omnibox_url_opened_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeRLZTrackerDelegate);
};
#endif // CHROME_BROWSER_RLZ_CHROME_RLZ_TRACKER_DELEGATE_H_
diff --git a/chrome/browser/safe_browsing/advanced_protection_status_manager.h b/chrome/browser/safe_browsing/advanced_protection_status_manager.h
index e1bfe1a..7815106 100644
--- a/chrome/browser/safe_browsing/advanced_protection_status_manager.h
+++ b/chrome/browser/safe_browsing/advanced_protection_status_manager.h
@@ -33,6 +33,12 @@
public:
AdvancedProtectionStatusManager(PrefService* pref_service,
signin::IdentityManager* identity_manager);
+
+ AdvancedProtectionStatusManager(const AdvancedProtectionStatusManager&) =
+ delete;
+ AdvancedProtectionStatusManager& operator=(
+ const AdvancedProtectionStatusManager&) = delete;
+
~AdvancedProtectionStatusManager() override;
// Returns whether the unconsented primary account of the associated profile
@@ -142,8 +148,6 @@
base::OneShotTimer timer_;
base::Time last_refreshed_;
base::TimeDelta minimum_delay_;
-
- DISALLOW_COPY_AND_ASSIGN(AdvancedProtectionStatusManager);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/android/password_reuse_controller_android.h b/chrome/browser/safe_browsing/android/password_reuse_controller_android.h
index f35b3e2..f529451 100644
--- a/chrome/browser/safe_browsing/android/password_reuse_controller_android.h
+++ b/chrome/browser/safe_browsing/android/password_reuse_controller_android.h
@@ -36,6 +36,12 @@
ChromePasswordProtectionService* service,
ReusedPasswordAccountType password_type,
OnWarningDone done_callback);
+
+ PasswordReuseControllerAndroid(const PasswordReuseControllerAndroid&) =
+ delete;
+ PasswordReuseControllerAndroid& operator=(
+ const PasswordReuseControllerAndroid&) = delete;
+
~PasswordReuseControllerAndroid() override;
// Called by |ChromePasswordProtectionService| when modal dialog needs to be
@@ -90,8 +96,6 @@
// Records the start time when modal warning is constructed.
base::TimeTicks modal_construction_start_time_;
-
- DISALLOW_COPY_AND_ASSIGN(PasswordReuseControllerAndroid);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/android/services_delegate_android.h b/chrome/browser/safe_browsing/android/services_delegate_android.h
index 7004ce0..d6f46ced2 100644
--- a/chrome/browser/safe_browsing/android/services_delegate_android.h
+++ b/chrome/browser/safe_browsing/android/services_delegate_android.h
@@ -18,6 +18,10 @@
class ServicesDelegateAndroid : public ServicesDelegate {
public:
explicit ServicesDelegateAndroid(SafeBrowsingService* safe_browsing_service);
+
+ ServicesDelegateAndroid(const ServicesDelegateAndroid&) = delete;
+ ServicesDelegateAndroid& operator=(const ServicesDelegateAndroid&) = delete;
+
~ServicesDelegateAndroid() override;
private:
@@ -50,8 +54,6 @@
scoped_refptr<SafeBrowsingDatabaseManager> database_manager_;
// Has the database_manager been set for tests?
bool database_manager_set_for_tests_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ServicesDelegateAndroid);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/certificate_reporting_service.h b/chrome/browser/safe_browsing/certificate_reporting_service.h
index cb32b80f..c24693e 100644
--- a/chrome/browser/safe_browsing/certificate_reporting_service.h
+++ b/chrome/browser/safe_browsing/certificate_reporting_service.h
@@ -95,6 +95,10 @@
class BoundedReportList {
public:
explicit BoundedReportList(size_t max_size);
+
+ BoundedReportList(const BoundedReportList&) = delete;
+ BoundedReportList& operator=(const BoundedReportList&) = delete;
+
~BoundedReportList();
void Add(const Report& report);
@@ -111,8 +115,6 @@
std::vector<Report> items_;
base::ThreadChecker thread_checker_;
-
- DISALLOW_COPY_AND_ASSIGN(BoundedReportList);
};
// Class that handles report uploads and implements the upload retry logic.
@@ -123,6 +125,10 @@
base::Clock* const clock,
base::TimeDelta report_ttl,
bool retries_enabled);
+
+ Reporter(const Reporter&) = delete;
+ Reporter& operator=(const Reporter&) = delete;
+
~Reporter();
// Sends a report. If the send fails, the report will be added to the retry
@@ -166,8 +172,6 @@
base::OnceClosure no_in_flight_reports_;
base::WeakPtrFactory<Reporter> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(Reporter);
};
// Public for testing.
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc
index e3a4e48..07f1e8ef 100644
--- a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc
+++ b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc
@@ -543,6 +543,9 @@
base::Unretained(GetCleanerController()))),
time_info_(std::move(time_info)) {}
+ ReporterRunner(const ReporterRunner&) = delete;
+ ReporterRunner& operator=(const ReporterRunner&) = delete;
+
~ReporterRunner() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DCHECK_EQ(instance_, this);
@@ -850,8 +853,6 @@
ReporterRunTimeInfo time_info_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(ReporterRunner);
};
// static
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_browsertest_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_browsertest_win.cc
index 8d11ea8..a07bf10 100644
--- a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_browsertest_win.cc
+++ b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_browsertest_win.cc
@@ -95,6 +95,11 @@
public:
explicit SettingsResetterTestDelegate(int* num_resets)
: num_resets_(num_resets) {}
+
+ SettingsResetterTestDelegate(const SettingsResetterTestDelegate&) = delete;
+ SettingsResetterTestDelegate& operator=(const SettingsResetterTestDelegate&) =
+ delete;
+
~SettingsResetterTestDelegate() override = default;
void FetchDefaultSettings(
@@ -114,8 +119,6 @@
private:
int* num_resets_;
-
- DISALLOW_COPY_AND_ASSIGN(SettingsResetterTestDelegate);
};
// Indicates the possible values to be written to the registry for cleanup
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h
index af7de26..d2a5a6d2 100644
--- a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h
+++ b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h
@@ -31,6 +31,10 @@
class Delegate {
public:
Delegate();
+
+ Delegate(const Delegate&) = delete;
+ Delegate& operator=(const Delegate&) = delete;
+
virtual ~Delegate();
virtual void FetchDefaultSettings(
@@ -38,12 +42,14 @@
virtual std::unique_ptr<ProfileResetter> GetProfileResetter(
Profile* profile);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Delegate);
};
PostCleanupSettingsResetter();
+
+ PostCleanupSettingsResetter(const PostCleanupSettingsResetter&) = delete;
+ PostCleanupSettingsResetter& operator=(const PostCleanupSettingsResetter&) =
+ delete;
+
virtual ~PostCleanupSettingsResetter();
// Returns true if the in-browser cleaner UI is enabled.
@@ -63,16 +69,6 @@
// Registers the settings reset pending tracked preference.
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
-
- private:
- // This object doesn't hold any state, so it's safe to delete it even after
- // an async function is called. For example, it's fine to let the object get
- // out of scope after invoking ResetTaggedProfiles() and there is no need
- // to wait for the callback to be run to release it. If you are intending to
- // change that assumption, please make sure you don't break the contract
- // where this class is used.
-
- DISALLOW_COPY_AND_ASSIGN(PostCleanupSettingsResetter);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/chrome_client_side_detection_host_delegate.h b/chrome/browser/safe_browsing/chrome_client_side_detection_host_delegate.h
index ffe0158..5e83da0 100644
--- a/chrome/browser/safe_browsing/chrome_client_side_detection_host_delegate.h
+++ b/chrome/browser/safe_browsing/chrome_client_side_detection_host_delegate.h
@@ -20,6 +20,12 @@
explicit ChromeClientSideDetectionHostDelegate(
content::WebContents* web_contents);
+
+ ChromeClientSideDetectionHostDelegate(
+ const ChromeClientSideDetectionHostDelegate&) = delete;
+ ChromeClientSideDetectionHostDelegate& operator=(
+ const ChromeClientSideDetectionHostDelegate&) = delete;
+
~ChromeClientSideDetectionHostDelegate() override;
// ClientSideDetectionHost::Delegate implementation.
@@ -47,8 +53,6 @@
content::WebContents* web_contents_;
SafeBrowsingNavigationObserverManager* observer_manager_for_testing_ =
nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeClientSideDetectionHostDelegate);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/chrome_client_side_detection_service_delegate.h b/chrome/browser/safe_browsing/chrome_client_side_detection_service_delegate.h
index ca5423f..19db5fe 100644
--- a/chrome/browser/safe_browsing/chrome_client_side_detection_service_delegate.h
+++ b/chrome/browser/safe_browsing/chrome_client_side_detection_service_delegate.h
@@ -17,6 +17,12 @@
: public ClientSideDetectionService::Delegate {
public:
explicit ChromeClientSideDetectionServiceDelegate(Profile* profile);
+
+ ChromeClientSideDetectionServiceDelegate(
+ const ChromeClientSideDetectionServiceDelegate&) = delete;
+ ChromeClientSideDetectionServiceDelegate& operator=(
+ const ChromeClientSideDetectionServiceDelegate&) = delete;
+
~ChromeClientSideDetectionServiceDelegate() override;
// ClientSideDetectionService::Delegate implementation.
@@ -28,8 +34,6 @@
private:
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeClientSideDetectionServiceDelegate);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/chrome_controller_client.h b/chrome/browser/safe_browsing/chrome_controller_client.h
index abf81bcd..6514011 100644
--- a/chrome/browser/safe_browsing/chrome_controller_client.h
+++ b/chrome/browser/safe_browsing/chrome_controller_client.h
@@ -31,12 +31,13 @@
const GURL& default_safe_page,
std::unique_ptr<security_interstitials::SettingsPageHelper>
settings_page_helper);
+
+ ChromeControllerClient(const ChromeControllerClient&) = delete;
+ ChromeControllerClient& operator=(const ChromeControllerClient&) = delete;
+
~ChromeControllerClient() override;
void Proceed() override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeControllerClient);
};
#endif // CHROME_BROWSER_SAFE_BROWSING_CHROME_CONTROLLER_CLIENT_H_
diff --git a/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.h b/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.h
index 4324536..7e420f5 100644
--- a/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.h
+++ b/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.h
@@ -41,6 +41,12 @@
get_user_population_callback,
enterprise_connectors::ConnectorsService* connectors_service,
ReferrerChainProvider* referrer_chain_provider);
+
+ ChromeEnterpriseRealTimeUrlLookupService(
+ const ChromeEnterpriseRealTimeUrlLookupService&) = delete;
+ ChromeEnterpriseRealTimeUrlLookupService& operator=(
+ const ChromeEnterpriseRealTimeUrlLookupService&) = delete;
+
~ChromeEnterpriseRealTimeUrlLookupService() override;
// RealTimeUrlLookupServiceBase:
@@ -76,8 +82,6 @@
base::WeakPtrFactory<ChromeEnterpriseRealTimeUrlLookupService> weak_factory_{
this};
- DISALLOW_COPY_AND_ASSIGN(ChromeEnterpriseRealTimeUrlLookupService);
-
}; // class ChromeEnterpriseRealTimeUrlLookupService
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
index 48042508..3318e30 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
@@ -102,13 +102,15 @@
class MockSafeBrowsingTokenFetcher : public SafeBrowsingTokenFetcher {
public:
MockSafeBrowsingTokenFetcher() = default;
+
+ MockSafeBrowsingTokenFetcher(const MockSafeBrowsingTokenFetcher&) = delete;
+ MockSafeBrowsingTokenFetcher& operator=(const MockSafeBrowsingTokenFetcher&) =
+ delete;
+
~MockSafeBrowsingTokenFetcher() override = default;
MOCK_METHOD1(Start, void(Callback));
MOCK_METHOD1(OnInvalidAccessToken, void(const std::string&));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockSafeBrowsingTokenFetcher);
};
// This matcher verifies that the client computed verdict
@@ -130,6 +132,12 @@
class MockClientSideDetectionService : public ClientSideDetectionService {
public:
MockClientSideDetectionService() : ClientSideDetectionService(nullptr) {}
+
+ MockClientSideDetectionService(const MockClientSideDetectionService&) =
+ delete;
+ MockClientSideDetectionService& operator=(
+ const MockClientSideDetectionService&) = delete;
+
~MockClientSideDetectionService() override {}
MOCK_METHOD3(SendClientReportPhishingRequest,
@@ -143,9 +151,6 @@
MOCK_METHOD0(GetModelStr, std::string&());
MOCK_METHOD0(GetModelSharedMemoryRegion, base::ReadOnlySharedMemoryRegion());
MOCK_METHOD0(GetModelType, CSDModelType());
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockClientSideDetectionService);
};
class MockSafeBrowsingUIManager : public SafeBrowsingUIManager {
@@ -199,6 +204,9 @@
public:
FakePhishingDetector() = default;
+ FakePhishingDetector(const FakePhishingDetector&) = delete;
+ FakePhishingDetector& operator=(const FakePhishingDetector&) = delete;
+
~FakePhishingDetector() override = default;
void BindReceiver(mojo::ScopedMessagePipeHandle handle) {
@@ -262,8 +270,6 @@
GURL url_;
std::string model_ = "";
base::ReadOnlySharedMemoryRegion region_ = base::ReadOnlySharedMemoryRegion();
-
- DISALLOW_COPY_AND_ASSIGN(FakePhishingDetector);
};
class ClientSideDetectionHostTestBase : public ChromeRenderViewHostTestHarness {
diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request.h b/chrome/browser/safe_browsing/download_protection/check_client_download_request.h
index bd22aadf..c99ce34 100644
--- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.h
+++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.h
@@ -39,6 +39,11 @@
DownloadProtectionService* service,
scoped_refptr<SafeBrowsingDatabaseManager> database_manager,
scoped_refptr<BinaryFeatureExtractor> binary_feature_extractor);
+
+ CheckClientDownloadRequest(const CheckClientDownloadRequest&) = delete;
+ CheckClientDownloadRequest& operator=(const CheckClientDownloadRequest&) =
+ delete;
+
~CheckClientDownloadRequest() override;
// download::DownloadItem::Observer:
@@ -94,8 +99,6 @@
base::TimeTicks upload_start_time_;
base::WeakPtrFactory<CheckClientDownloadRequest> weakptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CheckClientDownloadRequest);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.h b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.h
index 699a7b2..4d226e7 100644
--- a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.h
+++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.h
@@ -53,6 +53,12 @@
DownloadProtectionService* service,
scoped_refptr<SafeBrowsingDatabaseManager> database_manager,
std::unique_ptr<DownloadRequestMaker> download_request_maker);
+
+ CheckClientDownloadRequestBase(const CheckClientDownloadRequestBase&) =
+ delete;
+ CheckClientDownloadRequestBase& operator=(
+ const CheckClientDownloadRequestBase&) = delete;
+
virtual ~CheckClientDownloadRequestBase();
void Start();
@@ -178,8 +184,6 @@
// Used to create the download request proto.
std::unique_ptr<DownloadRequestMaker> download_request_maker_;
-
- DISALLOW_COPY_AND_ASSIGN(CheckClientDownloadRequestBase);
}; // namespace safe_browsing
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/download_protection/check_file_system_access_write_request.h b/chrome/browser/safe_browsing/download_protection/check_file_system_access_write_request.h
index 72aa83a..64ef071 100644
--- a/chrome/browser/safe_browsing/download_protection/check_file_system_access_write_request.h
+++ b/chrome/browser/safe_browsing/download_protection/check_file_system_access_write_request.h
@@ -31,6 +31,12 @@
DownloadProtectionService* service,
scoped_refptr<SafeBrowsingDatabaseManager> database_manager,
scoped_refptr<BinaryFeatureExtractor> binary_feature_extractor);
+
+ CheckFileSystemAccessWriteRequest(const CheckFileSystemAccessWriteRequest&) =
+ delete;
+ CheckFileSystemAccessWriteRequest& operator=(
+ const CheckFileSystemAccessWriteRequest&) = delete;
+
~CheckFileSystemAccessWriteRequest() override;
private:
@@ -61,8 +67,6 @@
base::WeakPtrFactory<CheckFileSystemAccessWriteRequest> weakptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(CheckFileSystemAccessWriteRequest);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/download_protection/download_feedback.cc b/chrome/browser/safe_browsing/download_protection/download_feedback.cc
index 6afa3096..30d34878 100644
--- a/chrome/browser/safe_browsing/download_protection/download_feedback.cc
+++ b/chrome/browser/safe_browsing/download_protection/download_feedback.cc
@@ -45,6 +45,10 @@
const base::FilePath& file_path,
const std::string& ping_request,
const std::string& ping_response);
+
+ DownloadFeedbackImpl(const DownloadFeedbackImpl&) = delete;
+ DownloadFeedbackImpl& operator=(const DownloadFeedbackImpl&) = delete;
+
~DownloadFeedbackImpl() override;
void Start(base::OnceClosure finish_callback) override;
@@ -80,8 +84,6 @@
// The time at which we started uploading. Used for metrics.
base::Time uploader_start_time_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadFeedbackImpl);
};
DownloadFeedbackImpl::DownloadFeedbackImpl(
diff --git a/chrome/browser/safe_browsing/download_protection/download_feedback_service.h b/chrome/browser/safe_browsing/download_protection/download_feedback_service.h
index 6a0a1ce..ce8ad2c 100644
--- a/chrome/browser/safe_browsing/download_protection/download_feedback_service.h
+++ b/chrome/browser/safe_browsing/download_protection/download_feedback_service.h
@@ -36,6 +36,10 @@
DownloadFeedbackService(
DownloadProtectionService* download_protection_service,
base::TaskRunner* file_task_runner);
+
+ DownloadFeedbackService(const DownloadFeedbackService&) = delete;
+ DownloadFeedbackService& operator=(const DownloadFeedbackService&) = delete;
+
~DownloadFeedbackService();
// Stores the request and response ping data from the download check, if the
@@ -92,8 +96,6 @@
base::queue<std::unique_ptr<DownloadFeedback>> active_feedback_;
base::WeakPtrFactory<DownloadFeedbackService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DownloadFeedbackService);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service.h b/chrome/browser/safe_browsing/download_protection/download_protection_service.h
index 1627b201..bc6c3aa2 100644
--- a/chrome/browser/safe_browsing/download_protection/download_protection_service.h
+++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.h
@@ -69,6 +69,10 @@
// to call SetEnabled() to start it. |sb_service| owns this object.
explicit DownloadProtectionService(SafeBrowsingService* sb_service);
+ DownloadProtectionService(const DownloadProtectionService&) = delete;
+ DownloadProtectionService& operator=(const DownloadProtectionService&) =
+ delete;
+
virtual ~DownloadProtectionService();
// Parse a flag of blocklisted sha256 hashes to check at each download.
@@ -350,8 +354,6 @@
DownloadReporter download_reporter_;
base::WeakPtrFactory<DownloadProtectionService> weak_ptr_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadProtectionService);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/download_protection/download_reporter.h b/chrome/browser/safe_browsing/download_protection/download_reporter.h
index ec150931..087314a 100644
--- a/chrome/browser/safe_browsing/download_protection/download_reporter.h
+++ b/chrome/browser/safe_browsing/download_protection/download_reporter.h
@@ -24,6 +24,10 @@
public ProfileObserver {
public:
DownloadReporter();
+
+ DownloadReporter(const DownloadReporter&) = delete;
+ DownloadReporter& operator=(const DownloadReporter&) = delete;
+
~DownloadReporter() override;
// ProfileManagerObserver:
@@ -65,8 +69,6 @@
void ReportAndRecordDangerousDownloadWarningBypassed(
download::DownloadItem* download,
download::DownloadDangerType danger_type);
-
- DISALLOW_COPY_AND_ASSIGN(DownloadReporter);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/download_protection/download_request_maker.h b/chrome/browser/safe_browsing/download_protection/download_request_maker.h
index cdbfd01..fb0d5e0 100644
--- a/chrome/browser/safe_browsing/download_protection/download_request_maker.h
+++ b/chrome/browser/safe_browsing/download_protection/download_request_maker.h
@@ -53,6 +53,10 @@
const std::vector<ClientDownloadRequest::Resource>& resources,
bool is_user_initiated,
ReferrerChainData* referrer_chain_data);
+
+ DownloadRequestMaker(const DownloadRequestMaker&) = delete;
+ DownloadRequestMaker& operator=(const DownloadRequestMaker&) = delete;
+
~DownloadRequestMaker();
// Starts filling in fields in the download ping. Will run the callback with
@@ -89,8 +93,6 @@
Callback callback_;
base::WeakPtrFactory<DownloadRequestMaker> weakptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DownloadRequestMaker);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/download_protection/ppapi_download_request.h b/chrome/browser/safe_browsing/download_protection/ppapi_download_request.h
index f20261f..fa92be2e 100644
--- a/chrome/browser/safe_browsing/download_protection/ppapi_download_request.h
+++ b/chrome/browser/safe_browsing/download_protection/ppapi_download_request.h
@@ -71,6 +71,9 @@
DownloadProtectionService* service,
scoped_refptr<SafeBrowsingDatabaseManager> database_manager);
+ PPAPIDownloadRequest(const PPAPIDownloadRequest&) = delete;
+ PPAPIDownloadRequest& operator=(const PPAPIDownloadRequest&) = delete;
+
~PPAPIDownloadRequest() override;
// Start the process of checking the download request. The callback passed as
@@ -175,8 +178,6 @@
content::WebContents* web_contents_;
base::WeakPtrFactory<PPAPIDownloadRequest> weakptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PPAPIDownloadRequest);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/download_protection/two_phase_uploader.cc b/chrome/browser/safe_browsing/download_protection/two_phase_uploader.cc
index 7dac4246..53790dc3 100644
--- a/chrome/browser/safe_browsing/download_protection/two_phase_uploader.cc
+++ b/chrome/browser/safe_browsing/download_protection/two_phase_uploader.cc
@@ -41,6 +41,10 @@
const base::FilePath& file_path,
FinishCallback finish_callback,
const net::NetworkTrafficAnnotationTag& traffic_annotation);
+
+ TwoPhaseUploaderImpl(const TwoPhaseUploaderImpl&) = delete;
+ TwoPhaseUploaderImpl& operator=(const TwoPhaseUploaderImpl&) = delete;
+
~TwoPhaseUploaderImpl() override;
// Begins the upload process.
@@ -64,8 +68,6 @@
net::NetworkTrafficAnnotationTag traffic_annotation_;
std::unique_ptr<network::SimpleURLLoader> url_loader_;
-
- DISALLOW_COPY_AND_ASSIGN(TwoPhaseUploaderImpl);
};
TwoPhaseUploaderImpl::TwoPhaseUploaderImpl(
diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident.h b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident.h
index 538913f..b43f0e35 100644
--- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident.h
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident.h
@@ -22,15 +22,16 @@
explicit BinaryIntegrityIncident(
std::unique_ptr<ClientIncidentReport_IncidentData_BinaryIntegrityIncident>
binary_integrity);
+
+ BinaryIntegrityIncident(const BinaryIntegrityIncident&) = delete;
+ BinaryIntegrityIncident& operator=(const BinaryIntegrityIncident&) = delete;
+
~BinaryIntegrityIncident() override;
// Incident methods:
IncidentType GetType() const override;
std::string GetKey() const override;
uint32_t ComputeDigest() const override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BinaryIntegrityIncident);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h b/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h
index bcea141..d91fb6e 100644
--- a/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h
+++ b/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h
@@ -27,6 +27,10 @@
// |delay| time to pass before and between each callback.
DelayedCallbackRunner(base::TimeDelta delay,
const scoped_refptr<base::TaskRunner>& task_runner);
+
+ DelayedCallbackRunner(const DelayedCallbackRunner&) = delete;
+ DelayedCallbackRunner& operator=(const DelayedCallbackRunner&) = delete;
+
~DelayedCallbackRunner();
// Registers |callback| with the runner. A copy of |callback| is held until it
@@ -54,8 +58,6 @@
// A timer upon the firing of which the next callback will be run.
base::DelayTimer timer_;
-
- DISALLOW_COPY_AND_ASSIGN(DelayedCallbackRunner);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner_unittest.cc
index 2778820..9f157944 100644
--- a/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner_unittest.cc
@@ -25,12 +25,14 @@
public:
explicit CallbackArgument(base::OnceClosure on_delete)
: on_delete_(std::move(on_delete)) {}
+
+ CallbackArgument(const CallbackArgument&) = delete;
+ CallbackArgument& operator=(const CallbackArgument&) = delete;
+
~CallbackArgument() { std::move(on_delete_).Run(); }
private:
base::OnceClosure on_delete_;
-
- DISALLOW_COPY_AND_ASSIGN(CallbackArgument);
};
} // namespace
diff --git a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.cc b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.cc
index 0ae057a..05b7e1de 100644
--- a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.cc
@@ -65,6 +65,9 @@
// it is in progress.
class DownloadItemData : public base::SupportsUserData::Data {
public:
+ DownloadItemData(const DownloadItemData&) = delete;
+ DownloadItemData& operator=(const DownloadItemData&) = delete;
+
~DownloadItemData() override {}
// Sets the ClientDownloadRequest for a given DownloadItem.
@@ -84,8 +87,6 @@
: request_(std::move(request)) {}
std::unique_ptr<ClientDownloadRequest> request_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadItemData);
};
// Make the key's value unique by setting it to its own location.
diff --git a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.h b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.h
index e244486..3d767c1 100644
--- a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.h
+++ b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.h
@@ -42,6 +42,10 @@
GetDownloadDetailsCallback;
DownloadMetadataManager();
+
+ DownloadMetadataManager(const DownloadMetadataManager&) = delete;
+ DownloadMetadataManager& operator=(const DownloadMetadataManager&) = delete;
+
~DownloadMetadataManager() override;
// Adds |download_manager| to the set observed by the metadata manager.
@@ -82,8 +86,6 @@
// Contexts for each DownloadManager that has been added and has not yet
// "gone down".
ManagerToContextMap contexts_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadMetadataManager);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/incident_reporting/incident.h b/chrome/browser/safe_browsing/incident_reporting/incident.h
index cba0b6ce..19cad96 100644
--- a/chrome/browser/safe_browsing/incident_reporting/incident.h
+++ b/chrome/browser/safe_browsing/incident_reporting/incident.h
@@ -37,6 +37,9 @@
// enable logging and pruning by the incident reporting service.
class Incident {
public:
+ Incident(const Incident&) = delete;
+ Incident& operator=(const Incident&) = delete;
+
virtual ~Incident();
// Returns the type of the incident.
@@ -65,8 +68,6 @@
private:
std::unique_ptr<ClientIncidentReport_IncidentData> payload_;
-
- DISALLOW_COPY_AND_ASSIGN(Incident);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.h b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.h
index 32e6f77..edeee2c 100644
--- a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.h
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.h
@@ -33,6 +33,10 @@
// The id associated with the URLFetcher, for use by tests.
static const int kTestUrlFetcherId;
+ IncidentReportUploaderImpl(const IncidentReportUploaderImpl&) = delete;
+ IncidentReportUploaderImpl& operator=(const IncidentReportUploaderImpl&) =
+ delete;
+
~IncidentReportUploaderImpl() override;
// Uploads a report with a caller-provided URL context. |callback| will be run
@@ -67,8 +71,6 @@
// The time at which the upload was initiated.
base::TimeTicks time_begin_;
-
- DISALLOW_COPY_AND_ASSIGN(IncidentReportUploaderImpl);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
index 821c260..172aa23 100644
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
@@ -165,6 +165,10 @@
PersistentIncidentStateCollection;
explicit UploadContext(std::unique_ptr<ClientIncidentReport> report);
+
+ UploadContext(const UploadContext&) = delete;
+ UploadContext& operator=(const UploadContext&) = delete;
+
~UploadContext();
// The report being uploaded.
@@ -176,9 +180,6 @@
// A mapping of profile contexts to the data to be persisted upon successful
// upload.
PersistentIncidentStateCollection profiles_to_state;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(UploadContext);
};
// An IncidentReceiver that is weakly-bound to the service and transparently
@@ -186,6 +187,10 @@
class IncidentReportingService::Receiver : public IncidentReceiver {
public:
explicit Receiver(const base::WeakPtr<IncidentReportingService>& service);
+
+ Receiver(const Receiver&) = delete;
+ Receiver& operator=(const Receiver&) = delete;
+
~Receiver() override;
// IncidentReceiver methods:
@@ -206,8 +211,6 @@
base::WeakPtr<IncidentReportingService> service_;
scoped_refptr<base::SingleThreadTaskRunner> thread_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(Receiver);
};
IncidentReportingService::Receiver::Receiver(
diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h
index cf52e63..5c13acf9 100644
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h
@@ -79,6 +79,9 @@
public:
explicit IncidentReportingService(SafeBrowsingService* safe_browsing_service);
+ IncidentReportingService(const IncidentReportingService&) = delete;
+ IncidentReportingService& operator=(const IncidentReportingService&) = delete;
+
// All incident collection, data collection, and uploads in progress are
// dropped at destruction.
~IncidentReportingService() override;
@@ -328,8 +331,6 @@
// that are posted during normal processing (e.g., environment collection,
// and report uploads).
base::WeakPtrFactory<IncidentReportingService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(IncidentReportingService);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
index a0d93507..9c704868 100644
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
@@ -378,6 +378,10 @@
FROM_HERE,
base::BindOnce(&FakeUploader::FinishUpload, base::Unretained(this)));
}
+
+ FakeUploader(const FakeUploader&) = delete;
+ FakeUploader& operator=(const FakeUploader&) = delete;
+
~FakeUploader() override { std::move(on_deleted_).Run(); }
private:
@@ -390,8 +394,6 @@
base::OnceClosure on_deleted_;
safe_browsing::IncidentReportUploader::Result result_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeUploader);
};
class FakeDownloadFinder : public safe_browsing::LastDownloadFinder {
@@ -413,6 +415,9 @@
new FakeDownloadFinder(std::move(on_deleted)));
}
+ FakeDownloadFinder(const FakeDownloadFinder&) = delete;
+ FakeDownloadFinder& operator=(const FakeDownloadFinder&) = delete;
+
~FakeDownloadFinder() override { std::move(on_deleted_).Run(); }
private:
@@ -420,8 +425,6 @@
: on_deleted_(std::move(on_deleted)) {}
base::OnceClosure on_deleted_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeDownloadFinder);
};
// Confirms that the test incident(s) was/were uploaded by the service, then
diff --git a/chrome/browser/safe_browsing/incident_reporting/last_download_finder.h b/chrome/browser/safe_browsing/incident_reporting/last_download_finder.h
index 3e8b8da..a796f1f 100644
--- a/chrome/browser/safe_browsing/incident_reporting/last_download_finder.h
+++ b/chrome/browser/safe_browsing/incident_reporting/last_download_finder.h
@@ -48,6 +48,9 @@
std::unique_ptr<ClientIncidentReport_NonBinaryDownloadDetails>)>
LastDownloadCallback;
+ LastDownloadFinder(const LastDownloadFinder&) = delete;
+ LastDownloadFinder& operator=(const LastDownloadFinder&) = delete;
+
~LastDownloadFinder() override;
// Initiates an asynchronous search for the most recent downloads. |callback|
@@ -140,8 +143,6 @@
// A factory for asynchronous operations on profiles' HistoryService.
base::WeakPtrFactory<LastDownloadFinder> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LastDownloadFinder);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc
index b2832ec79..b4ff519 100644
--- a/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc
@@ -47,6 +47,9 @@
EXPECT_EQ(ModificationLength, bytes_written);
}
+ ScopedModuleModifier(const ScopedModuleModifier&) = delete;
+ ScopedModuleModifier& operator=(const ScopedModuleModifier&) = delete;
+
~ScopedModuleModifier() {
uint8_t modification[ModificationLength];
std::transform(address_, address_ + ModificationLength, &modification[0],
@@ -62,8 +65,6 @@
private:
uint8_t* address_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedModuleModifier);
};
} // namespace
diff --git a/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate.h b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate.h
index b9f0468..886017a 100644
--- a/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate.h
+++ b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate.h
@@ -28,6 +28,11 @@
PreferenceValidationDelegate(
Profile* profile,
std::unique_ptr<IncidentReceiver> incident_receiver);
+
+ PreferenceValidationDelegate(const PreferenceValidationDelegate&) = delete;
+ PreferenceValidationDelegate& operator=(const PreferenceValidationDelegate&) =
+ delete;
+
~PreferenceValidationDelegate() override;
private:
@@ -50,8 +55,6 @@
Profile* profile_;
std::unique_ptr<IncidentReceiver> incident_receiver_;
-
- DISALLOW_COPY_AND_ASSIGN(PreferenceValidationDelegate);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/incident_reporting/resource_request_incident.h b/chrome/browser/safe_browsing/incident_reporting/resource_request_incident.h
index af26aa0..4abc6c9 100644
--- a/chrome/browser/safe_browsing/incident_reporting/resource_request_incident.h
+++ b/chrome/browser/safe_browsing/incident_reporting/resource_request_incident.h
@@ -22,15 +22,16 @@
explicit ResourceRequestIncident(
std::unique_ptr<ClientIncidentReport_IncidentData_ResourceRequestIncident>
script_detection_incident);
+
+ ResourceRequestIncident(const ResourceRequestIncident&) = delete;
+ ResourceRequestIncident& operator=(const ResourceRequestIncident&) = delete;
+
~ResourceRequestIncident() override;
// Incident methods:
IncidentType GetType() const override;
std::string GetKey() const override;
uint32_t ComputeDigest() const override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ResourceRequestIncident);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/incident_reporting/state_store.h b/chrome/browser/safe_browsing/incident_reporting/state_store.h
index 6dd463f7..03a4ce5 100644
--- a/chrome/browser/safe_browsing/incident_reporting/state_store.h
+++ b/chrome/browser/safe_browsing/incident_reporting/state_store.h
@@ -44,6 +44,10 @@
class Transaction {
public:
explicit Transaction(StateStore* store);
+
+ Transaction(const Transaction&) = delete;
+ Transaction& operator=(const Transaction&) = delete;
+
~Transaction();
// Marks the described incident as having been reported.
@@ -78,8 +82,6 @@
// A ScopedUserPrefUpdate through which changes to the incidents_sent
// preference are made.
std::unique_ptr<DictionaryPrefUpdate> pref_update_;
-
- DISALLOW_COPY_AND_ASSIGN(Transaction);
};
explicit StateStore(Profile* profile);
diff --git a/chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident.h b/chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident.h
index 0c27f2b3..d867952f 100644
--- a/chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident.h
+++ b/chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident.h
@@ -25,6 +25,11 @@
ClientIncidentReport_IncidentData_TrackedPreferenceIncident>
tracked_preference,
bool is_personal);
+
+ TrackedPreferenceIncident(const TrackedPreferenceIncident&) = delete;
+ TrackedPreferenceIncident& operator=(const TrackedPreferenceIncident&) =
+ delete;
+
~TrackedPreferenceIncident() override;
// Incident methods:
@@ -35,8 +40,6 @@
private:
bool is_personal_;
-
- DISALLOW_COPY_AND_ASSIGN(TrackedPreferenceIncident);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/local_two_phase_testserver.h b/chrome/browser/safe_browsing/local_two_phase_testserver.h
index 978be0e..f0bdb1e 100644
--- a/chrome/browser/safe_browsing/local_two_phase_testserver.h
+++ b/chrome/browser/safe_browsing/local_two_phase_testserver.h
@@ -20,6 +20,9 @@
// Initialize a two phase protocol test server.
LocalTwoPhaseTestServer();
+ LocalTwoPhaseTestServer(const LocalTwoPhaseTestServer&) = delete;
+ LocalTwoPhaseTestServer& operator=(const LocalTwoPhaseTestServer&) = delete;
+
~LocalTwoPhaseTestServer();
GURL GetURL(const std::string& relative_path) {
@@ -30,11 +33,8 @@
private:
net::EmbeddedTestServer embedded_test_server_;
-
- DISALLOW_COPY_AND_ASSIGN(LocalTwoPhaseTestServer);
};
} // namespace safe_browsing
#endif // CHROME_BROWSER_SAFE_BROWSING_LOCAL_TWO_PHASE_TESTSERVER_H_
-
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
index fb8dee8..62cd5fb 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -465,6 +465,11 @@
scoped_feature_list_.InitWithFeaturesAndParameters({tag_and_attribute}, {});
}
+ SafeBrowsingBlockingPageBrowserTest(
+ const SafeBrowsingBlockingPageBrowserTest&) = delete;
+ SafeBrowsingBlockingPageBrowserTest& operator=(
+ const SafeBrowsingBlockingPageBrowserTest&) = delete;
+
~SafeBrowsingBlockingPageBrowserTest() override {}
void CreatedBrowserMainParts(
@@ -809,8 +814,6 @@
TestSafeBrowsingServiceFactory factory_;
TestSafeBrowsingBlockingPageFactory* raw_blocking_page_factory_;
net::EmbeddedTestServer https_server_;
-
- DISALLOW_COPY_AND_ASSIGN(SafeBrowsingBlockingPageBrowserTest);
};
IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest, HardcodedUrls) {
diff --git a/chrome/browser/safe_browsing/safe_browsing_navigation_observer_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_navigation_observer_browsertest.cc
index 50cb31b9..92f2579 100644
--- a/chrome/browser/safe_browsing/safe_browsing_navigation_observer_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_navigation_observer_browsertest.cc
@@ -100,6 +100,10 @@
manager->AddObserver(this);
}
+ DownloadItemCreatedObserver(const DownloadItemCreatedObserver&) = delete;
+ DownloadItemCreatedObserver& operator=(const DownloadItemCreatedObserver&) =
+ delete;
+
~DownloadItemCreatedObserver() override {
if (manager_)
manager_->RemoveObserver(this);
@@ -146,8 +150,6 @@
base::OnceClosure quit_waiting_callback_;
DownloadManager* manager_;
std::vector<DownloadItem*> items_seen_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadItemCreatedObserver);
};
class InnerContentsCreationObserver : public content::WebContentsObserver {
@@ -214,14 +216,16 @@
}
}
+ TestNavigationObserverManager(const TestNavigationObserverManager&) = delete;
+ TestNavigationObserverManager& operator=(
+ const TestNavigationObserverManager&) = delete;
+
~TestNavigationObserverManager() override = default;
private:
std::vector<std::unique_ptr<SafeBrowsingNavigationObserver>> observer_list_;
std::vector<std::unique_ptr<InnerContentsCreationObserver>>
inner_contents_creation_observers_;
-
- DISALLOW_COPY_AND_ASSIGN(TestNavigationObserverManager);
};
class SBNavigationObserverBrowserTest : public InProcessBrowserTest {
diff --git a/chrome/browser/safe_browsing/services_delegate_desktop.h b/chrome/browser/safe_browsing/services_delegate_desktop.h
index 30fd3240..b37619e8 100644
--- a/chrome/browser/safe_browsing/services_delegate_desktop.h
+++ b/chrome/browser/safe_browsing/services_delegate_desktop.h
@@ -24,6 +24,10 @@
public:
ServicesDelegateDesktop(SafeBrowsingService* safe_browsing_service,
ServicesDelegate::ServicesCreator* services_creator);
+
+ ServicesDelegateDesktop(const ServicesDelegateDesktop&) = delete;
+ ServicesDelegateDesktop& operator=(const ServicesDelegateDesktop&) = delete;
+
~ServicesDelegateDesktop() override;
private:
@@ -69,8 +73,6 @@
// Has the database_manager been set for tests?
bool database_manager_set_for_tests_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ServicesDelegateDesktop);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config.h b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config.h
index 39fe982..04fdb44 100644
--- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config.h
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config.h
@@ -30,6 +30,10 @@
// with the config parameters.
static std::unique_ptr<SettingsResetPromptConfig> Create();
+ SettingsResetPromptConfig(const SettingsResetPromptConfig&) = delete;
+ SettingsResetPromptConfig& operator=(const SettingsResetPromptConfig&) =
+ delete;
+
virtual ~SettingsResetPromptConfig();
// Returns a non-negative integer ID if |url| should trigger a
@@ -72,8 +76,6 @@
base::TimeDelta delay_before_prompt_;
int prompt_wave_ = 0;
base::TimeDelta time_between_prompts_;
-
- DISALLOW_COPY_AND_ASSIGN(SettingsResetPromptConfig);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h
index 4ff6cf47..52d3b7b 100644
--- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h
@@ -52,6 +52,10 @@
Profile* profile,
std::unique_ptr<SettingsResetPromptConfig> prompt_config,
std::unique_ptr<ProfileResetter> profile_resetter);
+
+ SettingsResetPromptModel(const SettingsResetPromptModel&) = delete;
+ SettingsResetPromptModel& operator=(const SettingsResetPromptModel&) = delete;
+
virtual ~SettingsResetPromptModel();
Profile* profile() const;
@@ -141,8 +145,6 @@
std::unordered_set<int> domain_ids_for_startup_urls_to_reset_;
ResetState startup_urls_reset_state_ =
NO_RESET_REQUIRED_DUE_TO_DOMAIN_NOT_MATCHED;
-
- DISALLOW_COPY_AND_ASSIGN(SettingsResetPromptModel);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_util_win.cc b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_util_win.cc
index 0624127..351aee09 100644
--- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_util_win.cc
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_util_win.cc
@@ -85,12 +85,15 @@
class SettingsResetPromptDelegateImpl : public SettingsResetPromptDelegate {
public:
SettingsResetPromptDelegateImpl();
+
+ SettingsResetPromptDelegateImpl(const SettingsResetPromptDelegateImpl&) =
+ delete;
+ SettingsResetPromptDelegateImpl& operator=(
+ const SettingsResetPromptDelegateImpl&) = delete;
+
~SettingsResetPromptDelegateImpl() override;
void ShowSettingsResetPromptWithDelay() const override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SettingsResetPromptDelegateImpl);
};
SettingsResetPromptDelegateImpl::SettingsResetPromptDelegateImpl() = default;
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_util_win.h b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_util_win.h
index ba87e437..3bdef28 100644
--- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_util_win.h
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_util_win.h
@@ -21,12 +21,14 @@
class SettingsResetPromptDelegate {
public:
SettingsResetPromptDelegate();
+
+ SettingsResetPromptDelegate(const SettingsResetPromptDelegate&) = delete;
+ SettingsResetPromptDelegate& operator=(const SettingsResetPromptDelegate&) =
+ delete;
+
virtual ~SettingsResetPromptDelegate();
virtual void ShowSettingsResetPromptWithDelay() const = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SettingsResetPromptDelegate);
};
// Sets the global SettingsResetPromptDelegate, usually for testing.
diff --git a/chrome/browser/safe_browsing/signature_evaluator_mac.h b/chrome/browser/safe_browsing/signature_evaluator_mac.h
index fc18edd..4a7f6c6 100644
--- a/chrome/browser/safe_browsing/signature_evaluator_mac.h
+++ b/chrome/browser/safe_browsing/signature_evaluator_mac.h
@@ -29,6 +29,9 @@
MacSignatureEvaluator(const base::FilePath& signed_object_path,
const std::string& requirement);
+ MacSignatureEvaluator(const MacSignatureEvaluator&) = delete;
+ MacSignatureEvaluator& operator=(const MacSignatureEvaluator&) = delete;
+
~MacSignatureEvaluator();
// Creates the static code object and requirement string, and returns
@@ -62,8 +65,6 @@
// The requirement object constructed from the requirement string.
base::ScopedCFTypeRef<SecRequirementRef> requirement_;
-
- DISALLOW_COPY_AND_ASSIGN(MacSignatureEvaluator);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.h b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.h
index 5ab1d6ec..a056d9e 100644
--- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.h
+++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.h
@@ -67,6 +67,10 @@
public TelemetryService {
public:
AndroidTelemetryService(SafeBrowsingService* sb_service, Profile* profile);
+
+ AndroidTelemetryService(const AndroidTelemetryService&) = delete;
+ AndroidTelemetryService& operator=(const AndroidTelemetryService&) = delete;
+
~AndroidTelemetryService() override;
// download::SimpleDownloadManagerCoordinator::Observer.
@@ -110,8 +114,6 @@
SafeBrowsingService* sb_service_;
base::WeakPtrFactory<AndroidTelemetryService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AndroidTelemetryService);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/telemetry/telemetry_service.h b/chrome/browser/safe_browsing/telemetry/telemetry_service.h
index 6bce8221..4ac5ccc6 100644
--- a/chrome/browser/safe_browsing/telemetry/telemetry_service.h
+++ b/chrome/browser/safe_browsing/telemetry/telemetry_service.h
@@ -15,6 +15,10 @@
class TelemetryService {
public:
TelemetryService();
+
+ TelemetryService(const TelemetryService&) = delete;
+ TelemetryService& operator=(const TelemetryService&) = delete;
+
virtual ~TelemetryService();
base::WeakPtr<TelemetryService> GetWeakPtr() {
@@ -23,7 +27,6 @@
private:
base::WeakPtrFactory<TelemetryService> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(TelemetryService);
};
} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/test_extension_event_observer.h b/chrome/browser/safe_browsing/test_extension_event_observer.h
index cae8c8f..11c14422 100644
--- a/chrome/browser/safe_browsing/test_extension_event_observer.h
+++ b/chrome/browser/safe_browsing/test_extension_event_observer.h
@@ -17,6 +17,10 @@
explicit TestExtensionEventObserver(
extensions::TestEventRouter* event_router);
+ TestExtensionEventObserver(const TestExtensionEventObserver&) = delete;
+ TestExtensionEventObserver& operator=(const TestExtensionEventObserver&) =
+ delete;
+
~TestExtensionEventObserver() override = default;
// Removes |event_args_| from |*this| and returns them.
@@ -36,8 +40,6 @@
// The arguments passed for the last observed event.
base::Value latest_event_args_;
std::string latest_event_name_;
-
- DISALLOW_COPY_AND_ASSIGN(TestExtensionEventObserver);
};
std::unique_ptr<KeyedService> BuildSafeBrowsingPrivateEventRouter(
diff --git a/chrome/browser/safe_browsing/test_safe_browsing_blocking_page_quiet.h b/chrome/browser/safe_browsing/test_safe_browsing_blocking_page_quiet.h
index ff6e10f..07f3f02 100644
--- a/chrome/browser/safe_browsing/test_safe_browsing_blocking_page_quiet.h
+++ b/chrome/browser/safe_browsing/test_safe_browsing_blocking_page_quiet.h
@@ -20,6 +20,11 @@
public:
typedef security_interstitials::UnsafeResource UnsafeResource;
+ TestSafeBrowsingBlockingPageQuiet(const TestSafeBrowsingBlockingPageQuiet&) =
+ delete;
+ TestSafeBrowsingBlockingPageQuiet& operator=(
+ const TestSafeBrowsingBlockingPageQuiet&) = delete;
+
~TestSafeBrowsingBlockingPageQuiet() override;
static TestSafeBrowsingBlockingPageQuiet* CreateBlockingPage(
@@ -44,8 +49,6 @@
private:
security_interstitials::SafeBrowsingQuietErrorUI sb_error_ui_;
-
- DISALLOW_COPY_AND_ASSIGN(TestSafeBrowsingBlockingPageQuiet);
};
} // namespace security_interstitials
diff --git a/chrome/browser/safe_browsing/test_safe_browsing_database_helper.h b/chrome/browser/safe_browsing/test_safe_browsing_database_helper.h
index 46aa7c0..d25fc13 100644
--- a/chrome/browser/safe_browsing/test_safe_browsing_database_helper.h
+++ b/chrome/browser/safe_browsing/test_safe_browsing_database_helper.h
@@ -41,6 +41,11 @@
std::vector<safe_browsing::ListIdentifier> lists_to_insert);
TestSafeBrowsingDatabaseHelper();
+ TestSafeBrowsingDatabaseHelper(const TestSafeBrowsingDatabaseHelper&) =
+ delete;
+ TestSafeBrowsingDatabaseHelper& operator=(
+ const TestSafeBrowsingDatabaseHelper&) = delete;
+
~TestSafeBrowsingDatabaseHelper();
// Only compatible with the kMock policy. Marks the hash prefix for the URL as
@@ -66,8 +71,6 @@
// factory is not being mocked.
safe_browsing::TestV4GetHashProtocolManagerFactory* v4_get_hash_factory_ =
nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(TestSafeBrowsingDatabaseHelper);
};
#endif // CHROME_BROWSER_SAFE_BROWSING_TEST_SAFE_BROWSING_DATABASE_HELPER_H_
diff --git a/chrome/browser/safe_browsing/test_safe_browsing_service.h b/chrome/browser/safe_browsing/test_safe_browsing_service.h
index cc0030e..378b571 100644
--- a/chrome/browser/safe_browsing/test_safe_browsing_service.h
+++ b/chrome/browser/safe_browsing/test_safe_browsing_service.h
@@ -112,6 +112,12 @@
class TestSafeBrowsingServiceFactory : public SafeBrowsingServiceFactory {
public:
TestSafeBrowsingServiceFactory();
+
+ TestSafeBrowsingServiceFactory(const TestSafeBrowsingServiceFactory&) =
+ delete;
+ TestSafeBrowsingServiceFactory& operator=(
+ const TestSafeBrowsingServiceFactory&) = delete;
+
~TestSafeBrowsingServiceFactory() override;
// Creates test safe browsing service, and configures test UI manager,
@@ -136,8 +142,6 @@
scoped_refptr<TestSafeBrowsingDatabaseManager> test_database_manager_;
scoped_refptr<TestSafeBrowsingUIManager> test_ui_manager_;
bool use_v4_local_db_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(TestSafeBrowsingServiceFactory);
};
// This is an implemenation of SafeBrowsingUIManager without actually
diff --git a/chrome/browser/safe_browsing/v4_embedded_test_server_browsertest.cc b/chrome/browser/safe_browsing/v4_embedded_test_server_browsertest.cc
index 4de5b4d..1fee3b46 100644
--- a/chrome/browser/safe_browsing/v4_embedded_test_server_browsertest.cc
+++ b/chrome/browser/safe_browsing/v4_embedded_test_server_browsertest.cc
@@ -72,6 +72,12 @@
class V4EmbeddedTestServerBrowserTest : public InProcessBrowserTest {
public:
V4EmbeddedTestServerBrowserTest() {}
+
+ V4EmbeddedTestServerBrowserTest(const V4EmbeddedTestServerBrowserTest&) =
+ delete;
+ V4EmbeddedTestServerBrowserTest& operator=(
+ const V4EmbeddedTestServerBrowserTest&) = delete;
+
~V4EmbeddedTestServerBrowserTest() override {}
void SetUp() override {
@@ -111,8 +117,6 @@
// Owned by the V4Database.
TestV4DatabaseFactory* v4_db_factory_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(V4EmbeddedTestServerBrowserTest);
};
IN_PROC_BROWSER_TEST_F(V4EmbeddedTestServerBrowserTest, SimpleTest) {
diff --git a/chrome/browser/safe_xml_parser_browsertest.cc b/chrome/browser/safe_xml_parser_browsertest.cc
index 1eacdaaa..f106b51e 100644
--- a/chrome/browser/safe_xml_parser_browsertest.cc
+++ b/chrome/browser/safe_xml_parser_browsertest.cc
@@ -30,6 +30,10 @@
class SafeXmlParserTest : public InProcessBrowserTest {
public:
SafeXmlParserTest() = default;
+
+ SafeXmlParserTest(const SafeXmlParserTest&) = delete;
+ SafeXmlParserTest& operator=(const SafeXmlParserTest&) = delete;
+
~SafeXmlParserTest() override = default;
protected:
@@ -67,8 +71,6 @@
ASSERT_TRUE(result.value);
EXPECT_EQ(*expected_value, *result.value);
}
-
- DISALLOW_COPY_AND_ASSIGN(SafeXmlParserTest);
};
} // namespace
diff --git a/chrome/browser/search/background/ntp_background_service.h b/chrome/browser/search/background/ntp_background_service.h
index 2d0a445..85cc657 100644
--- a/chrome/browser/search/background/ntp_background_service.h
+++ b/chrome/browser/search/background/ntp_background_service.h
@@ -31,6 +31,10 @@
public:
NtpBackgroundService(
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory);
+
+ NtpBackgroundService(const NtpBackgroundService&) = delete;
+ NtpBackgroundService& operator=(const NtpBackgroundService&) = delete;
+
~NtpBackgroundService() override;
// KeyedService implementation.
@@ -173,8 +177,6 @@
ErrorInfo collection_error_info_;
ErrorInfo collection_images_error_info_;
ErrorInfo next_image_error_info_;
-
- DISALLOW_COPY_AND_ASSIGN(NtpBackgroundService);
};
#endif // CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUND_SERVICE_H_
diff --git a/chrome/browser/search/chrome_colors/chrome_colors_service.h b/chrome/browser/search/chrome_colors/chrome_colors_service.h
index 59ef0dc1..0c7eacf 100644
--- a/chrome/browser/search/chrome_colors/chrome_colors_service.h
+++ b/chrome/browser/search/chrome_colors/chrome_colors_service.h
@@ -27,6 +27,10 @@
class ChromeColorsService : public KeyedService {
public:
explicit ChromeColorsService(Profile* profile);
+
+ ChromeColorsService(const ChromeColorsService&) = delete;
+ ChromeColorsService& operator=(const ChromeColorsService&) = delete;
+
~ChromeColorsService() override;
// Returns id for the given |color| if it is in the predefined set, and
@@ -76,8 +80,6 @@
std::unique_ptr<ThemeService::ThemeReinstaller> prev_theme_reinstaller_;
base::WeakPtrFactory<ChromeColorsService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeColorsService);
};
} // namespace chrome_colors
diff --git a/chrome/browser/search/contextual_search_policy_handler_android.h b/chrome/browser/search/contextual_search_policy_handler_android.h
index edf1aec..d22d4b4 100644
--- a/chrome/browser/search/contextual_search_policy_handler_android.h
+++ b/chrome/browser/search/contextual_search_policy_handler_android.h
@@ -17,14 +17,17 @@
: public TypeCheckingPolicyHandler {
public:
ContextualSearchPolicyHandlerAndroid();
+
+ ContextualSearchPolicyHandlerAndroid(
+ const ContextualSearchPolicyHandlerAndroid&) = delete;
+ ContextualSearchPolicyHandlerAndroid& operator=(
+ const ContextualSearchPolicyHandlerAndroid&) = delete;
+
~ContextualSearchPolicyHandlerAndroid() override;
// ConfigurationPolicyHandler methods:
void ApplyPolicySettings(const PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ContextualSearchPolicyHandlerAndroid);
};
} // namespace policy
diff --git a/chrome/browser/search/instant_service.h b/chrome/browser/search/instant_service.h
index 9994e75e..c0a687b 100644
--- a/chrome/browser/search/instant_service.h
+++ b/chrome/browser/search/instant_service.h
@@ -60,6 +60,10 @@
public ThemeServiceObserver {
public:
explicit InstantService(Profile* profile);
+
+ InstantService(const InstantService&) = delete;
+ InstantService& operator=(const InstantService&) = delete;
+
~InstantService() override;
// Add, remove, and query RenderProcessHost IDs that are associated with
@@ -184,8 +188,6 @@
base::TimeTicks background_updated_timestamp_;
base::WeakPtrFactory<InstantService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(InstantService);
};
#endif // CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_
diff --git a/chrome/browser/search/instant_service_unittest.cc b/chrome/browser/search/instant_service_unittest.cc
index 77e54f9..d2cb2f3 100644
--- a/chrome/browser/search/instant_service_unittest.cc
+++ b/chrome/browser/search/instant_service_unittest.cc
@@ -73,14 +73,16 @@
class InstantServiceThemeTest : public InstantServiceTest {
public:
InstantServiceThemeTest() {}
+
+ InstantServiceThemeTest(const InstantServiceThemeTest&) = delete;
+ InstantServiceThemeTest& operator=(const InstantServiceThemeTest&) = delete;
+
~InstantServiceThemeTest() override {}
ui::TestNativeTheme* theme() { return &theme_; }
private:
ui::TestNativeTheme theme_;
-
- DISALLOW_COPY_AND_ASSIGN(InstantServiceThemeTest);
};
TEST_F(InstantServiceTest, SetNTPElementsNtpTheme) {
diff --git a/chrome/browser/search/most_visited_iframe_source.h b/chrome/browser/search/most_visited_iframe_source.h
index f7ef58f..77b8518e 100644
--- a/chrome/browser/search/most_visited_iframe_source.h
+++ b/chrome/browser/search/most_visited_iframe_source.h
@@ -18,6 +18,10 @@
class MostVisitedIframeSource : public content::URLDataSource {
public:
MostVisitedIframeSource();
+
+ MostVisitedIframeSource(const MostVisitedIframeSource&) = delete;
+ MostVisitedIframeSource& operator=(const MostVisitedIframeSource&) = delete;
+
~MostVisitedIframeSource() override;
// content::URLDataSource:
@@ -52,9 +56,6 @@
// does not exist
virtual bool GetOrigin(const content::WebContents::Getter& wc_getter,
std::string* origin) const;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MostVisitedIframeSource);
};
#endif // CHROME_BROWSER_SEARCH_MOST_VISITED_IFRAME_SOURCE_H_
diff --git a/chrome/browser/search/ntp_custom_background_enabled_policy_handler.h b/chrome/browser/search/ntp_custom_background_enabled_policy_handler.h
index 7897ac6..7428409 100644
--- a/chrome/browser/search/ntp_custom_background_enabled_policy_handler.h
+++ b/chrome/browser/search/ntp_custom_background_enabled_policy_handler.h
@@ -20,15 +20,18 @@
: public policy::TypeCheckingPolicyHandler {
public:
NtpCustomBackgroundEnabledPolicyHandler();
+
+ NtpCustomBackgroundEnabledPolicyHandler(
+ const NtpCustomBackgroundEnabledPolicyHandler&) = delete;
+ NtpCustomBackgroundEnabledPolicyHandler& operator=(
+ const NtpCustomBackgroundEnabledPolicyHandler&) = delete;
+
~NtpCustomBackgroundEnabledPolicyHandler() override;
protected:
// ConfigurationPolicyHandler:
void ApplyPolicySettings(const policy::PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NtpCustomBackgroundEnabledPolicyHandler);
};
#endif // CHROME_BROWSER_SEARCH_NTP_CUSTOM_BACKGROUND_ENABLED_POLICY_HANDLER_H_
diff --git a/chrome/browser/search/search_engine_base_url_tracker.h b/chrome/browser/search/search_engine_base_url_tracker.h
index 3c8f88c..75c22f59 100644
--- a/chrome/browser/search/search_engine_base_url_tracker.h
+++ b/chrome/browser/search/search_engine_base_url_tracker.h
@@ -35,6 +35,11 @@
TemplateURLService* template_url_service,
std::unique_ptr<SearchTermsData> search_terms_data,
const BaseURLChangedCallback& base_url_changed_callback);
+
+ SearchEngineBaseURLTracker(const SearchEngineBaseURLTracker&) = delete;
+ SearchEngineBaseURLTracker& operator=(const SearchEngineBaseURLTracker&) =
+ delete;
+
~SearchEngineBaseURLTracker() override;
private:
@@ -55,8 +60,6 @@
// change that affects the default search provider.
GURL previous_google_base_url_;
absl::optional<TemplateURLData> previous_default_search_provider_data_;
-
- DISALLOW_COPY_AND_ASSIGN(SearchEngineBaseURLTracker);
};
#endif // CHROME_BROWSER_SEARCH_SEARCH_ENGINE_BASE_URL_TRACKER_H_
diff --git a/chrome/browser/search_engines/chrome_template_url_service_client.h b/chrome/browser/search_engines/chrome_template_url_service_client.h
index f454fdfe..6b78b37c 100644
--- a/chrome/browser/search_engines/chrome_template_url_service_client.h
+++ b/chrome/browser/search_engines/chrome_template_url_service_client.h
@@ -18,6 +18,12 @@
public:
explicit ChromeTemplateURLServiceClient(
history::HistoryService* history_service);
+
+ ChromeTemplateURLServiceClient(const ChromeTemplateURLServiceClient&) =
+ delete;
+ ChromeTemplateURLServiceClient& operator=(
+ const ChromeTemplateURLServiceClient&) = delete;
+
~ChromeTemplateURLServiceClient() override;
// TemplateURLServiceClient:
@@ -42,8 +48,6 @@
history::HistoryServiceObserver>
history_service_observation_{this};
history::HistoryService* history_service_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeTemplateURLServiceClient);
};
#endif // CHROME_BROWSER_SEARCH_ENGINES_CHROME_TEMPLATE_URL_SERVICE_CLIENT_H_
diff --git a/chrome/browser/search_engines/template_url_fetcher_unittest.cc b/chrome/browser/search_engines/template_url_fetcher_unittest.cc
index 760b5dd..69f8f3f 100644
--- a/chrome/browser/search_engines/template_url_fetcher_unittest.cc
+++ b/chrome/browser/search_engines/template_url_fetcher_unittest.cc
@@ -51,6 +51,10 @@
const base::RepeatingClosure& request_completed_callback)
: TemplateURLFetcher(template_url_service),
callback_(request_completed_callback) {}
+
+ TestTemplateUrlFetcher(const TestTemplateUrlFetcher&) = delete;
+ TestTemplateUrlFetcher& operator=(const TestTemplateUrlFetcher&) = delete;
+
~TestTemplateUrlFetcher() override {}
protected:
@@ -62,8 +66,6 @@
private:
// Callback to be run when a request completes.
base::RepeatingClosure callback_;
-
- DISALLOW_COPY_AND_ASSIGN(TestTemplateUrlFetcher);
};
// Basic set-up for TemplateURLFetcher tests.
diff --git a/chrome/browser/search_engines/template_url_service_factory_test_util.h b/chrome/browser/search_engines/template_url_service_factory_test_util.h
index 3cd11754..56d9fd9 100644
--- a/chrome/browser/search_engines/template_url_service_factory_test_util.h
+++ b/chrome/browser/search_engines/template_url_service_factory_test_util.h
@@ -15,6 +15,12 @@
class TemplateURLServiceFactoryTestUtil {
public:
explicit TemplateURLServiceFactoryTestUtil(TestingProfile* profile);
+
+ TemplateURLServiceFactoryTestUtil(const TemplateURLServiceFactoryTestUtil&) =
+ delete;
+ TemplateURLServiceFactoryTestUtil& operator=(
+ const TemplateURLServiceFactoryTestUtil&) = delete;
+
virtual ~TemplateURLServiceFactoryTestUtil();
// Makes sure the load was successful.
@@ -25,8 +31,6 @@
private:
TestingProfile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(TemplateURLServiceFactoryTestUtil);
};
#endif // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_FACTORY_TEST_UTIL_H_
diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
index e8f15dfa..42e5c79 100644
--- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
@@ -97,6 +97,10 @@
class TestChangeProcessor : public syncer::SyncChangeProcessor {
public:
TestChangeProcessor();
+
+ TestChangeProcessor(const TestChangeProcessor&) = delete;
+ TestChangeProcessor& operator=(const TestChangeProcessor&) = delete;
+
~TestChangeProcessor() override;
// Store a copy of all the changes passed in so we can examine them later.
@@ -121,8 +125,6 @@
// Track the changes received in ProcessSyncChanges.
std::map<std::string, syncer::SyncChange> change_map_;
bool erroneous_;
-
- DISALLOW_COPY_AND_ASSIGN(TestChangeProcessor);
};
TestChangeProcessor::TestChangeProcessor() : erroneous_(false) {
diff --git a/chrome/browser/search_engines/template_url_service_test_util.h b/chrome/browser/search_engines/template_url_service_test_util.h
index 68905d0..80424c3 100644
--- a/chrome/browser/search_engines/template_url_service_test_util.h
+++ b/chrome/browser/search_engines/template_url_service_test_util.h
@@ -44,6 +44,11 @@
class TemplateURLServiceTestUtil : public TemplateURLServiceObserver {
public:
TemplateURLServiceTestUtil();
+
+ TemplateURLServiceTestUtil(const TemplateURLServiceTestUtil&) = delete;
+ TemplateURLServiceTestUtil& operator=(const TemplateURLServiceTestUtil&) =
+ delete;
+
~TemplateURLServiceTestUtil() override;
// TemplateURLServiceObserver implemementation.
@@ -102,8 +107,6 @@
scoped_refptr<KeywordWebDataService> web_data_service_;
std::unique_ptr<TemplateURLService> model_;
data_decoder::test::InProcessDataDecoder data_decoder_;
-
- DISALLOW_COPY_AND_ASSIGN(TemplateURLServiceTestUtil);
};
#endif // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_TEST_UTIL_H_
diff --git a/chrome/browser/security_events/security_event_recorder.h b/chrome/browser/security_events/security_event_recorder.h
index ca611f5..852b8f7 100644
--- a/chrome/browser/security_events/security_event_recorder.h
+++ b/chrome/browser/security_events/security_event_recorder.h
@@ -19,6 +19,10 @@
class SecurityEventRecorder : public KeyedService {
public:
SecurityEventRecorder() = default;
+
+ SecurityEventRecorder(const SecurityEventRecorder&) = delete;
+ SecurityEventRecorder& operator=(const SecurityEventRecorder&) = delete;
+
~SecurityEventRecorder() override = default;
// Records the GaiaPasswordReuse security event for the currently signed-in
@@ -29,9 +33,6 @@
// Returns the underlying Sync integration point.
virtual base::WeakPtr<syncer::ModelTypeControllerDelegate>
GetControllerDelegate() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SecurityEventRecorder);
};
#endif // CHROME_BROWSER_SECURITY_EVENTS_SECURITY_EVENT_RECORDER_H_
diff --git a/chrome/browser/security_events/security_event_recorder_impl.h b/chrome/browser/security_events/security_event_recorder_impl.h
index 5ddc621..1eee43f 100644
--- a/chrome/browser/security_events/security_event_recorder_impl.h
+++ b/chrome/browser/security_events/security_event_recorder_impl.h
@@ -18,6 +18,11 @@
SecurityEventRecorderImpl(
std::unique_ptr<SecurityEventSyncBridge> security_event_sync_bridge,
base::Clock* clock);
+
+ SecurityEventRecorderImpl(const SecurityEventRecorderImpl&) = delete;
+ SecurityEventRecorderImpl& operator=(const SecurityEventRecorderImpl&) =
+ delete;
+
~SecurityEventRecorderImpl() override;
void RecordGaiaPasswordReuse(
@@ -32,8 +37,6 @@
private:
std::unique_ptr<SecurityEventSyncBridge> security_event_sync_bridge_;
base::Clock* clock_;
-
- DISALLOW_COPY_AND_ASSIGN(SecurityEventRecorderImpl);
};
#endif // CHROME_BROWSER_SECURITY_EVENTS_SECURITY_EVENT_RECORDER_IMPL_H_
diff --git a/chrome/browser/security_events/security_event_sync_bridge.h b/chrome/browser/security_events/security_event_sync_bridge.h
index 5ff5ed6a..2f4c232 100644
--- a/chrome/browser/security_events/security_event_sync_bridge.h
+++ b/chrome/browser/security_events/security_event_sync_bridge.h
@@ -15,6 +15,10 @@
class SecurityEventSyncBridge {
public:
SecurityEventSyncBridge() = default;
+
+ SecurityEventSyncBridge(const SecurityEventSyncBridge&) = delete;
+ SecurityEventSyncBridge& operator=(const SecurityEventSyncBridge&) = delete;
+
virtual ~SecurityEventSyncBridge() = default;
virtual void RecordSecurityEvent(
@@ -23,9 +27,6 @@
// Returns the delegate for the controller, i.e. sync integration point.
virtual base::WeakPtr<syncer::ModelTypeControllerDelegate>
GetControllerDelegate() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SecurityEventSyncBridge);
};
#endif // CHROME_BROWSER_SECURITY_EVENTS_SECURITY_EVENT_SYNC_BRIDGE_H_
diff --git a/chrome/browser/security_events/security_event_sync_bridge_impl.h b/chrome/browser/security_events/security_event_sync_bridge_impl.h
index ec5c251..431e97ac 100644
--- a/chrome/browser/security_events/security_event_sync_bridge_impl.h
+++ b/chrome/browser/security_events/security_event_sync_bridge_impl.h
@@ -22,6 +22,11 @@
SecurityEventSyncBridgeImpl(
syncer::OnceModelTypeStoreFactory store_factory,
std::unique_ptr<syncer::ModelTypeChangeProcessor> change_processor);
+
+ SecurityEventSyncBridgeImpl(const SecurityEventSyncBridgeImpl&) = delete;
+ SecurityEventSyncBridgeImpl& operator=(const SecurityEventSyncBridgeImpl&) =
+ delete;
+
~SecurityEventSyncBridgeImpl() override;
void RecordSecurityEvent(sync_pb::SecurityEventSpecifics specifics) override;
@@ -68,8 +73,6 @@
std::unique_ptr<syncer::ModelTypeStore> store_;
base::WeakPtrFactory<SecurityEventSyncBridgeImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SecurityEventSyncBridgeImpl);
};
#endif // CHROME_BROWSER_SECURITY_EVENTS_SECURITY_EVENT_SYNC_BRIDGE_IMPL_H_
diff --git a/chrome/browser/send_tab_to_self/desktop_notification_handler.h b/chrome/browser/send_tab_to_self/desktop_notification_handler.h
index 26ae617..a2a2d19 100644
--- a/chrome/browser/send_tab_to_self/desktop_notification_handler.h
+++ b/chrome/browser/send_tab_to_self/desktop_notification_handler.h
@@ -25,6 +25,11 @@
public ReceivingUiHandler {
public:
explicit DesktopNotificationHandler(Profile* profile);
+
+ DesktopNotificationHandler(const DesktopNotificationHandler&) = delete;
+ DesktopNotificationHandler& operator=(const DesktopNotificationHandler&) =
+ delete;
+
~DesktopNotificationHandler() override;
// ReceivingUiHandler implementation.
@@ -58,7 +63,6 @@
protected:
Profile* const profile_;
- DISALLOW_COPY_AND_ASSIGN(DesktopNotificationHandler);
};
} // namespace send_tab_to_self
diff --git a/chrome/browser/serial/chrome_serial_delegate.h b/chrome/browser/serial/chrome_serial_delegate.h
index f646ff8..82701e0 100644
--- a/chrome/browser/serial/chrome_serial_delegate.h
+++ b/chrome/browser/serial/chrome_serial_delegate.h
@@ -13,6 +13,10 @@
class ChromeSerialDelegate : public content::SerialDelegate {
public:
ChromeSerialDelegate();
+
+ ChromeSerialDelegate(const ChromeSerialDelegate&) = delete;
+ ChromeSerialDelegate& operator=(const ChromeSerialDelegate&) = delete;
+
~ChromeSerialDelegate() override;
std::unique_ptr<content::SerialChooser> RunChooser(
@@ -28,9 +32,6 @@
Observer* observer) override;
void RemoveObserver(content::RenderFrameHost* frame,
Observer* observer) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeSerialDelegate);
};
#endif // CHROME_BROWSER_SERIAL_CHROME_SERIAL_DELEGATE_H_
diff --git a/chrome/browser/serial/serial_chooser_context.h b/chrome/browser/serial/serial_chooser_context.h
index c47f2ec..f660c37d 100644
--- a/chrome/browser/serial/serial_chooser_context.h
+++ b/chrome/browser/serial/serial_chooser_context.h
@@ -35,6 +35,10 @@
using PortObserver = content::SerialDelegate::Observer;
explicit SerialChooserContext(Profile* profile);
+
+ SerialChooserContext(const SerialChooserContext&) = delete;
+ SerialChooserContext& operator=(const SerialChooserContext&) = delete;
+
~SerialChooserContext() override;
// ObjectPermissionContextBase:
@@ -95,8 +99,6 @@
base::ObserverList<PortObserver> port_observer_list_;
base::WeakPtrFactory<SerialChooserContext> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SerialChooserContext);
};
#endif // CHROME_BROWSER_SERIAL_SERIAL_CHOOSER_CONTEXT_H_
diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc
index 7a50992..2e3a75f 100644
--- a/chrome/browser/sessions/better_session_restore_browsertest.cc
+++ b/chrome/browser/sessions/better_session_restore_browsertest.cc
@@ -555,6 +555,10 @@
class RestartTest : public BetterSessionRestoreTest {
public:
RestartTest() = default;
+
+ RestartTest(const RestartTest&) = delete;
+ RestartTest& operator=(const RestartTest&) = delete;
+
~RestartTest() override = default;
protected:
@@ -568,9 +572,6 @@
PrefService* pref_service = g_browser_process->local_state();
pref_service->SetBoolean(prefs::kWasRestarted, true);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(RestartTest);
};
IN_PROC_BROWSER_TEST_F(RestartTest, PRE_SessionCookies) {
diff --git a/chrome/browser/sessions/chrome_serialized_navigation_driver.h b/chrome/browser/sessions/chrome_serialized_navigation_driver.h
index 093b3a3d..d9b04f2 100644
--- a/chrome/browser/sessions/chrome_serialized_navigation_driver.h
+++ b/chrome/browser/sessions/chrome_serialized_navigation_driver.h
@@ -18,6 +18,11 @@
class ChromeSerializedNavigationDriver
: public sessions::ContentSerializedNavigationDriver {
public:
+ ChromeSerializedNavigationDriver(const ChromeSerializedNavigationDriver&) =
+ delete;
+ ChromeSerializedNavigationDriver& operator=(
+ const ChromeSerializedNavigationDriver&) = delete;
+
~ChromeSerializedNavigationDriver() override;
// Returns the singleton ChromeSerializedNavigationDriver. Almost all
@@ -31,8 +36,6 @@
friend struct base::DefaultSingletonTraits<ChromeSerializedNavigationDriver>;
ChromeSerializedNavigationDriver();
-
- DISALLOW_COPY_AND_ASSIGN(ChromeSerializedNavigationDriver);
};
#endif // CHROME_BROWSER_SESSIONS_CHROME_SERIALIZED_NAVIGATION_DRIVER_H_
diff --git a/chrome/browser/sessions/chrome_serialized_navigation_driver_unittest.cc b/chrome/browser/sessions/chrome_serialized_navigation_driver_unittest.cc
index 233876d..fbe0fb4 100644
--- a/chrome/browser/sessions/chrome_serialized_navigation_driver_unittest.cc
+++ b/chrome/browser/sessions/chrome_serialized_navigation_driver_unittest.cc
@@ -13,6 +13,12 @@
class ChromeSerializedNavigationDriverTest : public ::testing::Test {
public:
ChromeSerializedNavigationDriverTest() {}
+
+ ChromeSerializedNavigationDriverTest(
+ const ChromeSerializedNavigationDriverTest&) = delete;
+ ChromeSerializedNavigationDriverTest& operator=(
+ const ChromeSerializedNavigationDriverTest&) = delete;
+
~ChromeSerializedNavigationDriverTest() override {}
void SetUp() override {
@@ -23,9 +29,6 @@
void TearDown() override {
sessions::ContentSerializedNavigationDriver::SetInstance(nullptr);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeSerializedNavigationDriverTest);
};
// Tests that the input data is left unsanitized when the referrer policy is
diff --git a/chrome/browser/sessions/chrome_tab_restore_service_client.h b/chrome/browser/sessions/chrome_tab_restore_service_client.h
index 0a8c768..38a519b 100644
--- a/chrome/browser/sessions/chrome_tab_restore_service_client.h
+++ b/chrome/browser/sessions/chrome_tab_restore_service_client.h
@@ -15,6 +15,11 @@
class ChromeTabRestoreServiceClient : public sessions::TabRestoreServiceClient {
public:
explicit ChromeTabRestoreServiceClient(Profile* profile);
+
+ ChromeTabRestoreServiceClient(const ChromeTabRestoreServiceClient&) = delete;
+ ChromeTabRestoreServiceClient& operator=(
+ const ChromeTabRestoreServiceClient&) = delete;
+
~ChromeTabRestoreServiceClient() override;
private:
@@ -40,8 +45,6 @@
void OnTabRestored(const GURL& url) override;
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeTabRestoreServiceClient);
};
#endif // CHROME_BROWSER_SESSIONS_CHROME_TAB_RESTORE_SERVICE_CLIENT_H_
diff --git a/chrome/browser/sessions/restore_on_startup_policy_handler.h b/chrome/browser/sessions/restore_on_startup_policy_handler.h
index 9e0bf2d6..c8f785b 100644
--- a/chrome/browser/sessions/restore_on_startup_policy_handler.h
+++ b/chrome/browser/sessions/restore_on_startup_policy_handler.h
@@ -19,6 +19,11 @@
class RestoreOnStartupPolicyHandler : public TypeCheckingPolicyHandler {
public:
RestoreOnStartupPolicyHandler();
+
+ RestoreOnStartupPolicyHandler(const RestoreOnStartupPolicyHandler&) = delete;
+ RestoreOnStartupPolicyHandler& operator=(
+ const RestoreOnStartupPolicyHandler&) = delete;
+
~RestoreOnStartupPolicyHandler() override;
// ConfigurationPolicyHandler methods:
@@ -26,9 +31,6 @@
PolicyErrorMap* errors) override;
void ApplyPolicySettings(const PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(RestoreOnStartupPolicyHandler);
};
} // namespace policy
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index 84504f5..2c7464f1 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -306,6 +306,9 @@
return web_contents;
}
+ SessionRestoreImpl(const SessionRestoreImpl&) = delete;
+ SessionRestoreImpl& operator=(const SessionRestoreImpl&) = delete;
+
~SessionRestoreImpl() override {
BrowserList::RemoveObserver(this);
active_session_restorers->erase(this);
@@ -981,8 +984,6 @@
bool read_error_ = false;
base::WeakPtrFactory<SessionRestoreImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SessionRestoreImpl);
};
// SessionRestore -------------------------------------------------------------
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index 97cc52c..d531165 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -2044,6 +2044,10 @@
: num_expected_(num_expected), event_(event) {
BrowserList::AddObserver(this);
}
+
+ MultiBrowserObserver(const MultiBrowserObserver&) = delete;
+ MultiBrowserObserver& operator=(const MultiBrowserObserver&) = delete;
+
~MultiBrowserObserver() override { BrowserList::RemoveObserver(this); }
// Note that the returned pointers might no longer be valid (because the
@@ -2074,8 +2078,6 @@
Event event_;
std::vector<Browser*> browsers_;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(MultiBrowserObserver);
};
} // namespace
diff --git a/chrome/browser/sessions/session_restore_observer_browsertest.cc b/chrome/browser/sessions/session_restore_observer_browsertest.cc
index 3308fd718..1613826 100644
--- a/chrome/browser/sessions/session_restore_observer_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_observer_browsertest.cc
@@ -71,6 +71,11 @@
class MockSessionRestoreObserver : public SessionRestoreObserver {
public:
MockSessionRestoreObserver() { SessionRestore::AddObserver(this); }
+
+ MockSessionRestoreObserver(const MockSessionRestoreObserver&) = delete;
+ MockSessionRestoreObserver& operator=(const MockSessionRestoreObserver&) =
+ delete;
+
~MockSessionRestoreObserver() { SessionRestore::RemoveObserver(this); }
enum class SessionRestoreEvent { kStartedLoadingTabs, kFinishedLoadingTabs };
@@ -103,8 +108,6 @@
std::unordered_map<WebContents*,
std::unique_ptr<NavigationStartWebContentsObserver>>
navigation_start_observers_;
-
- DISALLOW_COPY_AND_ASSIGN(MockSessionRestoreObserver);
};
class SessionRestoreObserverTest : public InProcessBrowserTest {
diff --git a/chrome/browser/sessions/session_restore_observer_unittest.cc b/chrome/browser/sessions/session_restore_observer_unittest.cc
index 8869627..c469ad6 100644
--- a/chrome/browser/sessions/session_restore_observer_unittest.cc
+++ b/chrome/browser/sessions/session_restore_observer_unittest.cc
@@ -34,6 +34,10 @@
public:
MockSessionRestoreObserver() { SessionRestore::AddObserver(this); }
+ MockSessionRestoreObserver(const MockSessionRestoreObserver&) = delete;
+ MockSessionRestoreObserver& operator=(const MockSessionRestoreObserver&) =
+ delete;
+
~MockSessionRestoreObserver() { SessionRestore::RemoveObserver(this); }
enum class SessionRestoreEvent {
@@ -69,8 +73,6 @@
private:
std::vector<SessionRestoreEvent> session_restore_events_;
std::set<content::WebContents*> tabs_restoring_;
-
- DISALLOW_COPY_AND_ASSIGN(MockSessionRestoreObserver);
};
class SessionRestoreObserverTest : public ChromeRenderViewHostTestHarness {
diff --git a/chrome/browser/sessions/session_restore_stats_collector.h b/chrome/browser/sessions/session_restore_stats_collector.h
index 2131450..2c8c8f79 100644
--- a/chrome/browser/sessions/session_restore_stats_collector.h
+++ b/chrome/browser/sessions/session_restore_stats_collector.h
@@ -144,6 +144,10 @@
class SessionRestoreStatsCollector::StatsReportingDelegate {
public:
StatsReportingDelegate() {}
+
+ StatsReportingDelegate(const StatsReportingDelegate&) = delete;
+ StatsReportingDelegate& operator=(const StatsReportingDelegate&) = delete;
+
virtual ~StatsReportingDelegate() {}
// Called when TabLoader has completed its work.
@@ -152,9 +156,6 @@
// Called when a tab starts being tracked. Logs the relative time since last
// use of the tab.
virtual void ReportTabTimeSinceActive(base::TimeDelta elapsed) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(StatsReportingDelegate);
};
// The default reporting delegate, which reports statistics via UMA.
@@ -162,15 +163,16 @@
: public StatsReportingDelegate {
public:
UmaStatsReportingDelegate();
+
+ UmaStatsReportingDelegate(const UmaStatsReportingDelegate&) = delete;
+ UmaStatsReportingDelegate& operator=(const UmaStatsReportingDelegate&) =
+ delete;
+
~UmaStatsReportingDelegate() override {}
// StatsReportingDelegate:
void ReportTabLoaderStats(const TabLoaderStats& tab_loader_stats) override;
void ReportTabTimeSinceActive(base::TimeDelta elapsed) override;
-
- private:
-
- DISALLOW_COPY_AND_ASSIGN(UmaStatsReportingDelegate);
};
#endif // CHROME_BROWSER_SESSIONS_SESSION_RESTORE_STATS_COLLECTOR_H_
diff --git a/chrome/browser/sessions/session_restore_stats_collector_unittest.cc b/chrome/browser/sessions/session_restore_stats_collector_unittest.cc
index d635ff2..7689283 100644
--- a/chrome/browser/sessions/session_restore_stats_collector_unittest.cc
+++ b/chrome/browser/sessions/session_restore_stats_collector_unittest.cc
@@ -37,6 +37,10 @@
report_stats_collector_death_call_count_(0u),
report_tab_time_since_active_call_count_(0u) {}
+ MockStatsReportingDelegate(const MockStatsReportingDelegate&) = delete;
+ MockStatsReportingDelegate& operator=(const MockStatsReportingDelegate&) =
+ delete;
+
~MockStatsReportingDelegate() override = default;
void ReportTabLoaderStats(const TabLoaderStats& stats) override {
@@ -93,8 +97,6 @@
size_t report_stats_collector_death_call_count_;
size_t report_tab_time_since_active_call_count_;
TabLoaderStats tab_loader_stats_;
-
- DISALLOW_COPY_AND_ASSIGN(MockStatsReportingDelegate);
};
// A pass-through stats reporting delegate. This is used to decouple the
@@ -104,6 +106,12 @@
class PassthroughStatsReportingDelegate : public StatsReportingDelegate {
public:
PassthroughStatsReportingDelegate() : reporting_delegate_(nullptr) {}
+
+ PassthroughStatsReportingDelegate(const PassthroughStatsReportingDelegate&) =
+ delete;
+ PassthroughStatsReportingDelegate& operator=(
+ const PassthroughStatsReportingDelegate&) = delete;
+
~PassthroughStatsReportingDelegate() override {
reporting_delegate_->ReportStatsCollectorDeath();
}
@@ -122,8 +130,6 @@
private:
MockStatsReportingDelegate* reporting_delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(PassthroughStatsReportingDelegate);
};
} // namespace
diff --git a/chrome/browser/sessions/session_restore_test_helper.h b/chrome/browser/sessions/session_restore_test_helper.h
index bbf12a7..8166b269 100644
--- a/chrome/browser/sessions/session_restore_test_helper.h
+++ b/chrome/browser/sessions/session_restore_test_helper.h
@@ -19,6 +19,10 @@
class SessionRestoreTestHelper {
public:
SessionRestoreTestHelper();
+
+ SessionRestoreTestHelper(const SessionRestoreTestHelper&) = delete;
+ SessionRestoreTestHelper& operator=(const SessionRestoreTestHelper&) = delete;
+
~SessionRestoreTestHelper();
// Blocks until OnSessionRestore() is called.
@@ -42,8 +46,6 @@
// For safely binding pointers to callbacks.
base::WeakPtrFactory<SessionRestoreTestHelper> weak_ptr_factory{this};
-
- DISALLOW_COPY_AND_ASSIGN(SessionRestoreTestHelper);
};
#endif // CHROME_BROWSER_SESSIONS_SESSION_RESTORE_TEST_HELPER_H_
diff --git a/chrome/browser/sessions/session_restore_test_utils.h b/chrome/browser/sessions/session_restore_test_utils.h
index 11ce5f8..ceda9a5a 100644
--- a/chrome/browser/sessions/session_restore_test_utils.h
+++ b/chrome/browser/sessions/session_restore_test_utils.h
@@ -25,12 +25,16 @@
class ScopedAlwaysLoadSessionRestoreTestPolicy {
public:
ScopedAlwaysLoadSessionRestoreTestPolicy();
+
+ ScopedAlwaysLoadSessionRestoreTestPolicy(
+ const ScopedAlwaysLoadSessionRestoreTestPolicy&) = delete;
+ ScopedAlwaysLoadSessionRestoreTestPolicy& operator=(
+ const ScopedAlwaysLoadSessionRestoreTestPolicy&) = delete;
+
~ScopedAlwaysLoadSessionRestoreTestPolicy();
private:
AlwayLoadSessionRestorePolicy policy_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedAlwaysLoadSessionRestoreTestPolicy);
};
} // namespace testing
diff --git a/chrome/browser/sessions/session_service.h b/chrome/browser/sessions/session_service.h
index 0b28383e..2f5a74f 100644
--- a/chrome/browser/sessions/session_service.h
+++ b/chrome/browser/sessions/session_service.h
@@ -57,6 +57,10 @@
public:
// Creates a SessionService for the specified profile.
explicit SessionService(Profile* profile);
+
+ SessionService(const SessionService&) = delete;
+ SessionService& operator=(const SessionService&) = delete;
+
~SessionService() override;
// Returns true if a new window opening should really be treated like the
@@ -251,8 +255,6 @@
bool did_schedule_command_ = false;
base::WeakPtrFactory<SessionService> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SessionService);
};
#endif // CHROME_BROWSER_SESSIONS_SESSION_SERVICE_H_
diff --git a/chrome/browser/sessions/session_service_base.h b/chrome/browser/sessions/session_service_base.h
index b7673d5..f4de854 100644
--- a/chrome/browser/sessions/session_service_base.h
+++ b/chrome/browser/sessions/session_service_base.h
@@ -56,6 +56,9 @@
public:
enum class SessionServiceType { kAppRestore, kSessionRestore };
+ SessionServiceBase(const SessionServiceBase&) = delete;
+ SessionServiceBase& operator=(const SessionServiceBase&) = delete;
+
~SessionServiceBase() override;
static Browser::Type GetBrowserTypeFromWebContents(
@@ -294,8 +297,6 @@
WindowsTracking windows_tracking_;
base::WeakPtrFactory<SessionServiceBase> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SessionServiceBase);
};
#endif // CHROME_BROWSER_SESSIONS_SESSION_SERVICE_BASE_H_
diff --git a/chrome/browser/sessions/tab_loader.cc b/chrome/browser/sessions/tab_loader.cc
index abdce9c4..128e161 100644
--- a/chrome/browser/sessions/tab_loader.cc
+++ b/chrome/browser/sessions/tab_loader.cc
@@ -87,6 +87,9 @@
tab_loader_->reentry_depth_++;
}
+ ReentrancyHelper(const ReentrancyHelper&) = delete;
+ ReentrancyHelper& operator=(const ReentrancyHelper&) = delete;
+
~ReentrancyHelper() {
if (--tab_loader_->reentry_depth_ != 0)
return;
@@ -108,8 +111,6 @@
void DestroyTabLoader() { tab_loader_->this_retainer_ = nullptr; }
TabLoader* tab_loader_;
-
- DISALLOW_COPY_AND_ASSIGN(ReentrancyHelper);
};
// static
diff --git a/chrome/browser/sessions/tab_loader_delegate.cc b/chrome/browser/sessions/tab_loader_delegate.cc
index a4b19077..d99972a 100644
--- a/chrome/browser/sessions/tab_loader_delegate.cc
+++ b/chrome/browser/sessions/tab_loader_delegate.cc
@@ -36,6 +36,10 @@
public network::NetworkConnectionTracker::NetworkConnectionObserver {
public:
explicit TabLoaderDelegateImpl(TabLoaderCallback* callback);
+
+ TabLoaderDelegateImpl(const TabLoaderDelegateImpl&) = delete;
+ TabLoaderDelegateImpl& operator=(const TabLoaderDelegateImpl&) = delete;
+
~TabLoaderDelegateImpl() override;
// TabLoaderDelegate:
@@ -100,8 +104,6 @@
base::TimeDelta timeout_;
base::WeakPtrFactory<TabLoaderDelegateImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TabLoaderDelegateImpl);
};
TabLoaderDelegateImpl::TabLoaderDelegateImpl(TabLoaderCallback* callback)
diff --git a/chrome/browser/sessions/tab_loader_delegate.h b/chrome/browser/sessions/tab_loader_delegate.h
index b7db632..eaf1b055 100644
--- a/chrome/browser/sessions/tab_loader_delegate.h
+++ b/chrome/browser/sessions/tab_loader_delegate.h
@@ -34,6 +34,9 @@
// the loading of hidden tabs starts.
class TabLoaderDelegate {
public:
+ TabLoaderDelegate(const TabLoaderDelegate&) = delete;
+ TabLoaderDelegate& operator=(const TabLoaderDelegate&) = delete;
+
virtual ~TabLoaderDelegate() {}
// Create a tab loader delegate. |TabLoaderCallback::SetTabLoadingEnabled| can
@@ -82,9 +85,6 @@
protected:
// The delegate should only be created via the factory function.
TabLoaderDelegate() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TabLoaderDelegate);
};
#endif // CHROME_BROWSER_SESSIONS_TAB_LOADER_DELEGATE_H_
diff --git a/chrome/browser/sessions/tab_loader_tester.h b/chrome/browser/sessions/tab_loader_tester.h
index de1411e7..66de1ce9b 100644
--- a/chrome/browser/sessions/tab_loader_tester.h
+++ b/chrome/browser/sessions/tab_loader_tester.h
@@ -18,6 +18,10 @@
TabLoaderTester();
explicit TabLoaderTester(TabLoader* tab_loader);
+
+ TabLoaderTester(const TabLoaderTester&) = delete;
+ TabLoaderTester& operator=(const TabLoaderTester&) = delete;
+
~TabLoaderTester();
void SetTabLoader(TabLoader*);
@@ -57,8 +61,6 @@
private:
TabLoader* tab_loader_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(TabLoaderTester);
};
#endif // CHROME_BROWSER_SESSIONS_TAB_LOADER_TESTER_H_
diff --git a/chrome/browser/sharing/ack_message_handler.h b/chrome/browser/sharing/ack_message_handler.h
index 2700d2c..343dd75 100644
--- a/chrome/browser/sharing/ack_message_handler.h
+++ b/chrome/browser/sharing/ack_message_handler.h
@@ -15,6 +15,10 @@
class AckMessageHandler : public SharingMessageHandler {
public:
explicit AckMessageHandler(SharingMessageSender* sharing_message_sender);
+
+ AckMessageHandler(const AckMessageHandler&) = delete;
+ AckMessageHandler& operator=(const AckMessageHandler&) = delete;
+
~AckMessageHandler() override;
// SharingMessageHandler implementation:
@@ -23,8 +27,6 @@
private:
SharingMessageSender* sharing_message_sender_;
-
- DISALLOW_COPY_AND_ASSIGN(AckMessageHandler);
};
#endif // CHROME_BROWSER_SHARING_ACK_MESSAGE_HANDLER_H_
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.h b/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.h
index 8d58f24..851b9269 100644
--- a/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.h
+++ b/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.h
@@ -29,6 +29,10 @@
class SubMenuDelegate : public ui::SimpleMenuModel::Delegate {
public:
explicit SubMenuDelegate(ClickToCallContextMenuObserver* parent);
+
+ SubMenuDelegate(const SubMenuDelegate&) = delete;
+ SubMenuDelegate& operator=(const SubMenuDelegate&) = delete;
+
~SubMenuDelegate() override;
bool IsCommandIdEnabled(int command_id) const override;
@@ -36,8 +40,6 @@
private:
ClickToCallContextMenuObserver* const parent_;
-
- DISALLOW_COPY_AND_ASSIGN(SubMenuDelegate);
};
explicit ClickToCallContextMenuObserver(RenderViewContextMenuProxy* proxy);
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer_unittest.cc b/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer_unittest.cc
index cb0afdcf..d94cf14d 100644
--- a/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer_unittest.cc
+++ b/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer_unittest.cc
@@ -46,6 +46,11 @@
public:
ClickToCallContextMenuObserverTest() = default;
+ ClickToCallContextMenuObserverTest(
+ const ClickToCallContextMenuObserverTest&) = delete;
+ ClickToCallContextMenuObserverTest& operator=(
+ const ClickToCallContextMenuObserverTest&) = delete;
+
~ClickToCallContextMenuObserverTest() override = default;
void SetUp() override {
@@ -91,8 +96,6 @@
std::unique_ptr<content::WebContents> web_contents_;
std::unique_ptr<ClickToCallContextMenuObserver> observer_;
SharingMessage sharing_message;
-
- DISALLOW_COPY_AND_ASSIGN(ClickToCallContextMenuObserverTest);
};
} // namespace
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_message_handler_android.h b/chrome/browser/sharing/click_to_call/click_to_call_message_handler_android.h
index 577f2588..8e380373 100644
--- a/chrome/browser/sharing/click_to_call/click_to_call_message_handler_android.h
+++ b/chrome/browser/sharing/click_to_call/click_to_call_message_handler_android.h
@@ -12,6 +12,11 @@
class ClickToCallMessageHandler : public SharingMessageHandler {
public:
ClickToCallMessageHandler();
+
+ ClickToCallMessageHandler(const ClickToCallMessageHandler&) = delete;
+ ClickToCallMessageHandler& operator=(const ClickToCallMessageHandler&) =
+ delete;
+
~ClickToCallMessageHandler() override;
// SharingMessageHandler implementation:
@@ -21,9 +26,6 @@
protected:
// Calls into Java to handle a |phone_number|. Virtual for testing.
virtual void HandlePhoneNumber(const std::string& phone_number);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ClickToCallMessageHandler);
};
#endif // CHROME_BROWSER_SHARING_CLICK_TO_CALL_CLICK_TO_CALL_MESSAGE_HANDLER_ANDROID_H_
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h b/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h
index 1f93c771..44c77ef 100644
--- a/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h
+++ b/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h
@@ -35,6 +35,9 @@
const GURL& url,
bool hide_default_handler);
+ ClickToCallUiController(const ClickToCallUiController&) = delete;
+ ClickToCallUiController& operator=(const ClickToCallUiController&) = delete;
+
~ClickToCallUiController() override;
void OnDeviceSelected(const std::string& phone_number,
@@ -79,8 +82,6 @@
base::WeakPtrFactory<ClickToCallUiController> weak_ptr_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(ClickToCallUiController);
};
#endif // CHROME_BROWSER_SHARING_CLICK_TO_CALL_CLICK_TO_CALL_UI_CONTROLLER_H_
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_utils_unittest.cc b/chrome/browser/sharing/click_to_call/click_to_call_utils_unittest.cc
index ffed1b36f..c26e83aa 100644
--- a/chrome/browser/sharing/click_to_call/click_to_call_utils_unittest.cc
+++ b/chrome/browser/sharing/click_to_call/click_to_call_utils_unittest.cc
@@ -44,6 +44,9 @@
public:
ClickToCallUtilsTest() = default;
+ ClickToCallUtilsTest(const ClickToCallUtilsTest&) = delete;
+ ClickToCallUtilsTest& operator=(const ClickToCallUtilsTest&) = delete;
+
~ClickToCallUtilsTest() override = default;
void SetUp() override {
@@ -75,8 +78,6 @@
content::BrowserTaskEnvironment task_environment_;
TestingProfile profile_;
bool create_service_ = true;
-
- DISALLOW_COPY_AND_ASSIGN(ClickToCallUtilsTest);
};
} // namespace
diff --git a/chrome/browser/sharing/mock_sharing_service.h b/chrome/browser/sharing/mock_sharing_service.h
index 7c917c7..f42ab686 100644
--- a/chrome/browser/sharing/mock_sharing_service.h
+++ b/chrome/browser/sharing/mock_sharing_service.h
@@ -14,6 +14,10 @@
class MockSharingService : public SharingService {
public:
MockSharingService();
+
+ MockSharingService(const MockSharingService&) = delete;
+ MockSharingService& operator=(const MockSharingService&) = delete;
+
~MockSharingService() override;
MOCK_CONST_METHOD1(
@@ -40,9 +44,6 @@
MOCK_METHOD1(
UnregisterSharingHandler,
void(chrome_browser_sharing::SharingMessage::PayloadCase payload_case));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockSharingService);
};
#endif // CHROME_BROWSER_SHARING_MOCK_SHARING_SERVICE_H_
diff --git a/chrome/browser/sharing/ping_message_handler.h b/chrome/browser/sharing/ping_message_handler.h
index eca003a..64cd8f36 100644
--- a/chrome/browser/sharing/ping_message_handler.h
+++ b/chrome/browser/sharing/ping_message_handler.h
@@ -11,14 +11,15 @@
class PingMessageHandler : public SharingMessageHandler {
public:
PingMessageHandler();
+
+ PingMessageHandler(const PingMessageHandler&) = delete;
+ PingMessageHandler& operator=(const PingMessageHandler&) = delete;
+
~PingMessageHandler() override;
// SharingMessageHandler implementation:
void OnMessage(chrome_browser_sharing::SharingMessage message,
SharingMessageHandler::DoneCallback done_callback) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PingMessageHandler);
};
#endif // CHROME_BROWSER_SHARING_PING_MESSAGE_HANDLER_H_
diff --git a/chrome/browser/sharing/shared_clipboard/shared_clipboard_context_menu_observer.h b/chrome/browser/sharing/shared_clipboard/shared_clipboard_context_menu_observer.h
index ce86ebe5f..e6a12161 100644
--- a/chrome/browser/sharing/shared_clipboard/shared_clipboard_context_menu_observer.h
+++ b/chrome/browser/sharing/shared_clipboard/shared_clipboard_context_menu_observer.h
@@ -27,6 +27,10 @@
class SubMenuDelegate : public ui::SimpleMenuModel::Delegate {
public:
explicit SubMenuDelegate(SharedClipboardContextMenuObserver* parent);
+
+ SubMenuDelegate(const SubMenuDelegate&) = delete;
+ SubMenuDelegate& operator=(const SubMenuDelegate&) = delete;
+
~SubMenuDelegate() override;
bool IsCommandIdEnabled(int command_id) const override;
@@ -34,8 +38,6 @@
private:
SharedClipboardContextMenuObserver* const parent_;
-
- DISALLOW_COPY_AND_ASSIGN(SubMenuDelegate);
};
explicit SharedClipboardContextMenuObserver(
diff --git a/chrome/browser/sharing/shared_clipboard/shared_clipboard_context_menu_observer_unittest.cc b/chrome/browser/sharing/shared_clipboard/shared_clipboard_context_menu_observer_unittest.cc
index 535f415..491c5e5 100644
--- a/chrome/browser/sharing/shared_clipboard/shared_clipboard_context_menu_observer_unittest.cc
+++ b/chrome/browser/sharing/shared_clipboard/shared_clipboard_context_menu_observer_unittest.cc
@@ -46,6 +46,11 @@
public:
SharedClipboardContextMenuObserverTest() = default;
+ SharedClipboardContextMenuObserverTest(
+ const SharedClipboardContextMenuObserverTest&) = delete;
+ SharedClipboardContextMenuObserverTest& operator=(
+ const SharedClipboardContextMenuObserverTest&) = delete;
+
~SharedClipboardContextMenuObserverTest() override = default;
void SetUp() override {
@@ -92,8 +97,6 @@
std::unique_ptr<content::WebContents> web_contents_;
std::unique_ptr<SharedClipboardContextMenuObserver> observer_;
SharingMessage sharing_message;
-
- DISALLOW_COPY_AND_ASSIGN(SharedClipboardContextMenuObserverTest);
};
} // namespace
diff --git a/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler.h b/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler.h
index a181ae2..3da4e68 100644
--- a/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler.h
+++ b/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler.h
@@ -16,6 +16,11 @@
class SharedClipboardMessageHandler : public SharingMessageHandler {
public:
explicit SharedClipboardMessageHandler(SharingDeviceSource* device_source);
+
+ SharedClipboardMessageHandler(const SharedClipboardMessageHandler&) = delete;
+ SharedClipboardMessageHandler& operator=(
+ const SharedClipboardMessageHandler&) = delete;
+
~SharedClipboardMessageHandler() override;
// SharingMessageHandler implementation:
@@ -29,8 +34,6 @@
private:
SharingDeviceSource* device_source_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(SharedClipboardMessageHandler);
};
#endif // CHROME_BROWSER_SHARING_SHARED_CLIPBOARD_SHARED_CLIPBOARD_MESSAGE_HANDLER_H_
diff --git a/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_android.h b/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_android.h
index 2eeb8b0..bd29f2e 100644
--- a/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_android.h
+++ b/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_android.h
@@ -15,13 +15,17 @@
public:
explicit SharedClipboardMessageHandlerAndroid(
SharingDeviceSource* device_source);
+
+ SharedClipboardMessageHandlerAndroid(
+ const SharedClipboardMessageHandlerAndroid&) = delete;
+ SharedClipboardMessageHandlerAndroid& operator=(
+ const SharedClipboardMessageHandlerAndroid&) = delete;
+
~SharedClipboardMessageHandlerAndroid() override;
private:
// SharedClipboardMessageHandler implementation.
void ShowNotification(const std::string& device_name) override;
-
- DISALLOW_COPY_AND_ASSIGN(SharedClipboardMessageHandlerAndroid);
};
#endif // CHROME_BROWSER_SHARING_SHARED_CLIPBOARD_SHARED_CLIPBOARD_MESSAGE_HANDLER_ANDROID_H_
diff --git a/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop.h b/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop.h
index 8724345..d7bc8af 100644
--- a/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop.h
+++ b/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop.h
@@ -17,6 +17,12 @@
public:
SharedClipboardMessageHandlerDesktop(SharingDeviceSource* device_source,
Profile* profile);
+
+ SharedClipboardMessageHandlerDesktop(
+ const SharedClipboardMessageHandlerDesktop&) = delete;
+ SharedClipboardMessageHandlerDesktop& operator=(
+ const SharedClipboardMessageHandlerDesktop&) = delete;
+
~SharedClipboardMessageHandlerDesktop() override;
private:
@@ -24,8 +30,6 @@
void ShowNotification(const std::string& device_name) override;
Profile* profile_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(SharedClipboardMessageHandlerDesktop);
};
#endif // CHROME_BROWSER_SHARING_SHARED_CLIPBOARD_SHARED_CLIPBOARD_MESSAGE_HANDLER_DESKTOP_H_
diff --git a/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop_unittest.cc b/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop_unittest.cc
index 72d40ba..ce1412b 100644
--- a/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop_unittest.cc
+++ b/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop_unittest.cc
@@ -33,6 +33,11 @@
public:
SharedClipboardMessageHandlerTest() = default;
+ SharedClipboardMessageHandlerTest(const SharedClipboardMessageHandlerTest&) =
+ delete;
+ SharedClipboardMessageHandlerTest& operator=(
+ const SharedClipboardMessageHandlerTest&) = delete;
+
~SharedClipboardMessageHandlerTest() override = default;
void SetUp() override {
@@ -54,8 +59,6 @@
protected:
std::unique_ptr<SharedClipboardMessageHandlerDesktop> message_handler_;
MockSharingDeviceSource device_source_;
-
- DISALLOW_COPY_AND_ASSIGN(SharedClipboardMessageHandlerTest);
};
} // namespace
diff --git a/chrome/browser/sharing/shared_clipboard/shared_clipboard_test_base.h b/chrome/browser/sharing/shared_clipboard/shared_clipboard_test_base.h
index 41addb4..0e70390 100644
--- a/chrome/browser/sharing/shared_clipboard/shared_clipboard_test_base.h
+++ b/chrome/browser/sharing/shared_clipboard/shared_clipboard_test_base.h
@@ -28,6 +28,10 @@
class SharedClipboardTestBase : public testing::Test {
public:
SharedClipboardTestBase();
+
+ SharedClipboardTestBase(const SharedClipboardTestBase&) = delete;
+ SharedClipboardTestBase& operator=(const SharedClipboardTestBase&) = delete;
+
~SharedClipboardTestBase() override;
void SetUp() override;
@@ -48,9 +52,6 @@
TestingProfile profile_;
std::unique_ptr<NotificationDisplayServiceTester> notification_tester_;
std::unique_ptr<MockSharingService> sharing_service_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SharedClipboardTestBase);
};
#endif // CHROME_BROWSER_SHARING_SHARED_CLIPBOARD_SHARED_CLIPBOARD_TEST_BASE_H_
diff --git a/chrome/browser/sharing/shared_clipboard/shared_clipboard_ui_controller.h b/chrome/browser/sharing/shared_clipboard/shared_clipboard_ui_controller.h
index 7de6830..6f724d4 100644
--- a/chrome/browser/sharing/shared_clipboard/shared_clipboard_ui_controller.h
+++ b/chrome/browser/sharing/shared_clipboard/shared_clipboard_ui_controller.h
@@ -26,6 +26,10 @@
static SharedClipboardUiController* GetOrCreateFromWebContents(
content::WebContents* web_contents);
+ SharedClipboardUiController(const SharedClipboardUiController&) = delete;
+ SharedClipboardUiController& operator=(const SharedClipboardUiController&) =
+ delete;
+
~SharedClipboardUiController() override;
void OnDeviceSelected(const std::u16string& text,
@@ -58,8 +62,6 @@
base::WeakPtrFactory<SharedClipboardUiController> weak_ptr_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(SharedClipboardUiController);
};
#endif // CHROME_BROWSER_SHARING_SHARED_CLIPBOARD_SHARED_CLIPBOARD_UI_CONTROLLER_H_
diff --git a/chrome/browser/sharing/shared_clipboard/shared_clipboard_utils_unittest.cc b/chrome/browser/sharing/shared_clipboard/shared_clipboard_utils_unittest.cc
index 6dcb32d..c34ead9 100644
--- a/chrome/browser/sharing/shared_clipboard/shared_clipboard_utils_unittest.cc
+++ b/chrome/browser/sharing/shared_clipboard/shared_clipboard_utils_unittest.cc
@@ -46,18 +46,22 @@
/*instance_id_driver=*/nullptr,
/*sync_service=*/nullptr) {}
+ MockSharingDeviceRegistration(const MockSharingDeviceRegistration&) = delete;
+ MockSharingDeviceRegistration& operator=(
+ const MockSharingDeviceRegistration&) = delete;
+
~MockSharingDeviceRegistration() override = default;
MOCK_CONST_METHOD0(IsSharedClipboardSupported, bool());
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockSharingDeviceRegistration);
};
class SharedClipboardUtilsTest : public testing::Test {
public:
SharedClipboardUtilsTest() = default;
+ SharedClipboardUtilsTest(const SharedClipboardUtilsTest&) = delete;
+ SharedClipboardUtilsTest& operator=(const SharedClipboardUtilsTest&) = delete;
+
~SharedClipboardUtilsTest() override = default;
void SetUp() override {
@@ -76,8 +80,6 @@
content::BrowserTaskEnvironment task_environment_;
TestingProfile profile_;
bool create_service_ = true;
-
- DISALLOW_COPY_AND_ASSIGN(SharedClipboardUtilsTest);
};
} // namespace
diff --git a/chrome/browser/sharing/sharing_app.h b/chrome/browser/sharing/sharing_app.h
index 67334e13..13e1a014 100644
--- a/chrome/browser/sharing/sharing_app.h
+++ b/chrome/browser/sharing/sharing_app.h
@@ -22,15 +22,16 @@
std::u16string name,
std::string identifier);
SharingApp(SharingApp&& other);
+
+ SharingApp(const SharingApp&) = delete;
+ SharingApp& operator=(const SharingApp&) = delete;
+
~SharingApp();
const gfx::VectorIcon* vector_icon = nullptr;
gfx::Image image;
std::u16string name;
std::string identifier;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SharingApp);
};
#endif // CHROME_BROWSER_SHARING_SHARING_APP_H_
diff --git a/chrome/browser/sharing/sharing_device_registration.h b/chrome/browser/sharing/sharing_device_registration.h
index 26a7961..c0a86a5 100644
--- a/chrome/browser/sharing/sharing_device_registration.h
+++ b/chrome/browser/sharing/sharing_device_registration.h
@@ -45,6 +45,11 @@
VapidKeyManager* vapid_key_manager,
instance_id::InstanceIDDriver* instance_id_driver,
syncer::SyncService* sync_service);
+
+ SharingDeviceRegistration(const SharingDeviceRegistration&) = delete;
+ SharingDeviceRegistration& operator=(const SharingDeviceRegistration&) =
+ delete;
+
virtual ~SharingDeviceRegistration();
// Registers device with sharing sync preferences. Takes a |callback| function
@@ -130,8 +135,6 @@
enabled_features_testing_value_;
base::WeakPtrFactory<SharingDeviceRegistration> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SharingDeviceRegistration);
};
#endif // CHROME_BROWSER_SHARING_SHARING_DEVICE_REGISTRATION_H_
diff --git a/chrome/browser/sharing/sharing_device_registration_unittest.cc b/chrome/browser/sharing/sharing_device_registration_unittest.cc
index 5a5d4795..7a4d6ba 100644
--- a/chrome/browser/sharing/sharing_device_registration_unittest.cc
+++ b/chrome/browser/sharing/sharing_device_registration_unittest.cc
@@ -50,13 +50,14 @@
class MockInstanceIDDriver : public instance_id::InstanceIDDriver {
public:
MockInstanceIDDriver() : InstanceIDDriver(/*gcm_driver=*/nullptr) {}
+
+ MockInstanceIDDriver(const MockInstanceIDDriver&) = delete;
+ MockInstanceIDDriver& operator=(const MockInstanceIDDriver&) = delete;
+
~MockInstanceIDDriver() override = default;
MOCK_METHOD1(GetInstanceID,
instance_id::InstanceID*(const std::string& app_id));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockInstanceIDDriver);
};
class FakeInstanceID : public instance_id::InstanceID {
diff --git a/chrome/browser/sharing/sharing_device_source.h b/chrome/browser/sharing/sharing_device_source.h
index c3a509f..d987f238 100644
--- a/chrome/browser/sharing/sharing_device_source.h
+++ b/chrome/browser/sharing/sharing_device_source.h
@@ -20,6 +20,10 @@
class SharingDeviceSource {
public:
SharingDeviceSource();
+
+ SharingDeviceSource(const SharingDeviceSource&) = delete;
+ SharingDeviceSource& operator=(const SharingDeviceSource&) = delete;
+
virtual ~SharingDeviceSource();
// Returns if the source is ready. Calling GetAllDevices before this is true
@@ -45,8 +49,6 @@
private:
std::vector<base::OnceClosure> ready_callbacks_;
-
- DISALLOW_COPY_AND_ASSIGN(SharingDeviceSource);
};
#endif // CHROME_BROWSER_SHARING_SHARING_DEVICE_SOURCE_H_
diff --git a/chrome/browser/sharing/sharing_device_source_sync.h b/chrome/browser/sharing/sharing_device_source_sync.h
index c4bc3fe6..c487438 100644
--- a/chrome/browser/sharing/sharing_device_source_sync.h
+++ b/chrome/browser/sharing/sharing_device_source_sync.h
@@ -23,6 +23,10 @@
syncer::SyncService* sync_service,
syncer::LocalDeviceInfoProvider* local_device_info_provider,
syncer::DeviceInfoTracker* device_info_tracker);
+
+ SharingDeviceSourceSync(const SharingDeviceSourceSync&) = delete;
+ SharingDeviceSourceSync& operator=(const SharingDeviceSourceSync&) = delete;
+
~SharingDeviceSourceSync() override;
// SharingDeviceSource:
@@ -68,8 +72,6 @@
absl::optional<std::string> personalizable_local_device_name_;
base::WeakPtrFactory<SharingDeviceSourceSync> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SharingDeviceSourceSync);
};
#endif // CHROME_BROWSER_SHARING_SHARING_DEVICE_SOURCE_SYNC_H_
diff --git a/chrome/browser/sharing/sharing_fcm_handler.h b/chrome/browser/sharing/sharing_fcm_handler.h
index 96882b2..59ab8d9 100644
--- a/chrome/browser/sharing/sharing_fcm_handler.h
+++ b/chrome/browser/sharing/sharing_fcm_handler.h
@@ -40,6 +40,10 @@
syncer::DeviceInfoTracker* device_info_tracker,
SharingFCMSender* sharing_fcm_sender,
SharingHandlerRegistry* handler_registry);
+
+ SharingFCMHandler(const SharingFCMHandler&) = delete;
+ SharingFCMHandler& operator=(const SharingFCMHandler&) = delete;
+
~SharingFCMHandler() override;
// Registers itself as app handler for sharing messages.
@@ -106,8 +110,6 @@
bool is_listening_ = false;
base::WeakPtrFactory<SharingFCMHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SharingFCMHandler);
};
#endif // CHROME_BROWSER_SHARING_SHARING_FCM_HANDLER_H_
diff --git a/chrome/browser/sharing/sharing_fcm_sender_unittest.cc b/chrome/browser/sharing/sharing_fcm_sender_unittest.cc
index 580b1eba..e9f0c7c1 100644
--- a/chrome/browser/sharing/sharing_fcm_sender_unittest.cc
+++ b/chrome/browser/sharing/sharing_fcm_sender_unittest.cc
@@ -48,6 +48,10 @@
class FakeGCMDriver : public gcm::FakeGCMDriver {
public:
FakeGCMDriver() = default;
+
+ FakeGCMDriver(const FakeGCMDriver&) = delete;
+ FakeGCMDriver& operator=(const FakeGCMDriver&) = delete;
+
~FakeGCMDriver() override = default;
void EncryptMessage(const std::string& app_id,
@@ -71,13 +75,15 @@
private:
std::string app_id_, authorized_entity_, p256dh_, auth_secret_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeGCMDriver);
};
class FakeWebPushSender : public WebPushSender {
public:
FakeWebPushSender() : WebPushSender(/*url_loader_factory=*/nullptr) {}
+
+ FakeWebPushSender(const FakeWebPushSender&) = delete;
+ FakeWebPushSender& operator=(const FakeWebPushSender&) = delete;
+
~FakeWebPushSender() override = default;
void SendMessage(const std::string& fcm_token,
@@ -102,13 +108,15 @@
crypto::ECPrivateKey* vapid_key_;
absl::optional<WebPushMessage> message_;
SendWebPushMessageResult result_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeWebPushSender);
};
class FakeSharingMessageBridge : public SharingMessageBridge {
public:
FakeSharingMessageBridge() = default;
+
+ FakeSharingMessageBridge(const FakeSharingMessageBridge&) = delete;
+ FakeSharingMessageBridge& operator=(const FakeSharingMessageBridge&) = delete;
+
~FakeSharingMessageBridge() override = default;
// SharingMessageBridge:
@@ -139,8 +147,6 @@
private:
absl::optional<sync_pb::SharingMessageSpecifics> specifics_;
sync_pb::SharingMessageCommitError::ErrorCode error_code_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeSharingMessageBridge);
};
class MockVapidKeyManager : public VapidKeyManager {
diff --git a/chrome/browser/sharing/sharing_message_sender_unittest.cc b/chrome/browser/sharing/sharing_message_sender_unittest.cc
index 52ffa558..37fd3ed 100644
--- a/chrome/browser/sharing/sharing_message_sender_unittest.cc
+++ b/chrome/browser/sharing/sharing_message_sender_unittest.cc
@@ -113,6 +113,10 @@
SharingMessageSender::DelegateType::kFCM,
std::move(mock_sharing_fcm_sender));
}
+
+ SharingMessageSenderTest(const SharingMessageSenderTest&) = delete;
+ SharingMessageSenderTest& operator=(const SharingMessageSenderTest&) = delete;
+
~SharingMessageSenderTest() override = default;
std::unique_ptr<syncer::DeviceInfo> SetupDevice() {
@@ -140,8 +144,6 @@
SharingMessageSender sharing_message_sender_{
fake_device_info_sync_service_.GetLocalDeviceInfoProvider()};
MockSharingFCMSender* mock_sharing_fcm_sender_;
-
- DISALLOW_COPY_AND_ASSIGN(SharingMessageSenderTest);
};
MATCHER_P(ProtoEquals, message, "") {
diff --git a/chrome/browser/sharing/sharing_service_proxy_android.h b/chrome/browser/sharing/sharing_service_proxy_android.h
index 81af31b..c559cc63 100644
--- a/chrome/browser/sharing/sharing_service_proxy_android.h
+++ b/chrome/browser/sharing/sharing_service_proxy_android.h
@@ -14,6 +14,11 @@
class SharingServiceProxyAndroid {
public:
explicit SharingServiceProxyAndroid(SharingService* sharing_service);
+
+ SharingServiceProxyAndroid(const SharingServiceProxyAndroid&) = delete;
+ SharingServiceProxyAndroid& operator=(const SharingServiceProxyAndroid&) =
+ delete;
+
~SharingServiceProxyAndroid();
void SendSharedClipboardMessage(
@@ -33,8 +38,6 @@
private:
SharingService* sharing_service_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(SharingServiceProxyAndroid);
};
#endif // CHROME_BROWSER_SHARING_SHARING_SERVICE_PROXY_ANDROID_H_
diff --git a/chrome/browser/sharing/sharing_service_unittest.cc b/chrome/browser/sharing/sharing_service_unittest.cc
index 9e4806c..b9eb1983 100644
--- a/chrome/browser/sharing/sharing_service_unittest.cc
+++ b/chrome/browser/sharing/sharing_service_unittest.cc
@@ -52,10 +52,11 @@
class MockInstanceIDDriver : public instance_id::InstanceIDDriver {
public:
MockInstanceIDDriver() : InstanceIDDriver(/*gcm_driver=*/nullptr) {}
- ~MockInstanceIDDriver() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(MockInstanceIDDriver);
+ MockInstanceIDDriver(const MockInstanceIDDriver&) = delete;
+ MockInstanceIDDriver& operator=(const MockInstanceIDDriver&) = delete;
+
+ ~MockInstanceIDDriver() override = default;
};
class MockSharingHandlerRegistry : public SharingHandlerRegistry {
diff --git a/chrome/browser/sharing/sharing_sync_preference.h b/chrome/browser/sharing/sharing_sync_preference.h
index 5c8794a..4bc1072 100644
--- a/chrome/browser/sharing/sharing_sync_preference.h
+++ b/chrome/browser/sharing/sharing_sync_preference.h
@@ -53,6 +53,10 @@
SharingSyncPreference(
PrefService* prefs,
syncer::DeviceInfoSyncService* device_info_sync_service);
+
+ SharingSyncPreference(const SharingSyncPreference&) = delete;
+ SharingSyncPreference& operator=(const SharingSyncPreference&) = delete;
+
~SharingSyncPreference();
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
@@ -93,8 +97,6 @@
syncer::DeviceInfoSyncService* device_info_sync_service_;
syncer::LocalDeviceInfoProvider* local_device_info_provider_;
PrefChangeRegistrar pref_change_registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(SharingSyncPreference);
};
#endif // CHROME_BROWSER_SHARING_SHARING_SYNC_PREFERENCE_H_
diff --git a/chrome/browser/sharing/sms/sms_fetch_request_handler.h b/chrome/browser/sharing/sms/sms_fetch_request_handler.h
index d2c442c..fae988d 100644
--- a/chrome/browser/sharing/sms/sms_fetch_request_handler.h
+++ b/chrome/browser/sharing/sms/sms_fetch_request_handler.h
@@ -31,6 +31,10 @@
SmsFetchRequestHandler(SharingDeviceSource* device_source,
content::SmsFetcher* fetcher);
+
+ SmsFetchRequestHandler(const SmsFetchRequestHandler&) = delete;
+ SmsFetchRequestHandler& operator=(const SmsFetchRequestHandler&) = delete;
+
~SmsFetchRequestHandler() override;
// SharingMessageHandler
@@ -63,6 +67,10 @@
const std::vector<url::Origin>& origin_list,
const std::string& client_name,
SharingMessageHandler::DoneCallback respond_callback);
+
+ Request(const Request&) = delete;
+ Request& operator=(const Request&) = delete;
+
~Request() override;
void OnReceive(const content::OriginList&,
@@ -82,8 +90,6 @@
std::string one_time_code_;
std::string client_name_;
SharingMessageHandler::DoneCallback respond_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(Request);
};
void RemoveRequest(Request* Request);
@@ -100,8 +106,6 @@
base::flat_set<std::unique_ptr<Request>, base::UniquePtrComparator> requests_;
base::WeakPtrFactory<SmsFetchRequestHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SmsFetchRequestHandler);
};
#endif // CHROME_BROWSER_SHARING_SMS_SMS_FETCH_REQUEST_HANDLER_H_
diff --git a/chrome/browser/sharing/sms/sms_fetch_request_handler_unittest.cc b/chrome/browser/sharing/sms/sms_fetch_request_handler_unittest.cc
index 89d5a41..f07ecec 100644
--- a/chrome/browser/sharing/sms/sms_fetch_request_handler_unittest.cc
+++ b/chrome/browser/sharing/sms/sms_fetch_request_handler_unittest.cc
@@ -43,6 +43,10 @@
class MockSmsFetcher : public SmsFetcher {
public:
MockSmsFetcher() = default;
+
+ MockSmsFetcher(const MockSmsFetcher&) = delete;
+ MockSmsFetcher& operator=(const MockSmsFetcher&) = delete;
+
~MockSmsFetcher() = default;
MOCK_METHOD2(Subscribe,
@@ -56,9 +60,6 @@
void(const content::OriginList& origin_list,
Subscriber* subscriber));
MOCK_METHOD0(HasSubscribers, bool());
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockSmsFetcher);
};
class MockSmsFetchRequestHandler : public SmsFetchRequestHandler {
diff --git a/chrome/browser/sharing/vapid_key_manager.h b/chrome/browser/sharing/vapid_key_manager.h
index e86560a..29aa5658 100644
--- a/chrome/browser/sharing/vapid_key_manager.h
+++ b/chrome/browser/sharing/vapid_key_manager.h
@@ -31,6 +31,10 @@
public:
explicit VapidKeyManager(SharingSyncPreference* sharing_sync_preference,
syncer::SyncService* sync_service);
+
+ VapidKeyManager(const VapidKeyManager&) = delete;
+ VapidKeyManager& operator=(const VapidKeyManager&) = delete;
+
virtual ~VapidKeyManager();
// Returns the cached key. If absent, first attempts to refresh the cached
@@ -58,8 +62,6 @@
syncer::SyncService* sync_service_;
std::unique_ptr<crypto::ECPrivateKey> vapid_key_;
std::vector<uint8_t> vapid_key_info_;
-
- DISALLOW_COPY_AND_ASSIGN(VapidKeyManager);
};
#endif // CHROME_BROWSER_SHARING_VAPID_KEY_MANAGER_H_
diff --git a/chrome/browser/sharing/web_push/web_push_sender.h b/chrome/browser/sharing/web_push/web_push_sender.h
index 1ddef14..f680031 100644
--- a/chrome/browser/sharing/web_push/web_push_sender.h
+++ b/chrome/browser/sharing/web_push/web_push_sender.h
@@ -24,6 +24,10 @@
public:
explicit WebPushSender(
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory);
+
+ WebPushSender(const WebPushSender&) = delete;
+ WebPushSender& operator=(const WebPushSender&) = delete;
+
virtual ~WebPushSender();
// Sends a WebPushMessage via FCM Web Push. Authenticates with FCM server
@@ -47,8 +51,6 @@
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
base::WeakPtrFactory<WebPushSender> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WebPushSender);
};
#endif // CHROME_BROWSER_SHARING_WEB_PUSH_WEB_PUSH_SENDER_H_
diff --git a/chrome/browser/sharing_hub/sharing_hub_service.h b/chrome/browser/sharing_hub/sharing_hub_service.h
index ff2aba25..df3d910 100644
--- a/chrome/browser/sharing_hub/sharing_hub_service.h
+++ b/chrome/browser/sharing_hub/sharing_hub_service.h
@@ -22,14 +22,16 @@
class SharingHubService : public KeyedService {
public:
explicit SharingHubService(content::BrowserContext* context);
+
+ SharingHubService(const SharingHubService&) = delete;
+ SharingHubService& operator=(const SharingHubService&) = delete;
+
~SharingHubService() override;
virtual SharingHubModel* GetSharingHubModel();
private:
std::unique_ptr<SharingHubModel> model_;
-
- DISALLOW_COPY_AND_ASSIGN(SharingHubService);
};
} // namespace sharing_hub
diff --git a/chrome/browser/shutdown_signal_handlers_posix.cc b/chrome/browser/shutdown_signal_handlers_posix.cc
index ccc39d4..d2d23bc 100644
--- a/chrome/browser/shutdown_signal_handlers_posix.cc
+++ b/chrome/browser/shutdown_signal_handlers_posix.cc
@@ -78,6 +78,10 @@
int shutdown_fd,
base::OnceCallback<void(int)> shutdown_callback,
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
+
+ ShutdownDetector(const ShutdownDetector&) = delete;
+ ShutdownDetector& operator=(const ShutdownDetector&) = delete;
+
~ShutdownDetector() override;
// base::PlatformThread::Delegate:
@@ -87,8 +91,6 @@
const int shutdown_fd_;
base::OnceCallback<void(int)> shutdown_callback_;
const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(ShutdownDetector);
};
ShutdownDetector::ShutdownDetector(
diff --git a/chrome/browser/signin/account_consistency_mode_manager.h b/chrome/browser/signin/account_consistency_mode_manager.h
index f44852b..f334fac1 100644
--- a/chrome/browser/signin/account_consistency_mode_manager.h
+++ b/chrome/browser/signin/account_consistency_mode_manager.h
@@ -28,6 +28,11 @@
static AccountConsistencyModeManager* GetForProfile(Profile* profile);
explicit AccountConsistencyModeManager(Profile* profile);
+
+ AccountConsistencyModeManager(const AccountConsistencyModeManager&) = delete;
+ AccountConsistencyModeManager& operator=(
+ const AccountConsistencyModeManager&) = delete;
+
~AccountConsistencyModeManager() override;
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
@@ -91,8 +96,6 @@
Profile* profile_;
signin::AccountConsistencyMethod account_consistency_;
bool account_consistency_initialized_;
-
- DISALLOW_COPY_AND_ASSIGN(AccountConsistencyModeManager);
};
#endif // CHROME_BROWSER_SIGNIN_ACCOUNT_CONSISTENCY_MODE_MANAGER_H_
diff --git a/chrome/browser/signin/chrome_signin_client.h b/chrome/browser/signin/chrome_signin_client.h
index fe71b39..0436fbbf 100644
--- a/chrome/browser/signin/chrome_signin_client.h
+++ b/chrome/browser/signin/chrome_signin_client.h
@@ -37,6 +37,10 @@
{
public:
explicit ChromeSigninClient(Profile* profile);
+
+ ChromeSigninClient(const ChromeSigninClient&) = delete;
+ ChromeSigninClient& operator=(const ChromeSigninClient&) = delete;
+
~ChromeSigninClient() override;
void DoFinalInit() override;
@@ -109,8 +113,6 @@
url_loader_factory_for_testing_;
base::WeakPtrFactory<ChromeSigninClient> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeSigninClient);
};
#endif // CHROME_BROWSER_SIGNIN_CHROME_SIGNIN_CLIENT_H_
diff --git a/chrome/browser/signin/chrome_signin_helper.cc b/chrome/browser/signin/chrome_signin_helper.cc
index 874105a..1133ece1 100644
--- a/chrome/browser/signin/chrome_signin_helper.cc
+++ b/chrome/browser/signin/chrome_signin_helper.cc
@@ -162,12 +162,15 @@
explicit RequestDestructionObserverUserData(base::OnceClosure closure)
: closure_(std::move(closure)) {}
+ RequestDestructionObserverUserData(
+ const RequestDestructionObserverUserData&) = delete;
+ RequestDestructionObserverUserData& operator=(
+ const RequestDestructionObserverUserData&) = delete;
+
~RequestDestructionObserverUserData() override { std::move(closure_).Run(); }
private:
base::OnceClosure closure_;
-
- DISALLOW_COPY_AND_ASSIGN(RequestDestructionObserverUserData);
};
// This user data is used as a marker that a Mirror header was found on the
diff --git a/chrome/browser/signin/chrome_signin_helper.h b/chrome/browser/signin/chrome_signin_helper.h
index fd97784..9cf220a 100644
--- a/chrome/browser/signin/chrome_signin_helper.h
+++ b/chrome/browser/signin/chrome_signin_helper.h
@@ -48,6 +48,10 @@
const net::HttpRequestHeaders& original_headers,
net::HttpRequestHeaders* modified_headers,
std::vector<std::string>* headers_to_remove);
+
+ ChromeRequestAdapter(const ChromeRequestAdapter&) = delete;
+ ChromeRequestAdapter& operator=(const ChromeRequestAdapter&) = delete;
+
~ChromeRequestAdapter() override;
virtual content::WebContents::Getter GetWebContentsGetter() const = 0;
@@ -62,14 +66,15 @@
// request is complete (including any redirects). If a callback was already
// registered this function does nothing.
virtual void SetDestructionCallback(base::OnceClosure closure) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeRequestAdapter);
};
class ResponseAdapter {
public:
ResponseAdapter();
+
+ ResponseAdapter(const ResponseAdapter&) = delete;
+ ResponseAdapter& operator=(const ResponseAdapter&) = delete;
+
virtual ~ResponseAdapter();
virtual content::WebContents::Getter GetWebContentsGetter() const = 0;
@@ -82,9 +87,6 @@
virtual void SetUserData(
const void* key,
std::unique_ptr<base::SupportsUserData::Data> data) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ResponseAdapter);
};
// When Dice is enabled, the AccountReconcilor is blocked for a short delay
diff --git a/chrome/browser/signin/chrome_signin_helper_unittest.cc b/chrome/browser/signin/chrome_signin_helper_unittest.cc
index 14f379c..4c6ad983 100644
--- a/chrome/browser/signin/chrome_signin_helper_unittest.cc
+++ b/chrome/browser/signin/chrome_signin_helper_unittest.cc
@@ -65,6 +65,9 @@
headers_->SetHeader(header_name, header_value);
}
+ TestResponseAdapter(const TestResponseAdapter&) = delete;
+ TestResponseAdapter& operator=(const TestResponseAdapter&) = delete;
+
~TestResponseAdapter() override {}
content::WebContents::Getter GetWebContentsGetter() const override {
@@ -96,8 +99,6 @@
private:
bool is_main_frame_;
scoped_refptr<net::HttpResponseHeaders> headers_;
-
- DISALLOW_COPY_AND_ASSIGN(TestResponseAdapter);
};
} // namespace
diff --git a/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.cc b/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.cc
index 31749c7..3d75bda 100644
--- a/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.cc
+++ b/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.cc
@@ -46,6 +46,9 @@
// Owns all of the ProxyingURLLoaderFactorys for a given Profile.
class BrowserContextData : public base::SupportsUserData::Data {
public:
+ BrowserContextData(const BrowserContextData&) = delete;
+ BrowserContextData& operator=(const BrowserContextData&) = delete;
+
~BrowserContextData() override {}
static void StartProxying(
@@ -97,8 +100,6 @@
proxies_;
base::WeakPtrFactory<BrowserContextData> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BrowserContextData);
};
} // namespace
@@ -117,6 +118,9 @@
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation);
+ InProgressRequest(const InProgressRequest&) = delete;
+ InProgressRequest& operator=(const InProgressRequest&) = delete;
+
~InProgressRequest() override {
if (destruction_callback_)
std::move(destruction_callback_).Run();
@@ -206,8 +210,6 @@
// Messages received by |loader_receiver_| are forwarded to |target_loader_|.
mojo::Receiver<network::mojom::URLLoader> loader_receiver_;
mojo::Remote<network::mojom::URLLoader> target_loader_;
-
- DISALLOW_COPY_AND_ASSIGN(InProgressRequest);
};
class ProxyingURLLoaderFactory::InProgressRequest::ProxyRequestAdapter
@@ -227,6 +229,9 @@
DCHECK(in_progress_request_);
}
+ ProxyRequestAdapter(const ProxyRequestAdapter&) = delete;
+ ProxyRequestAdapter& operator=(const ProxyRequestAdapter&) = delete;
+
~ProxyRequestAdapter() override = default;
content::WebContents::Getter GetWebContentsGetter() const override {
@@ -252,8 +257,6 @@
private:
InProgressRequest* const in_progress_request_;
-
- DISALLOW_COPY_AND_ASSIGN(ProxyRequestAdapter);
};
class ProxyingURLLoaderFactory::InProgressRequest::ProxyResponseAdapter
@@ -266,6 +269,9 @@
DCHECK(headers_);
}
+ ProxyResponseAdapter(const ProxyResponseAdapter&) = delete;
+ ProxyResponseAdapter& operator=(const ProxyResponseAdapter&) = delete;
+
~ProxyResponseAdapter() override = default;
// signin::ResponseAdapter
@@ -302,8 +308,6 @@
private:
InProgressRequest* const in_progress_request_;
net::HttpResponseHeaders* const headers_;
-
- DISALLOW_COPY_AND_ASSIGN(ProxyResponseAdapter);
};
ProxyingURLLoaderFactory::InProgressRequest::InProgressRequest(
diff --git a/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.h b/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.h
index 0600231f..c51edc5 100644
--- a/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.h
+++ b/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.h
@@ -44,6 +44,10 @@
mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver,
mojo::PendingRemote<network::mojom::URLLoaderFactory> target_factory,
DisconnectCallback on_disconnect);
+
+ ProxyingURLLoaderFactory(const ProxyingURLLoaderFactory&) = delete;
+ ProxyingURLLoaderFactory& operator=(const ProxyingURLLoaderFactory&) = delete;
+
~ProxyingURLLoaderFactory() override;
// Called when a renderer needs a URLLoaderFactory to give this module the
@@ -90,8 +94,6 @@
requests_;
mojo::Remote<network::mojom::URLLoaderFactory> target_factory_;
DisconnectCallback on_disconnect_;
-
- DISALLOW_COPY_AND_ASSIGN(ProxyingURLLoaderFactory);
};
} // namespace signin
diff --git a/chrome/browser/signin/chrome_signin_proxying_url_loader_factory_unittest.cc b/chrome/browser/signin/chrome_signin_proxying_url_loader_factory_unittest.cc
index 25dc48e..e8877da 100644
--- a/chrome/browser/signin/chrome_signin_proxying_url_loader_factory_unittest.cc
+++ b/chrome/browser/signin/chrome_signin_proxying_url_loader_factory_unittest.cc
@@ -34,6 +34,10 @@
class MockDelegate : public HeaderModificationDelegate {
public:
MockDelegate() = default;
+
+ MockDelegate(const MockDelegate&) = delete;
+ MockDelegate& operator=(const MockDelegate&) = delete;
+
~MockDelegate() override = default;
MOCK_METHOD1(ShouldInterceptNavigation, bool(content::WebContents* contents));
@@ -50,8 +54,6 @@
private:
base::WeakPtrFactory<MockDelegate> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MockDelegate);
};
content::WebContents::Getter NullWebContentsGetter() {
@@ -64,6 +66,12 @@
public:
ChromeSigninProxyingURLLoaderFactoryTest()
: test_factory_receiver_(&test_factory_) {}
+
+ ChromeSigninProxyingURLLoaderFactoryTest(
+ const ChromeSigninProxyingURLLoaderFactoryTest&) = delete;
+ ChromeSigninProxyingURLLoaderFactoryTest& operator=(
+ const ChromeSigninProxyingURLLoaderFactoryTest&) = delete;
+
~ChromeSigninProxyingURLLoaderFactoryTest() override {}
base::WeakPtr<MockDelegate> StartRequest(
@@ -114,8 +122,6 @@
network::TestURLLoaderFactory test_factory_;
mojo::Receiver<network::mojom::URLLoaderFactory> test_factory_receiver_;
std::unique_ptr<std::string> response_body_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeSigninProxyingURLLoaderFactoryTest);
};
TEST_F(ChromeSigninProxyingURLLoaderFactoryTest, NoModification) {
diff --git a/chrome/browser/signin/chrome_signin_status_metrics_provider_delegate.h b/chrome/browser/signin/chrome_signin_status_metrics_provider_delegate.h
index fa6f859..d6e21ced 100644
--- a/chrome/browser/signin/chrome_signin_status_metrics_provider_delegate.h
+++ b/chrome/browser/signin/chrome_signin_status_metrics_provider_delegate.h
@@ -25,6 +25,12 @@
public IdentityManagerFactory::Observer {
public:
ChromeSigninStatusMetricsProviderDelegate();
+
+ ChromeSigninStatusMetricsProviderDelegate(
+ const ChromeSigninStatusMetricsProviderDelegate&) = delete;
+ ChromeSigninStatusMetricsProviderDelegate& operator=(
+ const ChromeSigninStatusMetricsProviderDelegate&) = delete;
+
~ChromeSigninStatusMetricsProviderDelegate() override;
private:
@@ -48,8 +54,6 @@
// Updates the sign-in status right after a new browser is opened.
void UpdateStatusWhenBrowserAdded(bool signed_in);
-
- DISALLOW_COPY_AND_ASSIGN(ChromeSigninStatusMetricsProviderDelegate);
};
#endif // CHROME_BROWSER_SIGNIN_CHROME_SIGNIN_STATUS_METRICS_PROVIDER_DELEGATE_H_
diff --git a/chrome/browser/signin/chrome_signin_url_loader_throttle.cc b/chrome/browser/signin/chrome_signin_url_loader_throttle.cc
index 860ddd0..259a80c 100644
--- a/chrome/browser/signin/chrome_signin_url_loader_throttle.cc
+++ b/chrome/browser/signin/chrome_signin_url_loader_throttle.cc
@@ -25,6 +25,9 @@
headers_to_remove),
throttle_(throttle) {}
+ ThrottleRequestAdapter(const ThrottleRequestAdapter&) = delete;
+ ThrottleRequestAdapter& operator=(const ThrottleRequestAdapter&) = delete;
+
~ThrottleRequestAdapter() override = default;
// ChromeRequestAdapter
@@ -51,8 +54,6 @@
private:
URLLoaderThrottle* const throttle_;
-
- DISALLOW_COPY_AND_ASSIGN(ThrottleRequestAdapter);
};
class URLLoaderThrottle::ThrottleResponseAdapter : public ResponseAdapter {
@@ -61,6 +62,9 @@
net::HttpResponseHeaders* headers)
: throttle_(throttle), headers_(headers) {}
+ ThrottleResponseAdapter(const ThrottleResponseAdapter&) = delete;
+ ThrottleResponseAdapter& operator=(const ThrottleResponseAdapter&) = delete;
+
~ThrottleResponseAdapter() override = default;
// ResponseAdapter
@@ -98,8 +102,6 @@
private:
URLLoaderThrottle* const throttle_;
net::HttpResponseHeaders* headers_;
-
- DISALLOW_COPY_AND_ASSIGN(ThrottleResponseAdapter);
};
// static
diff --git a/chrome/browser/signin/chrome_signin_url_loader_throttle.h b/chrome/browser/signin/chrome_signin_url_loader_throttle.h
index 07b60f3..aa5c6f6 100644
--- a/chrome/browser/signin/chrome_signin_url_loader_throttle.h
+++ b/chrome/browser/signin/chrome_signin_url_loader_throttle.h
@@ -27,6 +27,9 @@
std::unique_ptr<HeaderModificationDelegate> delegate,
content::WebContents::Getter web_contents_getter);
+ URLLoaderThrottle(const URLLoaderThrottle&) = delete;
+ URLLoaderThrottle& operator=(const URLLoaderThrottle&) = delete;
+
~URLLoaderThrottle() override;
// blink::URLLoaderThrottle
@@ -63,8 +66,6 @@
bool request_is_fetch_like_api_ = false;
base::OnceClosure destruction_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(URLLoaderThrottle);
};
} // namespace signin
diff --git a/chrome/browser/signin/chrome_signin_url_loader_throttle_unittest.cc b/chrome/browser/signin/chrome_signin_url_loader_throttle_unittest.cc
index 3a2afa0..e90a18a9 100644
--- a/chrome/browser/signin/chrome_signin_url_loader_throttle_unittest.cc
+++ b/chrome/browser/signin/chrome_signin_url_loader_throttle_unittest.cc
@@ -27,6 +27,10 @@
class MockDelegate : public HeaderModificationDelegate {
public:
MockDelegate() = default;
+
+ MockDelegate(const MockDelegate&) = delete;
+ MockDelegate& operator=(const MockDelegate&) = delete;
+
~MockDelegate() override = default;
MOCK_METHOD1(ShouldInterceptNavigation, bool(content::WebContents* contents));
@@ -36,9 +40,6 @@
MOCK_METHOD2(ProcessResponse,
void(ResponseAdapter* response_adapter,
const GURL& redirect_url));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockDelegate);
};
content::WebContents::Getter NullWebContentsGetter() {
diff --git a/chrome/browser/signin/dice_response_handler.h b/chrome/browser/signin/dice_response_handler.h
index 7c0cc122..61b140d 100644
--- a/chrome/browser/signin/dice_response_handler.h
+++ b/chrome/browser/signin/dice_response_handler.h
@@ -73,6 +73,10 @@
AccountReconcilor* account_reconcilor,
AboutSigninInternals* about_signin_internals,
const base::FilePath& profile_path_);
+
+ DiceResponseHandler(const DiceResponseHandler&) = delete;
+ DiceResponseHandler& operator=(const DiceResponseHandler&) = delete;
+
~DiceResponseHandler() override;
// Must be called when receiving a Dice response header.
@@ -96,6 +100,10 @@
AccountReconcilor* account_reconcilor,
std::unique_ptr<ProcessDiceHeaderDelegate> delegate,
DiceResponseHandler* dice_response_handler);
+
+ DiceTokenFetcher(const DiceTokenFetcher&) = delete;
+ DiceTokenFetcher& operator=(const DiceTokenFetcher&) = delete;
+
~DiceTokenFetcher() override;
const std::string& gaia_id() const { return gaia_id_; }
@@ -129,8 +137,6 @@
base::CancelableOnceClosure timeout_closure_;
bool should_enable_sync_;
std::unique_ptr<GaiaAuthFetcher> gaia_auth_fetcher_;
-
- DISALLOW_COPY_AND_ASSIGN(DiceTokenFetcher);
};
// Deletes the token fetcher.
@@ -176,7 +182,6 @@
std::unique_ptr<AccountReconcilor::Lock> lock_;
std::unique_ptr<base::OneShotTimer> timer_;
scoped_refptr<base::SequencedTaskRunner> task_runner_;
- DISALLOW_COPY_AND_ASSIGN(DiceResponseHandler);
};
#endif // CHROME_BROWSER_SIGNIN_DICE_RESPONSE_HANDLER_H_
diff --git a/chrome/browser/signin/dice_response_handler_unittest.cc b/chrome/browser/signin/dice_response_handler_unittest.cc
index 5b070a1..7f37c048 100644
--- a/chrome/browser/signin/dice_response_handler_unittest.cc
+++ b/chrome/browser/signin/dice_response_handler_unittest.cc
@@ -48,6 +48,9 @@
explicit DiceTestSigninClient(PrefService* pref_service)
: TestSigninClient(pref_service), consumer_(nullptr) {}
+ DiceTestSigninClient(const DiceTestSigninClient&) = delete;
+ DiceTestSigninClient& operator=(const DiceTestSigninClient&) = delete;
+
~DiceTestSigninClient() override {}
std::unique_ptr<GaiaAuthFetcher> CreateGaiaAuthFetcher(
@@ -74,8 +77,6 @@
private:
GaiaAuthConsumer* consumer_;
-
- DISALLOW_COPY_AND_ASSIGN(DiceTestSigninClient);
};
class DiceResponseHandlerTest : public testing::Test,
diff --git a/chrome/browser/signin/dice_tab_helper.h b/chrome/browser/signin/dice_tab_helper.h
index 18f7134..9dae73b1 100644
--- a/chrome/browser/signin/dice_tab_helper.h
+++ b/chrome/browser/signin/dice_tab_helper.h
@@ -18,6 +18,9 @@
class DiceTabHelper : public content::WebContentsUserData<DiceTabHelper>,
public content::WebContentsObserver {
public:
+ DiceTabHelper(const DiceTabHelper&) = delete;
+ DiceTabHelper& operator=(const DiceTabHelper&) = delete;
+
~DiceTabHelper() override;
signin_metrics::AccessPoint signin_access_point() const {
@@ -90,8 +93,6 @@
SyncSigninFlowStatus::kNotStarted;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(DiceTabHelper);
};
#endif // CHROME_BROWSER_SIGNIN_DICE_TAB_HELPER_H_
diff --git a/chrome/browser/signin/dice_web_signin_interceptor_browsertest.cc b/chrome/browser/signin/dice_web_signin_interceptor_browsertest.cc
index c39f4179..4269ee4 100644
--- a/chrome/browser/signin/dice_web_signin_interceptor_browsertest.cc
+++ b/chrome/browser/signin/dice_web_signin_interceptor_browsertest.cc
@@ -138,6 +138,10 @@
explicit BrowserCloseObserver(Browser* browser) : browser_(browser) {
BrowserList::AddObserver(this);
}
+
+ BrowserCloseObserver(const BrowserCloseObserver&) = delete;
+ BrowserCloseObserver& operator=(const BrowserCloseObserver&) = delete;
+
~BrowserCloseObserver() override { BrowserList::RemoveObserver(this); }
void Wait() { run_loop_.Run(); }
@@ -151,8 +155,6 @@
private:
Browser* browser_;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserCloseObserver);
};
// Runs the interception and returns the new profile that was created.
diff --git a/chrome/browser/signin/e2e_tests/test_accounts_util.h b/chrome/browser/signin/e2e_tests/test_accounts_util.h
index 22f6bf5..9457cca 100644
--- a/chrome/browser/signin/e2e_tests/test_accounts_util.h
+++ b/chrome/browser/signin/e2e_tests/test_accounts_util.h
@@ -29,13 +29,16 @@
class TestAccountsUtil {
public:
TestAccountsUtil();
+
+ TestAccountsUtil(const TestAccountsUtil&) = delete;
+ TestAccountsUtil& operator=(const TestAccountsUtil&) = delete;
+
virtual ~TestAccountsUtil();
bool Init(const base::FilePath& config_path);
bool GetAccount(const std::string& name, TestAccount& out_account) const;
private:
std::map<std::string, TestAccount> all_accounts_;
- DISALLOW_COPY_AND_ASSIGN(TestAccountsUtil);
};
} // namespace test
diff --git a/chrome/browser/signin/force_signin_verifier.h b/chrome/browser/signin/force_signin_verifier.h
index b864082..d5211aa 100644
--- a/chrome/browser/signin/force_signin_verifier.h
+++ b/chrome/browser/signin/force_signin_verifier.h
@@ -35,6 +35,10 @@
public:
explicit ForceSigninVerifier(Profile* profile,
signin::IdentityManager* identity_manager);
+
+ ForceSigninVerifier(const ForceSigninVerifier&) = delete;
+ ForceSigninVerifier& operator=(const ForceSigninVerifier&) = delete;
+
~ForceSigninVerifier() override;
void OnAccessTokenFetchComplete(GoogleServiceAuthError error,
@@ -86,8 +90,6 @@
signin::IdentityManager* identity_manager_ = nullptr;
base::WeakPtrFactory<ForceSigninVerifier> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ForceSigninVerifier);
};
#endif // CHROME_BROWSER_SIGNIN_FORCE_SIGNIN_VERIFIER_H_
diff --git a/chrome/browser/signin/force_signin_verifier_unittest.cc b/chrome/browser/signin/force_signin_verifier_unittest.cc
index ccc6b8d..13bb878 100644
--- a/chrome/browser/signin/force_signin_verifier_unittest.cc
+++ b/chrome/browser/signin/force_signin_verifier_unittest.cc
@@ -45,6 +45,11 @@
content::GetNetworkConnectionTracker()->AddNetworkConnectionObserver(this);
}
+ NetworkConnectionObserverHelper(const NetworkConnectionObserverHelper&) =
+ delete;
+ NetworkConnectionObserverHelper& operator=(
+ const NetworkConnectionObserverHelper&) = delete;
+
~NetworkConnectionObserverHelper() override {
content::GetNetworkConnectionTracker()->RemoveNetworkConnectionObserver(
this);
@@ -56,8 +61,6 @@
private:
base::RepeatingClosure closure_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkConnectionObserverHelper);
};
// Used to select which type of network type NetworkConnectionTracker should
diff --git a/chrome/browser/signin/header_modification_delegate.h b/chrome/browser/signin/header_modification_delegate.h
index dd7fa241..d7c39e8e 100644
--- a/chrome/browser/signin/header_modification_delegate.h
+++ b/chrome/browser/signin/header_modification_delegate.h
@@ -21,6 +21,11 @@
class HeaderModificationDelegate {
public:
HeaderModificationDelegate() = default;
+
+ HeaderModificationDelegate(const HeaderModificationDelegate&) = delete;
+ HeaderModificationDelegate& operator=(const HeaderModificationDelegate&) =
+ delete;
+
virtual ~HeaderModificationDelegate() = default;
virtual bool ShouldInterceptNavigation(content::WebContents* contents) = 0;
@@ -28,9 +33,6 @@
const GURL& redirect_url) = 0;
virtual void ProcessResponse(ResponseAdapter* response_adapter,
const GURL& redirect_url) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(HeaderModificationDelegate);
};
} // namespace signin
diff --git a/chrome/browser/signin/header_modification_delegate_impl.h b/chrome/browser/signin/header_modification_delegate_impl.h
index f7ad789..ab1fcec 100644
--- a/chrome/browser/signin/header_modification_delegate_impl.h
+++ b/chrome/browser/signin/header_modification_delegate_impl.h
@@ -28,6 +28,11 @@
explicit HeaderModificationDelegateImpl(Profile* profile);
#endif
+ HeaderModificationDelegateImpl(const HeaderModificationDelegateImpl&) =
+ delete;
+ HeaderModificationDelegateImpl& operator=(
+ const HeaderModificationDelegateImpl&) = delete;
+
~HeaderModificationDelegateImpl() override;
// HeaderModificationDelegate
@@ -55,8 +60,6 @@
#if defined(OS_ANDROID)
bool incognito_enabled_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(HeaderModificationDelegateImpl);
};
} // namespace signin
diff --git a/chrome/browser/signin/identity_test_environment_profile_adaptor.h b/chrome/browser/signin/identity_test_environment_profile_adaptor.h
index e5d0716..ef477efd 100644
--- a/chrome/browser/signin/identity_test_environment_profile_adaptor.h
+++ b/chrome/browser/signin/identity_test_environment_profile_adaptor.h
@@ -74,6 +74,12 @@
// factories supplied to it.
// |profile| must outlive this object.
explicit IdentityTestEnvironmentProfileAdaptor(Profile* profile);
+
+ IdentityTestEnvironmentProfileAdaptor(
+ const IdentityTestEnvironmentProfileAdaptor&) = delete;
+ IdentityTestEnvironmentProfileAdaptor& operator=(
+ const IdentityTestEnvironmentProfileAdaptor&) = delete;
+
~IdentityTestEnvironmentProfileAdaptor() {}
// Returns the IdentityTestEnvironment associated with this object (and
@@ -90,8 +96,6 @@
content::BrowserContext* context);
signin::IdentityTestEnvironment identity_test_env_;
-
- DISALLOW_COPY_AND_ASSIGN(IdentityTestEnvironmentProfileAdaptor);
};
#endif // CHROME_BROWSER_SIGNIN_IDENTITY_TEST_ENVIRONMENT_PROFILE_ADAPTOR_H_
diff --git a/chrome/browser/signin/investigator_dependency_provider.h b/chrome/browser/signin/investigator_dependency_provider.h
index 0b9a3fa..0981f01e 100644
--- a/chrome/browser/signin/investigator_dependency_provider.h
+++ b/chrome/browser/signin/investigator_dependency_provider.h
@@ -15,13 +15,18 @@
: public SigninInvestigator::DependencyProvider {
public:
explicit InvestigatorDependencyProvider(Profile* profile);
+
+ InvestigatorDependencyProvider(const InvestigatorDependencyProvider&) =
+ delete;
+ InvestigatorDependencyProvider& operator=(
+ const InvestigatorDependencyProvider&) = delete;
+
~InvestigatorDependencyProvider() override;
PrefService* GetPrefs() override;
private:
// Non-owning pointer.
Profile* profile_;
- DISALLOW_COPY_AND_ASSIGN(InvestigatorDependencyProvider);
};
#endif // CHROME_BROWSER_SIGNIN_INVESTIGATOR_DEPENDENCY_PROVIDER_H_
diff --git a/chrome/browser/signin/mirror_browsertest.cc b/chrome/browser/signin/mirror_browsertest.cc
index 1c6bc97..abc65d0 100644
--- a/chrome/browser/signin/mirror_browsertest.cc
+++ b/chrome/browser/signin/mirror_browsertest.cc
@@ -48,21 +48,27 @@
class HeaderModifyingThrottle : public blink::URLLoaderThrottle {
public:
HeaderModifyingThrottle() = default;
+
+ HeaderModifyingThrottle(const HeaderModifyingThrottle&) = delete;
+ HeaderModifyingThrottle& operator=(const HeaderModifyingThrottle&) = delete;
+
~HeaderModifyingThrottle() override = default;
void WillStartRequest(network::ResourceRequest* request,
bool* defer) override {
request->headers.SetHeader(signin::kChromeConnectedHeader, "User Data");
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(HeaderModifyingThrottle);
};
class ThrottleContentBrowserClient : public ChromeContentBrowserClient {
public:
explicit ThrottleContentBrowserClient(const GURL& watch_url)
: watch_url_(watch_url) {}
+
+ ThrottleContentBrowserClient(const ThrottleContentBrowserClient&) = delete;
+ ThrottleContentBrowserClient& operator=(const ThrottleContentBrowserClient&) =
+ delete;
+
~ThrottleContentBrowserClient() override = default;
// ContentBrowserClient overrides:
@@ -81,8 +87,6 @@
private:
const GURL watch_url_;
-
- DISALLOW_COPY_AND_ASSIGN(ThrottleContentBrowserClient);
};
// Subclass of DiceManageAccountBrowserTest with Mirror enabled.
diff --git a/chrome/browser/signin/process_dice_header_delegate_impl.h b/chrome/browser/signin/process_dice_header_delegate_impl.h
index 382bd5f..03fe8132 100644
--- a/chrome/browser/signin/process_dice_header_delegate_impl.h
+++ b/chrome/browser/signin/process_dice_header_delegate_impl.h
@@ -44,6 +44,11 @@
content::WebContents* web_contents,
EnableSyncCallback enable_sync_callback,
ShowSigninErrorCallback show_signin_error_callback);
+
+ ProcessDiceHeaderDelegateImpl(const ProcessDiceHeaderDelegateImpl&) = delete;
+ ProcessDiceHeaderDelegateImpl& operator=(
+ const ProcessDiceHeaderDelegateImpl&) = delete;
+
~ProcessDiceHeaderDelegateImpl() override;
// ProcessDiceHeaderDelegate:
@@ -67,7 +72,6 @@
signin_metrics::PromoAction::PROMO_ACTION_NO_SIGNIN_PROMO;
signin_metrics::Reason reason_ = signin_metrics::Reason::kUnknownReason;
GURL redirect_url_;
- DISALLOW_COPY_AND_ASSIGN(ProcessDiceHeaderDelegateImpl);
};
#endif // CHROME_BROWSER_SIGNIN_PROCESS_DICE_HEADER_DELEGATE_IMPL_H_
diff --git a/chrome/browser/signin/signin_global_error.h b/chrome/browser/signin/signin_global_error.h
index 4331023..3c2baeb 100644
--- a/chrome/browser/signin/signin_global_error.h
+++ b/chrome/browser/signin/signin_global_error.h
@@ -22,6 +22,10 @@
public:
SigninGlobalError(SigninErrorController* error_controller,
Profile* profile);
+
+ SigninGlobalError(const SigninGlobalError&) = delete;
+ SigninGlobalError& operator=(const SigninGlobalError&) = delete;
+
~SigninGlobalError() override;
// Returns true if there is an authentication error.
@@ -56,8 +60,6 @@
// The SigninErrorController that provides auth status.
SigninErrorController* error_controller_;
-
- DISALLOW_COPY_AND_ASSIGN(SigninGlobalError);
};
#endif // CHROME_BROWSER_SIGNIN_SIGNIN_GLOBAL_ERROR_H_
diff --git a/chrome/browser/signin/signin_manager.h b/chrome/browser/signin/signin_manager.h
index 0bafc6c4..0b4a84e 100644
--- a/chrome/browser/signin/signin_manager.h
+++ b/chrome/browser/signin/signin_manager.h
@@ -14,6 +14,10 @@
public signin::IdentityManager::Observer {
public:
explicit SigninManager(signin::IdentityManager* identity_manger);
+
+ SigninManager(const SigninManager&) = delete;
+ SigninManager& operator=(const SigninManager&) = delete;
+
~SigninManager() override;
private:
@@ -54,8 +58,6 @@
signin::IdentityManager* identity_manager_;
base::WeakPtrFactory<SigninManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SigninManager);
};
#endif // CHROME_BROWSER_SIGNIN_SIGNIN_MANAGER_H_
diff --git a/chrome/browser/signin/signin_profile_attributes_updater.h b/chrome/browser/signin/signin_profile_attributes_updater.h
index 14a4532..dfbfd503 100644
--- a/chrome/browser/signin/signin_profile_attributes_updater.h
+++ b/chrome/browser/signin/signin_profile_attributes_updater.h
@@ -26,6 +26,11 @@
const base::FilePath& profile_path,
PrefService* prefs);
+ SigninProfileAttributesUpdater(const SigninProfileAttributesUpdater&) =
+ delete;
+ SigninProfileAttributesUpdater& operator=(
+ const SigninProfileAttributesUpdater&) = delete;
+
~SigninProfileAttributesUpdater() override;
private:
@@ -46,8 +51,6 @@
base::ScopedObservation<signin::IdentityManager,
signin::IdentityManager::Observer>
identity_manager_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SigninProfileAttributesUpdater);
};
#endif // CHROME_BROWSER_SIGNIN_SIGNIN_PROFILE_ATTRIBUTES_UPDATER_H_
diff --git a/chrome/browser/signin/signin_status_metrics_provider_chromeos.h b/chrome/browser/signin/signin_status_metrics_provider_chromeos.h
index 970ad4f..34bd34f 100644
--- a/chrome/browser/signin/signin_status_metrics_provider_chromeos.h
+++ b/chrome/browser/signin/signin_status_metrics_provider_chromeos.h
@@ -20,6 +20,12 @@
: public SigninStatusMetricsProviderBase {
public:
SigninStatusMetricsProviderChromeOS();
+
+ SigninStatusMetricsProviderChromeOS(
+ const SigninStatusMetricsProviderChromeOS&) = delete;
+ SigninStatusMetricsProviderChromeOS& operator=(
+ const SigninStatusMetricsProviderChromeOS&) = delete;
+
~SigninStatusMetricsProviderChromeOS() override;
// SigninStatusMetricsProviderBase:
@@ -49,8 +55,6 @@
// Used only for testing.
static void SetGuestForTesting(bool is_guest);
static absl::optional<bool> guest_for_testing_;
-
- DISALLOW_COPY_AND_ASSIGN(SigninStatusMetricsProviderChromeOS);
};
#endif // CHROME_BROWSER_SIGNIN_SIGNIN_STATUS_METRICS_PROVIDER_CHROMEOS_H_
diff --git a/chrome/browser/signin/signin_ui_util_unittest.cc b/chrome/browser/signin/signin_ui_util_unittest.cc
index fe3d817..c5d6e58 100644
--- a/chrome/browser/signin/signin_ui_util_unittest.cc
+++ b/chrome/browser/signin/signin_ui_util_unittest.cc
@@ -68,6 +68,11 @@
class SigninUiUtilTestBrowserWindow : public TestBrowserWindow {
public:
SigninUiUtilTestBrowserWindow() = default;
+
+ SigninUiUtilTestBrowserWindow(const SigninUiUtilTestBrowserWindow&) = delete;
+ SigninUiUtilTestBrowserWindow& operator=(
+ const SigninUiUtilTestBrowserWindow&) = delete;
+
~SigninUiUtilTestBrowserWindow() override = default;
void set_browser(Browser* browser) { browser_ = browser; }
@@ -83,8 +88,6 @@
private:
Browser* browser_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(SigninUiUtilTestBrowserWindow);
};
} // namespace
diff --git a/chrome/browser/signin/signin_util.cc b/chrome/browser/signin/signin_util.cc
index 4cb61c6..55f3724 100644
--- a/chrome/browser/signin/signin_util.cc
+++ b/chrome/browser/signin/signin_util.cc
@@ -70,6 +70,10 @@
primary_account_email_(primary_account_email),
delegate_(delegate) {}
+ DeleteProfileDialogManager(const DeleteProfileDialogManager&) = delete;
+ DeleteProfileDialogManager& operator=(const DeleteProfileDialogManager&) =
+ delete;
+
~DeleteProfileDialogManager() override { BrowserList::RemoveObserver(this); }
void PresentDialogOnAllBrowserWindows() {
@@ -104,8 +108,6 @@
Profile* profile_;
std::string primary_account_email_;
Delegate* delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(DeleteProfileDialogManager);
};
#endif // defined(CAN_DELETE_PROFILE)
diff --git a/chrome/browser/signin/token_revoker_test_utils.h b/chrome/browser/signin/token_revoker_test_utils.h
index 8e75d9e..2c1b08a 100644
--- a/chrome/browser/signin/token_revoker_test_utils.h
+++ b/chrome/browser/signin/token_revoker_test_utils.h
@@ -18,6 +18,10 @@
class RefreshTokenRevoker : public GaiaAuthConsumer {
public:
RefreshTokenRevoker();
+
+ RefreshTokenRevoker(const RefreshTokenRevoker&) = delete;
+ RefreshTokenRevoker& operator=(const RefreshTokenRevoker&) = delete;
+
~RefreshTokenRevoker() override;
// Sends a request to Gaia servers to revoke the refresh token. Blocks until
@@ -31,8 +35,6 @@
private:
GaiaAuthFetcher gaia_fetcher_;
scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(RefreshTokenRevoker);
};
} // namespace token_revoker_test_utils
diff --git a/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc b/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc
index a7de50a..aa0d455 100644
--- a/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc
+++ b/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc
@@ -343,6 +343,11 @@
class ChromeSitePerProcessPDFTest : public ChromeSitePerProcessTest {
public:
ChromeSitePerProcessPDFTest() : test_guest_view_manager_(nullptr) {}
+
+ ChromeSitePerProcessPDFTest(const ChromeSitePerProcessPDFTest&) = delete;
+ ChromeSitePerProcessPDFTest& operator=(const ChromeSitePerProcessPDFTest&) =
+ delete;
+
~ChromeSitePerProcessPDFTest() override {}
void SetUpOnMainThread() override {
@@ -390,8 +395,6 @@
guest_view::TestGuestViewManagerFactory factory_;
guest_view::TestGuestViewManager* test_guest_view_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeSitePerProcessPDFTest);
};
// This test verifies that when navigating an OOPIF to a page with <embed>-ed
diff --git a/chrome/browser/site_isolation/chrome_site_per_process_test.h b/chrome/browser/site_isolation/chrome_site_per_process_test.h
index e906545..d5c9de4f 100644
--- a/chrome/browser/site_isolation/chrome_site_per_process_test.h
+++ b/chrome/browser/site_isolation/chrome_site_per_process_test.h
@@ -15,14 +15,15 @@
class ChromeSitePerProcessTest : public InProcessBrowserTest {
public:
ChromeSitePerProcessTest();
+
+ ChromeSitePerProcessTest(const ChromeSitePerProcessTest&) = delete;
+ ChromeSitePerProcessTest& operator=(const ChromeSitePerProcessTest&) = delete;
+
~ChromeSitePerProcessTest() override;
void SetUpCommandLine(base::CommandLine* command_line) override;
void SetUpOnMainThread() override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeSitePerProcessTest);
};
#endif // CHROME_BROWSER_SITE_ISOLATION_CHROME_SITE_PER_PROCESS_TEST_H_
diff --git a/chrome/browser/site_isolation/origin_agent_cluster_browsertest.cc b/chrome/browser/site_isolation/origin_agent_cluster_browsertest.cc
index 7f39f18e..be82e54 100644
--- a/chrome/browser/site_isolation/origin_agent_cluster_browsertest.cc
+++ b/chrome/browser/site_isolation/origin_agent_cluster_browsertest.cc
@@ -31,6 +31,11 @@
public:
OriginAgentClusterBrowserTest()
: https_server_(net::EmbeddedTestServer::TYPE_HTTPS) {}
+
+ OriginAgentClusterBrowserTest(const OriginAgentClusterBrowserTest&) = delete;
+ OriginAgentClusterBrowserTest& operator=(
+ const OriginAgentClusterBrowserTest&) = delete;
+
~OriginAgentClusterBrowserTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -76,8 +81,6 @@
net::EmbeddedTestServer https_server_;
base::test::ScopedFeatureList feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(OriginAgentClusterBrowserTest);
};
IN_PROC_BROWSER_TEST_F(OriginAgentClusterBrowserTest, Navigations) {
diff --git a/chrome/browser/site_isolation/site_details_browsertest.cc b/chrome/browser/site_isolation/site_details_browsertest.cc
index 25674b77..d86d7a6 100644
--- a/chrome/browser/site_isolation/site_details_browsertest.cc
+++ b/chrome/browser/site_isolation/site_details_browsertest.cc
@@ -161,6 +161,10 @@
class SiteDetailsBrowserTest : public extensions::ExtensionBrowserTest {
public:
SiteDetailsBrowserTest() {}
+
+ SiteDetailsBrowserTest(const SiteDetailsBrowserTest&) = delete;
+ SiteDetailsBrowserTest& operator=(const SiteDetailsBrowserTest&) = delete;
+
~SiteDetailsBrowserTest() override {}
void SetUpOnMainThread() override {
@@ -278,7 +282,6 @@
private:
std::vector<std::unique_ptr<TestExtensionDir>> temp_dirs_;
- DISALLOW_COPY_AND_ASSIGN(SiteDetailsBrowserTest);
};
// Test the accuracy of SiteDetails process estimation, in the presence of
diff --git a/chrome/browser/site_isolation/site_per_process_interactive_browsertest.cc b/chrome/browser/site_isolation/site_per_process_interactive_browsertest.cc
index 5e0c337..b5c40e7 100644
--- a/chrome/browser/site_isolation/site_per_process_interactive_browsertest.cc
+++ b/chrome/browser/site_isolation/site_per_process_interactive_browsertest.cc
@@ -85,6 +85,12 @@
class SitePerProcessInteractiveBrowserTest : public InProcessBrowserTest {
public:
SitePerProcessInteractiveBrowserTest() {}
+
+ SitePerProcessInteractiveBrowserTest(
+ const SitePerProcessInteractiveBrowserTest&) = delete;
+ SitePerProcessInteractiveBrowserTest& operator=(
+ const SitePerProcessInteractiveBrowserTest&) = delete;
+
~SitePerProcessInteractiveBrowserTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -115,9 +121,6 @@
};
void FullscreenElementInABA(FullscreenExitMethod exit_method);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SitePerProcessInteractiveBrowserTest);
};
// Check that document.hasFocus() works properly with out-of-process iframes.
@@ -1134,6 +1137,12 @@
: public SitePerProcessInteractiveBrowserTest {
public:
SitePerProcessInteractivePDFTest() : test_guest_view_manager_(nullptr) {}
+
+ SitePerProcessInteractivePDFTest(const SitePerProcessInteractivePDFTest&) =
+ delete;
+ SitePerProcessInteractivePDFTest& operator=(
+ const SitePerProcessInteractivePDFTest&) = delete;
+
~SitePerProcessInteractivePDFTest() override {}
void SetUpOnMainThread() override {
@@ -1154,8 +1163,6 @@
private:
guest_view::TestGuestViewManagerFactory factory_;
guest_view::TestGuestViewManager* test_guest_view_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(SitePerProcessInteractivePDFTest);
};
// This class observes a WebContents for a navigation to an extension scheme to
@@ -1356,12 +1363,21 @@
class SitePerProcessAutofillTest : public SitePerProcessInteractiveBrowserTest {
public:
SitePerProcessAutofillTest() : SitePerProcessInteractiveBrowserTest() {}
+
+ SitePerProcessAutofillTest(const SitePerProcessAutofillTest&) = delete;
+ SitePerProcessAutofillTest& operator=(const SitePerProcessAutofillTest&) =
+ delete;
+
~SitePerProcessAutofillTest() override {}
protected:
class TestAutofillClient : public autofill::TestAutofillClient {
public:
TestAutofillClient() : popup_shown_(false) {}
+
+ TestAutofillClient(const TestAutofillClient&) = delete;
+ TestAutofillClient& operator=(const TestAutofillClient&) = delete;
+
~TestAutofillClient() override {}
void WaitForNextPopup() {
@@ -1386,8 +1402,6 @@
gfx::RectF element_bounds_;
bool popup_shown_;
scoped_refptr<content::MessageLoopRunner> loop_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(TestAutofillClient);
};
const int kIframeTopDisplacement = 150;
@@ -1422,8 +1436,6 @@
private:
base::test::ScopedFeatureList scoped_feature_list_;
TestAutofillClient test_autofill_client_;
-
- DISALLOW_COPY_AND_ASSIGN(SitePerProcessAutofillTest);
};
// Waits until transforming |sample_point| from |render_frame_host| coordinates
diff --git a/chrome/browser/site_isolation/site_per_process_text_input_browsertest.cc b/chrome/browser/site_isolation/site_per_process_text_input_browsertest.cc
index eb3fcb9..daddbbb 100644
--- a/chrome/browser/site_isolation/site_per_process_text_input_browsertest.cc
+++ b/chrome/browser/site_isolation/site_per_process_text_input_browsertest.cc
@@ -255,6 +255,12 @@
class SitePerProcessTextInputManagerTest : public InProcessBrowserTest {
public:
SitePerProcessTextInputManagerTest() {}
+
+ SitePerProcessTextInputManagerTest(
+ const SitePerProcessTextInputManagerTest&) = delete;
+ SitePerProcessTextInputManagerTest& operator=(
+ const SitePerProcessTextInputManagerTest&) = delete;
+
~SitePerProcessTextInputManagerTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -346,9 +352,6 @@
current = ChildFrameAt(current, index);
return current;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SitePerProcessTextInputManagerTest);
};
// The following test loads a page with multiple nested <iframe> elements which
@@ -1169,6 +1172,10 @@
class TextDeleteDelegate : public ui::TextEditKeyBindingsDelegateAuraLinux {
public:
TextDeleteDelegate() {}
+
+ TextDeleteDelegate(const TextDeleteDelegate&) = delete;
+ TextDeleteDelegate& operator=(const TextDeleteDelegate&) = delete;
+
~TextDeleteDelegate() override {}
bool MatchEvent(
@@ -1180,9 +1187,6 @@
}
return true;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TextDeleteDelegate);
};
TextDeleteDelegate delegate;
@@ -1222,6 +1226,10 @@
explicit ShowDefinitionForWordObserver(content::WebContents* web_contents)
: content::RenderWidgetHostViewCocoaObserver(web_contents) {}
+ ShowDefinitionForWordObserver(const ShowDefinitionForWordObserver&) = delete;
+ ShowDefinitionForWordObserver& operator=(
+ const ShowDefinitionForWordObserver&) = delete;
+
~ShowDefinitionForWordObserver() override {}
const std::string& WaitForWordLookUp() {
@@ -1245,8 +1253,6 @@
bool did_receive_string_ = false;
std::string word_;
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(ShowDefinitionForWordObserver);
};
// Flakey (https:://crbug.com/874417).
diff --git a/chrome/browser/site_isolation/spellcheck_per_process_browsertest.cc b/chrome/browser/site_isolation/spellcheck_per_process_browsertest.cc
index 291f104a..eddf72c 100644
--- a/chrome/browser/site_isolation/spellcheck_per_process_browsertest.cc
+++ b/chrome/browser/site_isolation/spellcheck_per_process_browsertest.cc
@@ -47,6 +47,10 @@
public:
explicit MockSpellCheckHost(content::RenderProcessHost* process_host)
: process_host_(process_host) {}
+
+ MockSpellCheckHost(const MockSpellCheckHost&) = delete;
+ MockSpellCheckHost& operator=(const MockSpellCheckHost&) = delete;
+
~MockSpellCheckHost() override {}
content::RenderProcessHost* process_host() const { return process_host_; }
@@ -181,8 +185,6 @@
std::u16string text_;
mojo::Receiver<spellcheck::mojom::SpellCheckHost> receiver_{this};
base::OnceClosure quit_;
-
- DISALLOW_COPY_AND_ASSIGN(MockSpellCheckHost);
};
class SpellCheckBrowserTestHelper {
@@ -193,6 +195,10 @@
base::Unretained(this)));
}
+ SpellCheckBrowserTestHelper(const SpellCheckBrowserTestHelper&) = delete;
+ SpellCheckBrowserTestHelper& operator=(const SpellCheckBrowserTestHelper&) =
+ delete;
+
~SpellCheckBrowserTestHelper() {
SpellCheckHostChromeImpl::OverrideBinderForTesting(base::NullCallback());
}
@@ -255,8 +261,6 @@
base::OnceClosure quit_on_bind_closure_;
std::vector<std::unique_ptr<MockSpellCheckHost>> spell_check_hosts_;
-
- DISALLOW_COPY_AND_ASSIGN(SpellCheckBrowserTestHelper);
};
class ChromeSitePerProcessSpellCheckTest : public ChromeSitePerProcessTest {
diff --git a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
index b473bb51..3648860 100644
--- a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
+++ b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
@@ -20,6 +20,12 @@
public content::SpeechRecognitionEventListener {
public:
ChromeSpeechRecognitionManagerDelegate();
+
+ ChromeSpeechRecognitionManagerDelegate(
+ const ChromeSpeechRecognitionManagerDelegate&) = delete;
+ ChromeSpeechRecognitionManagerDelegate& operator=(
+ const ChromeSpeechRecognitionManagerDelegate&) = delete;
+
~ChromeSpeechRecognitionManagerDelegate() override;
protected:
@@ -57,8 +63,6 @@
base::OnceCallback<void(bool ask_user, bool is_allowed)> callback,
int render_process_id,
int render_frame_id);
-
- DISALLOW_COPY_AND_ASSIGN(ChromeSpeechRecognitionManagerDelegate);
};
} // namespace speech
diff --git a/chrome/browser/speech/extension_api/tts_extension_apitest.cc b/chrome/browser/speech/extension_api/tts_extension_apitest.cc
index e01c6de..a419494 100644
--- a/chrome/browser/speech/extension_api/tts_extension_apitest.cc
+++ b/chrome/browser/speech/extension_api/tts_extension_apitest.cc
@@ -221,6 +221,11 @@
class FakeNetworkOnlineStateForTest : public net::NetworkChangeNotifier {
public:
explicit FakeNetworkOnlineStateForTest(bool online) : online_(online) {}
+
+ FakeNetworkOnlineStateForTest(const FakeNetworkOnlineStateForTest&) = delete;
+ FakeNetworkOnlineStateForTest& operator=(
+ const FakeNetworkOnlineStateForTest&) = delete;
+
~FakeNetworkOnlineStateForTest() override {}
ConnectionType GetCurrentConnectionType() const override {
@@ -231,7 +236,6 @@
private:
bool online_;
- DISALLOW_COPY_AND_ASSIGN(FakeNetworkOnlineStateForTest);
};
class EventRouterAddListenerWaiter : public EventRouter::Observer {
@@ -242,6 +246,10 @@
event_router_->RegisterObserver(this, event_name);
}
+ EventRouterAddListenerWaiter(const EventRouterAddListenerWaiter&) = delete;
+ EventRouterAddListenerWaiter& operator=(const EventRouterAddListenerWaiter&) =
+ delete;
+
~EventRouterAddListenerWaiter() override {
event_router_->UnregisterObserver(this);
}
@@ -256,8 +264,6 @@
private:
EventRouter* const event_router_;
base::RunLoop loop_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(EventRouterAddListenerWaiter);
};
class TtsApiTest : public ExtensionApiTest {
diff --git a/chrome/browser/speech/speech_recognition_browsertest.cc b/chrome/browser/speech/speech_recognition_browsertest.cc
index 10dc1c2..dba3a53 100644
--- a/chrome/browser/speech/speech_recognition_browsertest.cc
+++ b/chrome/browser/speech/speech_recognition_browsertest.cc
@@ -26,6 +26,11 @@
class ChromeSpeechRecognitionTest : public InProcessBrowserTest {
public:
ChromeSpeechRecognitionTest() {}
+
+ ChromeSpeechRecognitionTest(const ChromeSpeechRecognitionTest&) = delete;
+ ChromeSpeechRecognitionTest& operator=(const ChromeSpeechRecognitionTest&) =
+ delete;
+
~ChromeSpeechRecognitionTest() override {}
void SetUp() override {
@@ -50,9 +55,6 @@
protected:
std::unique_ptr<content::FakeSpeechRecognitionManager>
fake_speech_recognition_manager_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeSpeechRecognitionTest);
};
class SpeechWebContentsObserver : public content::WebContentsObserver {
@@ -61,6 +63,11 @@
: WebContentsObserver(web_contents),
render_view_host_changed_(false),
web_contents_destroyed_(false) {}
+
+ SpeechWebContentsObserver(const SpeechWebContentsObserver&) = delete;
+ SpeechWebContentsObserver& operator=(const SpeechWebContentsObserver&) =
+ delete;
+
~SpeechWebContentsObserver() override {}
// content::WebContentsObserver overrides.
@@ -76,8 +83,6 @@
private:
bool render_view_host_changed_;
bool web_contents_destroyed_;
-
- DISALLOW_COPY_AND_ASSIGN(SpeechWebContentsObserver);
};
// Tests that ChromeSpeechRecognitionManagerDelegate works properly
diff --git a/chrome/browser/speech/speech_recognition_service_browsertest.cc b/chrome/browser/speech/speech_recognition_service_browsertest.cc
index fb912c0..fbe9612 100644
--- a/chrome/browser/speech/speech_recognition_service_browsertest.cc
+++ b/chrome/browser/speech/speech_recognition_service_browsertest.cc
@@ -129,6 +129,11 @@
scoped_feature_list_.InitWithFeatures(
{media::kLiveCaption, media::kUseSodaForLiveCaption}, {});
}
+
+ SpeechRecognitionServiceTest(const SpeechRecognitionServiceTest&) = delete;
+ SpeechRecognitionServiceTest& operator=(const SpeechRecognitionServiceTest&) =
+ delete;
+
~SpeechRecognitionServiceTest() override = default;
// InProcessBrowserTest
@@ -177,8 +182,6 @@
std::vector<std::string> recognition_results_;
bool is_client_requesting_speech_recognition_ = true;
-
- DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionServiceTest);
};
void SpeechRecognitionServiceTest::SetUp() {
diff --git a/chrome/browser/spellchecker/spell_check_host_chrome_impl.h b/chrome/browser/spellchecker/spell_check_host_chrome_impl.h
index da2be79f..41ff269 100644
--- a/chrome/browser/spellchecker/spell_check_host_chrome_impl.h
+++ b/chrome/browser/spellchecker/spell_check_host_chrome_impl.h
@@ -27,6 +27,10 @@
class SpellCheckHostChromeImpl : public SpellCheckHostImpl {
public:
explicit SpellCheckHostChromeImpl(int render_process_id);
+
+ SpellCheckHostChromeImpl(const SpellCheckHostChromeImpl&) = delete;
+ SpellCheckHostChromeImpl& operator=(const SpellCheckHostChromeImpl&) = delete;
+
~SpellCheckHostChromeImpl() override;
static void Create(
@@ -127,8 +131,6 @@
#if BUILDFLAG(USE_RENDERER_SPELLCHECKER)
base::WeakPtrFactory<SpellCheckHostChromeImpl> weak_factory_{this};
#endif
-
- DISALLOW_COPY_AND_ASSIGN(SpellCheckHostChromeImpl);
};
#endif // CHROME_BROWSER_SPELLCHECKER_SPELL_CHECK_HOST_CHROME_IMPL_H_
diff --git a/chrome/browser/spellchecker/spell_check_panel_host_impl.h b/chrome/browser/spellchecker/spell_check_panel_host_impl.h
index a5ef3d6..46e2c6e9d 100644
--- a/chrome/browser/spellchecker/spell_check_panel_host_impl.h
+++ b/chrome/browser/spellchecker/spell_check_panel_host_impl.h
@@ -17,6 +17,10 @@
class SpellCheckPanelHostImpl : public spellcheck::mojom::SpellCheckPanelHost {
public:
SpellCheckPanelHostImpl();
+
+ SpellCheckPanelHostImpl(const SpellCheckPanelHostImpl&) = delete;
+ SpellCheckPanelHostImpl& operator=(const SpellCheckPanelHostImpl&) = delete;
+
~SpellCheckPanelHostImpl() override;
static void Create(
@@ -35,8 +39,6 @@
void ShowSpellingPanel(bool show) override;
void UpdateSpellingPanelWithMisspelledWord(
const std::u16string& word) override;
-
- DISALLOW_COPY_AND_ASSIGN(SpellCheckPanelHostImpl);
};
#endif // CHROME_BROWSER_SPELLCHECKER_SPELL_CHECK_PANEL_HOST_IMPL_H_
diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary.h b/chrome/browser/spellchecker/spellcheck_custom_dictionary.h
index a4d45e1c..28a7938 100644
--- a/chrome/browser/spellchecker/spellcheck_custom_dictionary.h
+++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary.h
@@ -47,6 +47,10 @@
class Change {
public:
Change();
+
+ Change(const Change&) = delete;
+ Change& operator=(const Change&) = delete;
+
~Change();
// Adds |word| in this change.
@@ -92,8 +96,6 @@
// Whether to clear everything before adding words.
bool clear_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(Change);
};
// Interface to implement for dictionary load and change observers.
@@ -108,6 +110,10 @@
struct LoadFileResult {
LoadFileResult();
+
+ LoadFileResult(const LoadFileResult&) = delete;
+ LoadFileResult& operator=(const LoadFileResult&) = delete;
+
~LoadFileResult();
// The contents of the custom dictionary file or its backup. Does not
@@ -117,14 +123,16 @@
// True when the custom dictionary file on disk has a valid checksum and
// contains only valid words.
bool is_valid_file;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LoadFileResult);
};
// The dictionary will be saved in |dictionary_directory_name|.
explicit SpellcheckCustomDictionary(
const base::FilePath& dictionary_directory_name);
+
+ SpellcheckCustomDictionary(const SpellcheckCustomDictionary&) = delete;
+ SpellcheckCustomDictionary& operator=(const SpellcheckCustomDictionary&) =
+ delete;
+
~SpellcheckCustomDictionary() override;
// Returns the in-memory cache of words in the custom dictionary.
@@ -245,8 +253,6 @@
// Used to create weak pointers for an instance of this class.
base::WeakPtrFactory<SpellcheckCustomDictionary> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SpellcheckCustomDictionary);
};
#endif // CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_CUSTOM_DICTIONARY_H_
diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
index 20cb4a3..adc519f 100644
--- a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
+++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
@@ -148,6 +148,10 @@
public:
explicit SyncErrorFactoryStub(int* error_counter)
: error_counter_(error_counter) {}
+
+ SyncErrorFactoryStub(const SyncErrorFactoryStub&) = delete;
+ SyncErrorFactoryStub& operator=(const SyncErrorFactoryStub&) = delete;
+
~SyncErrorFactoryStub() override {}
// Overridden from syncer::SyncErrorFactory:
@@ -162,13 +166,17 @@
private:
int* error_counter_;
- DISALLOW_COPY_AND_ASSIGN(SyncErrorFactoryStub);
};
// Counts the number of notifications for dictionary load and change.
class DictionaryObserverCounter : public SpellcheckCustomDictionary::Observer {
public:
DictionaryObserverCounter() : loads_(0), changes_(0) {}
+
+ DictionaryObserverCounter(const DictionaryObserverCounter&) = delete;
+ DictionaryObserverCounter& operator=(const DictionaryObserverCounter&) =
+ delete;
+
virtual ~DictionaryObserverCounter() {}
int loads() const { return loads_; }
@@ -184,7 +192,6 @@
private:
int loads_;
int changes_;
- DISALLOW_COPY_AND_ASSIGN(DictionaryObserverCounter);
};
TEST_F(SpellcheckCustomDictionaryTest, SaveAndLoad) {
diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h
index a8acd00..f2eb0ab 100644
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h
@@ -56,6 +56,11 @@
const std::string& platform_spellcheck_language,
content::BrowserContext* browser_context,
SpellcheckService* spellcheck_service);
+
+ SpellcheckHunspellDictionary(const SpellcheckHunspellDictionary&) = delete;
+ SpellcheckHunspellDictionary& operator=(const SpellcheckHunspellDictionary&) =
+ delete;
+
~SpellcheckHunspellDictionary() override;
// SpellcheckDictionary implementation:
@@ -101,6 +106,10 @@
struct DictionaryFile {
public:
explicit DictionaryFile(base::TaskRunner* task_runner);
+
+ DictionaryFile(const DictionaryFile&) = delete;
+ DictionaryFile& operator=(const DictionaryFile&) = delete;
+
~DictionaryFile();
DictionaryFile(DictionaryFile&& other);
@@ -115,8 +124,6 @@
private:
// Task runner where the file is created.
scoped_refptr<base::TaskRunner> task_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(DictionaryFile);
};
void OnSimpleLoaderComplete(std::unique_ptr<std::string> response_body);
@@ -193,8 +200,6 @@
DictionaryFile dictionary_file_;
base::WeakPtrFactory<SpellcheckHunspellDictionary> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SpellcheckHunspellDictionary);
};
#endif // CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_HUNSPELL_DICTIONARY_H_
diff --git a/chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.h b/chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.h
index 3d36e11..cc5ce82 100644
--- a/chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.h
+++ b/chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.h
@@ -15,6 +15,12 @@
: public policy::TypeCheckingPolicyHandler {
public:
explicit SpellcheckLanguageBlocklistPolicyHandler(const char* policy_name);
+
+ SpellcheckLanguageBlocklistPolicyHandler(
+ const SpellcheckLanguageBlocklistPolicyHandler&) = delete;
+ SpellcheckLanguageBlocklistPolicyHandler& operator=(
+ const SpellcheckLanguageBlocklistPolicyHandler&) = delete;
+
~SpellcheckLanguageBlocklistPolicyHandler() override;
// ConfigurationPolicyHandler:
@@ -28,7 +34,6 @@
std::vector<base::Value>* const blocklisted,
std::vector<std::string>* const unknown,
std::vector<std::string>* const duplicates);
- DISALLOW_COPY_AND_ASSIGN(SpellcheckLanguageBlocklistPolicyHandler);
};
#endif // CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_LANGUAGE_BLOCKLIST_POLICY_HANDLER_H_
diff --git a/chrome/browser/spellchecker/spellcheck_language_policy_handler.h b/chrome/browser/spellchecker/spellcheck_language_policy_handler.h
index 85f7224b..0885593 100644
--- a/chrome/browser/spellchecker/spellcheck_language_policy_handler.h
+++ b/chrome/browser/spellchecker/spellcheck_language_policy_handler.h
@@ -15,6 +15,12 @@
: public policy::TypeCheckingPolicyHandler {
public:
SpellcheckLanguagePolicyHandler();
+
+ SpellcheckLanguagePolicyHandler(const SpellcheckLanguagePolicyHandler&) =
+ delete;
+ SpellcheckLanguagePolicyHandler& operator=(
+ const SpellcheckLanguagePolicyHandler&) = delete;
+
~SpellcheckLanguagePolicyHandler() override;
// ConfigurationPolicyHandler:
@@ -27,7 +33,6 @@
void SortForcedLanguages(const policy::PolicyMap& policies,
std::vector<base::Value>* const forced,
std::vector<std::string>* const unknown);
- DISALLOW_COPY_AND_ASSIGN(SpellcheckLanguagePolicyHandler);
};
#endif // CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_LANGUAGE_POLICY_HANDLER_H_
diff --git a/chrome/browser/spellchecker/spellcheck_service.h b/chrome/browser/spellchecker/spellcheck_service.h
index a810ed51..b417b23 100644
--- a/chrome/browser/spellchecker/spellcheck_service.h
+++ b/chrome/browser/spellchecker/spellcheck_service.h
@@ -75,6 +75,10 @@
};
explicit SpellcheckService(content::BrowserContext* context);
+
+ SpellcheckService(const SpellcheckService&) = delete;
+ SpellcheckService& operator=(const SpellcheckService&) = delete;
+
~SpellcheckService() override;
base::WeakPtr<SpellcheckService> GetWeakPtr();
@@ -324,8 +328,6 @@
bool dictionaries_loaded_ = false;
base::WeakPtrFactory<SpellcheckService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SpellcheckService);
};
#endif // CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_SERVICE_H_
diff --git a/chrome/browser/spellchecker/spellcheck_service_unittest.cc b/chrome/browser/spellchecker/spellcheck_service_unittest.cc
index c9f808b..ea1c48a 100644
--- a/chrome/browser/spellchecker/spellcheck_service_unittest.cc
+++ b/chrome/browser/spellchecker/spellcheck_service_unittest.cc
@@ -86,6 +86,11 @@
class SpellcheckServiceUnitTestBase : public testing::Test {
public:
SpellcheckServiceUnitTestBase() = default;
+
+ SpellcheckServiceUnitTestBase(const SpellcheckServiceUnitTestBase&) = delete;
+ SpellcheckServiceUnitTestBase& operator=(
+ const SpellcheckServiceUnitTestBase&) = delete;
+
~SpellcheckServiceUnitTestBase() override = default;
content::BrowserContext* browser_context() { return &profile_; }
@@ -111,9 +116,6 @@
base::test::ScopedFeatureList feature_list_;
#endif // defined(OS_WIN)
TestingProfile profile_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SpellcheckServiceUnitTestBase);
};
class SpellcheckServiceUnitTest : public SpellcheckServiceUnitTestBase,
diff --git a/chrome/browser/spellchecker/spelling_request.h b/chrome/browser/spellchecker/spelling_request.h
index 9490192..ec34ded 100644
--- a/chrome/browser/spellchecker/spelling_request.h
+++ b/chrome/browser/spellchecker/spelling_request.h
@@ -29,6 +29,9 @@
RequestTextCheckCallback callback,
DestructionCallback destruction_callback);
+ SpellingRequest(const SpellingRequest&) = delete;
+ SpellingRequest& operator=(const SpellingRequest&) = delete;
+
~SpellingRequest();
// Exposed to tests only.
@@ -80,8 +83,6 @@
DestructionCallback destruction_callback_;
base::WeakPtrFactory<SpellingRequest> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SpellingRequest);
};
#endif // CHROME_BROWSER_SPELLCHECKER_SPELLING_REQUEST_H_
diff --git a/chrome/browser/spellchecker/test/spellcheck_mock_panel_host.h b/chrome/browser/spellchecker/test/spellcheck_mock_panel_host.h
index f69ea26..1428691 100644
--- a/chrome/browser/spellchecker/test/spellcheck_mock_panel_host.h
+++ b/chrome/browser/spellchecker/test/spellcheck_mock_panel_host.h
@@ -16,6 +16,10 @@
class SpellCheckMockPanelHost : public spellcheck::mojom::SpellCheckPanelHost {
public:
explicit SpellCheckMockPanelHost(content::RenderProcessHost* process_host);
+
+ SpellCheckMockPanelHost(const SpellCheckMockPanelHost&) = delete;
+ SpellCheckMockPanelHost& operator=(const SpellCheckMockPanelHost&) = delete;
+
~SpellCheckMockPanelHost() override;
content::RenderProcessHost* process_host() const { return process_host_; }
@@ -35,8 +39,6 @@
bool show_spelling_panel_called_ = false;
bool spelling_panel_visible_ = false;
base::OnceClosure quit_;
-
- DISALLOW_COPY_AND_ASSIGN(SpellCheckMockPanelHost);
};
} // namespace spellcheck
diff --git a/chrome/browser/spellchecker/test/spellcheck_panel_browsertest_helper.h b/chrome/browser/spellchecker/test/spellcheck_panel_browsertest_helper.h
index 6ac7819..cc93233 100644
--- a/chrome/browser/spellchecker/test/spellcheck_panel_browsertest_helper.h
+++ b/chrome/browser/spellchecker/test/spellcheck_panel_browsertest_helper.h
@@ -15,6 +15,12 @@
class SpellCheckPanelBrowserTestHelper {
public:
SpellCheckPanelBrowserTestHelper();
+
+ SpellCheckPanelBrowserTestHelper(const SpellCheckPanelBrowserTestHelper&) =
+ delete;
+ SpellCheckPanelBrowserTestHelper& operator=(
+ const SpellCheckPanelBrowserTestHelper&) = delete;
+
~SpellCheckPanelBrowserTestHelper();
SpellCheckMockPanelHost* GetSpellCheckMockPanelHostForProcess(
@@ -29,8 +35,6 @@
base::OnceClosure quit_on_bind_closure_;
std::vector<std::unique_ptr<SpellCheckMockPanelHost>> hosts_;
-
- DISALLOW_COPY_AND_ASSIGN(SpellCheckPanelBrowserTestHelper);
};
} // namespace spellcheck
diff --git a/chrome/browser/ssl/cert_verifier_browser_test.h b/chrome/browser/ssl/cert_verifier_browser_test.h
index 9dd89bc..363e0d20 100644
--- a/chrome/browser/ssl/cert_verifier_browser_test.h
+++ b/chrome/browser/ssl/cert_verifier_browser_test.h
@@ -16,6 +16,10 @@
class CertVerifierBrowserTest : public InProcessBrowserTest {
public:
CertVerifierBrowserTest();
+
+ CertVerifierBrowserTest(const CertVerifierBrowserTest&) = delete;
+ CertVerifierBrowserTest& operator=(const CertVerifierBrowserTest&) = delete;
+
~CertVerifierBrowserTest() override;
// InProcessBrowserTest:
@@ -29,8 +33,6 @@
private:
content::ContentMockCertVerifier mock_cert_verifier_;
-
- DISALLOW_COPY_AND_ASSIGN(CertVerifierBrowserTest);
};
#endif // CHROME_BROWSER_SSL_CERT_VERIFIER_BROWSER_TEST_H_
diff --git a/chrome/browser/ssl/certificate_error_reporter.h b/chrome/browser/ssl/certificate_error_reporter.h
index f9f8832..c68fc0a 100644
--- a/chrome/browser/ssl/certificate_error_reporter.h
+++ b/chrome/browser/ssl/certificate_error_reporter.h
@@ -39,6 +39,9 @@
const uint8_t server_public_key[/* 32 */],
const uint32_t server_public_key_version);
+ CertificateErrorReporter(const CertificateErrorReporter&) = delete;
+ CertificateErrorReporter& operator=(const CertificateErrorReporter&) = delete;
+
virtual ~CertificateErrorReporter();
// Sends a certificate report to the report collection server. The
@@ -75,8 +78,6 @@
const uint8_t* server_public_key_;
const uint32_t server_public_key_version_;
-
- DISALLOW_COPY_AND_ASSIGN(CertificateErrorReporter);
};
#endif // CHROME_BROWSER_SSL_CERTIFICATE_ERROR_REPORTER_H_
diff --git a/chrome/browser/ssl/certificate_error_reporter_unittest.cc b/chrome/browser/ssl/certificate_error_reporter_unittest.cc
index 7f08d94..3ba8a5b 100644
--- a/chrome/browser/ssl/certificate_error_reporter_unittest.cc
+++ b/chrome/browser/ssl/certificate_error_reporter_unittest.cc
@@ -47,6 +47,9 @@
X25519_public_from_private(server_public_key_, server_private_key_);
}
+ ErrorReporterTest(const ErrorReporterTest&) = delete;
+ ErrorReporterTest& operator=(const ErrorReporterTest&) = delete;
+
~ErrorReporterTest() override {}
protected:
@@ -57,8 +60,6 @@
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(ErrorReporterTest);
};
// Test that ErrorReporter::SendExtendedReportingReport sends
diff --git a/chrome/browser/ssl/certificate_reporting_test_utils.cc b/chrome/browser/ssl/certificate_reporting_test_utils.cc
index dc6d2051..34e2dc6 100644
--- a/chrome/browser/ssl/certificate_reporting_test_utils.cc
+++ b/chrome/browser/ssl/certificate_reporting_test_utils.cc
@@ -44,6 +44,9 @@
expect_report_(expect_report),
reported_(false) {}
+ MockSSLCertReporter(const MockSSLCertReporter&) = delete;
+ MockSSLCertReporter& operator=(const MockSSLCertReporter&) = delete;
+
~MockSSLCertReporter() override {
if (expect_report_ == CERT_REPORT_EXPECTED) {
EXPECT_TRUE(reported_);
@@ -68,8 +71,6 @@
report_sent_callback_;
const ExpectReport expect_report_;
bool reported_;
-
- DISALLOW_COPY_AND_ASSIGN(MockSSLCertReporter);
};
SSLCertReporterCallback::SSLCertReporterCallback(base::RunLoop* run_loop)
diff --git a/chrome/browser/ssl/certificate_reporting_test_utils.h b/chrome/browser/ssl/certificate_reporting_test_utils.h
index a618cea..3f60578 100644
--- a/chrome/browser/ssl/certificate_reporting_test_utils.h
+++ b/chrome/browser/ssl/certificate_reporting_test_utils.h
@@ -38,6 +38,10 @@
class SSLCertReporterCallback {
public:
explicit SSLCertReporterCallback(base::RunLoop* run_loop);
+
+ SSLCertReporterCallback(const SSLCertReporterCallback&) = delete;
+ SSLCertReporterCallback& operator=(const SSLCertReporterCallback&) = delete;
+
~SSLCertReporterCallback();
void ReportSent(const std::string& hostname,
@@ -52,8 +56,6 @@
base::RunLoop* run_loop_;
std::string latest_hostname_reported_;
chrome_browser_ssl::CertLoggerRequest::ChromeChannel chrome_channel_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLCertReporterCallback);
};
#if !defined(OS_ANDROID)
diff --git a/chrome/browser/ssl/chrome_expect_ct_reporter_browsertest.cc b/chrome/browser/ssl/chrome_expect_ct_reporter_browsertest.cc
index a184390..af35ae4 100644
--- a/chrome/browser/ssl/chrome_expect_ct_reporter_browsertest.cc
+++ b/chrome/browser/ssl/chrome_expect_ct_reporter_browsertest.cc
@@ -43,6 +43,9 @@
true);
}
+ ExpectCTBrowserTest(const ExpectCTBrowserTest&) = delete;
+ ExpectCTBrowserTest& operator=(const ExpectCTBrowserTest&) = delete;
+
~ExpectCTBrowserTest() override {
SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting(
absl::nullopt);
@@ -121,8 +124,6 @@
// The report-uri value to use in the Expect-CT header for requests handled by
// ExpectCTHeaderRequestHandler.
GURL report_uri_;
-
- DISALLOW_COPY_AND_ASSIGN(ExpectCTBrowserTest);
};
// Tests that an Expect-CT reporter is properly set up and used for violations
diff --git a/chrome/browser/ssl/connection_help_tab_helper.h b/chrome/browser/ssl/connection_help_tab_helper.h
index c9d5654..6bfdffd 100644
--- a/chrome/browser/ssl/connection_help_tab_helper.h
+++ b/chrome/browser/ssl/connection_help_tab_helper.h
@@ -23,6 +23,9 @@
: public content::WebContentsObserver,
public content::WebContentsUserData<ConnectionHelpTabHelper> {
public:
+ ConnectionHelpTabHelper(const ConnectionHelpTabHelper&) = delete;
+ ConnectionHelpTabHelper& operator=(const ConnectionHelpTabHelper&) = delete;
+
~ConnectionHelpTabHelper() override;
// WebContentsObserver:
@@ -41,7 +44,5 @@
GURL testing_url_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(ConnectionHelpTabHelper);
};
#endif // CHROME_BROWSER_SSL_CONNECTION_HELP_TAB_HELPER_H_
diff --git a/chrome/browser/ssl/secure_origin_policy_handler.h b/chrome/browser/ssl/secure_origin_policy_handler.h
index c26f731..a7b7cb9a 100644
--- a/chrome/browser/ssl/secure_origin_policy_handler.h
+++ b/chrome/browser/ssl/secure_origin_policy_handler.h
@@ -17,15 +17,17 @@
class SecureOriginPolicyHandler : public SchemaValidatingPolicyHandler {
public:
SecureOriginPolicyHandler(const char* policy_name, Schema schema);
+
+ SecureOriginPolicyHandler(const SecureOriginPolicyHandler&) = delete;
+ SecureOriginPolicyHandler& operator=(const SecureOriginPolicyHandler&) =
+ delete;
+
~SecureOriginPolicyHandler() override;
protected:
// ConfigurationPolicyHandler:
void ApplyPolicySettings(const PolicyMap& policies,
PrefValueMap* prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SecureOriginPolicyHandler);
};
} // namespace policy
diff --git a/chrome/browser/ssl/security_state_tab_helper.h b/chrome/browser/ssl/security_state_tab_helper.h
index ce11511..21cb1cd 100644
--- a/chrome/browser/ssl/security_state_tab_helper.h
+++ b/chrome/browser/ssl/security_state_tab_helper.h
@@ -24,6 +24,9 @@
: public content::WebContentsObserver,
public content::WebContentsUserData<SecurityStateTabHelper> {
public:
+ SecurityStateTabHelper(const SecurityStateTabHelper&) = delete;
+ SecurityStateTabHelper& operator=(const SecurityStateTabHelper&) = delete;
+
~SecurityStateTabHelper() override;
// See security_state::GetSecurityLevel.
@@ -54,8 +57,6 @@
base::OnceClosure get_security_level_callback_for_tests_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(SecurityStateTabHelper);
};
#endif // CHROME_BROWSER_SSL_SECURITY_STATE_TAB_HELPER_H_
diff --git a/chrome/browser/ssl/security_state_tab_helper_browsertest.cc b/chrome/browser/ssl/security_state_tab_helper_browsertest.cc
index 174121b9..e0bc40a 100644
--- a/chrome/browser/ssl/security_state_tab_helper_browsertest.cc
+++ b/chrome/browser/ssl/security_state_tab_helper_browsertest.cc
@@ -180,6 +180,11 @@
explicit SecurityStyleTestObserver(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents),
latest_security_style_(blink::SecurityStyle::kUnknown) {}
+
+ SecurityStyleTestObserver(const SecurityStyleTestObserver&) = delete;
+ SecurityStyleTestObserver& operator=(const SecurityStyleTestObserver&) =
+ delete;
+
~SecurityStyleTestObserver() override {}
void DidChangeVisibleSecurityState() override {
@@ -209,7 +214,6 @@
blink::SecurityStyle latest_security_style_;
content::SecurityStyleExplanations latest_explanations_;
base::RunLoop run_loop_;
- DISALLOW_COPY_AND_ASSIGN(SecurityStyleTestObserver);
};
// Check that |observer|'s latest event was for an expired certificate
@@ -408,6 +412,10 @@
true);
}
+ SecurityStateTabHelperTest(const SecurityStateTabHelperTest&) = delete;
+ SecurityStateTabHelperTest& operator=(const SecurityStateTabHelperTest&) =
+ delete;
+
~SecurityStateTabHelperTest() override {
SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting(
absl::nullopt);
@@ -479,9 +487,6 @@
}
net::EmbeddedTestServer https_server_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SecurityStateTabHelperTest);
};
// Same as SecurityStateTabHelperTest, but with Incognito enabled.
@@ -1283,15 +1288,16 @@
class SecurityStateLoadingTest : public SecurityStateTabHelperTest {
public:
SecurityStateLoadingTest() : SecurityStateTabHelperTest() {}
+
+ SecurityStateLoadingTest(const SecurityStateLoadingTest&) = delete;
+ SecurityStateLoadingTest& operator=(const SecurityStateLoadingTest&) = delete;
+
~SecurityStateLoadingTest() override {}
protected:
void SetUpOnMainThread() override {
ASSERT_TRUE(embedded_test_server()->Start());
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SecurityStateLoadingTest);
};
// Tests that navigation state changes cause the security state to be
diff --git a/chrome/browser/ssl/security_state_tab_helper_unittest.cc b/chrome/browser/ssl/security_state_tab_helper_unittest.cc
index 06afe81..2b6faf2 100644
--- a/chrome/browser/ssl/security_state_tab_helper_unittest.cc
+++ b/chrome/browser/ssl/security_state_tab_helper_unittest.cc
@@ -28,6 +28,12 @@
: public ChromeRenderViewHostTestHarness {
public:
SecurityStateTabHelperHistogramTest() : helper_(nullptr) {}
+
+ SecurityStateTabHelperHistogramTest(
+ const SecurityStateTabHelperHistogramTest&) = delete;
+ SecurityStateTabHelperHistogramTest& operator=(
+ const SecurityStateTabHelperHistogramTest&) = delete;
+
~SecurityStateTabHelperHistogramTest() override {}
void SetUp() override {
@@ -74,7 +80,6 @@
private:
SecurityStateTabHelper* helper_;
- DISALLOW_COPY_AND_ASSIGN(SecurityStateTabHelperHistogramTest);
};
TEST_F(SecurityStateTabHelperHistogramTest, FormSubmissionHistogram) {
diff --git a/chrome/browser/ssl/ssl_browsertest.cc b/chrome/browser/ssl/ssl_browsertest.cc
index b9d0ccb..0d0a823 100644
--- a/chrome/browser/ssl/ssl_browsertest.cc
+++ b/chrome/browser/ssl/ssl_browsertest.cc
@@ -255,6 +255,10 @@
SSLErrorHandler::SetInterstitialTimerStartedCallbackForTesting(&callback_);
}
+ SSLInterstitialTimerObserver(const SSLInterstitialTimerObserver&) = delete;
+ SSLInterstitialTimerObserver& operator=(const SSLInterstitialTimerObserver&) =
+ delete;
+
~SSLInterstitialTimerObserver() {
SSLErrorHandler::SetInterstitialTimerStartedCallbackForTesting(nullptr);
}
@@ -277,8 +281,6 @@
SSLErrorHandler::TimerStartedCallback callback_;
std::unique_ptr<base::RunLoop> message_loop_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLInterstitialTimerObserver);
};
class ChromeContentBrowserClientForMixedContentTest
@@ -1712,6 +1714,12 @@
SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting(
true);
}
+
+ CertificateTransparencySSLUITest(const CertificateTransparencySSLUITest&) =
+ delete;
+ CertificateTransparencySSLUITest& operator=(
+ const CertificateTransparencySSLUITest&) = delete;
+
~CertificateTransparencySSLUITest() override {
SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting(
absl::nullopt);
@@ -1777,8 +1785,6 @@
net::EmbeddedTestServer https_server_;
testing::NiceMock<policy::MockConfigurationPolicyProvider> policy_provider_;
-
- DISALLOW_COPY_AND_ASSIGN(CertificateTransparencySSLUITest);
};
// Visit an HTTPS page that has a publicly trusted certificate issued after
@@ -2421,6 +2427,10 @@
class ExtensionEventObserver : public extensions::EventRouter::TestObserver {
public:
ExtensionEventObserver() = default;
+
+ ExtensionEventObserver(const ExtensionEventObserver&) = delete;
+ ExtensionEventObserver& operator=(const ExtensionEventObserver&) = delete;
+
~ExtensionEventObserver() override = default;
// extensions::EventRouter::TestObserver:
@@ -2434,8 +2444,6 @@
private:
std::vector<std::string> event_names_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionEventObserver);
};
ExtensionEventObserver observer;
@@ -3122,6 +3130,11 @@
SSLUITestWaitForDOMNotification()
: SSLUITestIgnoreCertErrors(), run_loop_(nullptr) {}
+ SSLUITestWaitForDOMNotification(const SSLUITestWaitForDOMNotification&) =
+ delete;
+ SSLUITestWaitForDOMNotification& operator=(
+ const SSLUITestWaitForDOMNotification&) = delete;
+
~SSLUITestWaitForDOMNotification() override { registrar_.RemoveAll(); }
void SetUpOnMainThread() override {
@@ -3153,8 +3166,6 @@
content::NotificationRegistrar registrar_;
std::string expected_notification_;
base::RunLoop* run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLUITestWaitForDOMNotification);
};
// Tests that a mixed resource which includes HTTP in the redirect chain
@@ -3451,6 +3462,9 @@
public:
SSLUIWorkerFetchTest() { EXPECT_TRUE(tmp_dir_.CreateUniqueTempDir()); }
+ SSLUIWorkerFetchTest(const SSLUIWorkerFetchTest&) = delete;
+ SSLUIWorkerFetchTest& operator=(const SSLUIWorkerFetchTest&) = delete;
+
~SSLUIWorkerFetchTest() override {}
void SetUpOnMainThread() override { SSLUITestBase::SetUpOnMainThread(); }
@@ -3639,8 +3653,6 @@
}
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLUIWorkerFetchTest);
};
IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest,
@@ -4616,6 +4628,10 @@
{{"FetchBehavior", "on-demand-only"}});
}
+ SSLNetworkTimeBrowserTest(const SSLNetworkTimeBrowserTest&) = delete;
+ SSLNetworkTimeBrowserTest& operator=(const SSLNetworkTimeBrowserTest&) =
+ delete;
+
~SSLNetworkTimeBrowserTest() override = default;
void SetUpOnMainThread() override {
@@ -4656,8 +4672,6 @@
base::test::ScopedFeatureList scoped_feature_list_;
std::unique_ptr<net::test_server::ControllableHttpResponse>
controllable_response_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLNetworkTimeBrowserTest);
};
// Tests that if an on-demand network time fetch returns that the clock
@@ -5862,6 +5876,10 @@
class SSLUITestCustomCACerts : public SSLUITestNoCert {
public:
SSLUITestCustomCACerts() = default;
+
+ SSLUITestCustomCACerts(const SSLUITestCustomCACerts&) = delete;
+ SSLUITestCustomCACerts& operator=(const SSLUITestCustomCACerts&) = delete;
+
~SSLUITestCustomCACerts() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -5968,8 +5986,6 @@
*out_cert_db = cert_db;
loop->Quit();
}
-
- DISALLOW_COPY_AND_ASSIGN(SSLUITestCustomCACerts);
};
// Imports a trusted CA certiifcate into a profile's NSS database.
@@ -7318,6 +7334,10 @@
SSLUIMITMSoftwareTest()
: CertVerifierBrowserTest(),
https_server_(net::EmbeddedTestServer::TYPE_HTTPS) {}
+
+ SSLUIMITMSoftwareTest(const SSLUIMITMSoftwareTest&) = delete;
+ SSLUIMITMSoftwareTest& operator=(const SSLUIMITMSoftwareTest&) = delete;
+
~SSLUIMITMSoftwareTest() override {}
void SetUpOnMainThread() override {
@@ -7435,7 +7455,6 @@
private:
net::EmbeddedTestServer https_server_;
- DISALLOW_COPY_AND_ASSIGN(SSLUIMITMSoftwareTest);
};
// The SSLUIMITMSoftwareEnabled and Disabled test classes exist so that the
@@ -7452,6 +7471,10 @@
{kMITMSoftwareInterstitial} /* enabled */, {} /* disabled */);
}
+ SSLUIMITMSoftwareEnabledTest(const SSLUIMITMSoftwareEnabledTest&) = delete;
+ SSLUIMITMSoftwareEnabledTest& operator=(const SSLUIMITMSoftwareEnabledTest&) =
+ delete;
+
~SSLUIMITMSoftwareEnabledTest() override {}
void SetUpOnMainThread() override {
@@ -7460,8 +7483,6 @@
private:
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLUIMITMSoftwareEnabledTest);
};
class SSLUIMITMSoftwareDisabledTest : public SSLUIMITMSoftwareTest {
@@ -7471,6 +7492,10 @@
{} /* enabled */, {kMITMSoftwareInterstitial} /* disabled */);
}
+ SSLUIMITMSoftwareDisabledTest(const SSLUIMITMSoftwareDisabledTest&) = delete;
+ SSLUIMITMSoftwareDisabledTest& operator=(
+ const SSLUIMITMSoftwareDisabledTest&) = delete;
+
~SSLUIMITMSoftwareDisabledTest() override {}
void SetUpOnMainThread() override {
@@ -7479,8 +7504,6 @@
private:
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLUIMITMSoftwareDisabledTest);
};
} // namespace
@@ -7760,6 +7783,11 @@
class TLSLegacyVersionSSLUITest : public SSLUITest {
public:
TLSLegacyVersionSSLUITest() = default;
+
+ TLSLegacyVersionSSLUITest(const TLSLegacyVersionSSLUITest&) = delete;
+ TLSLegacyVersionSSLUITest& operator=(const TLSLegacyVersionSSLUITest&) =
+ delete;
+
~TLSLegacyVersionSSLUITest() override = default;
void SetUpOnMainThread() override {
@@ -7795,8 +7823,6 @@
private:
content::ContentMockCertVerifier mock_cert_verifier_;
-
- DISALLOW_COPY_AND_ASSIGN(TLSLegacyVersionSSLUITest);
};
// TLS 1.2 should not trigger a warning.
@@ -8167,6 +8193,11 @@
SSLUIDynamicInterstitialTest()
: CertVerifierBrowserTest(),
https_server_(net::EmbeddedTestServer::TYPE_HTTPS) {}
+
+ SSLUIDynamicInterstitialTest(const SSLUIDynamicInterstitialTest&) = delete;
+ SSLUIDynamicInterstitialTest& operator=(const SSLUIDynamicInterstitialTest&) =
+ delete;
+
~SSLUIDynamicInterstitialTest() override {}
void SetUpCertVerifier() {
@@ -8261,8 +8292,6 @@
private:
net::EmbeddedTestServer https_server_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLUIDynamicInterstitialTest);
};
} // namespace
diff --git a/chrome/browser/ssl/ssl_client_auth_observer.h b/chrome/browser/ssl/ssl_client_auth_observer.h
index d7f4559..d10c47c 100644
--- a/chrome/browser/ssl/ssl_client_auth_observer.h
+++ b/chrome/browser/ssl/ssl_client_auth_observer.h
@@ -32,6 +32,10 @@
const content::BrowserContext* browser_context,
const scoped_refptr<net::SSLCertRequestInfo>& cert_request_info,
std::unique_ptr<content::ClientCertificateDelegate> delegate);
+
+ SSLClientAuthObserver(const SSLClientAuthObserver&) = delete;
+ SSLClientAuthObserver& operator=(const SSLClientAuthObserver&) = delete;
+
virtual ~SSLClientAuthObserver();
// UI should implement this to close the dialog.
@@ -75,8 +79,6 @@
const content::BrowserContext* browser_context_;
scoped_refptr<net::SSLCertRequestInfo> cert_request_info_;
std::unique_ptr<content::ClientCertificateDelegate> delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLClientAuthObserver);
};
#endif // CHROME_BROWSER_SSL_SSL_CLIENT_AUTH_OBSERVER_H_
diff --git a/chrome/browser/ssl/ssl_client_auth_requestor_mock.cc b/chrome/browser/ssl/ssl_client_auth_requestor_mock.cc
index 6201bda..65bc07f 100644
--- a/chrome/browser/ssl/ssl_client_auth_requestor_mock.cc
+++ b/chrome/browser/ssl/ssl_client_auth_requestor_mock.cc
@@ -22,6 +22,10 @@
base::OnceClosure done_callback)
: requestor_(requestor), done_callback_(std::move(done_callback)) {}
+ FakeClientCertificateDelegate(const FakeClientCertificateDelegate&) = delete;
+ FakeClientCertificateDelegate& operator=(
+ const FakeClientCertificateDelegate&) = delete;
+
~FakeClientCertificateDelegate() override {
if (requestor_) {
requestor_->CancelCertificateSelection();
@@ -40,8 +44,6 @@
private:
scoped_refptr<SSLClientAuthRequestorMock> requestor_;
base::OnceClosure done_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeClientCertificateDelegate);
};
} // namespace
diff --git a/chrome/browser/ssl/ssl_config_service_manager_pref.cc b/chrome/browser/ssl/ssl_config_service_manager_pref.cc
index 53d29de..890d844a 100644
--- a/chrome/browser/ssl/ssl_config_service_manager_pref.cc
+++ b/chrome/browser/ssl/ssl_config_service_manager_pref.cc
@@ -129,6 +129,11 @@
class SSLConfigServiceManagerPref : public SSLConfigServiceManager {
public:
explicit SSLConfigServiceManagerPref(PrefService* local_state);
+
+ SSLConfigServiceManagerPref(const SSLConfigServiceManagerPref&) = delete;
+ SSLConfigServiceManagerPref& operator=(const SSLConfigServiceManagerPref&) =
+ delete;
+
~SSLConfigServiceManagerPref() override {}
// Register local_state SSL preferences.
@@ -184,8 +189,6 @@
bool variations_unrestricted_ = true;
mojo::RemoteSet<network::mojom::SSLConfigClient> ssl_config_client_set_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLConfigServiceManagerPref);
};
SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
diff --git a/chrome/browser/ssl/ssl_error_controller_client.h b/chrome/browser/ssl/ssl_error_controller_client.h
index e022cb6..d126d357 100644
--- a/chrome/browser/ssl/ssl_error_controller_client.h
+++ b/chrome/browser/ssl/ssl_error_controller_client.h
@@ -38,6 +38,10 @@
std::unique_ptr<security_interstitials::MetricsHelper> metrics_helper,
std::unique_ptr<security_interstitials::SettingsPageHelper>
settings_page_helper);
+
+ SSLErrorControllerClient(const SSLErrorControllerClient&) = delete;
+ SSLErrorControllerClient& operator=(const SSLErrorControllerClient&) = delete;
+
~SSLErrorControllerClient() override;
// security_interstitials::ControllerClient overrides
@@ -51,8 +55,6 @@
const net::SSLInfo ssl_info_;
const GURL request_url_;
const int cert_error_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLErrorControllerClient);
};
#endif // CHROME_BROWSER_SSL_SSL_ERROR_CONTROLLER_CLIENT_H_
diff --git a/chrome/browser/startup_data.h b/chrome/browser/startup_data.h
index e5c8a019..50f97a0 100644
--- a/chrome/browser/startup_data.h
+++ b/chrome/browser/startup_data.h
@@ -37,6 +37,10 @@
class StartupData {
public:
StartupData();
+
+ StartupData(const StartupData&) = delete;
+ StartupData& operator=(const StartupData&) = delete;
+
~StartupData();
// Records core profile settings into the SystemProfileProto. It is important
@@ -102,8 +106,6 @@
#endif
std::unique_ptr<ChromeFeatureListCreator> chrome_feature_list_creator_;
-
- DISALLOW_COPY_AND_ASSIGN(StartupData);
};
#endif // CHROME_BROWSER_STARTUP_DATA_H_
diff --git a/chrome/browser/status_icons/desktop_notification_balloon.h b/chrome/browser/status_icons/desktop_notification_balloon.h
index 5857202..01487be 100644
--- a/chrome/browser/status_icons/desktop_notification_balloon.h
+++ b/chrome/browser/status_icons/desktop_notification_balloon.h
@@ -24,6 +24,11 @@
class DesktopNotificationBalloon {
public:
DesktopNotificationBalloon();
+
+ DesktopNotificationBalloon(const DesktopNotificationBalloon&) = delete;
+ DesktopNotificationBalloon& operator=(const DesktopNotificationBalloon&) =
+ delete;
+
virtual ~DesktopNotificationBalloon();
void DisplayBalloon(const gfx::ImageSkia& icon,
@@ -34,8 +39,6 @@
private:
// Counter to provide unique ids to notifications.
static int id_count_;
-
- DISALLOW_COPY_AND_ASSIGN(DesktopNotificationBalloon);
};
#endif // CHROME_BROWSER_STATUS_ICONS_DESKTOP_NOTIFICATION_BALLOON_H_
diff --git a/chrome/browser/status_icons/status_icon.h b/chrome/browser/status_icons/status_icon.h
index 43d84da..e1932ab 100644
--- a/chrome/browser/status_icons/status_icon.h
+++ b/chrome/browser/status_icons/status_icon.h
@@ -26,6 +26,10 @@
class StatusIcon {
public:
StatusIcon();
+
+ StatusIcon(const StatusIcon&) = delete;
+ StatusIcon& operator=(const StatusIcon&) = delete;
+
virtual ~StatusIcon();
// Sets the image associated with this status icon.
@@ -83,8 +87,6 @@
// Context menu, if any.
std::unique_ptr<StatusIconMenuModel> context_menu_contents_;
-
- DISALLOW_COPY_AND_ASSIGN(StatusIcon);
};
#endif // CHROME_BROWSER_STATUS_ICONS_STATUS_ICON_H_
diff --git a/chrome/browser/status_icons/status_tray.h b/chrome/browser/status_icons/status_tray.h
index 998ff2a..4834f75 100644
--- a/chrome/browser/status_icons/status_tray.h
+++ b/chrome/browser/status_icons/status_tray.h
@@ -34,6 +34,9 @@
// platform does not support status icons.
static std::unique_ptr<StatusTray> Create();
+ StatusTray(const StatusTray&) = delete;
+ StatusTray& operator=(const StatusTray&) = delete;
+
virtual ~StatusTray();
// Creates a new StatusIcon. The StatusTray retains ownership of the
@@ -63,8 +66,6 @@
// List containing all active StatusIcons. The icons are owned by this
// StatusTray.
StatusIcons status_icons_;
-
- DISALLOW_COPY_AND_ASSIGN(StatusTray);
};
#endif // CHROME_BROWSER_STATUS_ICONS_STATUS_TRAY_H_
diff --git a/chrome/browser/storage/durable_storage_browsertest.cc b/chrome/browser/storage/durable_storage_browsertest.cc
index 7a52a38..de743769 100644
--- a/chrome/browser/storage/durable_storage_browsertest.cc
+++ b/chrome/browser/storage/durable_storage_browsertest.cc
@@ -30,6 +30,11 @@
class DurableStorageBrowserTest : public InProcessBrowserTest {
public:
DurableStorageBrowserTest() = default;
+
+ DurableStorageBrowserTest(const DurableStorageBrowserTest&) = delete;
+ DurableStorageBrowserTest& operator=(const DurableStorageBrowserTest&) =
+ delete;
+
~DurableStorageBrowserTest() override = default;
void SetUpCommandLine(base::CommandLine*) override;
@@ -85,9 +90,6 @@
}
GURL url_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DurableStorageBrowserTest);
};
void DurableStorageBrowserTest::SetUpCommandLine(
diff --git a/chrome/browser/storage/durable_storage_permission_context.h b/chrome/browser/storage/durable_storage_permission_context.h
index 8a9a926..898467e 100644
--- a/chrome/browser/storage/durable_storage_permission_context.h
+++ b/chrome/browser/storage/durable_storage_permission_context.h
@@ -14,6 +14,12 @@
public:
explicit DurableStoragePermissionContext(
content::BrowserContext* browser_context);
+
+ DurableStoragePermissionContext(const DurableStoragePermissionContext&) =
+ delete;
+ DurableStoragePermissionContext& operator=(
+ const DurableStoragePermissionContext&) = delete;
+
~DurableStoragePermissionContext() override = default;
// PermissionContextBase implementation.
@@ -30,9 +36,6 @@
ContentSetting content_setting,
bool is_one_time) override;
bool IsRestrictedToSecureOrigins() const override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DurableStoragePermissionContext);
};
#endif // CHROME_BROWSER_STORAGE_DURABLE_STORAGE_PERMISSION_CONTEXT_H_
diff --git a/chrome/browser/subresource_filter/ad_tagging_browsertest.cc b/chrome/browser/subresource_filter/ad_tagging_browsertest.cc
index c22675e..8812e17 100644
--- a/chrome/browser/subresource_filter/ad_tagging_browsertest.cc
+++ b/chrome/browser/subresource_filter/ad_tagging_browsertest.cc
@@ -116,6 +116,10 @@
class AdTaggingBrowserTest : public SubresourceFilterBrowserTest {
public:
AdTaggingBrowserTest() : SubresourceFilterBrowserTest() {}
+
+ AdTaggingBrowserTest(const AdTaggingBrowserTest&) = delete;
+ AdTaggingBrowserTest& operator=(const AdTaggingBrowserTest&) = delete;
+
~AdTaggingBrowserTest() override {}
void SetUpOnMainThread() override {
@@ -204,8 +208,6 @@
content::RenderFrameHost* CreateFrameWithWindowStopAbortedLoadImpl(
const content::ToRenderFrameHost& adapter,
bool ad_script);
-
- DISALLOW_COPY_AND_ASSIGN(AdTaggingBrowserTest);
};
content::RenderFrameHost* AdTaggingBrowserTest::CreateDocWrittenFrameImpl(
diff --git a/chrome/browser/subresource_filter/subresource_filter_browser_test_harness.h b/chrome/browser/subresource_filter/subresource_filter_browser_test_harness.h
index 2a604e4..b3363f7 100644
--- a/chrome/browser/subresource_filter/subresource_filter_browser_test_harness.h
+++ b/chrome/browser/subresource_filter/subresource_filter_browser_test_harness.h
@@ -85,6 +85,11 @@
class SubresourceFilterBrowserTest : public PlatformBrowserTest {
public:
SubresourceFilterBrowserTest();
+
+ SubresourceFilterBrowserTest(const SubresourceFilterBrowserTest&) = delete;
+ SubresourceFilterBrowserTest& operator=(const SubresourceFilterBrowserTest&) =
+ delete;
+
~SubresourceFilterBrowserTest() override;
// Names of DocumentLoad histograms.
@@ -209,8 +214,6 @@
// Owned by the profile.
SubresourceFilterProfileContext* profile_context_;
-
- DISALLOW_COPY_AND_ASSIGN(SubresourceFilterBrowserTest);
};
// This class automatically syncs the SubresourceFilter SafeBrowsing list
diff --git a/chrome/browser/subresource_filter/subresource_filter_devtools_browsertest.cc b/chrome/browser/subresource_filter/subresource_filter_devtools_browsertest.cc
index ab10c97..5f8cf66 100644
--- a/chrome/browser/subresource_filter/subresource_filter_devtools_browsertest.cc
+++ b/chrome/browser/subresource_filter/subresource_filter_devtools_browsertest.cc
@@ -49,6 +49,9 @@
: ScopedDevtoolsOpener(
content::DevToolsAgentHost::GetOrCreateFor(web_contents)) {}
+ ScopedDevtoolsOpener(const ScopedDevtoolsOpener&) = delete;
+ ScopedDevtoolsOpener& operator=(const ScopedDevtoolsOpener&) = delete;
+
~ScopedDevtoolsOpener() { agent_host_->DetachClient(&test_client_); }
void EnableAdBlocking(bool enabled) {
@@ -69,7 +72,6 @@
private:
TestClient test_client_;
scoped_refptr<content::DevToolsAgentHost> agent_host_;
- DISALLOW_COPY_AND_ASSIGN(ScopedDevtoolsOpener);
};
} // namespace
diff --git a/chrome/browser/subresource_filter/subresource_filter_intercepting_browsertest.cc b/chrome/browser/subresource_filter/subresource_filter_intercepting_browsertest.cc
index a9eb8df..10e1c05 100644
--- a/chrome/browser/subresource_filter/subresource_filter_intercepting_browsertest.cc
+++ b/chrome/browser/subresource_filter/subresource_filter_intercepting_browsertest.cc
@@ -34,6 +34,12 @@
SubresourceFilterInterceptingBrowserTest()
: safe_browsing_test_server_(
std::make_unique<net::test_server::EmbeddedTestServer>()) {}
+
+ SubresourceFilterInterceptingBrowserTest(
+ const SubresourceFilterInterceptingBrowserTest&) = delete;
+ SubresourceFilterInterceptingBrowserTest& operator=(
+ const SubresourceFilterInterceptingBrowserTest&) = delete;
+
~SubresourceFilterInterceptingBrowserTest() override {}
net::test_server::EmbeddedTestServer* safe_browsing_test_server() {
@@ -107,7 +113,6 @@
// parent class' server.
std::unique_ptr<net::test_server::EmbeddedTestServer>
safe_browsing_test_server_;
- DISALLOW_COPY_AND_ASSIGN(SubresourceFilterInterceptingBrowserTest);
};
IN_PROC_BROWSER_TEST_F(SubresourceFilterInterceptingBrowserTest,
diff --git a/chrome/browser/subresource_filter/subresource_filter_worker_browsertest.cc b/chrome/browser/subresource_filter/subresource_filter_worker_browsertest.cc
index 382b52a..4d4c3e06 100644
--- a/chrome/browser/subresource_filter/subresource_filter_worker_browsertest.cc
+++ b/chrome/browser/subresource_filter/subresource_filter_worker_browsertest.cc
@@ -25,6 +25,12 @@
: public SubresourceFilterBrowserTest {
public:
SubresourceFilterWorkerFetchBrowserTest() = default;
+
+ SubresourceFilterWorkerFetchBrowserTest(
+ const SubresourceFilterWorkerFetchBrowserTest&) = delete;
+ SubresourceFilterWorkerFetchBrowserTest& operator=(
+ const SubresourceFilterWorkerFetchBrowserTest&) = delete;
+
~SubresourceFilterWorkerFetchBrowserTest() override = default;
protected:
@@ -70,9 +76,6 @@
ASSERT_TRUE(content::ExecJs(web_contents()->GetMainFrame(),
"document.title = \"\";"));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SubresourceFilterWorkerFetchBrowserTest);
};
// TODO(https://crbug.com/1011208): Add more tests for workers like top-level
diff --git a/chrome/browser/subresource_redirect/android/previews_android_bridge.h b/chrome/browser/subresource_redirect/android/previews_android_bridge.h
index 659d6c93..6339253 100644
--- a/chrome/browser/subresource_redirect/android/previews_android_bridge.h
+++ b/chrome/browser/subresource_redirect/android/previews_android_bridge.h
@@ -25,6 +25,10 @@
PreviewsAndroidBridge(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj);
+
+ PreviewsAndroidBridge(const PreviewsAndroidBridge&) = delete;
+ PreviewsAndroidBridge& operator=(const PreviewsAndroidBridge&) = delete;
+
virtual ~PreviewsAndroidBridge();
jboolean IsHttpsImageCompressionApplied(
@@ -34,8 +38,6 @@
private:
base::WeakPtrFactory<PreviewsAndroidBridge> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PreviewsAndroidBridge);
};
#endif // CHROME_BROWSER_SUBRESOURCE_REDIRECT_ANDROID_PREVIEWS_ANDROID_BRIDGE_H_
diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service.h b/chrome/browser/supervised_user/child_accounts/child_account_service.h
index 0f3e1ef..8196a850 100644
--- a/chrome/browser/supervised_user/child_accounts/child_account_service.h
+++ b/chrome/browser/supervised_user/child_accounts/child_account_service.h
@@ -36,6 +36,9 @@
public:
enum class AuthState { AUTHENTICATED, NOT_AUTHENTICATED, PENDING };
+ ChildAccountService(const ChildAccountService&) = delete;
+ ChildAccountService& operator=(const ChildAccountService&) = delete;
+
~ChildAccountService() override;
static bool IsChildAccountDetectionEnabled();
@@ -122,8 +125,6 @@
std::vector<base::OnceClosure> status_received_callback_list_;
base::WeakPtrFactory<ChildAccountService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChildAccountService);
};
#endif // CHROME_BROWSER_SUPERVISED_USER_CHILD_ACCOUNTS_CHILD_ACCOUNT_SERVICE_H_
diff --git a/chrome/browser/supervised_user/child_accounts/family_info_fetcher.h b/chrome/browser/supervised_user/child_accounts/family_info_fetcher.h
index 0082aa7..064bd43 100644
--- a/chrome/browser/supervised_user/child_accounts/family_info_fetcher.h
+++ b/chrome/browser/supervised_user/child_accounts/family_info_fetcher.h
@@ -88,6 +88,10 @@
Consumer* consumer,
signin::IdentityManager* identity_manager,
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory);
+
+ FamilyInfoFetcher(const FamilyInfoFetcher&) = delete;
+ FamilyInfoFetcher& operator=(const FamilyInfoFetcher&) = delete;
+
~FamilyInfoFetcher();
// Public so tests can use them.
@@ -133,8 +137,6 @@
std::string access_token_;
bool access_token_expired_;
std::unique_ptr<network::SimpleURLLoader> simple_url_loader_;
-
- DISALLOW_COPY_AND_ASSIGN(FamilyInfoFetcher);
};
#endif // CHROME_BROWSER_SUPERVISED_USER_CHILD_ACCOUNTS_FAMILY_INFO_FETCHER_H_
diff --git a/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.h b/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.h
index aab5450..007bcdca 100644
--- a/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.h
+++ b/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.h
@@ -31,6 +31,12 @@
PermissionRequestCreatorApiary(
signin::IdentityManager* identity_manager,
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory);
+
+ PermissionRequestCreatorApiary(const PermissionRequestCreatorApiary&) =
+ delete;
+ PermissionRequestCreatorApiary& operator=(
+ const PermissionRequestCreatorApiary&) = delete;
+
~PermissionRequestCreatorApiary() override;
static std::unique_ptr<PermissionRequestCreator> CreateWithProfile(
@@ -72,8 +78,6 @@
bool retry_on_network_change_;
RequestList requests_;
-
- DISALLOW_COPY_AND_ASSIGN(PermissionRequestCreatorApiary);
};
#endif // CHROME_BROWSER_SUPERVISED_USER_CHILD_ACCOUNTS_PERMISSION_REQUEST_CREATOR_APIARY_H_
diff --git a/chrome/browser/supervised_user/kids_chrome_management/kids_chrome_management_client.h b/chrome/browser/supervised_user/kids_chrome_management/kids_chrome_management_client.h
index a8381ab..804f878a 100644
--- a/chrome/browser/supervised_user/kids_chrome_management/kids_chrome_management_client.h
+++ b/chrome/browser/supervised_user/kids_chrome_management/kids_chrome_management_client.h
@@ -48,6 +48,10 @@
explicit KidsChromeManagementClient(Profile* profile);
+ KidsChromeManagementClient(const KidsChromeManagementClient&) = delete;
+ KidsChromeManagementClient& operator=(const KidsChromeManagementClient&) =
+ delete;
+
~KidsChromeManagementClient() override;
// Each of the next three methods is the interface to an RPC client.
@@ -107,8 +111,6 @@
// List of requests in execution.
KidsChromeRequestList requests_in_progress_;
-
- DISALLOW_COPY_AND_ASSIGN(KidsChromeManagementClient);
};
#endif // CHROME_BROWSER_SUPERVISED_USER_KIDS_CHROME_MANAGEMENT_KIDS_CHROME_MANAGEMENT_CLIENT_H_
diff --git a/chrome/browser/supervised_user/kids_management_url_checker_client.h b/chrome/browser/supervised_user/kids_management_url_checker_client.h
index b64a22bda1..33c4769 100644
--- a/chrome/browser/supervised_user/kids_management_url_checker_client.h
+++ b/chrome/browser/supervised_user/kids_management_url_checker_client.h
@@ -27,6 +27,12 @@
// |country| should be a two-letter country code (ISO 3166-1 alpha-2), e.g.,
// "us".
explicit KidsManagementURLCheckerClient(const std::string& country);
+
+ KidsManagementURLCheckerClient(const KidsManagementURLCheckerClient&) =
+ delete;
+ KidsManagementURLCheckerClient& operator=(
+ const KidsManagementURLCheckerClient&) = delete;
+
~KidsManagementURLCheckerClient() override;
// Checks whether an |url| is restricted according to KidsManagement
@@ -46,8 +52,6 @@
const std::string country_;
base::WeakPtrFactory<KidsManagementURLCheckerClient> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(KidsManagementURLCheckerClient);
};
#endif // CHROME_BROWSER_SUPERVISED_USER_KIDS_MANAGEMENT_URL_CHECKER_CLIENT_H_
diff --git a/chrome/browser/supervised_user/kids_management_url_checker_client_unittest.cc b/chrome/browser/supervised_user/kids_management_url_checker_client_unittest.cc
index 347be7c..c0c27ec 100644
--- a/chrome/browser/supervised_user/kids_management_url_checker_client_unittest.cc
+++ b/chrome/browser/supervised_user/kids_management_url_checker_client_unittest.cc
@@ -64,6 +64,11 @@
content::BrowserContext* context)
: KidsChromeManagementClient(static_cast<Profile*>(context)) {}
+ KidsChromeManagementClientForTesting(
+ const KidsChromeManagementClientForTesting&) = delete;
+ KidsChromeManagementClientForTesting& operator=(
+ const KidsChromeManagementClientForTesting&) = delete;
+
~KidsChromeManagementClientForTesting() override = default;
void ClassifyURL(
@@ -84,8 +89,6 @@
private:
std::unique_ptr<ClassifyUrlResponse> response_proto_;
KidsChromeManagementClient::ErrorCode error_code_;
-
- DISALLOW_COPY_AND_ASSIGN(KidsChromeManagementClientForTesting);
};
std::unique_ptr<KeyedService> CreateKidsChromeManagementClient(
diff --git a/chrome/browser/supervised_user/permission_request_creator_mock.h b/chrome/browser/supervised_user/permission_request_creator_mock.h
index 3e0f2464..95345f2 100644
--- a/chrome/browser/supervised_user/permission_request_creator_mock.h
+++ b/chrome/browser/supervised_user/permission_request_creator_mock.h
@@ -16,6 +16,11 @@
class PermissionRequestCreatorMock : public PermissionRequestCreator {
public:
explicit PermissionRequestCreatorMock(Profile* profile);
+
+ PermissionRequestCreatorMock(const PermissionRequestCreatorMock&) = delete;
+ PermissionRequestCreatorMock& operator=(const PermissionRequestCreatorMock&) =
+ delete;
+
~PermissionRequestCreatorMock() override;
// PermissionRequestCreator:
@@ -46,8 +51,6 @@
Profile* profile_ = nullptr;
std::vector<GURL> url_requests_;
-
- DISALLOW_COPY_AND_ASSIGN(PermissionRequestCreatorMock);
};
#endif // CHROME_BROWSER_SUPERVISED_USER_PERMISSION_REQUEST_CREATOR_MOCK_H_
diff --git a/chrome/browser/supervised_user/supervised_user_denylist.h b/chrome/browser/supervised_user/supervised_user_denylist.h
index 690993c..c86a597f 100644
--- a/chrome/browser/supervised_user/supervised_user_denylist.h
+++ b/chrome/browser/supervised_user/supervised_user_denylist.h
@@ -35,6 +35,10 @@
};
SupervisedUserDenylist();
+
+ SupervisedUserDenylist(const SupervisedUserDenylist&) = delete;
+ SupervisedUserDenylist& operator=(const SupervisedUserDenylist&) = delete;
+
~SupervisedUserDenylist();
// Asynchronously read a denylist from the given file, replacing any previous
@@ -54,8 +58,6 @@
std::vector<Hash> host_hashes_;
base::WeakPtrFactory<SupervisedUserDenylist> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SupervisedUserDenylist);
};
#endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_DENYLIST_H_
diff --git a/chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.h b/chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.h
index 8fbb18a..cbbd5ede 100644
--- a/chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.h
+++ b/chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.h
@@ -25,6 +25,11 @@
static std::unique_ptr<SupervisedUserGoogleAuthNavigationThrottle>
MaybeCreate(content::NavigationHandle* navigation_handle);
+ SupervisedUserGoogleAuthNavigationThrottle(
+ const SupervisedUserGoogleAuthNavigationThrottle&) = delete;
+ SupervisedUserGoogleAuthNavigationThrottle& operator=(
+ const SupervisedUserGoogleAuthNavigationThrottle&) = delete;
+
~SupervisedUserGoogleAuthNavigationThrottle() override;
ThrottleCheckResult WillStartRequest() override;
@@ -53,8 +58,6 @@
base::WeakPtrFactory<SupervisedUserGoogleAuthNavigationThrottle>
weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SupervisedUserGoogleAuthNavigationThrottle);
};
#endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_GOOGLE_AUTH_NAVIGATION_THROTTLE_H_
diff --git a/chrome/browser/supervised_user/supervised_user_interstitial.cc b/chrome/browser/supervised_user/supervised_user_interstitial.cc
index 57e5a3b7..faca281 100644
--- a/chrome/browser/supervised_user/supervised_user_interstitial.cc
+++ b/chrome/browser/supervised_user/supervised_user_interstitial.cc
@@ -64,6 +64,9 @@
class TabCloser : public content::WebContentsUserData<TabCloser> {
public:
+ TabCloser(const TabCloser&) = delete;
+ TabCloser& operator=(const TabCloser&) = delete;
+
~TabCloser() override {}
static void MaybeClose(WebContents* web_contents) {
@@ -108,8 +111,6 @@
base::WeakPtrFactory<TabCloser> weak_ptr_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(TabCloser);
};
WEB_CONTENTS_USER_DATA_KEY_IMPL(TabCloser)
diff --git a/chrome/browser/supervised_user/supervised_user_interstitial.h b/chrome/browser/supervised_user/supervised_user_interstitial.h
index 99ec80a..03323951 100644
--- a/chrome/browser/supervised_user/supervised_user_interstitial.h
+++ b/chrome/browser/supervised_user/supervised_user_interstitial.h
@@ -26,6 +26,10 @@
// search.
class SupervisedUserInterstitial {
public:
+ SupervisedUserInterstitial(const SupervisedUserInterstitial&) = delete;
+ SupervisedUserInterstitial& operator=(const SupervisedUserInterstitial&) =
+ delete;
+
~SupervisedUserInterstitial();
static std::unique_ptr<SupervisedUserInterstitial> Create(
@@ -80,8 +84,6 @@
// The Navigation ID of the navigation that last triggered the interstitial.
int64_t interstitial_navigation_id_;
-
- DISALLOW_COPY_AND_ASSIGN(SupervisedUserInterstitial);
};
#endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_INTERSTITIAL_H_
diff --git a/chrome/browser/supervised_user/supervised_user_navigation_observer.h b/chrome/browser/supervised_user/supervised_user_navigation_observer.h
index 69e034a..5000f02 100644
--- a/chrome/browser/supervised_user/supervised_user_navigation_observer.h
+++ b/chrome/browser/supervised_user/supervised_user_navigation_observer.h
@@ -40,6 +40,11 @@
public SupervisedUserServiceObserver,
public supervised_user::mojom::SupervisedUserCommands {
public:
+ SupervisedUserNavigationObserver(const SupervisedUserNavigationObserver&) =
+ delete;
+ SupervisedUserNavigationObserver& operator=(
+ const SupervisedUserNavigationObserver&) = delete;
+
~SupervisedUserNavigationObserver() override;
const std::vector<std::unique_ptr<const sessions::SerializedNavigationEntry>>&
@@ -176,8 +181,6 @@
this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(SupervisedUserNavigationObserver);
};
#endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_NAVIGATION_OBSERVER_H_
diff --git a/chrome/browser/supervised_user/supervised_user_navigation_throttle.h b/chrome/browser/supervised_user/supervised_user_navigation_throttle.h
index 5a49658..493647e 100644
--- a/chrome/browser/supervised_user/supervised_user_navigation_throttle.h
+++ b/chrome/browser/supervised_user/supervised_user_navigation_throttle.h
@@ -24,6 +24,11 @@
static std::unique_ptr<SupervisedUserNavigationThrottle>
MaybeCreateThrottleFor(content::NavigationHandle* navigation_handle);
+ SupervisedUserNavigationThrottle(const SupervisedUserNavigationThrottle&) =
+ delete;
+ SupervisedUserNavigationThrottle& operator=(
+ const SupervisedUserNavigationThrottle&) = delete;
+
~SupervisedUserNavigationThrottle() override;
// content::NavigationThrottle implementation:
@@ -62,8 +67,6 @@
SupervisedUserURLFilter::FilteringBehavior behavior_;
base::WeakPtrFactory<SupervisedUserNavigationThrottle> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(SupervisedUserNavigationThrottle);
};
#endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_NAVIGATION_THROTTLE_H_
diff --git a/chrome/browser/supervised_user/supervised_user_service.h b/chrome/browser/supervised_user/supervised_user_service.h
index c8984409..4d8e5511 100644
--- a/chrome/browser/supervised_user/supervised_user_service.h
+++ b/chrome/browser/supervised_user/supervised_user_service.h
@@ -115,6 +115,9 @@
};
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
+ SupervisedUserService(const SupervisedUserService&) = delete;
+ SupervisedUserService& operator=(const SupervisedUserService&) = delete;
+
~SupervisedUserService() override;
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
@@ -447,8 +450,6 @@
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
base::WeakPtrFactory<SupervisedUserService> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SupervisedUserService);
};
#endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
diff --git a/chrome/browser/supervised_user/supervised_user_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_service_unittest.cc
index 7d4ded3..3db8b9e 100644
--- a/chrome/browser/supervised_user/supervised_user_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_service_unittest.cc
@@ -93,6 +93,12 @@
public SupervisedUserURLFilter::Observer {
public:
SupervisedUserURLFilterObserver() {}
+
+ SupervisedUserURLFilterObserver(const SupervisedUserURLFilterObserver&) =
+ delete;
+ SupervisedUserURLFilterObserver& operator=(
+ const SupervisedUserURLFilterObserver&) = delete;
+
~SupervisedUserURLFilterObserver() {}
void Init(SupervisedUserURLFilter* url_filter) {
@@ -108,13 +114,15 @@
base::ScopedObservation<SupervisedUserURLFilter,
SupervisedUserURLFilter::Observer>
scoped_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SupervisedUserURLFilterObserver);
};
class AsyncResultHolder {
public:
AsyncResultHolder() : result_(false) {}
+
+ AsyncResultHolder(const AsyncResultHolder&) = delete;
+ AsyncResultHolder& operator=(const AsyncResultHolder&) = delete;
+
~AsyncResultHolder() {}
void SetResult(bool result) {
@@ -130,8 +138,6 @@
private:
base::RunLoop run_loop_;
bool result_;
-
- DISALLOW_COPY_AND_ASSIGN(AsyncResultHolder);
};
class SupervisedUserServiceTest : public ::testing::Test {
@@ -175,6 +181,11 @@
class MockPermissionRequestCreator : public PermissionRequestCreator {
public:
MockPermissionRequestCreator() : enabled_(false) {}
+
+ MockPermissionRequestCreator(const MockPermissionRequestCreator&) = delete;
+ MockPermissionRequestCreator& operator=(const MockPermissionRequestCreator&) =
+ delete;
+
~MockPermissionRequestCreator() override {}
void set_enabled(bool enabled) {
@@ -206,8 +217,6 @@
bool enabled_;
std::vector<GURL> requested_urls_;
std::vector<SuccessCallback> callbacks_;
-
- DISALLOW_COPY_AND_ASSIGN(MockPermissionRequestCreator);
};
} // namespace
diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.h b/chrome/browser/supervised_user/supervised_user_settings_service.h
index 219a523..59f3c308 100644
--- a/chrome/browser/supervised_user/supervised_user_settings_service.h
+++ b/chrome/browser/supervised_user/supervised_user_settings_service.h
@@ -68,6 +68,11 @@
base::RepeatingCallbackList<ShutdownCallbackType>;
SupervisedUserSettingsService();
+
+ SupervisedUserSettingsService(const SupervisedUserSettingsService&) = delete;
+ SupervisedUserSettingsService& operator=(
+ const SupervisedUserSettingsService&) = delete;
+
~SupervisedUserSettingsService() override;
// Initializes the service by loading its settings from a file underneath the
@@ -188,8 +193,6 @@
std::unique_ptr<syncer::SyncChangeProcessor> sync_processor_;
std::unique_ptr<syncer::SyncErrorFactory> error_handler_;
-
- DISALLOW_COPY_AND_ASSIGN(SupervisedUserSettingsService);
};
#endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SETTINGS_SERVICE_H_
diff --git a/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
index a84b8f0..e1e97ce 100644
--- a/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
@@ -27,6 +27,10 @@
class MockSyncErrorFactory : public syncer::SyncErrorFactory {
public:
explicit MockSyncErrorFactory(syncer::ModelType type);
+
+ MockSyncErrorFactory(const MockSyncErrorFactory&) = delete;
+ MockSyncErrorFactory& operator=(const MockSyncErrorFactory&) = delete;
+
~MockSyncErrorFactory() override;
// SyncErrorFactory implementation:
@@ -35,8 +39,6 @@
private:
syncer::ModelType type_;
-
- DISALLOW_COPY_AND_ASSIGN(MockSyncErrorFactory);
};
MockSyncErrorFactory::MockSyncErrorFactory(syncer::ModelType type)
diff --git a/chrome/browser/supervised_user/supervised_user_sync_model_type_controller.h b/chrome/browser/supervised_user/supervised_user_sync_model_type_controller.h
index 13e93f7..74378fb 100644
--- a/chrome/browser/supervised_user/supervised_user_sync_model_type_controller.h
+++ b/chrome/browser/supervised_user/supervised_user_sync_model_type_controller.h
@@ -24,6 +24,12 @@
const base::RepeatingClosure& dump_stack,
syncer::OnceModelTypeStoreFactory store_factory,
base::WeakPtr<syncer::SyncableService> syncable_service);
+
+ SupervisedUserSyncModelTypeController(
+ const SupervisedUserSyncModelTypeController&) = delete;
+ SupervisedUserSyncModelTypeController& operator=(
+ const SupervisedUserSyncModelTypeController&) = delete;
+
~SupervisedUserSyncModelTypeController() override;
// DataTypeController override.
@@ -31,8 +37,6 @@
private:
const Profile* const profile_;
-
- DISALLOW_COPY_AND_ASSIGN(SupervisedUserSyncModelTypeController);
};
#endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SYNC_MODEL_TYPE_CONTROLLER_H_
diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.h b/chrome/browser/supervised_user/supervised_user_url_filter.h
index 9ddc7fd0..a13e08cd 100644
--- a/chrome/browser/supervised_user/supervised_user_url_filter.h
+++ b/chrome/browser/supervised_user/supervised_user_url_filter.h
@@ -121,6 +121,10 @@
};
SupervisedUserURLFilter();
+
+ SupervisedUserURLFilter(const SupervisedUserURLFilter&) = delete;
+ SupervisedUserURLFilter& operator=(const SupervisedUserURLFilter&) = delete;
+
~SupervisedUserURLFilter();
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -292,8 +296,6 @@
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
base::WeakPtrFactory<SupervisedUserURLFilter> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SupervisedUserURLFilter);
};
#endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_URL_FILTER_H_
diff --git a/chrome/browser/sync/chrome_sync_client.h b/chrome/browser/sync/chrome_sync_client.h
index 9866cdc..2f8d6de8 100644
--- a/chrome/browser/sync/chrome_sync_client.h
+++ b/chrome/browser/sync/chrome_sync_client.h
@@ -39,6 +39,10 @@
class ChromeSyncClient : public browser_sync::BrowserSyncClient {
public:
explicit ChromeSyncClient(Profile* profile);
+
+ ChromeSyncClient(const ChromeSyncClient&) = delete;
+ ChromeSyncClient& operator=(const ChromeSyncClient&) = delete;
+
~ChromeSyncClient() override;
// BrowserSyncClient implementation.
@@ -108,8 +112,6 @@
// Generates and monitors the ExtensionsActivity object used by sync.
ExtensionsActivityMonitor extensions_activity_monitor_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeSyncClient);
};
} // namespace browser_sync
diff --git a/chrome/browser/sync/device_info_sync_client_impl.h b/chrome/browser/sync/device_info_sync_client_impl.h
index 0915929..03eb897 100644
--- a/chrome/browser/sync/device_info_sync_client_impl.h
+++ b/chrome/browser/sync/device_info_sync_client_impl.h
@@ -18,6 +18,9 @@
public:
explicit DeviceInfoSyncClientImpl(Profile* profile);
+ DeviceInfoSyncClientImpl(const DeviceInfoSyncClientImpl&) = delete;
+ DeviceInfoSyncClientImpl& operator=(const DeviceInfoSyncClientImpl&) = delete;
+
~DeviceInfoSyncClientImpl() override;
// syncer::DeviceInfoSyncClient:
@@ -45,8 +48,6 @@
private:
Profile* const profile_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceInfoSyncClientImpl);
};
} // namespace browser_sync
diff --git a/chrome/browser/sync/glue/extension_model_type_controller.h b/chrome/browser/sync/glue/extension_model_type_controller.h
index 98c7fe4..35f6ebc 100644
--- a/chrome/browser/sync/glue/extension_model_type_controller.h
+++ b/chrome/browser/sync/glue/extension_model_type_controller.h
@@ -24,6 +24,11 @@
base::WeakPtr<syncer::SyncableService> syncable_service,
const base::RepeatingClosure& dump_stack,
Profile* profile);
+
+ ExtensionModelTypeController(const ExtensionModelTypeController&) = delete;
+ ExtensionModelTypeController& operator=(const ExtensionModelTypeController&) =
+ delete;
+
~ExtensionModelTypeController() override;
// DataTypeController overrides.
@@ -32,8 +37,6 @@
private:
Profile* const profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionModelTypeController);
};
} // namespace browser_sync
diff --git a/chrome/browser/sync/glue/extension_setting_model_type_controller.h b/chrome/browser/sync/glue/extension_setting_model_type_controller.h
index 47ef250..9022ec1 100644
--- a/chrome/browser/sync/glue/extension_setting_model_type_controller.h
+++ b/chrome/browser/sync/glue/extension_setting_model_type_controller.h
@@ -28,6 +28,12 @@
SyncableServiceProvider syncable_service_provider,
const base::RepeatingClosure& dump_stack,
Profile* profile);
+
+ ExtensionSettingModelTypeController(
+ const ExtensionSettingModelTypeController&) = delete;
+ ExtensionSettingModelTypeController& operator=(
+ const ExtensionSettingModelTypeController&) = delete;
+
~ExtensionSettingModelTypeController() override;
// DataTypeController overrides.
@@ -36,8 +42,6 @@
private:
Profile* const profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionSettingModelTypeController);
};
} // namespace browser_sync
diff --git a/chrome/browser/sync/glue/extensions_activity_monitor.h b/chrome/browser/sync/glue/extensions_activity_monitor.h
index e72128ea8..41fa6dc 100644
--- a/chrome/browser/sync/glue/extensions_activity_monitor.h
+++ b/chrome/browser/sync/glue/extensions_activity_monitor.h
@@ -21,6 +21,11 @@
class ExtensionsActivityMonitor : public content::NotificationObserver {
public:
ExtensionsActivityMonitor();
+
+ ExtensionsActivityMonitor(const ExtensionsActivityMonitor&) = delete;
+ ExtensionsActivityMonitor& operator=(const ExtensionsActivityMonitor&) =
+ delete;
+
~ExtensionsActivityMonitor() override;
// content::NotificationObserver implementation.
@@ -37,8 +42,6 @@
// Used only on UI loop.
content::NotificationRegistrar registrar_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionsActivityMonitor);
};
} // namespace browser_sync
diff --git a/chrome/browser/sync/glue/synced_tab_delegate_android.h b/chrome/browser/sync/glue/synced_tab_delegate_android.h
index b4a480e..1955ab8 100644
--- a/chrome/browser/sync/glue/synced_tab_delegate_android.h
+++ b/chrome/browser/sync/glue/synced_tab_delegate_android.h
@@ -23,6 +23,10 @@
class SyncedTabDelegateAndroid : public TabContentsSyncedTabDelegate {
public:
explicit SyncedTabDelegateAndroid(TabAndroid* owning_tab_);
+
+ SyncedTabDelegateAndroid(const SyncedTabDelegateAndroid&) = delete;
+ SyncedTabDelegateAndroid& operator=(const SyncedTabDelegateAndroid&) = delete;
+
~SyncedTabDelegateAndroid() override;
// SyncedTabDelegate:
@@ -38,8 +42,6 @@
private:
TabAndroid* tab_android_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncedTabDelegateAndroid);
};
} // namespace browser_sync
diff --git a/chrome/browser/sync/glue/synced_window_delegate_android.h b/chrome/browser/sync/glue/synced_window_delegate_android.h
index dbe2830f..5937e87 100644
--- a/chrome/browser/sync/glue/synced_window_delegate_android.h
+++ b/chrome/browser/sync/glue/synced_window_delegate_android.h
@@ -21,6 +21,11 @@
class SyncedWindowDelegateAndroid : public sync_sessions::SyncedWindowDelegate {
public:
SyncedWindowDelegateAndroid(TabModel* tab_model, bool is_tabbed_activity);
+
+ SyncedWindowDelegateAndroid(const SyncedWindowDelegateAndroid&) = delete;
+ SyncedWindowDelegateAndroid& operator=(const SyncedWindowDelegateAndroid&) =
+ delete;
+
~SyncedWindowDelegateAndroid() override;
// sync_sessions::SyncedWindowDelegate implementation.
@@ -39,8 +44,6 @@
private:
TabModel* tab_model_;
const bool is_tabbed_activity_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(SyncedWindowDelegateAndroid);
};
} // namespace browser_sync
diff --git a/chrome/browser/sync/glue/synced_window_delegates_getter_android.h b/chrome/browser/sync/glue/synced_window_delegates_getter_android.h
index 24fac258..883ce87 100644
--- a/chrome/browser/sync/glue/synced_window_delegates_getter_android.h
+++ b/chrome/browser/sync/glue/synced_window_delegates_getter_android.h
@@ -19,14 +19,17 @@
: public sync_sessions::SyncedWindowDelegatesGetter {
public:
SyncedWindowDelegatesGetterAndroid();
+
+ SyncedWindowDelegatesGetterAndroid(
+ const SyncedWindowDelegatesGetterAndroid&) = delete;
+ SyncedWindowDelegatesGetterAndroid& operator=(
+ const SyncedWindowDelegatesGetterAndroid&) = delete;
+
~SyncedWindowDelegatesGetterAndroid() override;
// SyncedWindowDelegatesGetter implementation
SyncedWindowDelegateMap GetSyncedWindowDelegates() override;
const sync_sessions::SyncedWindowDelegate* FindById(SessionID id) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SyncedWindowDelegatesGetterAndroid);
};
} // namespace browser_sync
diff --git a/chrome/browser/sync/session_sync_service_factory.cc b/chrome/browser/sync/session_sync_service_factory.cc
index 7cd8bfd..03bd4f9 100644
--- a/chrome/browser/sync/session_sync_service_factory.cc
+++ b/chrome/browser/sync/session_sync_service_factory.cc
@@ -61,6 +61,9 @@
#endif // defined(OS_ANDROID)
}
+ SyncSessionsClientImpl(const SyncSessionsClientImpl&) = delete;
+ SyncSessionsClientImpl& operator=(const SyncSessionsClientImpl&) = delete;
+
~SyncSessionsClientImpl() override {}
// SyncSessionsClient implementation.
@@ -117,8 +120,6 @@
std::unique_ptr<sync_sessions::SyncedWindowDelegatesGetter>
window_delegates_getter_;
sync_sessions::SessionSyncPrefs session_sync_prefs_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncSessionsClientImpl);
};
} // namespace
diff --git a/chrome/browser/sync/sessions/browser_list_router_helper.h b/chrome/browser/sync/sessions/browser_list_router_helper.h
index 2d38e4c..69ec867623 100644
--- a/chrome/browser/sync/sessions/browser_list_router_helper.h
+++ b/chrome/browser/sync/sessions/browser_list_router_helper.h
@@ -22,6 +22,10 @@
public:
explicit BrowserListRouterHelper(SyncSessionsWebContentsRouter* router,
Profile* profile);
+
+ BrowserListRouterHelper(const BrowserListRouterHelper&) = delete;
+ BrowserListRouterHelper& operator=(const BrowserListRouterHelper&) = delete;
+
~BrowserListRouterHelper() override;
private:
@@ -40,8 +44,6 @@
Profile* profile_;
std::set<Browser*> attached_browsers_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserListRouterHelper);
};
} // namespace sync_sessions
diff --git a/chrome/browser/sync/sessions/sync_sessions_router_tab_helper.h b/chrome/browser/sync/sessions/sync_sessions_router_tab_helper.h
index be95950..7eab38e0 100644
--- a/chrome/browser/sync/sessions/sync_sessions_router_tab_helper.h
+++ b/chrome/browser/sync/sessions/sync_sessions_router_tab_helper.h
@@ -32,6 +32,10 @@
public translate::TranslateDriver::LanguageDetectionObserver,
public favicon::FaviconDriverObserver {
public:
+ SyncSessionsRouterTabHelper(const SyncSessionsRouterTabHelper&) = delete;
+ SyncSessionsRouterTabHelper& operator=(const SyncSessionsRouterTabHelper&) =
+ delete;
+
~SyncSessionsRouterTabHelper() override;
// WebContentsObserver implementation.
@@ -78,8 +82,6 @@
favicon::FaviconDriver* favicon_driver_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(SyncSessionsRouterTabHelper);
};
} // namespace sync_sessions
diff --git a/chrome/browser/sync/sync_encryption_keys_tab_helper.h b/chrome/browser/sync/sync_encryption_keys_tab_helper.h
index 93a6f75..f9d8d92f 100644
--- a/chrome/browser/sync/sync_encryption_keys_tab_helper.h
+++ b/chrome/browser/sync/sync_encryption_keys_tab_helper.h
@@ -33,6 +33,10 @@
chrome::mojom::SyncEncryptionKeysExtension> receiver,
content::RenderFrameHost* rfh);
+ SyncEncryptionKeysTabHelper(const SyncEncryptionKeysTabHelper&) = delete;
+ SyncEncryptionKeysTabHelper& operator=(const SyncEncryptionKeysTabHelper&) =
+ delete;
+
~SyncEncryptionKeysTabHelper() override;
// content::WebContentsObserver:
@@ -56,8 +60,6 @@
std::unique_ptr<EncryptionKeyApi> encryption_key_api_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(SyncEncryptionKeysTabHelper);
};
#endif // CHROME_BROWSER_SYNC_SYNC_ENCRYPTION_KEYS_TAB_HELPER_H_
diff --git a/chrome/browser/sync/sync_error_infobar_delegate_android.h b/chrome/browser/sync/sync_error_infobar_delegate_android.h
index ea4a8be..313caf1 100644
--- a/chrome/browser/sync/sync_error_infobar_delegate_android.h
+++ b/chrome/browser/sync/sync_error_infobar_delegate_android.h
@@ -11,6 +11,12 @@
class SyncErrorInfoBarDelegateAndroid : public ConfirmInfoBarDelegate {
public:
SyncErrorInfoBarDelegateAndroid();
+
+ SyncErrorInfoBarDelegateAndroid(const SyncErrorInfoBarDelegateAndroid&) =
+ delete;
+ SyncErrorInfoBarDelegateAndroid& operator=(
+ const SyncErrorInfoBarDelegateAndroid&) = delete;
+
~SyncErrorInfoBarDelegateAndroid() override;
// ConfirmInfoBarDelegate:
@@ -23,8 +29,6 @@
private:
base::android::ScopedJavaGlobalRef<jobject> java_delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncErrorInfoBarDelegateAndroid);
};
#endif // CHROME_BROWSER_SYNC_SYNC_ERROR_INFOBAR_DELEGATE_ANDROID_H_
diff --git a/chrome/browser/sync/sync_error_notifier_ash.h b/chrome/browser/sync/sync_error_notifier_ash.h
index 3fd9a1a..18c6990 100644
--- a/chrome/browser/sync/sync_error_notifier_ash.h
+++ b/chrome/browser/sync/sync_error_notifier_ash.h
@@ -18,6 +18,10 @@
public KeyedService {
public:
SyncErrorNotifier(syncer::SyncService* sync_service, Profile* profile);
+
+ SyncErrorNotifier(const SyncErrorNotifier&) = delete;
+ SyncErrorNotifier& operator=(const SyncErrorNotifier&) = delete;
+
~SyncErrorNotifier() override;
// KeyedService:
@@ -40,8 +44,6 @@
// Used to keep track of the message center notification.
std::string notification_id_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncErrorNotifier);
};
#endif // CHROME_BROWSER_SYNC_SYNC_ERROR_NOTIFIER_ASH_H_
diff --git a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
index 08538be..dcdf5a9 100644
--- a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
+++ b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
@@ -47,6 +47,10 @@
class SyncErrorNotifierTest : public BrowserWithTestWindowTest {
public:
SyncErrorNotifierTest() = default;
+
+ SyncErrorNotifierTest(const SyncErrorNotifierTest&) = delete;
+ SyncErrorNotifierTest& operator=(const SyncErrorNotifierTest&) = delete;
+
~SyncErrorNotifierTest() override = default;
void SetUp() override {
@@ -88,9 +92,6 @@
std::unique_ptr<NotificationDisplayServiceTester> display_service_;
user_manager::ScopedUserManager scoped_user_manager_{
std::make_unique<ash::MockUserManager>()};
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SyncErrorNotifierTest);
};
TEST_F(SyncErrorNotifierTest, NoNotificationWhenNoPassphrase) {
diff --git a/chrome/browser/sync/sync_startup_tracker.h b/chrome/browser/sync/sync_startup_tracker.h
index d89ed92..ce45d0e 100644
--- a/chrome/browser/sync/sync_startup_tracker.h
+++ b/chrome/browser/sync/sync_startup_tracker.h
@@ -27,6 +27,10 @@
};
SyncStartupTracker(syncer::SyncService* sync_service, Observer* observer);
+
+ SyncStartupTracker(const SyncStartupTracker&) = delete;
+ SyncStartupTracker& operator=(const SyncStartupTracker&) = delete;
+
~SyncStartupTracker() override;
enum SyncServiceState {
@@ -58,8 +62,6 @@
// Weak pointer to the observer to notify.
Observer* observer_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncStartupTracker);
};
#endif // CHROME_BROWSER_SYNC_SYNC_STARTUP_TRACKER_H_
diff --git a/chrome/browser/sync/test/integration/apps_helper.h b/chrome/browser/sync/test/integration/apps_helper.h
index 00d9a58..7ef391a 100644
--- a/chrome/browser/sync/test/integration/apps_helper.h
+++ b/chrome/browser/sync/test/integration/apps_helper.h
@@ -124,6 +124,10 @@
public extensions::InstallObserver {
public:
AppsMatchChecker();
+
+ AppsMatchChecker(const AppsMatchChecker&) = delete;
+ AppsMatchChecker& operator=(const AppsMatchChecker&) = delete;
+
~AppsMatchChecker() override;
// StatusChangeChecker implementation.
@@ -170,8 +174,6 @@
base::ScopedMultiSourceObservation<extensions::InstallTracker,
extensions::InstallObserver>
install_tracker_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AppsMatchChecker);
};
#endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc
index 1182505..1d154b5 100644
--- a/chrome/browser/sync/test/integration/bookmarks_helper.cc
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc
@@ -129,6 +129,10 @@
: model_(model), node_(node) {
model->AddObserver(this);
}
+
+ FaviconChangeObserver(const FaviconChangeObserver&) = delete;
+ FaviconChangeObserver& operator=(const FaviconChangeObserver&) = delete;
+
~FaviconChangeObserver() override { model_->RemoveObserver(this); }
void WaitForSetFavicon() {
DCHECK(!run_loop_.running());
@@ -172,7 +176,6 @@
BookmarkModel* model_;
const BookmarkNode* node_;
base::RunLoop run_loop_;
- DISALLOW_COPY_AND_ASSIGN(FaviconChangeObserver);
};
// Returns the number of nodes of node type |node_type| in |model| whose
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.h b/chrome/browser/sync/test/integration/bookmarks_helper.h
index c0bdf757..12aa5d8d 100644
--- a/chrome/browser/sync/test/integration/bookmarks_helper.h
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.h
@@ -501,14 +501,17 @@
bool IsExitConditionSatisfied(std::ostream* os) override;
+ ServerBookmarksEqualityChecker(const ServerBookmarksEqualityChecker&) =
+ delete;
+ ServerBookmarksEqualityChecker& operator=(
+ const ServerBookmarksEqualityChecker&) = delete;
+
~ServerBookmarksEqualityChecker() override;
private:
fake_server::FakeServer* fake_server_;
syncer::Cryptographer* cryptographer_;
const std::vector<ExpectedBookmark> expected_bookmarks_;
-
- DISALLOW_COPY_AND_ASSIGN(ServerBookmarksEqualityChecker);
};
// Checker used to block until the actual number of bookmarks with the given url
diff --git a/chrome/browser/sync/test/integration/configuration_refresher.h b/chrome/browser/sync/test/integration/configuration_refresher.h
index 1bd3265..6eda2d8 100644
--- a/chrome/browser/sync/test/integration/configuration_refresher.h
+++ b/chrome/browser/sync/test/integration/configuration_refresher.h
@@ -21,6 +21,10 @@
class ConfigurationRefresher : public syncer::SyncServiceObserver {
public:
ConfigurationRefresher();
+
+ ConfigurationRefresher(const ConfigurationRefresher&) = delete;
+ ConfigurationRefresher& operator=(const ConfigurationRefresher&) = delete;
+
~ConfigurationRefresher() override;
void Observe(syncer::SyncService* sync_service);
@@ -32,8 +36,6 @@
base::ScopedMultiSourceObservation<syncer::SyncService,
syncer::SyncServiceObserver>
scoped_observations_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ConfigurationRefresher);
};
#endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_CONFIGURATION_REFRESHER_H_
diff --git a/chrome/browser/sync/test/integration/dictionary_load_observer.h b/chrome/browser/sync/test/integration/dictionary_load_observer.h
index ca30498..889ebdd5 100644
--- a/chrome/browser/sync/test/integration/dictionary_load_observer.h
+++ b/chrome/browser/sync/test/integration/dictionary_load_observer.h
@@ -15,6 +15,10 @@
class DictionaryLoadObserver : public SpellcheckCustomDictionary::Observer {
public:
explicit DictionaryLoadObserver(base::OnceClosure quit_task);
+
+ DictionaryLoadObserver(const DictionaryLoadObserver&) = delete;
+ DictionaryLoadObserver& operator=(const DictionaryLoadObserver&) = delete;
+
virtual ~DictionaryLoadObserver();
// SpellcheckCustomDictionary::Observer implementation.
@@ -24,7 +28,6 @@
private:
base::OnceClosure quit_task_;
- DISALLOW_COPY_AND_ASSIGN(DictionaryLoadObserver);
};
#endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_DICTIONARY_LOAD_OBSERVER_H_
diff --git a/chrome/browser/sync/test/integration/enable_disable_test.cc b/chrome/browser/sync/test/integration/enable_disable_test.cc
index 1f510be..40b1908 100644
--- a/chrome/browser/sync/test/integration/enable_disable_test.cc
+++ b/chrome/browser/sync/test/integration/enable_disable_test.cc
@@ -67,6 +67,11 @@
class EnableDisableSingleClientTest : public SyncTest {
public:
EnableDisableSingleClientTest() : SyncTest(SINGLE_CLIENT) {}
+
+ EnableDisableSingleClientTest(const EnableDisableSingleClientTest&) = delete;
+ EnableDisableSingleClientTest& operator=(
+ const EnableDisableSingleClientTest&) = delete;
+
~EnableDisableSingleClientTest() override = default;
// Don't use self-notifications as they can trigger additional sync cycles.
@@ -123,8 +128,6 @@
private:
fake_server::EntityBuilderFactory entity_builder_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(EnableDisableSingleClientTest);
};
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
diff --git a/chrome/browser/sync/test/integration/extensions_helper.h b/chrome/browser/sync/test/integration/extensions_helper.h
index 4427efa..d46bc47 100644
--- a/chrome/browser/sync/test/integration/extensions_helper.h
+++ b/chrome/browser/sync/test/integration/extensions_helper.h
@@ -92,6 +92,10 @@
public content::NotificationObserver {
public:
ExtensionsMatchChecker();
+
+ ExtensionsMatchChecker(const ExtensionsMatchChecker&) = delete;
+ ExtensionsMatchChecker& operator=(const ExtensionsMatchChecker&) = delete;
+
~ExtensionsMatchChecker() override;
// StatusChangeChecker implementation.
@@ -120,8 +124,6 @@
std::vector<std::unique_ptr<SyncedExtensionInstaller>>
synced_extension_installers_;
content::NotificationRegistrar registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionsMatchChecker);
};
#endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_EXTENSIONS_HELPER_H_
diff --git a/chrome/browser/sync/test/integration/feature_toggler.h b/chrome/browser/sync/test/integration/feature_toggler.h
index 5110f04..21a1b2af 100644
--- a/chrome/browser/sync/test/integration/feature_toggler.h
+++ b/chrome/browser/sync/test/integration/feature_toggler.h
@@ -17,12 +17,13 @@
public:
explicit FeatureToggler(const base::Feature& feature);
+ FeatureToggler(const FeatureToggler&) = delete;
+ FeatureToggler& operator=(const FeatureToggler&) = delete;
+
~FeatureToggler();
private:
base::test::ScopedFeatureList override_features_;
-
- DISALLOW_COPY_AND_ASSIGN(FeatureToggler);
};
#endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_FEATURE_TOGGLER_H_
diff --git a/chrome/browser/sync/test/integration/migration_test.cc b/chrome/browser/sync/test/integration/migration_test.cc
index e34ad385..b052ad3 100644
--- a/chrome/browser/sync/test/integration/migration_test.cc
+++ b/chrome/browser/sync/test/integration/migration_test.cc
@@ -72,6 +72,10 @@
class MigrationTest : public SyncTest {
public:
explicit MigrationTest(TestType test_type) : SyncTest(test_type) {}
+
+ MigrationTest(const MigrationTest&) = delete;
+ MigrationTest& operator=(const MigrationTest&) = delete;
+
~MigrationTest() override {}
enum TriggerMethod { MODIFY_PREF, MODIFY_BOOKMARK, TRIGGER_REFRESH };
@@ -202,13 +206,16 @@
private:
// Used to keep track of the migration progress for each sync client.
std::vector<std::unique_ptr<MigrationWatcher>> migration_watchers_;
-
- DISALLOW_COPY_AND_ASSIGN(MigrationTest);
};
class MigrationSingleClientTest : public MigrationTest {
public:
MigrationSingleClientTest() : MigrationTest(SINGLE_CLIENT) {}
+
+ MigrationSingleClientTest(const MigrationSingleClientTest&) = delete;
+ MigrationSingleClientTest& operator=(const MigrationSingleClientTest&) =
+ delete;
+
~MigrationSingleClientTest() override {}
void RunSingleClientMigrationTest(const MigrationList& migration_list,
@@ -216,9 +223,6 @@
ASSERT_TRUE(SetupSync());
RunMigrationTest(migration_list, trigger_method);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MigrationSingleClientTest);
};
// The simplest possible migration tests -- a single data type.
@@ -314,6 +318,10 @@
class MigrationTwoClientTest : public MigrationTest {
public:
MigrationTwoClientTest() : MigrationTest(TWO_CLIENT) {}
+
+ MigrationTwoClientTest(const MigrationTwoClientTest&) = delete;
+ MigrationTwoClientTest& operator=(const MigrationTwoClientTest&) = delete;
+
~MigrationTwoClientTest() override = default;
// Helper function that verifies that preferences sync still works.
@@ -336,9 +344,6 @@
// test.
VerifyPrefSync();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MigrationTwoClientTest);
};
// Easiest possible test of migration errors: triggers a server
@@ -387,10 +392,10 @@
// Do not add optional datatypes.
}
- ~MigrationReconfigureTest() override {}
+ MigrationReconfigureTest(const MigrationReconfigureTest&) = delete;
+ MigrationReconfigureTest& operator=(const MigrationReconfigureTest&) = delete;
- private:
- DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest);
+ ~MigrationReconfigureTest() override {}
};
} // namespace
diff --git a/chrome/browser/sync/test/integration/migration_waiter.h b/chrome/browser/sync/test/integration/migration_waiter.h
index 0b9a0b1..69f8309f 100644
--- a/chrome/browser/sync/test/integration/migration_waiter.h
+++ b/chrome/browser/sync/test/integration/migration_waiter.h
@@ -22,6 +22,9 @@
MigrationWaiter(syncer::ModelTypeSet expected_types,
MigrationWatcher* watcher);
+ MigrationWaiter(const MigrationWaiter&) = delete;
+ MigrationWaiter& operator=(const MigrationWaiter&) = delete;
+
~MigrationWaiter() override;
// StatusChangeChecker implementation .
@@ -36,8 +39,6 @@
// The set of data types that are expected to eventually undergo migration.
const syncer::ModelTypeSet expected_types_;
-
- DISALLOW_COPY_AND_ASSIGN(MigrationWaiter);
};
#endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_MIGRATION_WAITER_H_
diff --git a/chrome/browser/sync/test/integration/migration_watcher.h b/chrome/browser/sync/test/integration/migration_watcher.h
index cd18ce0..cd36e4c 100644
--- a/chrome/browser/sync/test/integration/migration_watcher.h
+++ b/chrome/browser/sync/test/integration/migration_watcher.h
@@ -16,6 +16,10 @@
class MigrationWatcher : public syncer::MigrationObserver {
public:
explicit MigrationWatcher(SyncServiceImplHarness* harness);
+
+ MigrationWatcher(const MigrationWatcher&) = delete;
+ MigrationWatcher& operator=(const MigrationWatcher&) = delete;
+
~MigrationWatcher() override;
// Returns true if the observed profile has a migration in progress.
@@ -46,8 +50,6 @@
// The MigrationWatier that is waiting for this migration to complete.
MigrationWaiter* migration_waiter_;
-
- DISALLOW_COPY_AND_ASSIGN(MigrationWatcher);
};
#endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_MIGRATION_WATCHER_H_
diff --git a/chrome/browser/sync/test/integration/multi_client_status_change_checker.h b/chrome/browser/sync/test/integration/multi_client_status_change_checker.h
index 6576287..6bc86d29 100644
--- a/chrome/browser/sync/test/integration/multi_client_status_change_checker.h
+++ b/chrome/browser/sync/test/integration/multi_client_status_change_checker.h
@@ -21,6 +21,12 @@
public:
explicit MultiClientStatusChangeChecker(
std::vector<syncer::SyncServiceImpl*> services);
+
+ MultiClientStatusChangeChecker(const MultiClientStatusChangeChecker&) =
+ delete;
+ MultiClientStatusChangeChecker& operator=(
+ const MultiClientStatusChangeChecker&) = delete;
+
~MultiClientStatusChangeChecker() override;
protected:
@@ -38,8 +44,6 @@
base::ScopedMultiSourceObservation<syncer::SyncService,
syncer::SyncServiceObserver>
scoped_observations_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MultiClientStatusChangeChecker);
};
#endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_MULTI_CLIENT_STATUS_CHANGE_CHECKER_H_
diff --git a/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc
index 8f4c39445..7501371b 100644
--- a/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc
+++ b/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc
@@ -33,10 +33,11 @@
class DictionarySyncPerfTest : public SyncTest {
public:
DictionarySyncPerfTest() : SyncTest(TWO_CLIENT) {}
- ~DictionarySyncPerfTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(DictionarySyncPerfTest);
+ DictionarySyncPerfTest(const DictionarySyncPerfTest&) = delete;
+ DictionarySyncPerfTest& operator=(const DictionarySyncPerfTest&) = delete;
+
+ ~DictionarySyncPerfTest() override = default;
};
IN_PROC_BROWSER_TEST_F(DictionarySyncPerfTest, P0) {
diff --git a/chrome/browser/sync/test/integration/printers_helper.h b/chrome/browser/sync/test/integration/printers_helper.h
index 31f2226..c4b833c5 100644
--- a/chrome/browser/sync/test/integration/printers_helper.h
+++ b/chrome/browser/sync/test/integration/printers_helper.h
@@ -76,10 +76,11 @@
class PrintersMatchChecker : public AwaitMatchStatusChangeChecker {
public:
PrintersMatchChecker();
- ~PrintersMatchChecker() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(PrintersMatchChecker);
+ PrintersMatchChecker(const PrintersMatchChecker&) = delete;
+ PrintersMatchChecker& operator=(const PrintersMatchChecker&) = delete;
+
+ ~PrintersMatchChecker() override;
};
} // namespace printers_helper
diff --git a/chrome/browser/sync/test/integration/quiesce_status_change_checker.h b/chrome/browser/sync/test/integration/quiesce_status_change_checker.h
index 31bc1bb..db1f212 100644
--- a/chrome/browser/sync/test/integration/quiesce_status_change_checker.h
+++ b/chrome/browser/sync/test/integration/quiesce_status_change_checker.h
@@ -26,6 +26,11 @@
public:
explicit QuiesceStatusChangeChecker(
std::vector<syncer::SyncServiceImpl*> services);
+
+ QuiesceStatusChangeChecker(const QuiesceStatusChangeChecker&) = delete;
+ QuiesceStatusChangeChecker& operator=(const QuiesceStatusChangeChecker&) =
+ delete;
+
~QuiesceStatusChangeChecker() override;
// Implementation of StatusChangeChecker.
@@ -34,8 +39,6 @@
private:
class NestedUpdatedProgressMarkerChecker;
std::vector<std::unique_ptr<NestedUpdatedProgressMarkerChecker>> checkers_;
-
- DISALLOW_COPY_AND_ASSIGN(QuiesceStatusChangeChecker);
};
#endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_QUIESCE_STATUS_CHANGE_CHECKER_H_
diff --git a/chrome/browser/sync/test/integration/retry_verifier.h b/chrome/browser/sync/test/integration/retry_verifier.h
index 65623558..b81503e 100644
--- a/chrome/browser/sync/test/integration/retry_verifier.h
+++ b/chrome/browser/sync/test/integration/retry_verifier.h
@@ -27,6 +27,10 @@
public:
static const int kMaxRetry = 3;
RetryVerifier();
+
+ RetryVerifier(const RetryVerifier&) = delete;
+ RetryVerifier& operator=(const RetryVerifier&) = delete;
+
~RetryVerifier();
int retry_count() const { return retry_count_; }
@@ -43,7 +47,6 @@
DelayInfo delay_table_[kMaxRetry];
bool success_;
bool done_;
- DISALLOW_COPY_AND_ASSIGN(RetryVerifier);
};
#endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_RETRY_VERIFIER_H_
diff --git a/chrome/browser/sync/test/integration/send_tab_to_self_helper.h b/chrome/browser/sync/test/integration/send_tab_to_self_helper.h
index 2a24304..a9b6e7b 100644
--- a/chrome/browser/sync/test/integration/send_tab_to_self_helper.h
+++ b/chrome/browser/sync/test/integration/send_tab_to_self_helper.h
@@ -30,6 +30,10 @@
// object.
SendTabToSelfUrlChecker(send_tab_to_self::SendTabToSelfSyncService* service,
const GURL& url);
+
+ SendTabToSelfUrlChecker(const SendTabToSelfUrlChecker&) = delete;
+ SendTabToSelfUrlChecker& operator=(const SendTabToSelfUrlChecker&) = delete;
+
~SendTabToSelfUrlChecker() override;
// StatusChangeChecker implementation.
@@ -46,8 +50,6 @@
private:
const GURL url_;
send_tab_to_self::SendTabToSelfSyncService* const service_;
-
- DISALLOW_COPY_AND_ASSIGN(SendTabToSelfUrlChecker);
};
// Class that allows waiting until a particular |url| is marked opened by the
@@ -61,6 +63,11 @@
SendTabToSelfUrlOpenedChecker(
send_tab_to_self::SendTabToSelfSyncService* service,
const GURL& url);
+
+ SendTabToSelfUrlOpenedChecker(const SendTabToSelfUrlOpenedChecker&) = delete;
+ SendTabToSelfUrlOpenedChecker& operator=(
+ const SendTabToSelfUrlOpenedChecker&) = delete;
+
~SendTabToSelfUrlOpenedChecker() override;
// StatusChangeChecker implementation.
@@ -80,8 +87,6 @@
private:
const GURL url_;
send_tab_to_self::SendTabToSelfSyncService* const service_;
-
- DISALLOW_COPY_AND_ASSIGN(SendTabToSelfUrlOpenedChecker);
};
// Class that allows waiting the number of entries in until |service0|
@@ -95,6 +100,12 @@
SendTabToSelfModelEqualityChecker(
send_tab_to_self::SendTabToSelfSyncService* service0,
send_tab_to_self::SendTabToSelfSyncService* service1);
+
+ SendTabToSelfModelEqualityChecker(const SendTabToSelfModelEqualityChecker&) =
+ delete;
+ SendTabToSelfModelEqualityChecker& operator=(
+ const SendTabToSelfModelEqualityChecker&) = delete;
+
~SendTabToSelfModelEqualityChecker() override;
// StatusChangeChecker implementation.
@@ -111,8 +122,6 @@
private:
send_tab_to_self::SendTabToSelfSyncService* const service0_;
send_tab_to_self::SendTabToSelfSyncService* const service1_;
-
- DISALLOW_COPY_AND_ASSIGN(SendTabToSelfModelEqualityChecker);
};
// Class that allows waiting until the bridge is ready.
@@ -124,6 +133,11 @@
// object.
explicit SendTabToSelfActiveChecker(
send_tab_to_self::SendTabToSelfSyncService* service);
+
+ SendTabToSelfActiveChecker(const SendTabToSelfActiveChecker&) = delete;
+ SendTabToSelfActiveChecker& operator=(const SendTabToSelfActiveChecker&) =
+ delete;
+
~SendTabToSelfActiveChecker() override;
// StatusChangeChecker implementation.
@@ -139,7 +153,6 @@
private:
send_tab_to_self::SendTabToSelfSyncService* const service_;
- DISALLOW_COPY_AND_ASSIGN(SendTabToSelfActiveChecker);
};
// Class that allows waiting until two devices are ready.
@@ -149,6 +162,12 @@
public:
explicit SendTabToSelfMultiDeviceActiveChecker(
syncer::DeviceInfoTracker* tracker);
+
+ SendTabToSelfMultiDeviceActiveChecker(
+ const SendTabToSelfMultiDeviceActiveChecker&) = delete;
+ SendTabToSelfMultiDeviceActiveChecker& operator=(
+ const SendTabToSelfMultiDeviceActiveChecker&) = delete;
+
~SendTabToSelfMultiDeviceActiveChecker() override;
// StatusChangeChecker implementation.
@@ -159,7 +178,6 @@
private:
syncer::DeviceInfoTracker* const tracker_;
- DISALLOW_COPY_AND_ASSIGN(SendTabToSelfMultiDeviceActiveChecker);
};
// Class that allows waiting until device has send_tab_to_self disabled.
@@ -191,6 +209,12 @@
SendTabToSelfUrlDeletedChecker(
send_tab_to_self::SendTabToSelfSyncService* service,
const GURL& url);
+
+ SendTabToSelfUrlDeletedChecker(const SendTabToSelfUrlDeletedChecker&) =
+ delete;
+ SendTabToSelfUrlDeletedChecker& operator=(
+ const SendTabToSelfUrlDeletedChecker&) = delete;
+
~SendTabToSelfUrlDeletedChecker() override;
// StatusChangeChecker implementation.
@@ -207,8 +231,6 @@
private:
const GURL url_;
send_tab_to_self::SendTabToSelfSyncService* const service_;
-
- DISALLOW_COPY_AND_ASSIGN(SendTabToSelfUrlDeletedChecker);
};
} // namespace send_tab_to_self_helper
diff --git a/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc
index 191889a..048781d 100644
--- a/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc
@@ -78,6 +78,9 @@
service_->AddObserverAndStart(this);
}
+ AppListSyncUpdateWaiter(const AppListSyncUpdateWaiter&) = delete;
+ AppListSyncUpdateWaiter& operator=(const AppListSyncUpdateWaiter&) = delete;
+
~AppListSyncUpdateWaiter() override {
service_->RemoveObserver(this);
}
@@ -97,8 +100,6 @@
private:
app_list::AppListSyncableService* const service_;
bool service_updated_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(AppListSyncUpdateWaiter);
};
} // namespace
diff --git a/chrome/browser/sync/test/integration/single_client_autofill_profile_sync_test.cc b/chrome/browser/sync/test/integration/single_client_autofill_profile_sync_test.cc
index a87189c9..865f4cf7 100644
--- a/chrome/browser/sync/test/integration/single_client_autofill_profile_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_autofill_profile_sync_test.cc
@@ -40,10 +40,13 @@
class SingleClientAutofillProfileSyncTest : public SyncTest {
public:
SingleClientAutofillProfileSyncTest() : SyncTest(SINGLE_CLIENT) {}
- ~SingleClientAutofillProfileSyncTest() override {}
- private:
- DISALLOW_COPY_AND_ASSIGN(SingleClientAutofillProfileSyncTest);
+ SingleClientAutofillProfileSyncTest(
+ const SingleClientAutofillProfileSyncTest&) = delete;
+ SingleClientAutofillProfileSyncTest& operator=(
+ const SingleClientAutofillProfileSyncTest&) = delete;
+
+ ~SingleClientAutofillProfileSyncTest() override {}
};
IN_PROC_BROWSER_TEST_F(SingleClientAutofillProfileSyncTest,
diff --git a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
index 3c98a88..d5a4d8a6 100644
--- a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
@@ -100,10 +100,12 @@
class SingleClientBookmarksSyncTest : public SyncTest {
public:
SingleClientBookmarksSyncTest() : SyncTest(SINGLE_CLIENT) {}
- ~SingleClientBookmarksSyncTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(SingleClientBookmarksSyncTest);
+ SingleClientBookmarksSyncTest(const SingleClientBookmarksSyncTest&) = delete;
+ SingleClientBookmarksSyncTest& operator=(
+ const SingleClientBookmarksSyncTest&) = delete;
+
+ ~SingleClientBookmarksSyncTest() override = default;
};
class SingleClientBookmarksSyncTestWithEnabledReuploadBookmarks
diff --git a/chrome/browser/sync/test/integration/single_client_custom_passphrase_sync_test.cc b/chrome/browser/sync/test/integration/single_client_custom_passphrase_sync_test.cc
index e24663e..ff151bd 100644
--- a/chrome/browser/sync/test/integration/single_client_custom_passphrase_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_custom_passphrase_sync_test.cc
@@ -92,6 +92,12 @@
class SingleClientCustomPassphraseSyncTest : public SyncTest {
public:
SingleClientCustomPassphraseSyncTest() : SyncTest(SINGLE_CLIENT) {}
+
+ SingleClientCustomPassphraseSyncTest(
+ const SingleClientCustomPassphraseSyncTest&) = delete;
+ SingleClientCustomPassphraseSyncTest& operator=(
+ const SingleClientCustomPassphraseSyncTest&) = delete;
+
~SingleClientCustomPassphraseSyncTest() override {}
// Waits until the given set of bookmarks appears on the server, encrypted
@@ -176,9 +182,6 @@
server_entity->GetSpecifics().bookmark(), key_params));
GetFakeServer()->InjectEntity(std::move(server_entity));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SingleClientCustomPassphraseSyncTest);
};
class SingleClientCustomPassphraseDoNotUseScryptSyncTest
diff --git a/chrome/browser/sync/test/integration/single_client_device_info_sync_test.cc b/chrome/browser/sync/test/integration/single_client_device_info_sync_test.cc
index e658558..7073a49 100644
--- a/chrome/browser/sync/test/integration/single_client_device_info_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_device_info_sync_test.cc
@@ -115,6 +115,11 @@
public:
SingleClientDeviceInfoSyncTest() : SyncTest(SINGLE_CLIENT) {}
+ SingleClientDeviceInfoSyncTest(const SingleClientDeviceInfoSyncTest&) =
+ delete;
+ SingleClientDeviceInfoSyncTest& operator=(
+ const SingleClientDeviceInfoSyncTest&) = delete;
+
~SingleClientDeviceInfoSyncTest() override = default;
std::string GetLocalCacheGuid() {
@@ -145,9 +150,6 @@
specifics,
/*creation_time=*/0, /*last_modified_time=*/0));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SingleClientDeviceInfoSyncTest);
};
#if BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/sync/test/integration/single_client_extension_apps_sync_test.cc b/chrome/browser/sync/test/integration/single_client_extension_apps_sync_test.cc
index 2b58122..f5c1adcc 100644
--- a/chrome/browser/sync/test/integration/single_client_extension_apps_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_extension_apps_sync_test.cc
@@ -123,10 +123,13 @@
public:
SingleClientExtensionAppsOsSyncTest()
: SyncConsentOptionalSyncTest(SINGLE_CLIENT) {}
- ~SingleClientExtensionAppsOsSyncTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(SingleClientExtensionAppsOsSyncTest);
+ SingleClientExtensionAppsOsSyncTest(
+ const SingleClientExtensionAppsOsSyncTest&) = delete;
+ SingleClientExtensionAppsOsSyncTest& operator=(
+ const SingleClientExtensionAppsOsSyncTest&) = delete;
+
+ ~SingleClientExtensionAppsOsSyncTest() override = default;
};
IN_PROC_BROWSER_TEST_F(SingleClientExtensionAppsOsSyncTest,
diff --git a/chrome/browser/sync/test/integration/single_client_history_delete_directives_sync_test.cc b/chrome/browser/sync/test/integration/single_client_history_delete_directives_sync_test.cc
index a7c54a9..bfa14d5 100644
--- a/chrome/browser/sync/test/integration/single_client_history_delete_directives_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_history_delete_directives_sync_test.cc
@@ -71,6 +71,11 @@
public:
SingleClientHistoryDeleteDirectivesSyncTest() : SyncTest(SINGLE_CLIENT) {}
+ SingleClientHistoryDeleteDirectivesSyncTest(
+ const SingleClientHistoryDeleteDirectivesSyncTest&) = delete;
+ SingleClientHistoryDeleteDirectivesSyncTest& operator=(
+ const SingleClientHistoryDeleteDirectivesSyncTest&) = delete;
+
~SingleClientHistoryDeleteDirectivesSyncTest() override {}
bool WaitForHistoryDeleteDirectives(size_t num_expected_directives) {
@@ -100,9 +105,6 @@
loop.Run();
return exists;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SingleClientHistoryDeleteDirectivesSyncTest);
};
IN_PROC_BROWSER_TEST_F(SingleClientHistoryDeleteDirectivesSyncTest,
diff --git a/chrome/browser/sync/test/integration/single_client_nigori_sync_test.cc b/chrome/browser/sync/test/integration/single_client_nigori_sync_test.cc
index b016a1e3..c4b28b9 100644
--- a/chrome/browser/sync/test/integration/single_client_nigori_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_nigori_sync_test.cc
@@ -147,6 +147,9 @@
DCHECK(web_contents);
}
+ TabClosedChecker(const TabClosedChecker&) = delete;
+ TabClosedChecker& operator=(const TabClosedChecker&) = delete;
+
~TabClosedChecker() override = default;
// StatusChangeChecker overrides.
@@ -163,8 +166,6 @@
private:
bool closed_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(TabClosedChecker);
};
// Used to wait until a page's title changes to a certain value (useful to
@@ -179,6 +180,9 @@
DCHECK(web_contents);
}
+ PageTitleChecker(const PageTitleChecker&) = delete;
+ PageTitleChecker& operator=(const PageTitleChecker&) = delete;
+
~PageTitleChecker() override = default;
// StatusChangeChecker overrides.
@@ -197,8 +201,6 @@
private:
const std::u16string expected_title_;
-
- DISALLOW_COPY_AND_ASSIGN(PageTitleChecker);
};
// Used to wait until IsTrustedVaultKeyRequiredForPreferredDataTypes() returns
@@ -294,21 +296,29 @@
class SingleClientNigoriSyncTest : public SyncTest {
public:
SingleClientNigoriSyncTest() : SyncTest(SINGLE_CLIENT) {}
+
+ SingleClientNigoriSyncTest(const SingleClientNigoriSyncTest&) = delete;
+ SingleClientNigoriSyncTest& operator=(const SingleClientNigoriSyncTest&) =
+ delete;
+
~SingleClientNigoriSyncTest() override = default;
bool WaitForPasswordForms(
const std::vector<password_manager::PasswordForm>& forms) const {
return PasswordFormsChecker(0, forms).Wait();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SingleClientNigoriSyncTest);
};
class SingleClientNigoriSyncTestWithNotAwaitQuiescence
: public SingleClientNigoriSyncTest {
public:
SingleClientNigoriSyncTestWithNotAwaitQuiescence() = default;
+
+ SingleClientNigoriSyncTestWithNotAwaitQuiescence(
+ const SingleClientNigoriSyncTestWithNotAwaitQuiescence&) = delete;
+ SingleClientNigoriSyncTestWithNotAwaitQuiescence& operator=(
+ const SingleClientNigoriSyncTestWithNotAwaitQuiescence&) = delete;
+
~SingleClientNigoriSyncTestWithNotAwaitQuiescence() override = default;
bool TestUsesSelfNotifications() override {
@@ -317,9 +327,6 @@
// achieved and isn't needed.
return false;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SingleClientNigoriSyncTestWithNotAwaitQuiescence);
};
IN_PROC_BROWSER_TEST_F(SingleClientNigoriSyncTest,
@@ -585,6 +592,12 @@
class SingleClientNigoriWithWebApiTest : public SyncTest {
public:
SingleClientNigoriWithWebApiTest() : SyncTest(SINGLE_CLIENT) {}
+
+ SingleClientNigoriWithWebApiTest(const SingleClientNigoriWithWebApiTest&) =
+ delete;
+ SingleClientNigoriWithWebApiTest& operator=(
+ const SingleClientNigoriWithWebApiTest&) = delete;
+
~SingleClientNigoriWithWebApiTest() override = default;
// InProcessBrowserTest:
@@ -627,8 +640,6 @@
private:
std::unique_ptr<syncer::FakeSecurityDomainsServer> security_domains_server_;
-
- DISALLOW_COPY_AND_ASSIGN(SingleClientNigoriWithWebApiTest);
};
IN_PROC_BROWSER_TEST_F(SingleClientNigoriWithWebApiTest,
diff --git a/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc
index 77b2ed6..839c0f8 100644
--- a/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc
@@ -224,6 +224,12 @@
kEnablePasswordsAccountStorage},
/*disabled_features=*/{});
}
+
+ SingleClientPasswordsWithAccountStorageSyncTest(
+ const SingleClientPasswordsWithAccountStorageSyncTest&) = delete;
+ SingleClientPasswordsWithAccountStorageSyncTest& operator=(
+ const SingleClientPasswordsWithAccountStorageSyncTest&) = delete;
+
~SingleClientPasswordsWithAccountStorageSyncTest() override = default;
void SetUpInProcessBrowserTestFixture() override {
@@ -259,8 +265,6 @@
base::test::ScopedFeatureList feature_list_;
base::CallbackListSubscription test_signin_client_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(SingleClientPasswordsWithAccountStorageSyncTest);
};
// Sanity check: For Sync-the-feature, password data still ends up in the
diff --git a/chrome/browser/sync/test/integration/single_client_polling_sync_test.cc b/chrome/browser/sync/test/integration/single_client_polling_sync_test.cc
index 459ec61..94ba936 100644
--- a/chrome/browser/sync/test/integration/single_client_polling_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_polling_sync_test.cc
@@ -30,10 +30,12 @@
class SingleClientPollingSyncTest : public SyncTest {
public:
SingleClientPollingSyncTest() : SyncTest(SINGLE_CLIENT) {}
- ~SingleClientPollingSyncTest() override {}
- private:
- DISALLOW_COPY_AND_ASSIGN(SingleClientPollingSyncTest);
+ SingleClientPollingSyncTest(const SingleClientPollingSyncTest&) = delete;
+ SingleClientPollingSyncTest& operator=(const SingleClientPollingSyncTest&) =
+ delete;
+
+ ~SingleClientPollingSyncTest() override {}
};
// This test verifies that the poll interval in prefs gets initialized if no
diff --git a/chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc
index 15e0a73..f4d9da2 100644
--- a/chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc
@@ -39,6 +39,12 @@
class SingleClientPreferencesSyncTest : public SyncTest {
public:
SingleClientPreferencesSyncTest() : SyncTest(SINGLE_CLIENT) {}
+
+ SingleClientPreferencesSyncTest(const SingleClientPreferencesSyncTest&) =
+ delete;
+ SingleClientPreferencesSyncTest& operator=(
+ const SingleClientPreferencesSyncTest&) = delete;
+
~SingleClientPreferencesSyncTest() override = default;
// If non-empty, |contents| will be written to the Preferences file of the
@@ -67,8 +73,6 @@
// Profile object is created. If empty, no preexisting file will be written.
// The map key corresponds to the profile's index.
std::map<int, std::string> preexisting_preferences_file_contents_;
-
- DISALLOW_COPY_AND_ASSIGN(SingleClientPreferencesSyncTest);
};
IN_PROC_BROWSER_TEST_F(SingleClientPreferencesSyncTest, Sanity) {
diff --git a/chrome/browser/sync/test/integration/single_client_secondary_account_sync_test.cc b/chrome/browser/sync/test/integration/single_client_secondary_account_sync_test.cc
index b7932104..9dc84ea 100644
--- a/chrome/browser/sync/test/integration/single_client_secondary_account_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_secondary_account_sync_test.cc
@@ -46,6 +46,12 @@
class SingleClientSecondaryAccountSyncTest : public SyncTest {
public:
SingleClientSecondaryAccountSyncTest() : SyncTest(SINGLE_CLIENT) {}
+
+ SingleClientSecondaryAccountSyncTest(
+ const SingleClientSecondaryAccountSyncTest&) = delete;
+ SingleClientSecondaryAccountSyncTest& operator=(
+ const SingleClientSecondaryAccountSyncTest&) = delete;
+
~SingleClientSecondaryAccountSyncTest() override {}
void SetUpInProcessBrowserTestFixture() override {
@@ -66,8 +72,6 @@
base::test::ScopedFeatureList features_;
base::CallbackListSubscription test_signin_client_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(SingleClientSecondaryAccountSyncTest);
};
// The unconsented primary account (aka secondary account) isn't supported on
diff --git a/chrome/browser/sync/test/integration/single_client_send_tab_to_self_sync_test.cc b/chrome/browser/sync/test/integration/single_client_send_tab_to_self_sync_test.cc
index 4ca226f..3d145a2 100644
--- a/chrome/browser/sync/test/integration/single_client_send_tab_to_self_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_send_tab_to_self_sync_test.cc
@@ -30,12 +30,15 @@
SingleClientSendTabToSelfSyncTest() : SyncTest(SINGLE_CLIENT) {
}
+ SingleClientSendTabToSelfSyncTest(const SingleClientSendTabToSelfSyncTest&) =
+ delete;
+ SingleClientSendTabToSelfSyncTest& operator=(
+ const SingleClientSendTabToSelfSyncTest&) = delete;
+
~SingleClientSendTabToSelfSyncTest() override {}
private:
base::test::ScopedFeatureList scoped_list_;
-
- DISALLOW_COPY_AND_ASSIGN(SingleClientSendTabToSelfSyncTest);
};
IN_PROC_BROWSER_TEST_F(SingleClientSendTabToSelfSyncTest,
diff --git a/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
index 457551f..75b5a86 100644
--- a/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
@@ -233,6 +233,11 @@
class SingleClientSessionsSyncTest : public SyncTest {
public:
SingleClientSessionsSyncTest() : SyncTest(SINGLE_CLIENT) {}
+
+ SingleClientSessionsSyncTest(const SingleClientSessionsSyncTest&) = delete;
+ SingleClientSessionsSyncTest& operator=(const SingleClientSessionsSyncTest&) =
+ delete;
+
~SingleClientSessionsSyncTest() override {}
void ExpectNavigationChain(const std::vector<GURL>& urls) {
@@ -284,9 +289,6 @@
accounts, run_loop.QuitClosure());
run_loop.Run();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SingleClientSessionsSyncTest);
};
IN_PROC_BROWSER_TEST_F(SingleClientSessionsSyncTest,
@@ -887,6 +889,12 @@
public:
SingleClientSessionsSyncTestWithFaviconTestServer()
: SingleClientSessionsSyncTest() {}
+
+ SingleClientSessionsSyncTestWithFaviconTestServer(
+ const SingleClientSessionsSyncTestWithFaviconTestServer&) = delete;
+ SingleClientSessionsSyncTestWithFaviconTestServer& operator=(
+ const SingleClientSessionsSyncTestWithFaviconTestServer&) = delete;
+
~SingleClientSessionsSyncTestWithFaviconTestServer() override = default;
protected:
@@ -897,9 +905,6 @@
ASSERT_TRUE(embedded_test_server()->Start());
SingleClientSessionsSyncTest::SetUpOnMainThread();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SingleClientSessionsSyncTestWithFaviconTestServer);
};
IN_PROC_BROWSER_TEST_F(SingleClientSessionsSyncTestWithFaviconTestServer,
diff --git a/chrome/browser/sync/test/integration/single_client_sync_invalidations_test.cc b/chrome/browser/sync/test/integration/single_client_sync_invalidations_test.cc
index 23d134b..2b34aa9 100644
--- a/chrome/browser/sync/test/integration/single_client_sync_invalidations_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_sync_invalidations_test.cc
@@ -174,12 +174,16 @@
switches::kUseSyncInvalidations,
switches::kUseSyncInvalidationsForWalletAndOffer});
}
+
+ SingleClientWithSyncSendInterestedDataTypesTest(
+ const SingleClientWithSyncSendInterestedDataTypesTest&) = delete;
+ SingleClientWithSyncSendInterestedDataTypesTest& operator=(
+ const SingleClientWithSyncSendInterestedDataTypesTest&) = delete;
+
~SingleClientWithSyncSendInterestedDataTypesTest() override = default;
private:
base::test::ScopedFeatureList override_features_;
-
- DISALLOW_COPY_AND_ASSIGN(SingleClientWithSyncSendInterestedDataTypesTest);
};
IN_PROC_BROWSER_TEST_F(SingleClientWithSyncSendInterestedDataTypesTest,
@@ -221,6 +225,12 @@
/*disabled_features=*/{
switches::kUseSyncInvalidationsForWalletAndOffer});
}
+
+ SingleClientWithUseSyncInvalidationsTest(
+ const SingleClientWithUseSyncInvalidationsTest&) = delete;
+ SingleClientWithUseSyncInvalidationsTest& operator=(
+ const SingleClientWithUseSyncInvalidationsTest&) = delete;
+
~SingleClientWithUseSyncInvalidationsTest() override = default;
// Injects a test DeviceInfo entity to the fake server.
@@ -248,8 +258,6 @@
private:
base::test::ScopedFeatureList override_features_;
-
- DISALLOW_COPY_AND_ASSIGN(SingleClientWithUseSyncInvalidationsTest);
};
IN_PROC_BROWSER_TEST_F(SingleClientWithUseSyncInvalidationsTest,
diff --git a/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc b/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc
index ba6d7f27..b82df56 100644
--- a/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc
@@ -103,6 +103,11 @@
public:
AutofillWebDataServiceConsumer() {}
+ AutofillWebDataServiceConsumer(const AutofillWebDataServiceConsumer&) =
+ delete;
+ AutofillWebDataServiceConsumer& operator=(
+ const AutofillWebDataServiceConsumer&) = delete;
+
virtual ~AutofillWebDataServiceConsumer() {}
void OnWebDataServiceRequestDone(
@@ -119,7 +124,6 @@
private:
base::RunLoop run_loop_;
T result_;
- DISALLOW_COPY_AND_ASSIGN(AutofillWebDataServiceConsumer);
};
std::vector<std::unique_ptr<CreditCard>> GetServerCards(
@@ -191,6 +195,10 @@
test_clock_.SetNow(kArbitraryDefaultTime);
}
+ SingleClientWalletSyncTest(const SingleClientWalletSyncTest&) = delete;
+ SingleClientWalletSyncTest& operator=(const SingleClientWalletSyncTest&) =
+ delete;
+
~SingleClientWalletSyncTest() override {}
protected:
@@ -252,9 +260,6 @@
testing::NiceMock<PersonalDataLoadedObserverMock> personal_data_observer_;
base::HistogramTester histogram_tester_;
autofill::TestAutofillClock test_clock_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SingleClientWalletSyncTest);
};
class SingleClientWalletSyncTestWithoutAccountStorage
@@ -1325,6 +1330,12 @@
features_.InitAndEnableFeature(
autofill::features::kAutofillEnableAccountWalletStorage);
}
+
+ SingleClientWalletSecondaryAccountSyncTest(
+ const SingleClientWalletSecondaryAccountSyncTest&) = delete;
+ SingleClientWalletSecondaryAccountSyncTest& operator=(
+ const SingleClientWalletSecondaryAccountSyncTest&) = delete;
+
~SingleClientWalletSecondaryAccountSyncTest() override {}
void SetUpInProcessBrowserTestFixture() override {
@@ -1345,8 +1356,6 @@
base::test::ScopedFeatureList features_;
base::CallbackListSubscription test_signin_client_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(SingleClientWalletSecondaryAccountSyncTest);
};
// ChromeOS doesn't support changes to the primary account after startup, so
diff --git a/chrome/browser/sync/test/integration/sync_auth_test.cc b/chrome/browser/sync/test/integration/sync_auth_test.cc
index e0c22f5..bb3188d 100644
--- a/chrome/browser/sync/test/integration/sync_auth_test.cc
+++ b/chrome/browser/sync/test/integration/sync_auth_test.cc
@@ -97,6 +97,10 @@
class SyncAuthTest : public SyncTest {
public:
SyncAuthTest() : SyncTest(SINGLE_CLIENT), bookmark_index_(0) {}
+
+ SyncAuthTest(const SyncAuthTest&) = delete;
+ SyncAuthTest& operator=(const SyncAuthTest&) = delete;
+
~SyncAuthTest() override {}
// Helper function that adds a bookmark and waits for either an auth error, or
@@ -136,8 +140,6 @@
}
int bookmark_index_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncAuthTest);
};
// Verify that sync works with a valid OAuth2 token.
diff --git a/chrome/browser/sync/test/integration/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc
index 4d6f2480..0c29f4e 100644
--- a/chrome/browser/sync/test/integration/sync_errors_test.cc
+++ b/chrome/browser/sync/test/integration/sync_errors_test.cc
@@ -111,10 +111,11 @@
class SyncErrorTest : public SyncTest {
public:
SyncErrorTest() : SyncTest(SINGLE_CLIENT) {}
- ~SyncErrorTest() override {}
- private:
- DISALLOW_COPY_AND_ASSIGN(SyncErrorTest);
+ SyncErrorTest(const SyncErrorTest&) = delete;
+ SyncErrorTest& operator=(const SyncErrorTest&) = delete;
+
+ ~SyncErrorTest() override {}
};
// Helper class that waits until the sync engine has hit an actionable error.
@@ -123,6 +124,9 @@
explicit ActionableErrorChecker(SyncServiceImpl* service)
: SingleClientStatusChangeChecker(service) {}
+ ActionableErrorChecker(const ActionableErrorChecker&) = delete;
+ ActionableErrorChecker& operator=(const ActionableErrorChecker&) = delete;
+
~ActionableErrorChecker() override {}
// Checks if an actionable error has been hit. Called repeatedly each time PSS
@@ -134,9 +138,6 @@
return (status.sync_protocol_error.action != syncer::UNKNOWN_ACTION &&
service()->HasUnrecoverableError());
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ActionableErrorChecker);
};
IN_PROC_BROWSER_TEST_F(SyncErrorTest, BirthdayErrorTest) {
diff --git a/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc b/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc
index ff612f9..c02a67c 100644
--- a/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc
+++ b/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc
@@ -25,6 +25,11 @@
class SyncExponentialBackoffTest : public SyncTest {
public:
SyncExponentialBackoffTest() : SyncTest(SINGLE_CLIENT) {}
+
+ SyncExponentialBackoffTest(const SyncExponentialBackoffTest&) = delete;
+ SyncExponentialBackoffTest& operator=(const SyncExponentialBackoffTest&) =
+ delete;
+
~SyncExponentialBackoffTest() override {}
void SetUp() override {
@@ -32,9 +37,6 @@
net::NetworkChangeNotifier::SetTestNotificationsOnly(true);
SyncTest::SetUp();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SyncExponentialBackoffTest);
};
// Helper class that checks if a sync client has successfully gone through
diff --git a/chrome/browser/sync/test/integration/sync_extension_installer.h b/chrome/browser/sync/test/integration/sync_extension_installer.h
index 5cab940..e752c1c 100644
--- a/chrome/browser/sync/test/integration/sync_extension_installer.h
+++ b/chrome/browser/sync/test/integration/sync_extension_installer.h
@@ -26,6 +26,10 @@
class SyncedExtensionInstaller : public content::NotificationObserver {
public:
explicit SyncedExtensionInstaller(Profile* profile);
+
+ SyncedExtensionInstaller(const SyncedExtensionInstaller&) = delete;
+ SyncedExtensionInstaller& operator=(const SyncedExtensionInstaller&) = delete;
+
~SyncedExtensionInstaller() override;
// content::NotificationObserver implementation.
@@ -40,8 +44,6 @@
content::NotificationRegistrar registrar_;
base::WeakPtrFactory<SyncedExtensionInstaller> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SyncedExtensionInstaller);
};
#endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_INSTALLER_H_
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 1354d480..6408e43 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -150,13 +150,16 @@
/*url_loader_factory=*/nullptr,
/*project_id*/ kInvalidationGCMSenderId,
/*migrate_prefs=*/false) {}
+
+ FakePerUserTopicSubscriptionManager(
+ const FakePerUserTopicSubscriptionManager&) = delete;
+ FakePerUserTopicSubscriptionManager& operator=(
+ const FakePerUserTopicSubscriptionManager&) = delete;
+
~FakePerUserTopicSubscriptionManager() override = default;
void UpdateSubscribedTopics(const invalidation::Topics& topics,
const std::string& instance_id_token) override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FakePerUserTopicSubscriptionManager);
};
std::unique_ptr<invalidation::FCMNetworkHandler> CreateFCMNetworkHandler(
diff --git a/chrome/browser/sync/test/integration/sync_test.h b/chrome/browser/sync/test/integration/sync_test.h
index 536b62d..f739b795 100644
--- a/chrome/browser/sync/test/integration/sync_test.h
+++ b/chrome/browser/sync/test/integration/sync_test.h
@@ -132,6 +132,10 @@
public:
explicit FakeInstanceID(const std::string& app_id,
gcm::GCMDriver* gcm_driver);
+
+ FakeInstanceID(const FakeInstanceID&) = delete;
+ FakeInstanceID& operator=(const FakeInstanceID&) = delete;
+
~FakeInstanceID() override = default;
void GetID(GetIDCallback callback) override {}
@@ -164,12 +168,15 @@
static std::string GenerateNextToken();
std::string token_;
- DISALLOW_COPY_AND_ASSIGN(FakeInstanceID);
};
class FakeInstanceIDDriver : public instance_id::InstanceIDDriver {
public:
explicit FakeInstanceIDDriver(gcm::GCMDriver* gcm_driver);
+
+ FakeInstanceIDDriver(const FakeInstanceIDDriver&) = delete;
+ FakeInstanceIDDriver& operator=(const FakeInstanceIDDriver&) = delete;
+
~FakeInstanceIDDriver() override;
instance_id::InstanceID* GetInstanceID(const std::string& app_id) override;
void RemoveInstanceID(const std::string& app_id) override {}
@@ -178,7 +185,6 @@
private:
gcm::GCMDriver* gcm_driver_;
std::map<std::string, std::unique_ptr<FakeInstanceID>> fake_instance_ids_;
- DISALLOW_COPY_AND_ASSIGN(FakeInstanceIDDriver);
};
// A SyncTest must be associated with a particular test type.
diff --git a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
index 0f2cd42..2559e00 100644
--- a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
@@ -110,12 +110,13 @@
public TwoClientAppListSyncTest {
public:
RemoveDefaultAppSyncTest() = default;
+
+ RemoveDefaultAppSyncTest(const RemoveDefaultAppSyncTest&) = delete;
+ RemoveDefaultAppSyncTest& operator=(const RemoveDefaultAppSyncTest&) = delete;
+
~RemoveDefaultAppSyncTest() override = default;
bool MarkAppAsDefaultApp() { return GetParam(); }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(RemoveDefaultAppSyncTest);
};
IN_PROC_BROWSER_TEST_F(TwoClientAppListSyncTest, StartWithNoApps) {
diff --git a/chrome/browser/sync/test/integration/two_client_autocomplete_sync_test.cc b/chrome/browser/sync/test/integration/two_client_autocomplete_sync_test.cc
index ebd42c6..ce88bf0 100644
--- a/chrome/browser/sync/test/integration/two_client_autocomplete_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_autocomplete_sync_test.cc
@@ -21,12 +21,14 @@
class TwoClientAutocompleteSyncTest : public SyncTest {
public:
TwoClientAutocompleteSyncTest() : SyncTest(TWO_CLIENT) {}
+
+ TwoClientAutocompleteSyncTest(const TwoClientAutocompleteSyncTest&) = delete;
+ TwoClientAutocompleteSyncTest& operator=(
+ const TwoClientAutocompleteSyncTest&) = delete;
+
~TwoClientAutocompleteSyncTest() override {}
bool TestUsesSelfNotifications() override { return false; }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TwoClientAutocompleteSyncTest);
};
IN_PROC_BROWSER_TEST_F(TwoClientAutocompleteSyncTest, WebDataServiceSanity) {
diff --git a/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
index e07fbe0..7595245 100644
--- a/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
@@ -55,10 +55,13 @@
class TwoClientAutofillProfileSyncTest : public SyncTest {
public:
TwoClientAutofillProfileSyncTest() : SyncTest(TWO_CLIENT) {}
- ~TwoClientAutofillProfileSyncTest() override {}
- private:
- DISALLOW_COPY_AND_ASSIGN(TwoClientAutofillProfileSyncTest);
+ TwoClientAutofillProfileSyncTest(const TwoClientAutofillProfileSyncTest&) =
+ delete;
+ TwoClientAutofillProfileSyncTest& operator=(
+ const TwoClientAutofillProfileSyncTest&) = delete;
+
+ ~TwoClientAutofillProfileSyncTest() override {}
};
IN_PROC_BROWSER_TEST_F(TwoClientAutofillProfileSyncTest,
diff --git a/chrome/browser/sync/test/integration/two_client_extension_apps_sync_test.cc b/chrome/browser/sync/test/integration/two_client_extension_apps_sync_test.cc
index 7c456bc9..e7a978c 100644
--- a/chrome/browser/sync/test/integration/two_client_extension_apps_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_extension_apps_sync_test.cc
@@ -57,10 +57,12 @@
public:
TwoClientExtensionAppsSyncTest() : SyncTest(TWO_CLIENT) {}
- ~TwoClientExtensionAppsSyncTest() override = default;
+ TwoClientExtensionAppsSyncTest(const TwoClientExtensionAppsSyncTest&) =
+ delete;
+ TwoClientExtensionAppsSyncTest& operator=(
+ const TwoClientExtensionAppsSyncTest&) = delete;
- private:
- DISALLOW_COPY_AND_ASSIGN(TwoClientExtensionAppsSyncTest);
+ ~TwoClientExtensionAppsSyncTest() override = default;
};
IN_PROC_BROWSER_TEST_F(TwoClientExtensionAppsSyncTest,
diff --git a/chrome/browser/sync/test/integration/two_client_polling_sync_test.cc b/chrome/browser/sync/test/integration/two_client_polling_sync_test.cc
index 34a1fd3..b91091266 100644
--- a/chrome/browser/sync/test/integration/two_client_polling_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_polling_sync_test.cc
@@ -31,10 +31,11 @@
class TwoClientPollingSyncTest : public SyncTest {
public:
TwoClientPollingSyncTest() : SyncTest(TWO_CLIENT) {}
- ~TwoClientPollingSyncTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(TwoClientPollingSyncTest);
+ TwoClientPollingSyncTest(const TwoClientPollingSyncTest&) = delete;
+ TwoClientPollingSyncTest& operator=(const TwoClientPollingSyncTest&) = delete;
+
+ ~TwoClientPollingSyncTest() override = default;
};
class SessionCountMatchChecker : public SingleClientStatusChangeChecker {
diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
index 82dffef..7d4f062 100644
--- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
@@ -37,10 +37,11 @@
public:
TwoClientPreferencesSyncTest() : SyncTest(TWO_CLIENT) {}
- ~TwoClientPreferencesSyncTest() override {}
+ TwoClientPreferencesSyncTest(const TwoClientPreferencesSyncTest&) = delete;
+ TwoClientPreferencesSyncTest& operator=(const TwoClientPreferencesSyncTest&) =
+ delete;
- private:
- DISALLOW_COPY_AND_ASSIGN(TwoClientPreferencesSyncTest);
+ ~TwoClientPreferencesSyncTest() override {}
};
IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, E2E_ENABLED(Sanity)) {
diff --git a/chrome/browser/sync/test/integration/two_client_printers_sync_test.cc b/chrome/browser/sync/test/integration/two_client_printers_sync_test.cc
index 7620673..aefbe3f40 100644
--- a/chrome/browser/sync/test/integration/two_client_printers_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_printers_sync_test.cc
@@ -38,10 +38,12 @@
class TwoClientPrintersSyncTest : public SyncTest {
public:
TwoClientPrintersSyncTest() : SyncTest(TWO_CLIENT) {}
- ~TwoClientPrintersSyncTest() override {}
- private:
- DISALLOW_COPY_AND_ASSIGN(TwoClientPrintersSyncTest);
+ TwoClientPrintersSyncTest(const TwoClientPrintersSyncTest&) = delete;
+ TwoClientPrintersSyncTest& operator=(const TwoClientPrintersSyncTest&) =
+ delete;
+
+ ~TwoClientPrintersSyncTest() override {}
};
} // namespace
diff --git a/chrome/browser/sync/test/integration/two_client_send_tab_to_self_sync_test.cc b/chrome/browser/sync/test/integration/two_client_send_tab_to_self_sync_test.cc
index b6e462d..65f3a90 100644
--- a/chrome/browser/sync/test/integration/two_client_send_tab_to_self_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_send_tab_to_self_sync_test.cc
@@ -32,10 +32,12 @@
public:
TwoClientSendTabToSelfSyncTest() : SyncTest(TWO_CLIENT) {}
- ~TwoClientSendTabToSelfSyncTest() override {}
+ TwoClientSendTabToSelfSyncTest(const TwoClientSendTabToSelfSyncTest&) =
+ delete;
+ TwoClientSendTabToSelfSyncTest& operator=(
+ const TwoClientSendTabToSelfSyncTest&) = delete;
- private:
- DISALLOW_COPY_AND_ASSIGN(TwoClientSendTabToSelfSyncTest);
+ ~TwoClientSendTabToSelfSyncTest() override {}
};
IN_PROC_BROWSER_TEST_F(TwoClientSendTabToSelfSyncTest,
diff --git a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
index a836f13..3c7070f 100644
--- a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
@@ -46,14 +46,16 @@
class TwoClientSessionsSyncTest : public SyncTest {
public:
TwoClientSessionsSyncTest() : SyncTest(TWO_CLIENT) {}
+
+ TwoClientSessionsSyncTest(const TwoClientSessionsSyncTest&) = delete;
+ TwoClientSessionsSyncTest& operator=(const TwoClientSessionsSyncTest&) =
+ delete;
+
~TwoClientSessionsSyncTest() override {}
bool WaitForForeignSessionsToSync(int local_index, int non_local_index) {
return ForeignSessionsMatchChecker(non_local_index, local_index).Wait();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TwoClientSessionsSyncTest);
};
static const char* kURL1 = "data:text/html,<html><title>Test</title></html>";
diff --git a/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
index 9a222be..6555cee 100644
--- a/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
@@ -23,10 +23,10 @@
public:
TwoClientThemesSyncTest() : SyncTest(TWO_CLIENT) {}
- ~TwoClientThemesSyncTest() override {}
+ TwoClientThemesSyncTest(const TwoClientThemesSyncTest&) = delete;
+ TwoClientThemesSyncTest& operator=(const TwoClientThemesSyncTest&) = delete;
- private:
- DISALLOW_COPY_AND_ASSIGN(TwoClientThemesSyncTest);
+ ~TwoClientThemesSyncTest() override {}
};
// Starts with default themes, then sets up sync and uses it to set all
diff --git a/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc
index 7230c2c..41e8385 100644
--- a/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc
@@ -51,6 +51,11 @@
class TwoClientTypedUrlsSyncTest : public SyncTest {
public:
TwoClientTypedUrlsSyncTest() : SyncTest(TWO_CLIENT) {}
+
+ TwoClientTypedUrlsSyncTest(const TwoClientTypedUrlsSyncTest&) = delete;
+ TwoClientTypedUrlsSyncTest& operator=(const TwoClientTypedUrlsSyncTest&) =
+ delete;
+
~TwoClientTypedUrlsSyncTest() override {}
::testing::AssertionResult CheckClientsEqual() {
@@ -87,9 +92,6 @@
else
return urls[0].visit_count();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TwoClientTypedUrlsSyncTest);
};
IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, E2E_ENABLED(Add)) {
diff --git a/chrome/browser/sync/test/integration/two_client_wallet_sync_test.cc b/chrome/browser/sync/test/integration/two_client_wallet_sync_test.cc
index 7e43281..9cb8b13 100644
--- a/chrome/browser/sync/test/integration/two_client_wallet_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_wallet_sync_test.cc
@@ -57,6 +57,10 @@
class TwoClientWalletSyncTest : public SyncTest {
public:
TwoClientWalletSyncTest() : SyncTest(TWO_CLIENT) {}
+
+ TwoClientWalletSyncTest(const TwoClientWalletSyncTest&) = delete;
+ TwoClientWalletSyncTest& operator=(const TwoClientWalletSyncTest&) = delete;
+
~TwoClientWalletSyncTest() override {}
// Needed for AwaitQuiescence().
@@ -76,8 +80,6 @@
private:
autofill::TestAutofillClock test_clock_;
-
- DISALLOW_COPY_AND_ASSIGN(TwoClientWalletSyncTest);
};
IN_PROC_BROWSER_TEST_F(TwoClientWalletSyncTest, UpdateCreditCardMetadata) {
diff --git a/chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc b/chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc
index e0255bb..203c7858 100644
--- a/chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc
@@ -59,6 +59,11 @@
scoped_feature_list_.InitAndDisableFeature(features::kWebAppsCrosapi);
#endif
}
+
+ TwoClientWebAppsBMOSyncTest(const TwoClientWebAppsBMOSyncTest&) = delete;
+ TwoClientWebAppsBMOSyncTest& operator=(const TwoClientWebAppsBMOSyncTest&) =
+ delete;
+
~TwoClientWebAppsBMOSyncTest() override = default;
bool SetupClients() override {
@@ -191,8 +196,6 @@
private:
FakeWebAppProviderCreator fake_web_app_provider_creator_;
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(TwoClientWebAppsBMOSyncTest);
};
// Test is flaky (crbug.com/1097050)
diff --git a/chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc b/chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc
index b5785717..4c620421 100644
--- a/chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc
@@ -62,6 +62,9 @@
#endif
}
+ TwoClientWebAppsSyncTest(const TwoClientWebAppsSyncTest&) = delete;
+ TwoClientWebAppsSyncTest& operator=(const TwoClientWebAppsSyncTest&) = delete;
+
~TwoClientWebAppsSyncTest() override = default;
void SetUpOnMainThread() override {
@@ -95,8 +98,6 @@
private:
base::test::ScopedFeatureList scoped_feature_list_;
ScopedOsHooksSuppress os_hooks_suppress_;
-
- DISALLOW_COPY_AND_ASSIGN(TwoClientWebAppsSyncTest);
};
IN_PROC_BROWSER_TEST_F(TwoClientWebAppsSyncTest, Basic) {
diff --git a/chrome/browser/sync/test/integration/user_events_helper.h b/chrome/browser/sync/test/integration/user_events_helper.h
index 9c6d4bf..246c3315 100644
--- a/chrome/browser/sync/test/integration/user_events_helper.h
+++ b/chrome/browser/sync/test/integration/user_events_helper.h
@@ -28,6 +28,10 @@
syncer::SyncServiceImpl* service,
fake_server::FakeServer* fake_server,
std::vector<sync_pb::UserEventSpecifics> expected_specifics);
+
+ UserEventEqualityChecker(const UserEventEqualityChecker&) = delete;
+ UserEventEqualityChecker& operator=(const UserEventEqualityChecker&) = delete;
+
~UserEventEqualityChecker() override;
bool IsExitConditionSatisfied(std::ostream* os) override;
@@ -35,8 +39,6 @@
private:
fake_server::FakeServer* fake_server_;
const std::vector<sync_pb::UserEventSpecifics> expected_specifics_;
-
- DISALLOW_COPY_AND_ASSIGN(UserEventEqualityChecker);
};
#endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_USER_EVENTS_HELPER_H_
diff --git a/chrome/browser/sync_file_system/drive_backend/callback_helper.h b/chrome/browser/sync_file_system/drive_backend/callback_helper.h
index 5d5406c..6544bd4c 100644
--- a/chrome/browser/sync_file_system/drive_backend/callback_helper.h
+++ b/chrome/browser/sync_file_system/drive_backend/callback_helper.h
@@ -47,6 +47,9 @@
DCHECK(task_runner_.get());
}
+ CallbackHolder(const CallbackHolder&) = delete;
+ CallbackHolder& operator=(const CallbackHolder&) = delete;
+
~CallbackHolder() {
if (callback_) {
task_runner_->PostTask(from_here_,
@@ -67,8 +70,6 @@
scoped_refptr<base::SequencedTaskRunner> task_runner_;
const base::Location from_here_;
CallbackType callback_;
-
- DISALLOW_COPY_AND_ASSIGN(CallbackHolder);
};
} // namespace internal
diff --git a/chrome/browser/sync_file_system/drive_backend/callback_tracker.h b/chrome/browser/sync_file_system/drive_backend/callback_tracker.h
index a808f8e3..15738c1 100644
--- a/chrome/browser/sync_file_system/drive_backend/callback_tracker.h
+++ b/chrome/browser/sync_file_system/drive_backend/callback_tracker.h
@@ -40,6 +40,10 @@
std::map<internal::AbortHelper*, base::OnceClosure>;
CallbackTracker();
+
+ CallbackTracker(const CallbackTracker&) = delete;
+ CallbackTracker& operator=(const CallbackTracker&) = delete;
+
~CallbackTracker();
// Returns a wrapped callback.
@@ -65,8 +69,6 @@
internal::AbortHelper* helper);
AbortClosureByHelper helpers_; // Owns AbortHelpers.
-
- DISALLOW_COPY_AND_ASSIGN(CallbackTracker);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.h b/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.h
index ef55d69..79aa5269 100644
--- a/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.h
+++ b/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.h
@@ -22,6 +22,10 @@
class AbortHelper {
public:
explicit AbortHelper(CallbackTracker* tracker);
+
+ AbortHelper(const AbortHelper&) = delete;
+ AbortHelper& operator=(const AbortHelper&) = delete;
+
~AbortHelper();
base::WeakPtr<AbortHelper> AsWeakPtr();
@@ -31,8 +35,6 @@
private:
CallbackTracker* tracker_; // Not owned.
base::WeakPtrFactory<AbortHelper> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AbortHelper);
};
template <typename>
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
index 186ffb35..9cd51c2 100644
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
@@ -42,6 +42,10 @@
typedef std::vector<std::string> FileIDList;
explicit ConflictResolver(SyncEngineContext* sync_context);
+
+ ConflictResolver(const ConflictResolver&) = delete;
+ ConflictResolver& operator=(const ConflictResolver&) = delete;
+
~ConflictResolver() override;
void RunPreflight(std::unique_ptr<SyncTaskToken> token) override;
void RunExclusive(std::unique_ptr<SyncTaskToken> token);
@@ -79,8 +83,6 @@
SyncEngineContext* sync_context_; // Not owned.
base::WeakPtrFactory<ConflictResolver> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ConflictResolver);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
index 9abf721..c53bc9d1 100644
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
@@ -55,6 +55,10 @@
ConflictResolverTest()
: task_environment_(content::BrowserTaskEnvironment::IO_MAINLOOP) {}
+
+ ConflictResolverTest(const ConflictResolverTest&) = delete;
+ ConflictResolverTest& operator=(const ConflictResolverTest&) = delete;
+
~ConflictResolverTest() override {}
void SetUp() override {
@@ -268,8 +272,6 @@
std::unique_ptr<FakeRemoteChangeProcessor> remote_change_processor_;
std::unique_ptr<SyncTaskManager> sync_task_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(ConflictResolverTest);
};
TEST_F(ConflictResolverTest, NoFileToBeResolved) {
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
index 6f8e598..034e1de 100644
--- a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
@@ -84,6 +84,10 @@
: task_environment_(content::BrowserTaskEnvironment::IO_MAINLOOP),
pending_remote_changes_(0),
pending_local_changes_(0) {}
+
+ DriveBackendSyncTest(const DriveBackendSyncTest&) = delete;
+ DriveBackendSyncTest& operator=(const DriveBackendSyncTest&) = delete;
+
~DriveBackendSyncTest() override {}
void SetUp() override {
@@ -601,8 +605,6 @@
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
scoped_refptr<base::SequencedTaskRunner> worker_task_runner_;
scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(DriveBackendSyncTest);
};
TEST_F(DriveBackendSyncTest, LocalToRemoteBasicTest) {
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h b/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h
index 62ca59d..593977a 100644
--- a/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h
+++ b/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h
@@ -36,6 +36,10 @@
const base::WeakPtr<DriveServiceWrapper>& wrapper,
base::SingleThreadTaskRunner* ui_task_runner,
base::SequencedTaskRunner* worker_task_runner);
+
+ DriveServiceOnWorker(const DriveServiceOnWorker&) = delete;
+ DriveServiceOnWorker& operator=(const DriveServiceOnWorker&) = delete;
+
~DriveServiceOnWorker() override;
google_apis::CancelCallbackOnce AddNewDirectory(
@@ -201,8 +205,6 @@
scoped_refptr<base::SequencedTaskRunner> worker_task_runner_;
base::SequenceChecker sequence_checker_;
-
- DISALLOW_COPY_AND_ASSIGN(DriveServiceOnWorker);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_uploader_on_worker.h b/chrome/browser/sync_file_system/drive_backend/drive_uploader_on_worker.h
index 5aeb6dd..50bf5f34 100644
--- a/chrome/browser/sync_file_system/drive_backend/drive_uploader_on_worker.h
+++ b/chrome/browser/sync_file_system/drive_backend/drive_uploader_on_worker.h
@@ -33,6 +33,10 @@
const base::WeakPtr<DriveUploaderWrapper>& wrapper,
base::SingleThreadTaskRunner* ui_task_runner,
base::SequencedTaskRunner* worker_task_runner);
+
+ DriveUploaderOnWorker(const DriveUploaderOnWorker&) = delete;
+ DriveUploaderOnWorker& operator=(const DriveUploaderOnWorker&) = delete;
+
~DriveUploaderOnWorker() override;
void StartBatchProcessing() override;
@@ -68,8 +72,6 @@
scoped_refptr<base::SequencedTaskRunner> worker_task_runner_;
base::SequenceChecker sequece_checker_;
-
- DISALLOW_COPY_AND_ASSIGN(DriveUploaderOnWorker);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h b/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h
index b74eab8..863d10b 100644
--- a/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h
+++ b/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h
@@ -22,6 +22,10 @@
class FakeDriveServiceWrapper : public drive::FakeDriveService {
public:
FakeDriveServiceWrapper();
+
+ FakeDriveServiceWrapper(const FakeDriveServiceWrapper&) = delete;
+ FakeDriveServiceWrapper& operator=(const FakeDriveServiceWrapper&) = delete;
+
~FakeDriveServiceWrapper() override;
// DriveServiceInterface overrides.
@@ -37,8 +41,6 @@
private:
bool make_directory_conflict_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeDriveServiceWrapper);
};
// A fake implementation of DriveUploaderInterface, which provides fake
@@ -46,6 +48,10 @@
class FakeDriveUploader : public drive::DriveUploaderInterface {
public:
explicit FakeDriveUploader(FakeDriveServiceWrapper* fake_drive_service);
+
+ FakeDriveUploader(const FakeDriveUploader&) = delete;
+ FakeDriveUploader& operator=(const FakeDriveUploader&) = delete;
+
~FakeDriveUploader() override;
// DriveUploaderInterface overrides.
@@ -78,8 +84,6 @@
private:
FakeDriveServiceWrapper* fake_drive_service_;
bool make_file_conflict_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeDriveUploader);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h b/chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h
index 6418b68..673fddb90 100644
--- a/chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h
+++ b/chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h
@@ -42,6 +42,10 @@
class FakeSyncWorker : public SyncWorkerInterface {
public:
FakeSyncWorker();
+
+ FakeSyncWorker(const FakeSyncWorker&) = delete;
+ FakeSyncWorker& operator=(const FakeSyncWorker&) = delete;
+
~FakeSyncWorker() override;
// SyncWorkerInterface overrides.
@@ -95,8 +99,6 @@
base::ObserverList<Observer>::Unchecked observers_;
base::SequenceChecker sequence_checker_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeSyncWorker);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/folder_creator.h b/chrome/browser/sync_file_system/drive_backend/folder_creator.h
index 43413bbb..7e8bc44 100644
--- a/chrome/browser/sync_file_system/drive_backend/folder_creator.h
+++ b/chrome/browser/sync_file_system/drive_backend/folder_creator.h
@@ -36,6 +36,10 @@
MetadataDatabase* metadata_database,
const std::string& parent_folder_id,
const std::string& title);
+
+ FolderCreator(const FolderCreator&) = delete;
+ FolderCreator& operator=(const FolderCreator&) = delete;
+
~FolderCreator();
void Run(FileIDCallback callback);
@@ -57,8 +61,6 @@
const std::string title_;
base::WeakPtrFactory<FolderCreator> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FolderCreator);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.h b/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.h
index 90dfe55..27568b2 100644
--- a/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.h
+++ b/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.h
@@ -51,6 +51,10 @@
class Iterator {
public:
explicit Iterator(LevelDBWrapper* db);
+
+ Iterator(const Iterator&) = delete;
+ Iterator& operator=(const Iterator&) = delete;
+
~Iterator();
bool Valid();
@@ -69,8 +73,6 @@
LevelDBWrapper* db_; // do not own
std::unique_ptr<leveldb::Iterator> db_iterator_;
PendingOperationMap::iterator map_iterator_;
-
- DISALLOW_COPY_AND_ASSIGN(Iterator);
};
explicit LevelDBWrapper(std::unique_ptr<leveldb::DB> db);
diff --git a/chrome/browser/sync_file_system/drive_backend/list_changes_task.h b/chrome/browser/sync_file_system/drive_backend/list_changes_task.h
index 720ae03..216dbd6 100644
--- a/chrome/browser/sync_file_system/drive_backend/list_changes_task.h
+++ b/chrome/browser/sync_file_system/drive_backend/list_changes_task.h
@@ -32,6 +32,10 @@
class ListChangesTask : public SyncTask {
public:
explicit ListChangesTask(SyncEngineContext* sync_context);
+
+ ListChangesTask(const ListChangesTask&) = delete;
+ ListChangesTask& operator=(const ListChangesTask&) = delete;
+
~ListChangesTask() override;
void RunPreflight(std::unique_ptr<SyncTaskToken> token) override;
@@ -54,8 +58,6 @@
std::vector<std::string> file_ids_;
base::WeakPtrFactory<ListChangesTask> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ListChangesTask);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc b/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc
index 0d32e33..ae4caa7 100644
--- a/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc
@@ -44,6 +44,10 @@
public:
ListChangesTaskTest()
: task_environment_(content::BrowserTaskEnvironment::IO_MAINLOOP) {}
+
+ ListChangesTaskTest(const ListChangesTaskTest&) = delete;
+ ListChangesTaskTest& operator=(const ListChangesTaskTest&) = delete;
+
~ListChangesTaskTest() override {}
void SetUp() override {
@@ -208,8 +212,6 @@
std::unique_ptr<FakeDriveServiceHelper> fake_drive_service_helper_;
std::unique_ptr<SyncTaskManager> sync_task_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(ListChangesTaskTest);
};
TEST_F(ListChangesTaskTest, NoChange) {
diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h
index 40639f4..916ae8d 100644
--- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h
+++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h
@@ -46,6 +46,10 @@
const FileChange& local_change,
const base::FilePath& local_path,
const storage::FileSystemURL& url);
+
+ LocalToRemoteSyncer(const LocalToRemoteSyncer&) = delete;
+ LocalToRemoteSyncer& operator=(const LocalToRemoteSyncer&) = delete;
+
~LocalToRemoteSyncer() override;
void RunPreflight(std::unique_ptr<SyncTaskToken> token) override;
@@ -126,8 +130,6 @@
std::unique_ptr<FolderCreator> folder_creator_;
base::WeakPtrFactory<LocalToRemoteSyncer> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LocalToRemoteSyncer);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
index 5dc8176..4b99b9a 100644
--- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
@@ -54,6 +54,10 @@
public:
LocalToRemoteSyncerTest()
: task_environment_(content::BrowserTaskEnvironment::IO_MAINLOOP) {}
+
+ LocalToRemoteSyncerTest(const LocalToRemoteSyncerTest&) = delete;
+ LocalToRemoteSyncerTest& operator=(const LocalToRemoteSyncerTest&) = delete;
+
~LocalToRemoteSyncerTest() override {}
void SetUp() override {
@@ -253,8 +257,6 @@
std::unique_ptr<FakeDriveServiceHelper> fake_drive_helper_;
std::unique_ptr<FakeRemoteChangeProcessor> remote_change_processor_;
std::unique_ptr<SyncTaskManager> sync_task_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(LocalToRemoteSyncerTest);
};
TEST_F(LocalToRemoteSyncerTest, CreateFile) {
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.h b/chrome/browser/sync_file_system/drive_backend/metadata_database.h
index e708d94..fb24f77 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database.h
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.h
@@ -135,6 +135,9 @@
bool enable_on_disk_index,
std::unique_ptr<MetadataDatabase>* metadata_database_out);
+ MetadataDatabase(const MetadataDatabase&) = delete;
+ MetadataDatabase& operator=(const MetadataDatabase&) = delete;
+
~MetadataDatabase();
static void ClearDatabase(
@@ -403,8 +406,6 @@
std::unique_ptr<MetadataDatabaseIndexInterface> index_;
base::WeakPtrFactory<MetadataDatabase> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MetadataDatabase);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_index.h b/chrome/browser/sync_file_system/drive_backend/metadata_database_index.h
index 248f10d..d96eebf 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_index.h
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_index.h
@@ -56,6 +56,9 @@
// Maintains indexes of MetadataDatabase on memory.
class MetadataDatabaseIndex : public MetadataDatabaseIndexInterface {
public:
+ MetadataDatabaseIndex(const MetadataDatabaseIndex&) = delete;
+ MetadataDatabaseIndex& operator=(const MetadataDatabaseIndex&) = delete;
+
~MetadataDatabaseIndex() override;
static std::unique_ptr<MetadataDatabaseIndex> Create(LevelDBWrapper* db);
@@ -161,8 +164,6 @@
DirtyTrackers dirty_trackers_;
DirtyTrackers demoted_dirty_trackers_;
-
- DISALLOW_COPY_AND_ASSIGN(MetadataDatabaseIndex);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_interface.h b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_interface.h
index 393ece4..c883c05 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_interface.h
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_interface.h
@@ -36,6 +36,12 @@
class MetadataDatabaseIndexInterface {
public:
MetadataDatabaseIndexInterface() {}
+
+ MetadataDatabaseIndexInterface(const MetadataDatabaseIndexInterface&) =
+ delete;
+ MetadataDatabaseIndexInterface& operator=(
+ const MetadataDatabaseIndexInterface&) = delete;
+
virtual ~MetadataDatabaseIndexInterface() {}
// Removes unreachable items.
@@ -120,9 +126,6 @@
virtual std::vector<std::string> GetRegisteredAppIDs() const = 0;
virtual std::vector<int64_t> GetAllTrackerIDs() const = 0;
virtual std::vector<std::string> GetAllMetadataIDs() const = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MetadataDatabaseIndexInterface);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.h b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.h
index ba5d42f..1d04ecf 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.h
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.h
@@ -34,6 +34,10 @@
static std::unique_ptr<MetadataDatabaseIndexOnDisk> Create(
LevelDBWrapper* db);
+ MetadataDatabaseIndexOnDisk(const MetadataDatabaseIndexOnDisk&) = delete;
+ MetadataDatabaseIndexOnDisk& operator=(const MetadataDatabaseIndexOnDisk&) =
+ delete;
+
~MetadataDatabaseIndexOnDisk() override;
// MetadataDatabaseIndexInterface overrides.
@@ -170,8 +174,6 @@
std::unique_ptr<ServiceMetadata> service_metadata_;
size_t num_dirty_trackers_;
-
- DISALLOW_COPY_AND_ASSIGN(MetadataDatabaseIndexOnDisk);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
index 302cc20e..2865a95e 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
@@ -194,6 +194,9 @@
next_file_id_number_(1),
next_md5_sequence_number_(1) {}
+ MetadataDatabaseTest(const MetadataDatabaseTest&) = delete;
+ MetadataDatabaseTest& operator=(const MetadataDatabaseTest&) = delete;
+
virtual ~MetadataDatabaseTest() {}
void SetUp() override {
@@ -634,8 +637,6 @@
int64_t next_tracker_id_;
int64_t next_file_id_number_;
int64_t next_md5_sequence_number_;
-
- DISALLOW_COPY_AND_ASSIGN(MetadataDatabaseTest);
};
INSTANTIATE_TEST_SUITE_P(MetadataDatabaseTestWithIndexesOnDisk,
diff --git a/chrome/browser/sync_file_system/drive_backend/register_app_task.h b/chrome/browser/sync_file_system/drive_backend/register_app_task.h
index 2ae2b15..b5e85f74 100644
--- a/chrome/browser/sync_file_system/drive_backend/register_app_task.h
+++ b/chrome/browser/sync_file_system/drive_backend/register_app_task.h
@@ -30,6 +30,10 @@
class RegisterAppTask : public ExclusiveTask {
public:
RegisterAppTask(SyncEngineContext* sync_context, const std::string& app_id);
+
+ RegisterAppTask(const RegisterAppTask&) = delete;
+ RegisterAppTask& operator=(const RegisterAppTask&) = delete;
+
~RegisterAppTask() override;
bool CanFinishImmediately();
@@ -55,8 +59,6 @@
std::unique_ptr<FolderCreator> folder_creator_;
base::WeakPtrFactory<RegisterAppTask> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(RegisterAppTask);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
index 9921117..4f5e63d 100644
--- a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
@@ -48,6 +48,10 @@
RegisterAppTaskTest()
: next_file_id_(1000),
next_tracker_id_(10000) {}
+
+ RegisterAppTaskTest(const RegisterAppTaskTest&) = delete;
+ RegisterAppTaskTest& operator=(const RegisterAppTaskTest&) = delete;
+
~RegisterAppTaskTest() override {}
void SetUp() override {
@@ -273,8 +277,6 @@
std::unique_ptr<SyncEngineContext> context_;
std::unique_ptr<FakeDriveServiceHelper> fake_drive_service_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(RegisterAppTaskTest);
};
TEST_F(RegisterAppTaskTest, AlreadyRegistered) {
diff --git a/chrome/browser/sync_file_system/drive_backend/remote_change_processor_on_worker.h b/chrome/browser/sync_file_system/drive_backend/remote_change_processor_on_worker.h
index e5278ec2..daa8676 100644
--- a/chrome/browser/sync_file_system/drive_backend/remote_change_processor_on_worker.h
+++ b/chrome/browser/sync_file_system/drive_backend/remote_change_processor_on_worker.h
@@ -31,6 +31,11 @@
const base::WeakPtr<RemoteChangeProcessorWrapper>& wrapper,
base::SingleThreadTaskRunner* ui_task_runner,
base::SequencedTaskRunner* worker_task_runner);
+
+ RemoteChangeProcessorOnWorker(const RemoteChangeProcessorOnWorker&) = delete;
+ RemoteChangeProcessorOnWorker& operator=(
+ const RemoteChangeProcessorOnWorker&) = delete;
+
~RemoteChangeProcessorOnWorker() override;
void PrepareForProcessRemoteChange(const storage::FileSystemURL& url,
@@ -54,8 +59,6 @@
scoped_refptr<base::SequencedTaskRunner> worker_task_runner_;
base::SequenceChecker sequence_checker_;
-
- DISALLOW_COPY_AND_ASSIGN(RemoteChangeProcessorOnWorker);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h
index 49b46ee..dab56f0 100644
--- a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h
+++ b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h
@@ -46,6 +46,10 @@
// Conflicting trackers will have low priority for RemoteToLocalSyncer so that
// it should be resolved by LocatToRemoteSyncer.
explicit RemoteToLocalSyncer(SyncEngineContext* sync_context);
+
+ RemoteToLocalSyncer(const RemoteToLocalSyncer&) = delete;
+ RemoteToLocalSyncer& operator=(const RemoteToLocalSyncer&) = delete;
+
~RemoteToLocalSyncer() override;
void RunPreflight(std::unique_ptr<SyncTaskToken> token) override;
@@ -215,8 +219,6 @@
std::unique_ptr<FileChangeList> local_changes_;
base::WeakPtrFactory<RemoteToLocalSyncer> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(RemoteToLocalSyncer);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc
index 482e4c66..86ae988 100644
--- a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc
@@ -52,6 +52,10 @@
RemoteToLocalSyncerTest()
: task_environment_(content::BrowserTaskEnvironment::IO_MAINLOOP) {}
+
+ RemoteToLocalSyncerTest(const RemoteToLocalSyncerTest&) = delete;
+ RemoteToLocalSyncerTest& operator=(const RemoteToLocalSyncerTest&) = delete;
+
~RemoteToLocalSyncerTest() override {}
void SetUp() override {
@@ -236,8 +240,6 @@
std::unique_ptr<SyncTaskManager> sync_task_manager_;
URLToFileChangesMap expected_changes_;
-
- DISALLOW_COPY_AND_ASSIGN(RemoteToLocalSyncerTest);
};
TEST_F(RemoteToLocalSyncerTest, AddNewFile) {
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
index b2274ea..e5182e3 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
@@ -116,6 +116,9 @@
sequence_checker_.DetachFromSequence();
}
+ WorkerObserver(const WorkerObserver&) = delete;
+ WorkerObserver& operator=(const WorkerObserver&) = delete;
+
~WorkerObserver() override {
DCHECK(sequence_checker_.CalledOnValidSequence());
}
@@ -175,8 +178,6 @@
base::WeakPtr<SyncEngine> sync_engine_;
base::SequenceChecker sequence_checker_;
-
- DISALLOW_COPY_AND_ASSIGN(WorkerObserver);
};
std::unique_ptr<SyncEngine> SyncEngine::CreateForBrowserContext(
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.h b/chrome/browser/sync_file_system/drive_backend/sync_engine.h
index cad40d2..f1ad31fa 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.h
@@ -74,14 +74,15 @@
class DriveServiceFactory {
public:
DriveServiceFactory() {}
+
+ DriveServiceFactory(const DriveServiceFactory&) = delete;
+ DriveServiceFactory& operator=(const DriveServiceFactory&) = delete;
+
virtual ~DriveServiceFactory() {}
virtual std::unique_ptr<drive::DriveServiceInterface> CreateDriveService(
signin::IdentityManager* identity_manager,
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
base::SequencedTaskRunner* blocking_task_runner);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DriveServiceFactory);
};
static std::unique_ptr<SyncEngine> CreateForBrowserContext(
@@ -90,6 +91,9 @@
static void AppendDependsOnFactories(
std::set<BrowserContextKeyedServiceFactory*>* factories);
+ SyncEngine(const SyncEngine&) = delete;
+ SyncEngine& operator=(const SyncEngine&) = delete;
+
~SyncEngine() override;
void Reset();
@@ -228,7 +232,6 @@
CallbackTracker callback_tracker_;
base::WeakPtrFactory<SyncEngine> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(SyncEngine);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_context.h b/chrome/browser/sync_file_system/drive_backend/sync_engine_context.h
index 3d80a11..661da39 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_context.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_context.h
@@ -39,6 +39,10 @@
TaskLogger* task_logger,
const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner,
const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner);
+
+ SyncEngineContext(const SyncEngineContext&) = delete;
+ SyncEngineContext& operator=(const SyncEngineContext&) = delete;
+
~SyncEngineContext();
void SetMetadataDatabase(std::unique_ptr<MetadataDatabase> metadata_database);
@@ -70,8 +74,6 @@
scoped_refptr<base::SequencedTaskRunner> worker_task_runner_;
base::SequenceChecker sequence_checker_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncEngineContext);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h
index 368aac9f..b3da331f 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h
@@ -66,6 +66,10 @@
SyncEngineInitializer(SyncEngineContext* sync_context,
const base::FilePath& database_path,
leveldb::Env* env_override);
+
+ SyncEngineInitializer(const SyncEngineInitializer&) = delete;
+ SyncEngineInitializer& operator=(const SyncEngineInitializer&) = delete;
+
~SyncEngineInitializer() override;
void RunPreflight(std::unique_ptr<SyncTaskToken> token) override;
@@ -111,8 +115,6 @@
std::unique_ptr<google_apis::FileResource> sync_root_folder_;
base::WeakPtrFactory<SyncEngineInitializer> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SyncEngineInitializer);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
index 1c0b269..b8f6362 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
@@ -49,6 +49,11 @@
};
SyncEngineInitializerTest() {}
+
+ SyncEngineInitializerTest(const SyncEngineInitializerTest&) = delete;
+ SyncEngineInitializerTest& operator=(const SyncEngineInitializerTest&) =
+ delete;
+
~SyncEngineInitializerTest() override {}
void SetUp() override {
@@ -211,8 +216,6 @@
std::unique_ptr<SyncTaskManager> sync_task_manager_;
std::unique_ptr<SyncEngineContext> sync_context_;
drive::FakeDriveService* fake_drive_service_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(SyncEngineInitializerTest);
};
TEST_F(SyncEngineInitializerTest, EmptyDatabase_NoRemoteSyncRoot) {
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
index 0b4060b..0be341a1 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
@@ -36,6 +36,10 @@
typedef RemoteFileSyncService::OriginStatusMap RemoteOriginStatusMap;
SyncEngineTest() {}
+
+ SyncEngineTest(const SyncEngineTest&) = delete;
+ SyncEngineTest& operator=(const SyncEngineTest&) = delete;
+
~SyncEngineTest() override {}
void SetUp() override {
@@ -128,8 +132,6 @@
std::unique_ptr<drive_backend::SyncEngine> sync_engine_;
scoped_refptr<base::SequencedTaskRunner> worker_task_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncEngineTest);
};
TEST_F(SyncEngineTest, OriginTest) {
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task.h b/chrome/browser/sync_file_system/drive_backend/sync_task.h
index 99a507e..1e6f410 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task.h
@@ -19,6 +19,10 @@
class SyncTask {
public:
SyncTask() : used_network_(false) {}
+
+ SyncTask(const SyncTask&) = delete;
+ SyncTask& operator=(const SyncTask&) = delete;
+
virtual ~SyncTask() {}
virtual void RunPreflight(std::unique_ptr<SyncTaskToken> token) = 0;
@@ -31,13 +35,15 @@
private:
bool used_network_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncTask);
};
class ExclusiveTask : public SyncTask {
public:
ExclusiveTask();
+
+ ExclusiveTask(const ExclusiveTask&) = delete;
+ ExclusiveTask& operator=(const ExclusiveTask&) = delete;
+
~ExclusiveTask() override;
void RunPreflight(std::unique_ptr<SyncTaskToken> token) final;
@@ -45,8 +51,6 @@
private:
base::WeakPtrFactory<ExclusiveTask> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExclusiveTask);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc
index 927ae7d..7ac059d 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc
@@ -28,6 +28,10 @@
public:
explicit SyncTaskAdapter(SyncTaskManager::Task task)
: task_(std::move(task)) {}
+
+ SyncTaskAdapter(const SyncTaskAdapter&) = delete;
+ SyncTaskAdapter& operator=(const SyncTaskAdapter&) = delete;
+
~SyncTaskAdapter() override = default;
void RunExclusive(SyncStatusCallback callback) override {
@@ -36,8 +40,6 @@
private:
SyncTaskManager::Task task_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncTaskAdapter);
};
} // namespace
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.h b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.h
index a288e94..9d3ce563 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.h
@@ -74,6 +74,10 @@
SyncTaskManager(base::WeakPtr<Client> client,
size_t maximum_background_task,
const scoped_refptr<base::SequencedTaskRunner>& task_runner);
+
+ SyncTaskManager(const SyncTaskManager&) = delete;
+ SyncTaskManager& operator=(const SyncTaskManager&) = delete;
+
virtual ~SyncTaskManager();
// This needs to be called to start task scheduling.
@@ -207,8 +211,6 @@
base::SequenceChecker sequence_checker_;
base::WeakPtrFactory<SyncTaskManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SyncTaskManager);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc
index e32927c..4cfade9 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc
@@ -64,6 +64,10 @@
base::RunLoop().RunUntilIdle();
maybe_schedule_next_task_count_ = 0;
}
+
+ TaskManagerClient(const TaskManagerClient&) = delete;
+ TaskManagerClient& operator=(const TaskManagerClient&) = delete;
+
~TaskManagerClient() override {}
// DriveFileSyncManager::Client overrides.
@@ -119,8 +123,6 @@
int idle_task_scheduled_count_;
SyncStatusCode last_operation_status_;
-
- DISALLOW_COPY_AND_ASSIGN(TaskManagerClient);
};
class MultihopSyncTask : public ExclusiveTask {
@@ -131,6 +133,9 @@
DCHECK(task_completed_);
}
+ MultihopSyncTask(const MultihopSyncTask&) = delete;
+ MultihopSyncTask& operator=(const MultihopSyncTask&) = delete;
+
~MultihopSyncTask() override {}
void RunExclusive(SyncStatusCallback callback) override {
@@ -153,8 +158,6 @@
bool* task_started_;
bool* task_completed_;
base::WeakPtrFactory<MultihopSyncTask> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MultihopSyncTask);
};
class BackgroundTask : public SyncTask {
@@ -175,6 +178,9 @@
Stats* stats)
: app_id_(app_id), path_(path), stats_(stats) {}
+ BackgroundTask(const BackgroundTask&) = delete;
+ BackgroundTask& operator=(const BackgroundTask&) = delete;
+
~BackgroundTask() override {}
void RunPreflight(std::unique_ptr<SyncTaskToken> token) override {
@@ -211,8 +217,6 @@
Stats* stats_;
base::WeakPtrFactory<BackgroundTask> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BackgroundTask);
};
class BlockerUpdateTestHelper : public SyncTask {
@@ -228,6 +232,9 @@
paths_(paths.begin(), paths.end()),
log_(log) {}
+ BlockerUpdateTestHelper(const BlockerUpdateTestHelper&) = delete;
+ BlockerUpdateTestHelper& operator=(const BlockerUpdateTestHelper&) = delete;
+
~BlockerUpdateTestHelper() override {}
void RunPreflight(std::unique_ptr<SyncTaskToken> token) override {
@@ -274,8 +281,6 @@
Log* log_;
base::WeakPtrFactory<BlockerUpdateTestHelper> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BlockerUpdateTestHelper);
};
// Arbitrary non-default status values for testing.
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_token.h b/chrome/browser/sync_file_system/drive_backend/sync_task_token.h
index 6c79a6c..f05bc38 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_token.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_token.h
@@ -48,6 +48,10 @@
void UpdateTask(const base::Location& location, SyncStatusCallback callback);
const base::Location& location() const { return location_; }
+
+ SyncTaskToken(const SyncTaskToken&) = delete;
+ SyncTaskToken& operator=(const SyncTaskToken&) = delete;
+
virtual ~SyncTaskToken();
static SyncStatusCallback WrapToCallback(
@@ -86,8 +90,6 @@
std::unique_ptr<TaskLogger::TaskLog> task_log_;
std::unique_ptr<TaskBlocker> task_blocker_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncTaskToken);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_worker.h b/chrome/browser/sync_file_system/drive_backend/sync_worker.h
index 0268efc..d5d030f 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_worker.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_worker.h
@@ -66,6 +66,9 @@
extensions::ExtensionRegistry* extension_registry,
leveldb::Env* env_override);
+ SyncWorker(const SyncWorker&) = delete;
+ SyncWorker& operator=(const SyncWorker&) = delete;
+
~SyncWorker() override;
void Initialize(std::unique_ptr<SyncEngineContext> context) override;
@@ -181,7 +184,6 @@
base::SequenceChecker sequence_checker_;
base::WeakPtrFactory<SyncWorker> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(SyncWorker);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc
index 5e0fc53..dd9233f 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc
@@ -52,19 +52,24 @@
explicit MockSyncTask(bool used_network) {
set_used_network(used_network);
}
+
+ MockSyncTask(const MockSyncTask&) = delete;
+ MockSyncTask& operator=(const MockSyncTask&) = delete;
+
~MockSyncTask() override {}
void RunExclusive(SyncStatusCallback callback) override {
std::move(callback).Run(SYNC_STATUS_OK);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockSyncTask);
};
class MockExtensionService : public TestExtensionService {
public:
MockExtensionService() : registry_(nullptr) {}
+
+ MockExtensionService(const MockExtensionService&) = delete;
+ MockExtensionService& operator=(const MockExtensionService&) = delete;
+
~MockExtensionService() override {}
void AddExtension(const extensions::Extension* extension) override {
@@ -93,14 +98,16 @@
private:
extensions::ExtensionRegistry registry_;
-
- DISALLOW_COPY_AND_ASSIGN(MockExtensionService);
};
class SyncWorkerTest : public testing::Test,
public base::SupportsWeakPtr<SyncWorkerTest> {
public:
SyncWorkerTest() {}
+
+ SyncWorkerTest(const SyncWorkerTest&) = delete;
+ SyncWorkerTest& operator=(const SyncWorkerTest&) = delete;
+
~SyncWorkerTest() override {}
void SetUp() override {
@@ -162,8 +169,6 @@
std::unique_ptr<MockExtensionService> extension_service_;
std::unique_ptr<SyncWorker> sync_worker_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncWorkerTest);
};
TEST_F(SyncWorkerTest, EnableOrigin) {
diff --git a/chrome/browser/sync_file_system/drive_backend/task_dependency_manager.h b/chrome/browser/sync_file_system/drive_backend/task_dependency_manager.h
index 4d4c4d4..33ddc51 100644
--- a/chrome/browser/sync_file_system/drive_backend/task_dependency_manager.h
+++ b/chrome/browser/sync_file_system/drive_backend/task_dependency_manager.h
@@ -35,6 +35,10 @@
class TaskDependencyManager {
public:
TaskDependencyManager();
+
+ TaskDependencyManager(const TaskDependencyManager&) = delete;
+ TaskDependencyManager& operator=(const TaskDependencyManager&) = delete;
+
~TaskDependencyManager();
// Inserts |task_blocker| to the collection and returns true if it
@@ -57,8 +61,6 @@
std::map<std::string, SubtreeSet> paths_by_app_id_;
std::set<std::string> file_ids_;
std::set<int64_t> tracker_ids_;
-
- DISALLOW_COPY_AND_ASSIGN(TaskDependencyManager);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.h b/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.h
index 21bfb24..dd556b6c 100644
--- a/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.h
+++ b/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.h
@@ -33,6 +33,10 @@
UninstallAppTask(SyncEngineContext* sync_context,
const std::string& app_id,
UninstallFlag uninstall_flag);
+
+ UninstallAppTask(const UninstallAppTask&) = delete;
+ UninstallAppTask& operator=(const UninstallAppTask&) = delete;
+
~UninstallAppTask() override;
void RunExclusive(SyncStatusCallback callback) override;
@@ -53,8 +57,6 @@
int64_t app_root_tracker_id_;
base::WeakPtrFactory<UninstallAppTask> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UninstallAppTask);
};
} // namespace drive_backend
diff --git a/chrome/browser/sync_file_system/fake_remote_change_processor.h b/chrome/browser/sync_file_system/fake_remote_change_processor.h
index 0055d32..04e19a8 100644
--- a/chrome/browser/sync_file_system/fake_remote_change_processor.h
+++ b/chrome/browser/sync_file_system/fake_remote_change_processor.h
@@ -38,6 +38,11 @@
storage::FileSystemURL::Comparator> URLToFileMetadata;
FakeRemoteChangeProcessor();
+
+ FakeRemoteChangeProcessor(const FakeRemoteChangeProcessor&) = delete;
+ FakeRemoteChangeProcessor& operator=(const FakeRemoteChangeProcessor&) =
+ delete;
+
~FakeRemoteChangeProcessor() override;
// RemoteChangeProcessor overrides.
@@ -76,8 +81,6 @@
// Initial local file metadata. These are overridden by applied changes.
URLToFileMetadata local_file_metadata_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeRemoteChangeProcessor);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/file_status_observer.h b/chrome/browser/sync_file_system/file_status_observer.h
index bbc5239..d5a542c 100644
--- a/chrome/browser/sync_file_system/file_status_observer.h
+++ b/chrome/browser/sync_file_system/file_status_observer.h
@@ -20,6 +20,10 @@
class FileStatusObserver {
public:
FileStatusObserver() {}
+
+ FileStatusObserver(const FileStatusObserver&) = delete;
+ FileStatusObserver& operator=(const FileStatusObserver&) = delete;
+
virtual ~FileStatusObserver() {}
virtual void OnFileStatusChanged(const storage::FileSystemURL& url,
@@ -27,9 +31,6 @@
SyncFileStatus sync_status,
SyncAction action_taken,
SyncDirection direction) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FileStatusObserver);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc b/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
index ff55f7c..d383448 100644
--- a/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
+++ b/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
@@ -175,6 +175,9 @@
base::GenerateGUID(),
blob_data)) {}
+ WriteHelper(const WriteHelper&) = delete;
+ WriteHelper& operator=(const WriteHelper&) = delete;
+
~WriteHelper() = default;
ScopedTextBlob* scoped_text_blob() const { return blob_data_.get(); }
@@ -197,8 +200,6 @@
int64_t bytes_written_;
std::unique_ptr<storage::BlobStorageContext> blob_storage_context_;
std::unique_ptr<ScopedTextBlob> blob_data_;
-
- DISALLOW_COPY_AND_ASSIGN(WriteHelper);
};
void DidGetUsageAndQuota(storage::StatusCallback callback,
diff --git a/chrome/browser/sync_file_system/local/canned_syncable_file_system.h b/chrome/browser/sync_file_system/local/canned_syncable_file_system.h
index 27d34b3..421c642 100644
--- a/chrome/browser/sync_file_system/local/canned_syncable_file_system.h
+++ b/chrome/browser/sync_file_system/local/canned_syncable_file_system.h
@@ -70,6 +70,10 @@
bool in_memory_file_system,
const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner);
+
+ CannedSyncableFileSystem(const CannedSyncableFileSystem&) = delete;
+ CannedSyncableFileSystem& operator=(const CannedSyncableFileSystem&) = delete;
+
~CannedSyncableFileSystem() override;
// SetUp must be called before using this instance.
@@ -239,8 +243,6 @@
bool is_filesystem_opened_; // Should be accessed only on the IO thread.
scoped_refptr<ObserverList> sync_status_observers_;
-
- DISALLOW_COPY_AND_ASSIGN(CannedSyncableFileSystem);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/local/local_file_change_tracker.h b/chrome/browser/sync_file_system/local/local_file_change_tracker.h
index 935c6ec..c38510a 100644
--- a/chrome/browser/sync_file_system/local/local_file_change_tracker.h
+++ b/chrome/browser/sync_file_system/local/local_file_change_tracker.h
@@ -49,6 +49,10 @@
LocalFileChangeTracker(const base::FilePath& base_path,
leveldb::Env* env_override,
base::SequencedTaskRunner* file_task_runner);
+
+ LocalFileChangeTracker(const LocalFileChangeTracker&) = delete;
+ LocalFileChangeTracker& operator=(const LocalFileChangeTracker&) = delete;
+
~LocalFileChangeTracker() override;
// FileUpdateObserver overrides.
@@ -188,8 +192,6 @@
// This can be accessed on any threads (with num_changes_lock_).
int64_t num_changes_;
mutable base::Lock num_changes_lock_;
-
- DISALLOW_COPY_AND_ASSIGN(LocalFileChangeTracker);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/local/local_file_sync_service.h b/chrome/browser/sync_file_system/local/local_file_sync_service.h
index a4d9bb5..b89e0450 100644
--- a/chrome/browser/sync_file_system/local/local_file_sync_service.h
+++ b/chrome/browser/sync_file_system/local/local_file_sync_service.h
@@ -56,6 +56,10 @@
class Observer {
public:
Observer() {}
+
+ Observer(const Observer&) = delete;
+ Observer& operator=(const Observer&) = delete;
+
virtual ~Observer() {}
// This is called when there're one or more local changes available.
@@ -63,9 +67,6 @@
// scheduling but the value may not be accurately reflect the real-time
// value.
virtual void OnLocalChangeAvailable(int64_t pending_changes_hint) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Observer);
};
typedef base::OnceCallback<void(SyncStatusCode status,
@@ -76,6 +77,10 @@
static std::unique_ptr<LocalFileSyncService> CreateForTesting(
Profile* profile,
leveldb::Env* env_override);
+
+ LocalFileSyncService(const LocalFileSyncService&) = delete;
+ LocalFileSyncService& operator=(const LocalFileSyncService&) = delete;
+
~LocalFileSyncService() override;
void Shutdown();
@@ -235,8 +240,6 @@
GetLocalChangeProcessorCallback get_local_change_processor_;
base::ObserverList<Observer>::Unchecked change_observers_;
-
- DISALLOW_COPY_AND_ASSIGN(LocalFileSyncService);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/local/local_file_sync_status.h b/chrome/browser/sync_file_system/local/local_file_sync_status.h
index 6fb27844..fcff9ca7c 100644
--- a/chrome/browser/sync_file_system/local/local_file_sync_status.h
+++ b/chrome/browser/sync_file_system/local/local_file_sync_status.h
@@ -39,15 +39,20 @@
class Observer {
public:
Observer() {}
+
+ Observer(const Observer&) = delete;
+ Observer& operator=(const Observer&) = delete;
+
virtual ~Observer() {}
virtual void OnSyncEnabled(const storage::FileSystemURL& url) = 0;
virtual void OnWriteEnabled(const storage::FileSystemURL& url) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Observer);
};
LocalFileSyncStatus();
+
+ LocalFileSyncStatus(const LocalFileSyncStatus&) = delete;
+ LocalFileSyncStatus& operator=(const LocalFileSyncStatus&) = delete;
+
~LocalFileSyncStatus();
// Increment writing counter for |url|.
@@ -97,8 +102,6 @@
URLSet syncing_;
base::ObserverList<Observer>::Unchecked observer_list_;
-
- DISALLOW_COPY_AND_ASSIGN(LocalFileSyncStatus);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/local/local_origin_change_observer.h b/chrome/browser/sync_file_system/local/local_origin_change_observer.h
index 3213114..82e2460 100644
--- a/chrome/browser/sync_file_system/local/local_origin_change_observer.h
+++ b/chrome/browser/sync_file_system/local/local_origin_change_observer.h
@@ -15,12 +15,14 @@
class LocalOriginChangeObserver {
public:
LocalOriginChangeObserver() {}
+
+ LocalOriginChangeObserver(const LocalOriginChangeObserver&) = delete;
+ LocalOriginChangeObserver& operator=(const LocalOriginChangeObserver&) =
+ delete;
+
~LocalOriginChangeObserver() {}
virtual void OnChangesAvailableInOrigins(const std::set<GURL>& origins) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LocalOriginChangeObserver);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/local/mock_sync_status_observer.h b/chrome/browser/sync_file_system/local/mock_sync_status_observer.h
index e7fed9d05..fe61d20 100644
--- a/chrome/browser/sync_file_system/local/mock_sync_status_observer.h
+++ b/chrome/browser/sync_file_system/local/mock_sync_status_observer.h
@@ -14,14 +14,15 @@
class MockSyncStatusObserver : public LocalFileSyncStatus::Observer {
public:
MockSyncStatusObserver();
+
+ MockSyncStatusObserver(const MockSyncStatusObserver&) = delete;
+ MockSyncStatusObserver& operator=(const MockSyncStatusObserver&) = delete;
+
~MockSyncStatusObserver() override;
// LocalFileSyncStatus::Observer overrides.
MOCK_METHOD1(OnSyncEnabled, void(const storage::FileSystemURL& url));
MOCK_METHOD1(OnWriteEnabled, void(const storage::FileSystemURL& url));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockSyncStatusObserver);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/local/root_delete_helper.h b/chrome/browser/sync_file_system/local/root_delete_helper.h
index d272b1d..27bc4b8f 100644
--- a/chrome/browser/sync_file_system/local/root_delete_helper.h
+++ b/chrome/browser/sync_file_system/local/root_delete_helper.h
@@ -36,6 +36,10 @@
LocalFileSyncStatus* sync_status,
const storage::FileSystemURL& url,
FileStatusCallback callback);
+
+ RootDeleteHelper(const RootDeleteHelper&) = delete;
+ RootDeleteHelper& operator=(const RootDeleteHelper&) = delete;
+
~RootDeleteHelper();
void Run();
@@ -55,8 +59,6 @@
LocalFileSyncStatus* sync_status_;
base::WeakPtrFactory<RootDeleteHelper> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(RootDeleteHelper);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/local/sync_file_system_backend.h b/chrome/browser/sync_file_system/local/sync_file_system_backend.h
index fcf5310..7769a726 100644
--- a/chrome/browser/sync_file_system/local/sync_file_system_backend.h
+++ b/chrome/browser/sync_file_system/local/sync_file_system_backend.h
@@ -27,6 +27,10 @@
class SyncFileSystemBackend : public storage::FileSystemBackend {
public:
explicit SyncFileSystemBackend(Profile* profile);
+
+ SyncFileSystemBackend(const SyncFileSystemBackend&) = delete;
+ SyncFileSystemBackend& operator=(const SyncFileSystemBackend&) = delete;
+
~SyncFileSystemBackend() override;
static std::unique_ptr<SyncFileSystemBackend> CreateForTesting();
@@ -104,8 +108,6 @@
storage::OpenFileSystemMode mode,
OpenFileSystemCallback callback,
SyncStatusCode status);
-
- DISALLOW_COPY_AND_ASSIGN(SyncFileSystemBackend);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/local/syncable_file_operation_runner.h b/chrome/browser/sync_file_system/local/syncable_file_operation_runner.h
index 202f3ef..be447a3 100644
--- a/chrome/browser/sync_file_system/local/syncable_file_operation_runner.h
+++ b/chrome/browser/sync_file_system/local/syncable_file_operation_runner.h
@@ -33,6 +33,10 @@
class Task {
public:
Task() {}
+
+ Task(const Task&) = delete;
+ Task& operator=(const Task&) = delete;
+
virtual ~Task() {}
// Only one of Run() or Cancel() is called.
@@ -47,8 +51,6 @@
friend class SyncableFileOperationRunner;
bool IsRunnable(LocalFileSyncStatus* status) const;
void Start(LocalFileSyncStatus* status);
-
- DISALLOW_COPY_AND_ASSIGN(Task);
};
SyncableFileOperationRunner(int64_t max_inflight_tasks,
diff --git a/chrome/browser/sync_file_system/local_change_processor.h b/chrome/browser/sync_file_system/local_change_processor.h
index 5770a1a5..4279997 100644
--- a/chrome/browser/sync_file_system/local_change_processor.h
+++ b/chrome/browser/sync_file_system/local_change_processor.h
@@ -23,6 +23,10 @@
class LocalChangeProcessor {
public:
LocalChangeProcessor() {}
+
+ LocalChangeProcessor(const LocalChangeProcessor&) = delete;
+ LocalChangeProcessor& operator=(const LocalChangeProcessor&) = delete;
+
virtual ~LocalChangeProcessor() {}
// This is called to apply the local |change|. If the change type is
@@ -37,9 +41,6 @@
const SyncFileMetadata& local_file_metadata,
const storage::FileSystemURL& url,
SyncStatusCallback callback) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LocalChangeProcessor);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/mock_local_change_processor.h b/chrome/browser/sync_file_system/mock_local_change_processor.h
index de6fc9a5..ae736a1 100644
--- a/chrome/browser/sync_file_system/mock_local_change_processor.h
+++ b/chrome/browser/sync_file_system/mock_local_change_processor.h
@@ -15,6 +15,10 @@
class MockLocalChangeProcessor : public LocalChangeProcessor {
public:
MockLocalChangeProcessor();
+
+ MockLocalChangeProcessor(const MockLocalChangeProcessor&) = delete;
+ MockLocalChangeProcessor& operator=(const MockLocalChangeProcessor&) = delete;
+
~MockLocalChangeProcessor() override;
// LocalChangeProcessor override.
@@ -31,8 +35,6 @@
const SyncFileMetadata& local_file_metadata,
const storage::FileSystemURL& url,
SyncStatusCallback callback);
-
- DISALLOW_COPY_AND_ASSIGN(MockLocalChangeProcessor);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/mock_remote_change_processor.h b/chrome/browser/sync_file_system/mock_remote_change_processor.h
index 79e73b40..c8dc274 100644
--- a/chrome/browser/sync_file_system/mock_remote_change_processor.h
+++ b/chrome/browser/sync_file_system/mock_remote_change_processor.h
@@ -25,6 +25,11 @@
class MockRemoteChangeProcessor : public RemoteChangeProcessor {
public:
MockRemoteChangeProcessor();
+
+ MockRemoteChangeProcessor(const MockRemoteChangeProcessor&) = delete;
+ MockRemoteChangeProcessor& operator=(const MockRemoteChangeProcessor&) =
+ delete;
+
~MockRemoteChangeProcessor() override;
// RemoteChangeProcessor overrides.
@@ -44,9 +49,6 @@
void(const storage::FileSystemURL& url,
const FileChange& change,
SyncStatusCallback callback));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockRemoteChangeProcessor);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/mock_remote_file_sync_service.h b/chrome/browser/sync_file_system/mock_remote_file_sync_service.h
index 45f759d..4c096ef 100644
--- a/chrome/browser/sync_file_system/mock_remote_file_sync_service.h
+++ b/chrome/browser/sync_file_system/mock_remote_file_sync_service.h
@@ -28,6 +28,11 @@
class MockRemoteFileSyncService : public RemoteFileSyncService {
public:
MockRemoteFileSyncService();
+
+ MockRemoteFileSyncService(const MockRemoteFileSyncService&) = delete;
+ MockRemoteFileSyncService& operator=(const MockRemoteFileSyncService&) =
+ delete;
+
~MockRemoteFileSyncService() override;
// RemoteFileSyncService overrides.
@@ -89,8 +94,6 @@
base::ObserverList<FileStatusObserver>::Unchecked file_status_observers_;
RemoteServiceState state_;
-
- DISALLOW_COPY_AND_ASSIGN(MockRemoteFileSyncService);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/remote_change_processor.h b/chrome/browser/sync_file_system/remote_change_processor.h
index cd12584..ead8978 100644
--- a/chrome/browser/sync_file_system/remote_change_processor.h
+++ b/chrome/browser/sync_file_system/remote_change_processor.h
@@ -40,6 +40,10 @@
const FileChangeList& changes)>;
RemoteChangeProcessor() {}
+
+ RemoteChangeProcessor(const RemoteChangeProcessor&) = delete;
+ RemoteChangeProcessor& operator=(const RemoteChangeProcessor&) = delete;
+
virtual ~RemoteChangeProcessor() {}
// This must be called before processing the change for the |url|.
@@ -80,9 +84,6 @@
virtual void RecordFakeLocalChange(const storage::FileSystemURL& url,
const FileChange& change,
SyncStatusCallback callback) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(RemoteChangeProcessor);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/remote_file_sync_service.h b/chrome/browser/sync_file_system/remote_file_sync_service.h
index 235b8ced..102a7d97 100644
--- a/chrome/browser/sync_file_system/remote_file_sync_service.h
+++ b/chrome/browser/sync_file_system/remote_file_sync_service.h
@@ -83,6 +83,10 @@
class Observer {
public:
Observer() {}
+
+ Observer(const Observer&) = delete;
+ Observer& operator=(const Observer&) = delete;
+
virtual ~Observer() {}
// This is called when RemoteFileSyncService updates its internal queue
@@ -96,9 +100,6 @@
virtual void OnRemoteServiceStateUpdated(
RemoteServiceState state,
const std::string& description) {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Observer);
};
struct Version {
@@ -132,6 +133,10 @@
std::set<BrowserContextKeyedServiceFactory*>* factories);
RemoteFileSyncService() {}
+
+ RemoteFileSyncService(const RemoteFileSyncService&) = delete;
+ RemoteFileSyncService& operator=(const RemoteFileSyncService&) = delete;
+
virtual ~RemoteFileSyncService() {}
// Adds and removes observers.
@@ -198,9 +203,6 @@
virtual void SetSyncEnabled(bool enabled) = 0;
virtual void PromoteDemotedChanges(base::OnceClosure callback) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(RemoteFileSyncService);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/sync_event_observer.h b/chrome/browser/sync_file_system/sync_event_observer.h
index 965d26b..da3bb5a 100644
--- a/chrome/browser/sync_file_system/sync_event_observer.h
+++ b/chrome/browser/sync_file_system/sync_event_observer.h
@@ -22,6 +22,10 @@
class SyncEventObserver {
public:
SyncEventObserver() {}
+
+ SyncEventObserver(const SyncEventObserver&) = delete;
+ SyncEventObserver& operator=(const SyncEventObserver&) = delete;
+
virtual ~SyncEventObserver() {}
// Reports there was a state change in the sync file system backend.
@@ -37,9 +41,6 @@
SyncFileStatus status,
SyncAction action,
SyncDirection direction) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SyncEventObserver);
};
} // namespace sync_file_system
diff --git a/chrome/browser/sync_file_system/sync_process_runner.cc b/chrome/browser/sync_file_system/sync_process_runner.cc
index cb6946db..3be335f 100644
--- a/chrome/browser/sync_file_system/sync_process_runner.cc
+++ b/chrome/browser/sync_file_system/sync_process_runner.cc
@@ -41,12 +41,13 @@
base::TimeTicks Now() const override { return base::TimeTicks::Now(); }
+ BaseTimerHelper(const BaseTimerHelper&) = delete;
+ BaseTimerHelper& operator=(const BaseTimerHelper&) = delete;
+
~BaseTimerHelper() override {}
private:
base::OneShotTimer timer_;
-
- DISALLOW_COPY_AND_ASSIGN(BaseTimerHelper);
};
bool WasSuccessfulSync(SyncStatusCode status) {
diff --git a/chrome/browser/sync_file_system/sync_process_runner_unittest.cc b/chrome/browser/sync_file_system/sync_process_runner_unittest.cc
index 48bc18e5..ce727599 100644
--- a/chrome/browser/sync_file_system/sync_process_runner_unittest.cc
+++ b/chrome/browser/sync_file_system/sync_process_runner_unittest.cc
@@ -21,6 +21,10 @@
class FakeClient : public SyncProcessRunner::Client {
public:
FakeClient() : service_state_(SYNC_SERVICE_RUNNING) {}
+
+ FakeClient(const FakeClient&) = delete;
+ FakeClient& operator=(const FakeClient&) = delete;
+
~FakeClient() override {}
SyncServiceState GetSyncServiceState() override { return service_state_; }
@@ -33,13 +37,15 @@
private:
SyncServiceState service_state_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeClient);
};
class FakeTimerHelper : public SyncProcessRunner::TimerHelper {
public:
FakeTimerHelper() {}
+
+ FakeTimerHelper(const FakeTimerHelper&) = delete;
+ FakeTimerHelper& operator=(const FakeTimerHelper&) = delete;
+
~FakeTimerHelper() override {}
bool IsRunning() override { return !timer_task_.is_null(); }
@@ -74,8 +80,6 @@
base::TimeTicks current_time_;
base::TimeTicks scheduled_time_;
base::OnceClosure timer_task_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeTimerHelper);
};
class FakeSyncProcessRunner : public SyncProcessRunner {
@@ -94,6 +98,9 @@
running_tasks_.push(std::move(callback));
}
+ FakeSyncProcessRunner(const FakeSyncProcessRunner&) = delete;
+ FakeSyncProcessRunner& operator=(const FakeSyncProcessRunner&) = delete;
+
~FakeSyncProcessRunner() override {}
void UpdateChanges(int num_changes) {
@@ -114,8 +121,6 @@
private:
size_t max_parallel_task_;
base::queue<SyncStatusCallback> running_tasks_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeSyncProcessRunner);
};
} // namespace
diff --git a/chrome/browser/tab_contents/navigation_metrics_recorder.h b/chrome/browser/tab_contents/navigation_metrics_recorder.h
index 11c59e8..627c534 100644
--- a/chrome/browser/tab_contents/navigation_metrics_recorder.h
+++ b/chrome/browser/tab_contents/navigation_metrics_recorder.h
@@ -17,6 +17,10 @@
: public content::WebContentsObserver,
public content::WebContentsUserData<NavigationMetricsRecorder> {
public:
+ NavigationMetricsRecorder(const NavigationMetricsRecorder&) = delete;
+ NavigationMetricsRecorder& operator=(const NavigationMetricsRecorder&) =
+ delete;
+
~NavigationMetricsRecorder() override;
// Turns on a synthetic field trial that is set on any navigation to a site
@@ -36,8 +40,6 @@
bool is_synthetic_isolation_trial_enabled_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(NavigationMetricsRecorder);
};
#endif // CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_METRICS_RECORDER_H_
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc
index 347ad96..15260d5 100644
--- a/chrome/browser/themes/browser_theme_pack.cc
+++ b/chrome/browser/themes/browser_theme_pack.cc
@@ -381,6 +381,10 @@
public:
explicit ThemeImageSource(const gfx::ImageSkia& source) : source_(source) {
}
+
+ ThemeImageSource(const ThemeImageSource&) = delete;
+ ThemeImageSource& operator=(const ThemeImageSource&) = delete;
+
~ThemeImageSource() override {}
gfx::ImageSkiaRep GetImageForScale(float scale) override {
@@ -395,8 +399,6 @@
private:
const gfx::ImageSkia source_;
-
- DISALLOW_COPY_AND_ASSIGN(ThemeImageSource);
};
// An ImageSkiaSource that delays decoding PNG data into bitmaps until
@@ -410,6 +412,9 @@
explicit ThemeImagePngSource(const PngMap& png_map) : png_map_(png_map) {}
+ ThemeImagePngSource(const ThemeImagePngSource&) = delete;
+ ThemeImagePngSource& operator=(const ThemeImagePngSource&) = delete;
+
~ThemeImagePngSource() override {}
private:
@@ -483,8 +488,6 @@
typedef std::map<ui::ResourceScaleFactor, SkBitmap> BitmapMap;
BitmapMap bitmap_map_;
-
- DISALLOW_COPY_AND_ASSIGN(ThemeImagePngSource);
};
class TabBackgroundImageSource: public gfx::CanvasImageSource {
@@ -502,6 +505,9 @@
hsl_shift_(hsl_shift),
vertical_offset_(vertical_offset) {}
+ TabBackgroundImageSource(const TabBackgroundImageSource&) = delete;
+ TabBackgroundImageSource& operator=(const TabBackgroundImageSource&) = delete;
+
~TabBackgroundImageSource() override {}
// Overridden from CanvasImageSource:
@@ -537,8 +543,6 @@
const gfx::ImageSkia overlay_;
const color_utils::HSL hsl_shift_;
const int vertical_offset_;
-
- DISALLOW_COPY_AND_ASSIGN(TabBackgroundImageSource);
};
class ControlButtonBackgroundImageSource : public gfx::CanvasImageSource {
@@ -552,6 +556,11 @@
DCHECK(!bg_image.isNull());
}
+ ControlButtonBackgroundImageSource(
+ const ControlButtonBackgroundImageSource&) = delete;
+ ControlButtonBackgroundImageSource& operator=(
+ const ControlButtonBackgroundImageSource&) = delete;
+
~ControlButtonBackgroundImageSource() override = default;
void Draw(gfx::Canvas* canvas) override {
@@ -564,8 +573,6 @@
private:
const SkColor background_color_;
const gfx::ImageSkia bg_image_;
-
- DISALLOW_COPY_AND_ASSIGN(ControlButtonBackgroundImageSource);
};
// Returns whether the color is grayscale.
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index abba09a..9e9552f 100644
--- a/chrome/browser/themes/theme_service.cc
+++ b/chrome/browser/themes/theme_service.cc
@@ -99,6 +99,9 @@
extensions::ExtensionRegistry::Get(theme_service_->profile_));
}
+ ThemeObserver(const ThemeObserver&) = delete;
+ ThemeObserver& operator=(const ThemeObserver&) = delete;
+
~ThemeObserver() override {
}
@@ -152,8 +155,6 @@
base::ScopedObservation<extensions::ExtensionRegistry,
extensions::ExtensionRegistryObserver>
extension_registry_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ThemeObserver);
};
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
diff --git a/chrome/browser/themes/theme_service_aura_linux.h b/chrome/browser/themes/theme_service_aura_linux.h
index b46623f..bab500f 100644
--- a/chrome/browser/themes/theme_service_aura_linux.h
+++ b/chrome/browser/themes/theme_service_aura_linux.h
@@ -15,6 +15,10 @@
class ThemeServiceAuraLinux : public ThemeService {
public:
using ThemeService::ThemeService;
+
+ ThemeServiceAuraLinux(const ThemeServiceAuraLinux&) = delete;
+ ThemeServiceAuraLinux& operator=(const ThemeServiceAuraLinux&) = delete;
+
~ThemeServiceAuraLinux() override;
// Overridden from ThemeService:
@@ -25,9 +29,6 @@
void FixInconsistentPreferencesIfNeeded() override;
static bool ShouldUseSystemThemeForProfile(const Profile* profile);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ThemeServiceAuraLinux);
};
#endif // CHROME_BROWSER_THEMES_THEME_SERVICE_AURA_LINUX_H_
diff --git a/chrome/browser/themes/theme_service_browsertest.cc b/chrome/browser/themes/theme_service_browsertest.cc
index c1b9a7e..03f0c4c 100644
--- a/chrome/browser/themes/theme_service_browsertest.cc
+++ b/chrome/browser/themes/theme_service_browsertest.cc
@@ -31,15 +31,16 @@
public:
ThemeServiceBrowserTest() {
}
+
+ ThemeServiceBrowserTest(const ThemeServiceBrowserTest&) = delete;
+ ThemeServiceBrowserTest& operator=(const ThemeServiceBrowserTest&) = delete;
+
~ThemeServiceBrowserTest() override {}
void SetUp() override {
extensions::ComponentLoader::EnableBackgroundExtensionsForTesting();
extensions::ExtensionBrowserTest::SetUp();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ThemeServiceBrowserTest);
};
// Test that the theme is recreated from the extension when the data pack is
diff --git a/chrome/browser/themes/theme_syncable_service.h b/chrome/browser/themes/theme_syncable_service.h
index e7c907b..0b89a0b 100644
--- a/chrome/browser/themes/theme_syncable_service.h
+++ b/chrome/browser/themes/theme_syncable_service.h
@@ -54,6 +54,10 @@
// `profile` may be nullptr in tests (and is the one used by theme_service,
// otherwise).
ThemeSyncableService(Profile* profile, ThemeService* theme_service);
+
+ ThemeSyncableService(const ThemeSyncableService&) = delete;
+ ThemeSyncableService& operator=(const ThemeSyncableService&) = delete;
+
~ThemeSyncableService() override;
static syncer::ModelType model_type() { return syncer::THEMES; }
@@ -135,8 +139,6 @@
base::ThreadChecker thread_checker_;
FRIEND_TEST_ALL_PREFIXES(ThemeSyncableServiceTest, AreThemeSpecificsEqual);
-
- DISALLOW_COPY_AND_ASSIGN(ThemeSyncableService);
};
#endif // CHROME_BROWSER_THEMES_THEME_SYNCABLE_SERVICE_H_
diff --git a/chrome/browser/thumbnail/cc/scoped_ptr_expiring_cache.h b/chrome/browser/thumbnail/cc/scoped_ptr_expiring_cache.h
index 38a65f1..2b10627 100644
--- a/chrome/browser/thumbnail/cc/scoped_ptr_expiring_cache.h
+++ b/chrome/browser/thumbnail/cc/scoped_ptr_expiring_cache.h
@@ -23,6 +23,9 @@
explicit ScopedPtrExpiringCache(size_t max_cache_size)
: max_cache_size_(max_cache_size) {}
+ ScopedPtrExpiringCache(const ScopedPtrExpiringCache&) = delete;
+ ScopedPtrExpiringCache& operator=(const ScopedPtrExpiringCache&) = delete;
+
~ScopedPtrExpiringCache() {}
void Put(const Key& key, std::unique_ptr<Value> value) {
@@ -71,8 +74,6 @@
size_t max_cache_size_;
LinkedHashMap map_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedPtrExpiringCache);
};
#endif // CHROME_BROWSER_THUMBNAIL_CC_SCOPED_PTR_EXPIRING_CACHE_H_
diff --git a/chrome/browser/thumbnail/cc/thumbnail.h b/chrome/browser/thumbnail/cc/thumbnail.h
index 743586b..061c6577 100644
--- a/chrome/browser/thumbnail/cc/thumbnail.h
+++ b/chrome/browser/thumbnail/cc/thumbnail.h
@@ -43,6 +43,10 @@
float scale,
ui::UIResourceProvider* ui_resource_provider,
ThumbnailDelegate* thumbnail_delegate);
+
+ Thumbnail(const Thumbnail&) = delete;
+ Thumbnail& operator=(const Thumbnail&) = delete;
+
~Thumbnail() override;
TabId tab_id() const { return tab_id_; }
@@ -87,7 +91,6 @@
ThumbnailDelegate* thumbnail_delegate_;
base::WeakPtrFactory<Thumbnail> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(Thumbnail);
};
#endif // CHROME_BROWSER_THUMBNAIL_CC_THUMBNAIL_H_
diff --git a/chrome/browser/thumbnail/cc/thumbnail_cache.h b/chrome/browser/thumbnail/cc/thumbnail_cache.h
index bded20b..e71af3d 100644
--- a/chrome/browser/thumbnail/cc/thumbnail_cache.h
+++ b/chrome/browser/thumbnail/cc/thumbnail_cache.h
@@ -51,6 +51,9 @@
bool save_jpeg_thumbnails,
double jpeg_aspect_ratio);
+ ThumbnailCache(const ThumbnailCache&) = delete;
+ ThumbnailCache& operator=(const ThumbnailCache&) = delete;
+
~ThumbnailCache() override;
void SetUIResourceProvider(ui::UIResourceProvider* ui_resource_provider);
@@ -190,8 +193,6 @@
std::unique_ptr<base::MemoryPressureListener> memory_pressure_;
base::WeakPtrFactory<ThumbnailCache> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ThumbnailCache);
};
#endif // CHROME_BROWSER_THUMBNAIL_CC_THUMBNAIL_CACHE_H_
diff --git a/chrome/browser/thumbnail/generator/android/local_media_data_source_factory.cc b/chrome/browser/thumbnail/generator/android/local_media_data_source_factory.cc
index 577cbc8..1f926ec 100644
--- a/chrome/browser/thumbnail/generator/android/local_media_data_source_factory.cc
+++ b/chrome/browser/thumbnail/generator/android/local_media_data_source_factory.cc
@@ -86,6 +86,10 @@
file_task_runner_(file_task_runner),
media_data_callback_(media_data_callback),
receiver_(this, std::move(receiver)) {}
+
+ LocalMediaDataSource(const LocalMediaDataSource&) = delete;
+ LocalMediaDataSource& operator=(const LocalMediaDataSource&) = delete;
+
~LocalMediaDataSource() override = default;
private:
@@ -125,8 +129,6 @@
mojo::Receiver<chrome::mojom::MediaDataSource> receiver_;
base::WeakPtrFactory<LocalMediaDataSource> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LocalMediaDataSource);
};
} // namespace
diff --git a/chrome/browser/thumbnail/generator/android/local_media_data_source_factory.h b/chrome/browser/thumbnail/generator/android/local_media_data_source_factory.h
index 6c4fe78..77c4813f 100644
--- a/chrome/browser/thumbnail/generator/android/local_media_data_source_factory.h
+++ b/chrome/browser/thumbnail/generator/android/local_media_data_source_factory.h
@@ -25,6 +25,10 @@
const base::FilePath& file_path,
scoped_refptr<base::SequencedTaskRunner> file_task_runner);
+ LocalMediaDataSourceFactory(const LocalMediaDataSourceFactory&) = delete;
+ LocalMediaDataSourceFactory& operator=(const LocalMediaDataSourceFactory&) =
+ delete;
+
~LocalMediaDataSourceFactory() override;
// SafeMediaMetadataParser::MediaDataSourceFactory implementation.
@@ -36,8 +40,6 @@
// Local downloaded media file path. This is user-defined input.
base::FilePath file_path_;
scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(LocalMediaDataSourceFactory);
};
#endif // CHROME_BROWSER_THUMBNAIL_GENERATOR_ANDROID_LOCAL_MEDIA_DATA_SOURCE_FACTORY_H_
diff --git a/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_impl.h b/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_impl.h
index 21f70c0..08e08ef 100644
--- a/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_impl.h
+++ b/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_impl.h
@@ -42,6 +42,10 @@
public:
ThumbnailMediaParserImpl(const std::string& mime_type,
const base::FilePath& file_path);
+
+ ThumbnailMediaParserImpl(const ThumbnailMediaParserImpl&) = delete;
+ ThumbnailMediaParserImpl& operator=(const ThumbnailMediaParserImpl&) = delete;
+
~ThumbnailMediaParserImpl() override;
// ThumbnailMediaParser implementation.
@@ -118,8 +122,6 @@
bool decode_done_;
base::WeakPtrFactory<ThumbnailMediaParserImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ThumbnailMediaParserImpl);
};
#endif // CHROME_BROWSER_THUMBNAIL_GENERATOR_ANDROID_THUMBNAIL_MEDIA_PARSER_IMPL_H_
diff --git a/chrome/browser/thumbnail/generator/image_thumbnail_request.h b/chrome/browser/thumbnail/generator/image_thumbnail_request.h
index 35ca6c0..b09a1c3 100644
--- a/chrome/browser/thumbnail/generator/image_thumbnail_request.h
+++ b/chrome/browser/thumbnail/generator/image_thumbnail_request.h
@@ -21,6 +21,9 @@
ImageThumbnailRequest(int icon_size,
base::OnceCallback<void(const SkBitmap&)> callback);
+ ImageThumbnailRequest(const ImageThumbnailRequest&) = delete;
+ ImageThumbnailRequest& operator=(const ImageThumbnailRequest&) = delete;
+
~ImageThumbnailRequest() override;
// Kicks off an asynchronous process to retrieve the thumbnail for the file
@@ -41,8 +44,6 @@
const int icon_size_;
base::OnceCallback<void(const SkBitmap&)> callback_;
base::WeakPtrFactory<ImageThumbnailRequest> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ImageThumbnailRequest);
};
#endif // CHROME_BROWSER_THUMBNAIL_GENERATOR_IMAGE_THUMBNAIL_REQUEST_H_
diff --git a/chrome/browser/tracing/background_tracing_metrics_provider.h b/chrome/browser/tracing/background_tracing_metrics_provider.h
index e5c5915..18ad44b 100644
--- a/chrome/browser/tracing/background_tracing_metrics_provider.h
+++ b/chrome/browser/tracing/background_tracing_metrics_provider.h
@@ -25,6 +25,12 @@
class BackgroundTracingMetricsProvider : public metrics::MetricsProvider {
public:
BackgroundTracingMetricsProvider();
+
+ BackgroundTracingMetricsProvider(const BackgroundTracingMetricsProvider&) =
+ delete;
+ BackgroundTracingMetricsProvider& operator=(
+ const BackgroundTracingMetricsProvider&) = delete;
+
~BackgroundTracingMetricsProvider() override;
// metrics::MetricsProvider:
@@ -45,8 +51,6 @@
// owned by |system_profile_providers_|.
MetricsProvider* av_metrics_provider_ = nullptr;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(BackgroundTracingMetricsProvider);
};
} // namespace tracing
diff --git a/chrome/browser/tracing/trace_event_system_stats_monitor.cc b/chrome/browser/tracing/trace_event_system_stats_monitor.cc
index 88513c0..e1adb2c 100644
--- a/chrome/browser/tracing/trace_event_system_stats_monitor.cc
+++ b/chrome/browser/tracing/trace_event_system_stats_monitor.cc
@@ -26,6 +26,10 @@
public:
explicit SystemStatsHolder(const base::SystemMetrics& system_metrics)
: system_metrics_(system_metrics) {}
+
+ SystemStatsHolder(const SystemStatsHolder&) = delete;
+ SystemStatsHolder& operator=(const SystemStatsHolder&) = delete;
+
~SystemStatsHolder() override = default;
// base::trace_event::ConvertableToTraceFormat overrides:
@@ -37,8 +41,6 @@
private:
const base::SystemMetrics system_metrics_;
-
- DISALLOW_COPY_AND_ASSIGN(SystemStatsHolder);
};
} // namespace
diff --git a/chrome/browser/tracing/trace_event_system_stats_monitor.h b/chrome/browser/tracing/trace_event_system_stats_monitor.h
index f533a89e..418a1c0 100644
--- a/chrome/browser/tracing/trace_event_system_stats_monitor.h
+++ b/chrome/browser/tracing/trace_event_system_stats_monitor.h
@@ -21,6 +21,11 @@
public performance_monitor::SystemMonitor::SystemObserver {
public:
TraceEventSystemStatsMonitor();
+
+ TraceEventSystemStatsMonitor(const TraceEventSystemStatsMonitor&) = delete;
+ TraceEventSystemStatsMonitor& operator=(const TraceEventSystemStatsMonitor&) =
+ delete;
+
~TraceEventSystemStatsMonitor() override;
// base::trace_event::TraceLog::EnabledStateChangedObserver overrides:
@@ -45,8 +50,6 @@
bool is_profiling_ = false;
base::WeakPtrFactory<TraceEventSystemStatsMonitor> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TraceEventSystemStatsMonitor);
};
} // namespace tracing
diff --git a/chrome/browser/translate/chrome_translate_client.h b/chrome/browser/translate/chrome_translate_client.h
index a927888..79e3eb4 100644
--- a/chrome/browser/translate/chrome_translate_client.h
+++ b/chrome/browser/translate/chrome_translate_client.h
@@ -48,6 +48,9 @@
public content::WebContentsUserData<ChromeTranslateClient>,
public autofill_assistant::RuntimeObserver {
public:
+ ChromeTranslateClient(const ChromeTranslateClient&) = delete;
+ ChromeTranslateClient& operator=(const ChromeTranslateClient&) = delete;
+
~ChromeTranslateClient() override;
// Gets the LanguageState associated with the page.
@@ -152,8 +155,6 @@
#endif
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(ChromeTranslateClient);
};
#endif // CHROME_BROWSER_TRANSLATE_CHROME_TRANSLATE_CLIENT_H_
diff --git a/chrome/browser/translate/fake_translate_agent.h b/chrome/browser/translate/fake_translate_agent.h
index 18d81c86..685ac77 100644
--- a/chrome/browser/translate/fake_translate_agent.h
+++ b/chrome/browser/translate/fake_translate_agent.h
@@ -44,6 +44,10 @@
class FakeTranslateAgent : public translate::mojom::TranslateAgent {
public:
FakeTranslateAgent();
+
+ FakeTranslateAgent(const FakeTranslateAgent&) = delete;
+ FakeTranslateAgent& operator=(const FakeTranslateAgent&) = delete;
+
~FakeTranslateAgent() override;
// TODO(crbug.com/1064974) Remove with subframe translation launch.
@@ -80,7 +84,6 @@
mojo::Receiver<translate::mojom::TranslateAgent> receiver_{this};
mojo::AssociatedReceiverSet<translate::mojom::TranslateAgent>
per_frame_translate_agent_receivers_;
- DISALLOW_COPY_AND_ASSIGN(FakeTranslateAgent);
};
#endif // CHROME_BROWSER_TRANSLATE_FAKE_TRANSLATE_AGENT_H_
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc
index cad0db4..cff6538 100644
--- a/chrome/browser/translate/translate_manager_browsertest.cc
+++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -235,6 +235,10 @@
base::Unretained(this)));
}
+ TranslateManagerBrowserTest(const TranslateManagerBrowserTest&) = delete;
+ TranslateManagerBrowserTest& operator=(const TranslateManagerBrowserTest&) =
+ delete;
+
~TranslateManagerBrowserTest() override = default;
void WaitUntilLanguageDetermined() { language_determined_waiter_->Wait(); }
@@ -353,8 +357,6 @@
std::unique_ptr<TranslateWaiter> language_determined_waiter_;
std::string script_;
-
- DISALLOW_COPY_AND_ASSIGN(TranslateManagerBrowserTest);
};
// Tests that the CLD (Compact Language Detection) works properly.
diff --git a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
index 3eb8ea2..e383b4a 100644
--- a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
+++ b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
@@ -479,6 +479,11 @@
SetApplicationLocale(kInvalidLocale);
}
+ TranslateManagerRenderViewHostInvalidLocaleTest(
+ const TranslateManagerRenderViewHostInvalidLocaleTest&) = delete;
+ TranslateManagerRenderViewHostInvalidLocaleTest& operator=(
+ const TranslateManagerRenderViewHostInvalidLocaleTest&) = delete;
+
~TranslateManagerRenderViewHostInvalidLocaleTest() override {
SetApplicationLocale(original_locale_);
}
@@ -491,8 +496,6 @@
translate::TranslateDownloadManager::GetInstance()->set_application_locale(
g_browser_process->GetApplicationLocale());
}
-
- DISALLOW_COPY_AND_ASSIGN(TranslateManagerRenderViewHostInvalidLocaleTest);
};
// A list of languages to fake being returned by the translate server.
diff --git a/chrome/browser/translate/translate_ranker_metrics_provider.h b/chrome/browser/translate/translate_ranker_metrics_provider.h
index a548bc6..56c8d3d 100644
--- a/chrome/browser/translate/translate_ranker_metrics_provider.h
+++ b/chrome/browser/translate/translate_ranker_metrics_provider.h
@@ -15,6 +15,12 @@
public ProfileManagerObserver {
public:
TranslateRankerMetricsProvider();
+
+ TranslateRankerMetricsProvider(const TranslateRankerMetricsProvider&) =
+ delete;
+ TranslateRankerMetricsProvider& operator=(
+ const TranslateRankerMetricsProvider&) = delete;
+
~TranslateRankerMetricsProvider() override;
// From metrics::MetricsProvider.
@@ -32,8 +38,6 @@
// The current state of logging.
bool logging_enabled_;
-
- DISALLOW_COPY_AND_ASSIGN(TranslateRankerMetricsProvider);
};
} // namespace translate
diff --git a/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.h b/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.h
index 29bbbc5..5b9a883 100644
--- a/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.h
+++ b/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.h
@@ -27,6 +27,11 @@
: public AutofillKeyboardAccessoryAdapter::AccessoryView {
public:
explicit AutofillKeyboardAccessoryView(AutofillPopupController* controller);
+
+ AutofillKeyboardAccessoryView(const AutofillKeyboardAccessoryView&) = delete;
+ AutofillKeyboardAccessoryView& operator=(
+ const AutofillKeyboardAccessoryView&) = delete;
+
~AutofillKeyboardAccessoryView() override;
// Implementation of AutofillKeyboardAccessoryAdapter::AccessoryView.
@@ -68,8 +73,6 @@
// The corresponding java object.
base::android::ScopedJavaGlobalRef<jobject> java_object_;
-
- DISALLOW_COPY_AND_ASSIGN(AutofillKeyboardAccessoryView);
};
} // namespace autofill
diff --git a/chrome/browser/ui/android/autofill/autofill_popup_view_android.h b/chrome/browser/ui/android/autofill/autofill_popup_view_android.h
index cbf742d..547bf1b 100644
--- a/chrome/browser/ui/android/autofill/autofill_popup_view_android.h
+++ b/chrome/browser/ui/android/autofill/autofill_popup_view_android.h
@@ -21,6 +21,10 @@
class AutofillPopupViewAndroid : public AutofillPopupView {
public:
explicit AutofillPopupViewAndroid(AutofillPopupController* controller);
+
+ AutofillPopupViewAndroid(const AutofillPopupViewAndroid&) = delete;
+ AutofillPopupViewAndroid& operator=(const AutofillPopupViewAndroid&) = delete;
+
~AutofillPopupViewAndroid() override;
// --------------------------------------------------------------------------
@@ -69,8 +73,6 @@
// Popup view
ui::ViewAndroid::ScopedAnchorView popup_view_;
-
- DISALLOW_COPY_AND_ASSIGN(AutofillPopupViewAndroid);
};
} // namespace autofill
diff --git a/chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h b/chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h
index ec09a16..27d0955c 100644
--- a/chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h
+++ b/chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h
@@ -27,6 +27,11 @@
CreditCardScannerViewAndroid(
const base::WeakPtr<CreditCardScannerViewDelegate>& delegate,
content::WebContents* web_contents);
+
+ CreditCardScannerViewAndroid(const CreditCardScannerViewAndroid&) = delete;
+ CreditCardScannerViewAndroid& operator=(const CreditCardScannerViewAndroid&) =
+ delete;
+
~CreditCardScannerViewAndroid() override;
// Called by JNI when user cancelled credit card scan.
@@ -51,8 +56,6 @@
// The corresponding Java object that uses Android APIs for scanning.
base::android::ScopedJavaGlobalRef<jobject> java_object_;
-
- DISALLOW_COPY_AND_ASSIGN(CreditCardScannerViewAndroid);
};
} // namespace autofill
diff --git a/chrome/browser/ui/android/chrome_http_auth_handler.h b/chrome/browser/ui/android/chrome_http_auth_handler.h
index def0ed5..5167bce 100644
--- a/chrome/browser/ui/android/chrome_http_auth_handler.h
+++ b/chrome/browser/ui/android/chrome_http_auth_handler.h
@@ -27,6 +27,10 @@
ChromeHttpAuthHandler(const std::u16string& authority,
const std::u16string& explanation,
LoginHandler::LoginModelData* login_model_data);
+
+ ChromeHttpAuthHandler(const ChromeHttpAuthHandler&) = delete;
+ ChromeHttpAuthHandler& operator=(const ChromeHttpAuthHandler&) = delete;
+
~ChromeHttpAuthHandler() override;
// This must be called before using the object.
@@ -76,8 +80,6 @@
// If not null, points to a model we need to notify of our own destruction
// so it doesn't try and access this when its too late.
password_manager::HttpAuthManager* auth_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeHttpAuthHandler);
};
#endif // CHROME_BROWSER_UI_ANDROID_CHROME_HTTP_AUTH_HANDLER_H_
diff --git a/chrome/browser/ui/android/context_menu_helper.h b/chrome/browser/ui/android/context_menu_helper.h
index 0625e669..93f113e 100644
--- a/chrome/browser/ui/android/context_menu_helper.h
+++ b/chrome/browser/ui/android/context_menu_helper.h
@@ -21,6 +21,9 @@
class ContextMenuHelper
: public content::WebContentsUserData<ContextMenuHelper> {
public:
+ ContextMenuHelper(const ContextMenuHelper&) = delete;
+ ContextMenuHelper& operator=(const ContextMenuHelper&) = delete;
+
~ContextMenuHelper() override;
void ShowContextMenu(content::RenderFrameHost* render_frame_host,
@@ -45,8 +48,6 @@
content::ContextMenuParams context_menu_params_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(ContextMenuHelper);
};
#endif // CHROME_BROWSER_UI_ANDROID_CONTEXT_MENU_HELPER_H_
diff --git a/chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.h b/chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.h
index ba94cf3..f2a03d8 100644
--- a/chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.h
+++ b/chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.h
@@ -33,6 +33,10 @@
explicit UsbChooserDialogAndroid(
std::unique_ptr<permissions::ChooserController> controller,
base::OnceClosure on_close);
+
+ UsbChooserDialogAndroid(const UsbChooserDialogAndroid&) = delete;
+ UsbChooserDialogAndroid& operator=(const UsbChooserDialogAndroid&) = delete;
+
~UsbChooserDialogAndroid() override;
// permissions::ChooserController::View implementation
@@ -62,8 +66,6 @@
std::vector<std::string> item_id_map_;
base::android::ScopedJavaGlobalRef<jobject> java_dialog_;
-
- DISALLOW_COPY_AND_ASSIGN(UsbChooserDialogAndroid);
};
#endif // CHROME_BROWSER_UI_ANDROID_DEVICE_DIALOG_USB_CHOOSER_DIALOG_ANDROID_H_
diff --git a/chrome/browser/ui/android/infobars/autofill_credit_card_filling_infobar.h b/chrome/browser/ui/android/infobars/autofill_credit_card_filling_infobar.h
index 8afe8db46..be07f74 100644
--- a/chrome/browser/ui/android/infobars/autofill_credit_card_filling_infobar.h
+++ b/chrome/browser/ui/android/infobars/autofill_credit_card_filling_infobar.h
@@ -25,6 +25,12 @@
explicit AutofillCreditCardFillingInfoBar(
std::unique_ptr<autofill::AutofillCreditCardFillingInfoBarDelegateMobile>
delegate);
+
+ AutofillCreditCardFillingInfoBar(const AutofillCreditCardFillingInfoBar&) =
+ delete;
+ AutofillCreditCardFillingInfoBar& operator=(
+ const AutofillCreditCardFillingInfoBar&) = delete;
+
~AutofillCreditCardFillingInfoBar() override;
private:
@@ -32,8 +38,6 @@
base::android::ScopedJavaLocalRef<jobject> CreateRenderInfoBar(
JNIEnv* env,
const ResourceIdMapper& resource_id_mapper) override;
-
- DISALLOW_COPY_AND_ASSIGN(AutofillCreditCardFillingInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_AUTOFILL_CREDIT_CARD_FILLING_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/autofill_save_card_infobar.h b/chrome/browser/ui/android/infobars/autofill_save_card_infobar.h
index 1e6ef9d..a34dfa9 100644
--- a/chrome/browser/ui/android/infobars/autofill_save_card_infobar.h
+++ b/chrome/browser/ui/android/infobars/autofill_save_card_infobar.h
@@ -23,6 +23,9 @@
std::unique_ptr<autofill::AutofillSaveCardInfoBarDelegateMobile>
delegate);
+ AutofillSaveCardInfoBar(const AutofillSaveCardInfoBar&) = delete;
+ AutofillSaveCardInfoBar& operator=(const AutofillSaveCardInfoBar&) = delete;
+
~AutofillSaveCardInfoBar() override;
// Called when a link in the legal message text was clicked.
@@ -41,8 +44,6 @@
// of autofill_save_card_infobar_delegate_mobile.cc as Android icon .xmls
// are stored in /chrome and /components cannot depend on /chrome.
int GetGooglePayBrandingIconId();
-
- DISALLOW_COPY_AND_ASSIGN(AutofillSaveCardInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_AUTOFILL_SAVE_CARD_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/data_reduction_promo_infobar.h b/chrome/browser/ui/android/infobars/data_reduction_promo_infobar.h
index e42a9e1..7fd920e 100644
--- a/chrome/browser/ui/android/infobars/data_reduction_promo_infobar.h
+++ b/chrome/browser/ui/android/infobars/data_reduction_promo_infobar.h
@@ -14,6 +14,10 @@
explicit DataReductionPromoInfoBar(
std::unique_ptr<DataReductionPromoInfoBarDelegateAndroid> delegate);
+ DataReductionPromoInfoBar(const DataReductionPromoInfoBar&) = delete;
+ DataReductionPromoInfoBar& operator=(const DataReductionPromoInfoBar&) =
+ delete;
+
~DataReductionPromoInfoBar() override;
private:
@@ -23,8 +27,6 @@
const ResourceIdMapper& resource_id_mapper) override;
DataReductionPromoInfoBarDelegateAndroid* GetDelegate();
-
- DISALLOW_COPY_AND_ASSIGN(DataReductionPromoInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_DATA_REDUCTION_PROMO_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/download_progress_infobar.cc b/chrome/browser/ui/android/infobars/download_progress_infobar.cc
index 66219b1..b1e0954 100644
--- a/chrome/browser/ui/android/infobars/download_progress_infobar.cc
+++ b/chrome/browser/ui/android/infobars/download_progress_infobar.cc
@@ -27,6 +27,11 @@
data_.Reset(env, jdata);
}
+ DownloadProgressInfoBarDelegate(const DownloadProgressInfoBarDelegate&) =
+ delete;
+ DownloadProgressInfoBarDelegate& operator=(
+ const DownloadProgressInfoBarDelegate&) = delete;
+
~DownloadProgressInfoBarDelegate() override = default;
infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override {
@@ -45,8 +50,6 @@
private:
base::android::ScopedJavaGlobalRef<jobject> client_;
base::android::ScopedJavaGlobalRef<jobject> data_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadProgressInfoBarDelegate);
};
DownloadProgressInfoBar::DownloadProgressInfoBar(
diff --git a/chrome/browser/ui/android/infobars/download_progress_infobar.h b/chrome/browser/ui/android/infobars/download_progress_infobar.h
index d9c85aa7b..5c24467 100644
--- a/chrome/browser/ui/android/infobars/download_progress_infobar.h
+++ b/chrome/browser/ui/android/infobars/download_progress_infobar.h
@@ -17,6 +17,10 @@
public:
explicit DownloadProgressInfoBar(
std::unique_ptr<DownloadProgressInfoBarDelegate> delegate);
+
+ DownloadProgressInfoBar(const DownloadProgressInfoBar&) = delete;
+ DownloadProgressInfoBar& operator=(const DownloadProgressInfoBar&) = delete;
+
~DownloadProgressInfoBar() override;
base::android::ScopedJavaLocalRef<jobject> GetTab(
@@ -31,9 +35,6 @@
base::android::ScopedJavaLocalRef<jobject> CreateRenderInfoBar(
JNIEnv* env,
const ResourceIdMapper& resource_id_mapper) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DownloadProgressInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_DOWNLOAD_PROGRESS_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/duplicate_download_infobar.h b/chrome/browser/ui/android/infobars/duplicate_download_infobar.h
index 6d11167..fe780c4a 100644
--- a/chrome/browser/ui/android/infobars/duplicate_download_infobar.h
+++ b/chrome/browser/ui/android/infobars/duplicate_download_infobar.h
@@ -38,6 +38,10 @@
public:
static std::unique_ptr<infobars::InfoBar> CreateInfoBar(
std::unique_ptr<android::DuplicateDownloadInfoBarDelegate> delegate);
+
+ DuplicateDownloadInfoBar(const DuplicateDownloadInfoBar&) = delete;
+ DuplicateDownloadInfoBar& operator=(const DuplicateDownloadInfoBar&) = delete;
+
~DuplicateDownloadInfoBar() override;
static void RecordDuplicateDownloadInfobarEvent(
@@ -54,8 +58,6 @@
const ResourceIdMapper& resource_id_mapper) override;
android::DuplicateDownloadInfoBarDelegate* GetDelegate();
-
- DISALLOW_COPY_AND_ASSIGN(DuplicateDownloadInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_DUPLICATE_DOWNLOAD_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/framebust_block_infobar.h b/chrome/browser/ui/android/infobars/framebust_block_infobar.h
index 52dbe339..83459d2 100644
--- a/chrome/browser/ui/android/infobars/framebust_block_infobar.h
+++ b/chrome/browser/ui/android/infobars/framebust_block_infobar.h
@@ -23,6 +23,9 @@
// See FramebustBlockInfoBar.java for UI specifics.
class FramebustBlockInfoBar : public infobars::InfoBarAndroid {
public:
+ FramebustBlockInfoBar(const FramebustBlockInfoBar&) = delete;
+ FramebustBlockInfoBar& operator=(const FramebustBlockInfoBar&) = delete;
+
~FramebustBlockInfoBar() override;
static void Show(content::WebContents* web_contents,
@@ -41,8 +44,6 @@
const base::android::JavaParamRef<jobject>& obj) override;
std::unique_ptr<FramebustBlockMessageDelegate> delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(FramebustBlockInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_FRAMEBUST_BLOCK_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/generated_password_saved_infobar.h b/chrome/browser/ui/android/infobars/generated_password_saved_infobar.h
index d9f2a8b7..0d0c028 100644
--- a/chrome/browser/ui/android/infobars/generated_password_saved_infobar.h
+++ b/chrome/browser/ui/android/infobars/generated_password_saved_infobar.h
@@ -17,6 +17,11 @@
public:
explicit GeneratedPasswordSavedInfoBar(
std::unique_ptr<GeneratedPasswordSavedInfoBarDelegateAndroid> delegate);
+
+ GeneratedPasswordSavedInfoBar(const GeneratedPasswordSavedInfoBar&) = delete;
+ GeneratedPasswordSavedInfoBar& operator=(
+ const GeneratedPasswordSavedInfoBar&) = delete;
+
~GeneratedPasswordSavedInfoBar() override;
private:
@@ -27,8 +32,6 @@
void OnLinkClicked(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj) override;
void ProcessButton(int action) override;
-
- DISALLOW_COPY_AND_ASSIGN(GeneratedPasswordSavedInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_GENERATED_PASSWORD_SAVED_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/grouped_permission_infobar.h b/chrome/browser/ui/android/infobars/grouped_permission_infobar.h
index abc0f510..0676e14 100644
--- a/chrome/browser/ui/android/infobars/grouped_permission_infobar.h
+++ b/chrome/browser/ui/android/infobars/grouped_permission_infobar.h
@@ -15,6 +15,10 @@
public:
explicit GroupedPermissionInfoBar(
std::unique_ptr<GroupedPermissionInfoBarDelegate> delegate);
+
+ GroupedPermissionInfoBar(const GroupedPermissionInfoBar&) = delete;
+ GroupedPermissionInfoBar& operator=(const GroupedPermissionInfoBar&) = delete;
+
~GroupedPermissionInfoBar() override;
private:
@@ -24,8 +28,6 @@
const ResourceIdMapper& resource_id_mapper) override;
GroupedPermissionInfoBarDelegate* GetDelegate();
-
- DISALLOW_COPY_AND_ASSIGN(GroupedPermissionInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_GROUPED_PERMISSION_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/instant_apps_infobar.h b/chrome/browser/ui/android/infobars/instant_apps_infobar.h
index 6c4a2ab..32adfa61 100644
--- a/chrome/browser/ui/android/infobars/instant_apps_infobar.h
+++ b/chrome/browser/ui/android/infobars/instant_apps_infobar.h
@@ -15,6 +15,9 @@
InstantAppsInfoBar(
std::unique_ptr<InstantAppsInfoBarDelegate> delegate);
+ InstantAppsInfoBar(const InstantAppsInfoBar&) = delete;
+ InstantAppsInfoBar& operator=(const InstantAppsInfoBar&) = delete;
+
~InstantAppsInfoBar() override;
private:
@@ -24,8 +27,6 @@
const ResourceIdMapper& resource_id_mapper) override;
base::android::ScopedJavaGlobalRef<jobject> java_infobar_;
-
- DISALLOW_COPY_AND_ASSIGN(InstantAppsInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_INSTANT_APPS_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/near_oom_infobar.h b/chrome/browser/ui/android/infobars/near_oom_infobar.h
index ead58a3..5f14267 100644
--- a/chrome/browser/ui/android/infobars/near_oom_infobar.h
+++ b/chrome/browser/ui/android/infobars/near_oom_infobar.h
@@ -21,6 +21,9 @@
// NearOomMessageDelegate for behavior specifics.
class NearOomInfoBar : public infobars::InfoBarAndroid {
public:
+ NearOomInfoBar(const NearOomInfoBar&) = delete;
+ NearOomInfoBar& operator=(const NearOomInfoBar&) = delete;
+
~NearOomInfoBar() override;
// |delegate| must remain alive while showing this info bar.
@@ -39,7 +42,6 @@
void ProcessButton(int action) override;
InterventionDelegate* delegate_;
- DISALLOW_COPY_AND_ASSIGN(NearOomInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_NEAR_OOM_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/near_oom_reduction_infobar.h b/chrome/browser/ui/android/infobars/near_oom_reduction_infobar.h
index e107613..58b5ef1d 100644
--- a/chrome/browser/ui/android/infobars/near_oom_reduction_infobar.h
+++ b/chrome/browser/ui/android/infobars/near_oom_reduction_infobar.h
@@ -21,6 +21,9 @@
// specifics, and NearOomMessageDelegate for behavior specifics.
class NearOomReductionInfoBar : public infobars::InfoBarAndroid {
public:
+ NearOomReductionInfoBar(const NearOomReductionInfoBar&) = delete;
+ NearOomReductionInfoBar& operator=(const NearOomReductionInfoBar&) = delete;
+
~NearOomReductionInfoBar() override;
static void Show(content::WebContents* web_contents,
@@ -38,7 +41,6 @@
void ProcessButton(int action) override;
InterventionDelegate* delegate_;
- DISALLOW_COPY_AND_ASSIGN(NearOomReductionInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_NEAR_OOM_REDUCTION_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/reader_mode_infobar.h b/chrome/browser/ui/android/infobars/reader_mode_infobar.h
index 45ab32a..2f0f9a58 100644
--- a/chrome/browser/ui/android/infobars/reader_mode_infobar.h
+++ b/chrome/browser/ui/android/infobars/reader_mode_infobar.h
@@ -17,6 +17,10 @@
public:
explicit ReaderModeInfoBar(
std::unique_ptr<ReaderModeInfoBarDelegate> delegate);
+
+ ReaderModeInfoBar(const ReaderModeInfoBar&) = delete;
+ ReaderModeInfoBar& operator=(const ReaderModeInfoBar&) = delete;
+
~ReaderModeInfoBar() override;
base::android::ScopedJavaLocalRef<jobject> GetTab(
@@ -31,9 +35,6 @@
base::android::ScopedJavaLocalRef<jobject> CreateRenderInfoBar(
JNIEnv* env,
const ResourceIdMapper& resource_id_mapper) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ReaderModeInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_READER_MODE_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/save_password_infobar.h b/chrome/browser/ui/android/infobars/save_password_infobar.h
index 0cfd2a2..412fc17 100644
--- a/chrome/browser/ui/android/infobars/save_password_infobar.h
+++ b/chrome/browser/ui/android/infobars/save_password_infobar.h
@@ -19,6 +19,10 @@
explicit SavePasswordInfoBar(
std::unique_ptr<SavePasswordInfoBarDelegate> delegate,
absl::optional<AccountInfo> account_info);
+
+ SavePasswordInfoBar(const SavePasswordInfoBar&) = delete;
+ SavePasswordInfoBar& operator=(const SavePasswordInfoBar&) = delete;
+
~SavePasswordInfoBar() override;
private:
@@ -32,8 +36,6 @@
base::android::ScopedJavaGlobalRef<jobject> java_infobar_;
absl::optional<AccountInfo> account_info_;
-
- DISALLOW_COPY_AND_ASSIGN(SavePasswordInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_SAVE_PASSWORD_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/search_geolocation_disclosure_infobar.h b/chrome/browser/ui/android/infobars/search_geolocation_disclosure_infobar.h
index 52491ec..c2f3f0f 100644
--- a/chrome/browser/ui/android/infobars/search_geolocation_disclosure_infobar.h
+++ b/chrome/browser/ui/android/infobars/search_geolocation_disclosure_infobar.h
@@ -15,6 +15,12 @@
public:
explicit SearchGeolocationDisclosureInfoBar(
std::unique_ptr<SearchGeolocationDisclosureInfoBarDelegate> delegate);
+
+ SearchGeolocationDisclosureInfoBar(
+ const SearchGeolocationDisclosureInfoBar&) = delete;
+ SearchGeolocationDisclosureInfoBar& operator=(
+ const SearchGeolocationDisclosureInfoBar&) = delete;
+
~SearchGeolocationDisclosureInfoBar() override;
private:
@@ -27,8 +33,6 @@
void ProcessButton(int action) override;
SearchGeolocationDisclosureInfoBarDelegate* GetDelegate();
-
- DISALLOW_COPY_AND_ASSIGN(SearchGeolocationDisclosureInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_SEARCH_GEOLOCATION_DISCLOSURE_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/simple_confirm_infobar_builder.cc b/chrome/browser/ui/android/infobars/simple_confirm_infobar_builder.cc
index 782870a5..9a6efd9 100644
--- a/chrome/browser/ui/android/infobars/simple_confirm_infobar_builder.cc
+++ b/chrome/browser/ui/android/infobars/simple_confirm_infobar_builder.cc
@@ -34,6 +34,10 @@
const std::u16string& link_text_str,
bool auto_expire);
+ SimpleConfirmInfoBarDelegate(const SimpleConfirmInfoBarDelegate&) = delete;
+ SimpleConfirmInfoBarDelegate& operator=(const SimpleConfirmInfoBarDelegate&) =
+ delete;
+
~SimpleConfirmInfoBarDelegate() override;
// ConfirmInfoBarDelegate:
@@ -58,8 +62,6 @@
std::u16string secondary_str_;
std::u16string link_text_str_;
bool auto_expire_;
-
- DISALLOW_COPY_AND_ASSIGN(SimpleConfirmInfoBarDelegate);
};
SimpleConfirmInfoBarDelegate::SimpleConfirmInfoBarDelegate(
diff --git a/chrome/browser/ui/android/infobars/survey_infobar.h b/chrome/browser/ui/android/infobars/survey_infobar.h
index 2b94fe2..398fe347 100644
--- a/chrome/browser/ui/android/infobars/survey_infobar.h
+++ b/chrome/browser/ui/android/infobars/survey_infobar.h
@@ -17,6 +17,10 @@
class SurveyInfoBar : public infobars::InfoBarAndroid {
public:
explicit SurveyInfoBar(std::unique_ptr<SurveyInfoBarDelegate> delegate);
+
+ SurveyInfoBar(const SurveyInfoBar&) = delete;
+ SurveyInfoBar& operator=(const SurveyInfoBar&) = delete;
+
~SurveyInfoBar() override;
base::android::ScopedJavaLocalRef<jobject> GetTab(
@@ -31,9 +35,6 @@
base::android::ScopedJavaLocalRef<jobject> CreateRenderInfoBar(
JNIEnv* env,
const ResourceIdMapper& resource_id_mapper) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SurveyInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_SURVEY_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/sync_error_infobar.h b/chrome/browser/ui/android/infobars/sync_error_infobar.h
index e5c9c9de..475ae14 100644
--- a/chrome/browser/ui/android/infobars/sync_error_infobar.h
+++ b/chrome/browser/ui/android/infobars/sync_error_infobar.h
@@ -14,6 +14,10 @@
public:
explicit SyncErrorInfoBar(
std::unique_ptr<SyncErrorInfoBarDelegateAndroid> delegate);
+
+ SyncErrorInfoBar(const SyncErrorInfoBar&) = delete;
+ SyncErrorInfoBar& operator=(const SyncErrorInfoBar&) = delete;
+
~SyncErrorInfoBar() override;
protected:
@@ -21,8 +25,6 @@
base::android::ScopedJavaLocalRef<jobject> CreateRenderInfoBar(
JNIEnv* env,
const ResourceIdMapper& resource_id_mapper) override;
-
- DISALLOW_COPY_AND_ASSIGN(SyncErrorInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_SYNC_ERROR_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/translate_compact_infobar.h b/chrome/browser/ui/android/infobars/translate_compact_infobar.h
index 4055932..cf0cd62 100644
--- a/chrome/browser/ui/android/infobars/translate_compact_infobar.h
+++ b/chrome/browser/ui/android/infobars/translate_compact_infobar.h
@@ -24,6 +24,10 @@
public:
explicit TranslateCompactInfoBar(
std::unique_ptr<translate::TranslateInfoBarDelegate> delegate);
+
+ TranslateCompactInfoBar(const TranslateCompactInfoBar&) = delete;
+ TranslateCompactInfoBar& operator=(const TranslateCompactInfoBar&) = delete;
+
~TranslateCompactInfoBar() override;
// JNI method specific to string settings in translate.
@@ -98,7 +102,6 @@
FLAG_NEVER_SITE = 1 << 4,
FLAG_EXPAND_MENU = 1 << 5,
};
- DISALLOW_COPY_AND_ASSIGN(TranslateCompactInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_TRANSLATE_COMPACT_INFOBAR_H_
diff --git a/chrome/browser/ui/android/infobars/update_password_infobar.h b/chrome/browser/ui/android/infobars/update_password_infobar.h
index a128a88..698cca1 100644
--- a/chrome/browser/ui/android/infobars/update_password_infobar.h
+++ b/chrome/browser/ui/android/infobars/update_password_infobar.h
@@ -17,6 +17,10 @@
public:
UpdatePasswordInfoBar(std::unique_ptr<UpdatePasswordInfoBarDelegate> delegate,
absl::optional<AccountInfo> account_info);
+
+ UpdatePasswordInfoBar(const UpdatePasswordInfoBar&) = delete;
+ UpdatePasswordInfoBar& operator=(const UpdatePasswordInfoBar&) = delete;
+
~UpdatePasswordInfoBar() override;
int GetIdOfSelectedUsername() const;
@@ -32,8 +36,6 @@
base::android::ScopedJavaGlobalRef<jobject> java_infobar_;
absl::optional<AccountInfo> account_info_;
-
- DISALLOW_COPY_AND_ASSIGN(UpdatePasswordInfoBar);
};
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_UPDATE_PASSWORD_INFOBAR_H_
diff --git a/chrome/browser/ui/android/interventions/framebust_block_message_delegate_bridge.h b/chrome/browser/ui/android/interventions/framebust_block_message_delegate_bridge.h
index 2f8ca0f..bcff60e 100644
--- a/chrome/browser/ui/android/interventions/framebust_block_message_delegate_bridge.h
+++ b/chrome/browser/ui/android/interventions/framebust_block_message_delegate_bridge.h
@@ -18,6 +18,12 @@
public:
explicit FramebustBlockMessageDelegateBridge(
std::unique_ptr<FramebustBlockMessageDelegate> delegate);
+
+ FramebustBlockMessageDelegateBridge(
+ const FramebustBlockMessageDelegateBridge&) = delete;
+ FramebustBlockMessageDelegateBridge& operator=(
+ const FramebustBlockMessageDelegateBridge&) = delete;
+
virtual ~FramebustBlockMessageDelegateBridge();
// JNI accessors.
@@ -37,8 +43,6 @@
private:
std::unique_ptr<FramebustBlockMessageDelegate> message_delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(FramebustBlockMessageDelegateBridge);
};
#endif // CHROME_BROWSER_UI_ANDROID_INTERVENTIONS_FRAMEBUST_BLOCK_MESSAGE_DELEGATE_BRIDGE_H_
diff --git a/chrome/browser/ui/android/layouts/scene_layer.h b/chrome/browser/ui/android/layouts/scene_layer.h
index 4f3f544..aefa1d3 100644
--- a/chrome/browser/ui/android/layouts/scene_layer.h
+++ b/chrome/browser/ui/android/layouts/scene_layer.h
@@ -32,6 +32,10 @@
SceneLayer(JNIEnv* env,
const base::android::JavaRef<jobject>& jobj,
scoped_refptr<cc::Layer> layer);
+
+ SceneLayer(const SceneLayer&) = delete;
+ SceneLayer& operator=(const SceneLayer&) = delete;
+
virtual ~SceneLayer();
// Notifies that this scene layer is about to be detached from its parent.
@@ -59,9 +63,6 @@
protected:
JavaObjectWeakGlobalRef weak_java_scene_layer_;
scoped_refptr<cc::Layer> layer_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SceneLayer);
};
} // namespace android
diff --git a/chrome/browser/ui/android/passwords/credential_leak_dialog_view_android.h b/chrome/browser/ui/android/passwords/credential_leak_dialog_view_android.h
index 53e8cf7..4abb53b 100644
--- a/chrome/browser/ui/android/passwords/credential_leak_dialog_view_android.h
+++ b/chrome/browser/ui/android/passwords/credential_leak_dialog_view_android.h
@@ -23,6 +23,12 @@
public:
explicit CredentialLeakDialogViewAndroid(
CredentialLeakControllerAndroid* controller);
+
+ CredentialLeakDialogViewAndroid(const CredentialLeakDialogViewAndroid&) =
+ delete;
+ CredentialLeakDialogViewAndroid& operator=(
+ const CredentialLeakDialogViewAndroid&) = delete;
+
~CredentialLeakDialogViewAndroid();
// Called to create and show the dialog.
@@ -43,8 +49,6 @@
// The corresponding java object.
base::android::ScopedJavaGlobalRef<jobject> java_object_;
-
- DISALLOW_COPY_AND_ASSIGN(CredentialLeakDialogViewAndroid);
};
#endif // CHROME_BROWSER_UI_ANDROID_PASSWORDS_CREDENTIAL_LEAK_DIALOG_VIEW_ANDROID_H_
diff --git a/chrome/browser/ui/android/passwords/manual_filling_view_android.h b/chrome/browser/ui/android/passwords/manual_filling_view_android.h
index 04376b0..8004743 100644
--- a/chrome/browser/ui/android/passwords/manual_filling_view_android.h
+++ b/chrome/browser/ui/android/passwords/manual_filling_view_android.h
@@ -30,6 +30,10 @@
// Builds the UI for the |controller|.
ManualFillingViewAndroid(ManualFillingController* controller,
content::WebContents* web_contents);
+
+ ManualFillingViewAndroid(const ManualFillingViewAndroid&) = delete;
+ ManualFillingViewAndroid& operator=(const ManualFillingViewAndroid&) = delete;
+
~ManualFillingViewAndroid() override;
// ManualFillingViewInterface:
@@ -91,8 +95,6 @@
// The corresponding java object. Use `GetOrCreateJavaObject()` to access.
base::android::ScopedJavaGlobalRef<jobject> java_object_internal_;
-
- DISALLOW_COPY_AND_ASSIGN(ManualFillingViewAndroid);
};
#endif // CHROME_BROWSER_UI_ANDROID_PASSWORDS_MANUAL_FILLING_VIEW_ANDROID_H_
diff --git a/chrome/browser/ui/android/passwords/password_generation_dialog_view_android.h b/chrome/browser/ui/android/passwords/password_generation_dialog_view_android.h
index a83337b..74decfb3 100644
--- a/chrome/browser/ui/android/passwords/password_generation_dialog_view_android.h
+++ b/chrome/browser/ui/android/passwords/password_generation_dialog_view_android.h
@@ -24,6 +24,11 @@
explicit PasswordGenerationDialogViewAndroid(
PasswordGenerationController* controller);
+ PasswordGenerationDialogViewAndroid(
+ const PasswordGenerationDialogViewAndroid&) = delete;
+ PasswordGenerationDialogViewAndroid& operator=(
+ const PasswordGenerationDialogViewAndroid&) = delete;
+
~PasswordGenerationDialogViewAndroid() override;
// Called to show the dialog. |password| is the generated password.
@@ -57,7 +62,6 @@
// Whether the dialog was shown for manual generation or not. Used for
// metrics.
autofill::password_generation::PasswordGenerationType generation_type_;
- DISALLOW_COPY_AND_ASSIGN(PasswordGenerationDialogViewAndroid);
};
#endif // CHROME_BROWSER_UI_ANDROID_PASSWORDS_PASSWORD_GENERATION_DIALOG_VIEW_ANDROID_H_
diff --git a/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.h b/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.h
index aeddf4d8..be8fd85 100644
--- a/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.h
+++ b/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.h
@@ -25,6 +25,11 @@
explicit PasswordReuseDialogViewAndroid(
PasswordReuseControllerAndroid* controller);
+ PasswordReuseDialogViewAndroid(const PasswordReuseDialogViewAndroid&) =
+ delete;
+ PasswordReuseDialogViewAndroid& operator=(
+ const PasswordReuseDialogViewAndroid&) = delete;
+
// Destructor must delete its Java counterpart.
~PasswordReuseDialogViewAndroid();
@@ -44,8 +49,6 @@
// The corresponding java object.
base::android::ScopedJavaGlobalRef<jobject> java_object_;
-
- DISALLOW_COPY_AND_ASSIGN(PasswordReuseDialogViewAndroid);
};
} // namespace safe_browsing
diff --git a/chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.h b/chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.h
index b2e2329..b879e41 100644
--- a/chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.h
+++ b/chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.h
@@ -20,6 +20,12 @@
public:
explicit ChromeWebContentsViewDelegateAndroid(
content::WebContents* web_contents);
+
+ ChromeWebContentsViewDelegateAndroid(
+ const ChromeWebContentsViewDelegateAndroid&) = delete;
+ ChromeWebContentsViewDelegateAndroid& operator=(
+ const ChromeWebContentsViewDelegateAndroid&) = delete;
+
~ChromeWebContentsViewDelegateAndroid() override;
// WebContentsViewDelegate:
@@ -32,8 +38,6 @@
private:
// The WebContents that owns the view and this delegate transitively.
content::WebContents* web_contents_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeWebContentsViewDelegateAndroid);
};
#endif // CHROME_BROWSER_UI_ANDROID_TAB_CONTENTS_CHROME_WEB_CONTENTS_VIEW_DELEGATE_ANDROID_H_
diff --git a/chrome/browser/ui/android/tab_model/android_live_tab_context.h b/chrome/browser/ui/android/tab_model/android_live_tab_context.h
index 86963c2..06215a5 100644
--- a/chrome/browser/ui/android/tab_model/android_live_tab_context.h
+++ b/chrome/browser/ui/android/tab_model/android_live_tab_context.h
@@ -24,6 +24,10 @@
class AndroidLiveTabContext : public sessions::LiveTabContext {
public:
explicit AndroidLiveTabContext(TabModel* tab_model);
+
+ AndroidLiveTabContext(const AndroidLiveTabContext&) = delete;
+ AndroidLiveTabContext& operator=(const AndroidLiveTabContext&) = delete;
+
~AndroidLiveTabContext() override {}
// Overridden from LiveTabContext:
@@ -74,7 +78,6 @@
private:
TabModel* tab_model_;
- DISALLOW_COPY_AND_ASSIGN(AndroidLiveTabContext);
};
diff --git a/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h b/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h
index 8050a94..ad75818 100644
--- a/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h
+++ b/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h
@@ -32,6 +32,10 @@
Profile* profile,
chrome::android::ActivityType activity_type);
void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
+
+ TabModelJniBridge(const TabModelJniBridge&) = delete;
+ TabModelJniBridge& operator=(const TabModelJniBridge&) = delete;
+
~TabModelJniBridge() override;
// Called by JNI
@@ -88,9 +92,6 @@
// It corresponds to a Java observer that is registered with the corresponding
// Java TabModelJniBridge.
std::unique_ptr<TabModelObserverJniBridge> observer_bridge_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TabModelJniBridge);
};
#endif // CHROME_BROWSER_UI_ANDROID_TAB_MODEL_TAB_MODEL_JNI_BRIDGE_H_
diff --git a/chrome/browser/ui/android/tab_model/tab_model_observer.h b/chrome/browser/ui/android/tab_model/tab_model_observer.h
index 98440ad..faf1248 100644
--- a/chrome/browser/ui/android/tab_model/tab_model_observer.h
+++ b/chrome/browser/ui/android/tab_model/tab_model_observer.h
@@ -18,6 +18,10 @@
class TabModelObserver {
public:
TabModelObserver();
+
+ TabModelObserver(const TabModelObserver&) = delete;
+ TabModelObserver& operator=(const TabModelObserver&) = delete;
+
virtual ~TabModelObserver();
// Called when a |tab| is selected.
@@ -60,9 +64,6 @@
// Called after a tab has been removed. At this point the tab is no longer in
// the TabModel.
virtual void TabRemoved(TabAndroid* tab);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TabModelObserver);
};
#endif // CHROME_BROWSER_UI_ANDROID_TAB_MODEL_TAB_MODEL_OBSERVER_H_
diff --git a/chrome/browser/ui/android/tab_model/tab_model_observer_jni_bridge.h b/chrome/browser/ui/android/tab_model/tab_model_observer_jni_bridge.h
index 255d38f7..9cb5aae 100644
--- a/chrome/browser/ui/android/tab_model/tab_model_observer_jni_bridge.h
+++ b/chrome/browser/ui/android/tab_model/tab_model_observer_jni_bridge.h
@@ -21,6 +21,10 @@
TabModelObserverJniBridge(JNIEnv* env,
const base::android::JavaRef<jobject>& tab_model);
+ TabModelObserverJniBridge(const TabModelObserverJniBridge&) = delete;
+ TabModelObserverJniBridge& operator=(const TabModelObserverJniBridge&) =
+ delete;
+
~TabModelObserverJniBridge();
void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
@@ -95,8 +99,6 @@
// Observers attached to this bridge.
base::ObserverList<TabModelObserver>::Unchecked observers_;
-
- DISALLOW_COPY_AND_ASSIGN(TabModelObserverJniBridge);
};
#endif // CHROME_BROWSER_UI_ANDROID_TAB_MODEL_TAB_MODEL_OBSERVER_JNI_BRIDGE_H_
diff --git a/chrome/browser/ui/app_icon_loader.h b/chrome/browser/ui/app_icon_loader.h
index ea47cae0..0b62b9a 100644
--- a/chrome/browser/ui/app_icon_loader.h
+++ b/chrome/browser/ui/app_icon_loader.h
@@ -17,6 +17,9 @@
// and ArcAppIconLoader.
class AppIconLoader {
public:
+ AppIconLoader(const AppIconLoader&) = delete;
+ AppIconLoader& operator=(const AppIconLoader&) = delete;
+
virtual ~AppIconLoader();
// Returns true is this AppIconLoader is able to load an image for the
@@ -51,8 +54,6 @@
// The delegate object which receives the icon images. No ownership.
AppIconLoaderDelegate* const delegate_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(AppIconLoader);
};
#endif // CHROME_BROWSER_UI_APP_ICON_LOADER_H_
diff --git a/chrome/browser/ui/app_list/app_service/app_service_app_icon_loader.h b/chrome/browser/ui/app_list/app_service/app_service_app_icon_loader.h
index 9d8f75a..e2c03b92 100644
--- a/chrome/browser/ui/app_list/app_service/app_service_app_icon_loader.h
+++ b/chrome/browser/ui/app_list/app_service/app_service_app_icon_loader.h
@@ -27,6 +27,10 @@
AppServiceAppIconLoader(Profile* profile,
int resource_size_in_dip,
AppIconLoaderDelegate* delegate);
+
+ AppServiceAppIconLoader(const AppServiceAppIconLoader&) = delete;
+ AppServiceAppIconLoader& operator=(const AppServiceAppIconLoader&) = delete;
+
~AppServiceAppIconLoader() override;
// AppIconLoader overrides:
@@ -61,8 +65,6 @@
AppIDToIconMap icon_map_;
base::WeakPtrFactory<AppServiceAppIconLoader> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AppServiceAppIconLoader);
};
#endif // CHROME_BROWSER_UI_APP_LIST_APP_SERVICE_APP_SERVICE_APP_ICON_LOADER_H_
diff --git a/chrome/browser/ui/app_list/app_service/app_service_app_item.h b/chrome/browser/ui/app_list/app_service/app_service_app_item.h
index e4e5ecc..c75e1e60e 100644
--- a/chrome/browser/ui/app_list/app_service/app_service_app_item.h
+++ b/chrome/browser/ui/app_list/app_service/app_service_app_item.h
@@ -23,6 +23,10 @@
AppListModelUpdater* model_updater,
const app_list::AppListSyncableService::SyncItem* sync_item,
const apps::AppUpdate& app_update);
+
+ AppServiceAppItem(const AppServiceAppItem&) = delete;
+ AppServiceAppItem& operator=(const AppServiceAppItem&) = delete;
+
~AppServiceAppItem() override;
void OnAppUpdate(const apps::AppUpdate& app_update);
@@ -51,8 +55,6 @@
std::unique_ptr<app_list::AppContextMenu> context_menu_;
base::WeakPtrFactory<AppServiceAppItem> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AppServiceAppItem);
};
#endif // CHROME_BROWSER_UI_APP_LIST_APP_SERVICE_APP_SERVICE_APP_ITEM_H_
diff --git a/chrome/browser/ui/app_list/app_service/app_service_app_model_builder.h b/chrome/browser/ui/app_list/app_service/app_service_app_model_builder.h
index 6661e36f..c542812 100644
--- a/chrome/browser/ui/app_list/app_service/app_service_app_model_builder.h
+++ b/chrome/browser/ui/app_list/app_service/app_service_app_model_builder.h
@@ -16,6 +16,10 @@
public:
explicit AppServiceAppModelBuilder(AppListControllerDelegate* controller);
+ AppServiceAppModelBuilder(const AppServiceAppModelBuilder&) = delete;
+ AppServiceAppModelBuilder& operator=(const AppServiceAppModelBuilder&) =
+ delete;
+
~AppServiceAppModelBuilder() override;
private:
@@ -30,8 +34,6 @@
apps::AppRegistryCache* cache) override;
std::unique_ptr<AppListModelUpdaterObserver> crostini_folder_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(AppServiceAppModelBuilder);
};
#endif // CHROME_BROWSER_UI_APP_LIST_APP_SERVICE_APP_SERVICE_APP_MODEL_BUILDER_H_
diff --git a/chrome/browser/ui/app_list/app_sync_ui_state.h b/chrome/browser/ui/app_list/app_sync_ui_state.h
index 38f88de..a9745b3 100644
--- a/chrome/browser/ui/app_list/app_sync_ui_state.h
+++ b/chrome/browser/ui/app_list/app_sync_ui_state.h
@@ -49,6 +49,10 @@
static bool ShouldObserveAppSyncForProfile(Profile* profile);
explicit AppSyncUIState(Profile* profile);
+
+ AppSyncUIState(const AppSyncUIState&) = delete;
+ AppSyncUIState& operator=(const AppSyncUIState&) = delete;
+
~AppSyncUIState() override;
void AddObserver(AppSyncUIStateObserver* observer);
@@ -90,8 +94,6 @@
base::ObserverList<AppSyncUIStateObserver> observers_;
extensions::ExtensionRegistry* extension_registry_;
-
- DISALLOW_COPY_AND_ASSIGN(AppSyncUIState);
};
#endif // CHROME_BROWSER_UI_APP_LIST_APP_SYNC_UI_STATE_H_
diff --git a/chrome/browser/ui/app_list/app_sync_ui_state_watcher.h b/chrome/browser/ui/app_list/app_sync_ui_state_watcher.h
index fe5a6fb..772fd534 100644
--- a/chrome/browser/ui/app_list/app_sync_ui_state_watcher.h
+++ b/chrome/browser/ui/app_list/app_sync_ui_state_watcher.h
@@ -18,6 +18,10 @@
class AppSyncUIStateWatcher : public AppSyncUIStateObserver {
public:
AppSyncUIStateWatcher(Profile* profile, AppListModelUpdater* model_updater);
+
+ AppSyncUIStateWatcher(const AppSyncUIStateWatcher&) = delete;
+ AppSyncUIStateWatcher& operator=(const AppSyncUIStateWatcher&) = delete;
+
~AppSyncUIStateWatcher() override;
private:
@@ -27,8 +31,6 @@
AppSyncUIState* app_sync_ui_state_;
// Owned by AppListSyncableService
AppListModelUpdater* model_updater_;
-
- DISALLOW_COPY_AND_ASSIGN(AppSyncUIStateWatcher);
};
#endif // CHROME_BROWSER_UI_APP_LIST_APP_SYNC_UI_STATE_WATCHER_H_
diff --git a/chrome/browser/ui/app_list/arc/arc_app_icon.cc b/chrome/browser/ui/app_list/arc/arc_app_icon.cc
index 0ca3baa2..373a26d 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_icon.cc
+++ b/chrome/browser/ui/app_list/arc/arc_app_icon.cc
@@ -70,6 +70,10 @@
class ArcAppIcon::Source : public gfx::ImageSkiaSource {
public:
Source(const base::WeakPtr<ArcAppIcon>& host, int resource_size_in_dip);
+
+ Source(const Source&) = delete;
+ Source& operator=(const Source&) = delete;
+
~Source() override;
private:
@@ -86,8 +90,6 @@
// is a cache to avoid resizing IDR icons in GetImageForScale every time.
static base::LazyInstance<std::map<std::pair<int, int>, gfx::ImageSkia>>::
DestructorAtExit default_icons_cache_;
-
- DISALLOW_COPY_AND_ASSIGN(Source);
};
base::LazyInstance<std::map<std::pair<int, int>, gfx::ImageSkia>>::
@@ -150,6 +152,10 @@
bool retain_padding,
gfx::ImageSkia& image_skia,
std::map<ui::ResourceScaleFactor, base::Time>& incomplete_scale_factors);
+
+ DecodeRequest(const DecodeRequest&) = delete;
+ DecodeRequest& operator=(const DecodeRequest&) = delete;
+
~DecodeRequest() override;
// ImageDecoder::ImageRequest
@@ -163,7 +169,6 @@
const bool retain_padding_;
gfx::ImageSkia& image_skia_;
std::map<ui::ResourceScaleFactor, base::Time>& incomplete_scale_factors_;
- DISALLOW_COPY_AND_ASSIGN(DecodeRequest);
};
////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/app_list/arc/arc_app_launcher.h b/chrome/browser/ui/app_list/arc/arc_app_launcher.h
index 81863e7..9cc96d2 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_launcher.h
+++ b/chrome/browser/ui/app_list/arc/arc_app_launcher.h
@@ -31,6 +31,10 @@
bool deferred_launch_allowed,
int64_t display_id,
apps::mojom::LaunchSource launch_source);
+
+ ArcAppLauncher(const ArcAppLauncher&) = delete;
+ ArcAppLauncher& operator=(const ArcAppLauncher&) = delete;
+
~ArcAppLauncher() override;
bool app_launched() const { return app_launched_; }
@@ -68,8 +72,6 @@
bool app_launched_ = false;
// Enum that indicates what type of metric to record to UMA on launch.
apps::mojom::LaunchSource launch_source_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppLauncher);
};
#endif // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_LAUNCHER_H_
diff --git a/chrome/browser/ui/app_list/arc/arc_app_scoped_pref_update.h b/chrome/browser/ui/app_list/arc/arc_app_scoped_pref_update.h
index b1e85de..18e6f93 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_scoped_pref_update.h
+++ b/chrome/browser/ui/app_list/arc/arc_app_scoped_pref_update.h
@@ -27,6 +27,10 @@
ArcAppScopedPrefUpdate(PrefService* service,
const std::string& id,
const std::string& path);
+
+ ArcAppScopedPrefUpdate(const ArcAppScopedPrefUpdate&) = delete;
+ ArcAppScopedPrefUpdate& operator=(const ArcAppScopedPrefUpdate&) = delete;
+
~ArcAppScopedPrefUpdate() override;
// DictionaryPrefUpdate:
@@ -34,8 +38,6 @@
private:
const std::string id_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppScopedPrefUpdate);
};
} // namespace arc
diff --git a/chrome/browser/ui/app_list/arc/arc_app_test.h b/chrome/browser/ui/app_list/arc/arc_app_test.h
index 8096eb7..e7f2b10 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_test.h
+++ b/chrome/browser/ui/app_list/arc/arc_app_test.h
@@ -40,6 +40,10 @@
class ArcAppTest {
public:
ArcAppTest();
+
+ ArcAppTest(const ArcAppTest&) = delete;
+ ArcAppTest& operator=(const ArcAppTest&) = delete;
+
virtual ~ArcAppTest();
void SetUp(Profile* profile);
@@ -145,8 +149,6 @@
std::vector<arc::mojom::ShortcutInfo> fake_shortcuts_;
bool dbus_thread_manager_initialized_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppTest);
};
#endif // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_
diff --git a/chrome/browser/ui/app_list/arc/arc_app_utils.cc b/chrome/browser/ui/app_list/arc/arc_app_utils.cc
index c486337b..10c8496 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_utils.cc
+++ b/chrome/browser/ui/app_list/arc/arc_app_utils.cc
@@ -726,6 +726,11 @@
class ProfileDestroyedObserver : public ProfileObserver {
public:
ProfileDestroyedObserver() = default;
+
+ ProfileDestroyedObserver(const ProfileDestroyedObserver&) = delete;
+ ProfileDestroyedObserver& operator=(const ProfileDestroyedObserver&) =
+ delete;
+
~ProfileDestroyedObserver() override = default;
void Observe(Profile* profile) {
@@ -741,8 +746,6 @@
private:
base::ScopedMultiSourceObservation<Profile, ProfileObserver>
observed_profiles_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ProfileDestroyedObserver);
};
static base::NoDestructor<ProfileDestroyedObserver>
profile_destroyed_observer;
diff --git a/chrome/browser/ui/app_list/arc/arc_app_utils.h b/chrome/browser/ui/app_list/arc/arc_app_utils.h
index 71d7d36..0f51074 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_utils.h
+++ b/chrome/browser/ui/app_list/arc/arc_app_utils.h
@@ -63,6 +63,10 @@
class Intent {
public:
Intent();
+
+ Intent(const Intent&) = delete;
+ Intent& operator=(const Intent&) = delete;
+
~Intent();
enum LaunchFlags : uint32_t {
@@ -101,8 +105,6 @@
std::string activity_; // Extracted from component.
uint32_t launch_flags_ = 0; // Extracted from launchFlags;
std::vector<std::string> extra_params_; // Other parameters not listed above.
-
- DISALLOW_COPY_AND_ASSIGN(Intent);
};
// Observes ARC app launches.
diff --git a/chrome/browser/ui/app_list/arc/arc_fast_app_reinstall_starter.h b/chrome/browser/ui/app_list/arc/arc_fast_app_reinstall_starter.h
index 0667943..5e1b469 100644
--- a/chrome/browser/ui/app_list/arc/arc_fast_app_reinstall_starter.h
+++ b/chrome/browser/ui/app_list/arc/arc_fast_app_reinstall_starter.h
@@ -21,6 +21,11 @@
public:
ArcFastAppReinstallStarter(content::BrowserContext* context,
PrefService* pref_service);
+
+ ArcFastAppReinstallStarter(const ArcFastAppReinstallStarter&) = delete;
+ ArcFastAppReinstallStarter& operator=(const ArcFastAppReinstallStarter&) =
+ delete;
+
~ArcFastAppReinstallStarter() override;
// Creating Fast App Reinstall starter will call MaybeStartFastAppReinstall().
@@ -45,8 +50,6 @@
content::BrowserContext* const context_;
PrefService* const pref_service_;
bool started_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ArcFastAppReinstallStarter);
};
} // namespace arc
diff --git a/chrome/browser/ui/app_list/arc/arc_package_sync_model_type_controller.h b/chrome/browser/ui/app_list/arc/arc_package_sync_model_type_controller.h
index b0c83a1..1551d7f 100644
--- a/chrome/browser/ui/app_list/arc/arc_package_sync_model_type_controller.h
+++ b/chrome/browser/ui/app_list/arc/arc_package_sync_model_type_controller.h
@@ -40,6 +40,11 @@
syncer::SyncService* sync_service,
Profile* profile);
+ ArcPackageSyncModelTypeController(const ArcPackageSyncModelTypeController&) =
+ delete;
+ ArcPackageSyncModelTypeController& operator=(
+ const ArcPackageSyncModelTypeController&) = delete;
+
~ArcPackageSyncModelTypeController() override;
// DataTypeController overrides.
@@ -60,8 +65,6 @@
Profile* const profile_;
ArcAppListPrefs* const arc_prefs_;
PrefChangeRegistrar pref_registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcPackageSyncModelTypeController);
};
#endif // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_PACKAGE_SYNC_MODEL_TYPE_CONTROLLER_H_
diff --git a/chrome/browser/ui/app_list/arc/arc_package_syncable_service.h b/chrome/browser/ui/app_list/arc/arc_package_syncable_service.h
index 9c7257f3..2d7a002 100644
--- a/chrome/browser/ui/app_list/arc/arc_package_syncable_service.h
+++ b/chrome/browser/ui/app_list/arc/arc_package_syncable_service.h
@@ -45,6 +45,10 @@
int64_t last_backup_time;
};
+ ArcPackageSyncableService(const ArcPackageSyncableService&) = delete;
+ ArcPackageSyncableService& operator=(const ArcPackageSyncableService&) =
+ delete;
+
~ArcPackageSyncableService() override;
static ArcPackageSyncableService* Create(Profile* profile,
@@ -132,8 +136,6 @@
syncer::SyncableService::StartSyncFlare flare_;
ArcAppListPrefs* const prefs_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcPackageSyncableService);
};
} // namespace arc
diff --git a/chrome/browser/ui/app_list/arc/arc_pai_starter.h b/chrome/browser/ui/app_list/arc/arc_pai_starter.h
index f623e2b..1640549 100644
--- a/chrome/browser/ui/app_list/arc/arc_pai_starter.h
+++ b/chrome/browser/ui/app_list/arc/arc_pai_starter.h
@@ -25,6 +25,10 @@
class ArcPaiStarter : public ArcAppListPrefs::Observer {
public:
explicit ArcPaiStarter(Profile* profile);
+
+ ArcPaiStarter(const ArcPaiStarter&) = delete;
+ ArcPaiStarter& operator=(const ArcPaiStarter&) = delete;
+
~ArcPaiStarter() override;
// Creates PAI starter in case it has not been executed for the requested
@@ -91,8 +95,6 @@
base::Time request_start_time_;
// Keep last.
base::WeakPtrFactory<ArcPaiStarter> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcPaiStarter);
};
} // namespace arc
diff --git a/chrome/browser/ui/app_list/arc/arc_playstore_app_context_menu.h b/chrome/browser/ui/app_list/arc/arc_playstore_app_context_menu.h
index 78ee7899..b446bf5 100644
--- a/chrome/browser/ui/app_list/arc/arc_playstore_app_context_menu.h
+++ b/chrome/browser/ui/app_list/arc/arc_playstore_app_context_menu.h
@@ -19,6 +19,11 @@
ArcPlayStoreAppContextMenu(app_list::AppContextMenuDelegate* delegate,
Profile* profile,
AppListControllerDelegate* controller);
+
+ ArcPlayStoreAppContextMenu(const ArcPlayStoreAppContextMenu&) = delete;
+ ArcPlayStoreAppContextMenu& operator=(const ArcPlayStoreAppContextMenu&) =
+ delete;
+
~ArcPlayStoreAppContextMenu() override;
// AppListContextMenu overrides:
@@ -27,9 +32,6 @@
// ui::SimpleMenuModel::Delegate overrides:
void ExecuteCommand(int command_id, int event_flags) override;
bool IsCommandIdEnabled(int command_id) const override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ArcPlayStoreAppContextMenu);
};
#endif // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_PLAYSTORE_APP_CONTEXT_MENU_H_
diff --git a/chrome/browser/ui/app_list/arc/arc_usb_host_permission_browsertest.cc b/chrome/browser/ui/app_list/arc/arc_usb_host_permission_browsertest.cc
index d522b6e..ce503ac 100644
--- a/chrome/browser/ui/app_list/arc/arc_usb_host_permission_browsertest.cc
+++ b/chrome/browser/ui/app_list/arc/arc_usb_host_permission_browsertest.cc
@@ -44,6 +44,9 @@
public:
ArcUsbHostPermissionTest() = default;
+ ArcUsbHostPermissionTest(const ArcUsbHostPermissionTest&) = delete;
+ ArcUsbHostPermissionTest& operator=(const ArcUsbHostPermissionTest&) = delete;
+
~ArcUsbHostPermissionTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -167,14 +170,16 @@
ArcUsbHostPermissionManager* arc_usb_permission_manager_;
std::unique_ptr<FakeAppInstance> app_instance_;
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcUsbHostPermissionTest);
};
class ArcUsbHostKioskPermissionTest : public ArcUsbHostPermissionTest {
public:
ArcUsbHostKioskPermissionTest() = default;
+ ArcUsbHostKioskPermissionTest(const ArcUsbHostKioskPermissionTest&) = delete;
+ ArcUsbHostKioskPermissionTest& operator=(
+ const ArcUsbHostKioskPermissionTest&) = delete;
+
~ArcUsbHostKioskPermissionTest() override = default;
void SetUpOnMainThread() override {
@@ -209,8 +214,6 @@
int accepted_response_count_ = 0;
std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcUsbHostKioskPermissionTest);
};
IN_PROC_BROWSER_TEST_F(ArcUsbHostPermissionTest, UsbTemporayPermissionTest) {
diff --git a/chrome/browser/ui/app_list/arc/arc_usb_host_permission_manager.h b/chrome/browser/ui/app_list/arc/arc_usb_host_permission_manager.h
index 3d0c5b1a..1e136d9 100644
--- a/chrome/browser/ui/app_list/arc/arc_usb_host_permission_manager.h
+++ b/chrome/browser/ui/app_list/arc/arc_usb_host_permission_manager.h
@@ -69,6 +69,10 @@
callback);
UsbPermissionRequest(UsbPermissionRequest&& other);
UsbPermissionRequest& operator=(UsbPermissionRequest&& other);
+
+ UsbPermissionRequest(const UsbPermissionRequest&) = delete;
+ UsbPermissionRequest& operator=(const UsbPermissionRequest&) = delete;
+
~UsbPermissionRequest();
const std::string& package_name() const { return package_name_; }
@@ -92,8 +96,6 @@
// Callback of the device access reqeust. nullopt if this is a scan device
// list request.
absl::optional<RequestPermissionCallback> callback_;
-
- DISALLOW_COPY_AND_ASSIGN(UsbPermissionRequest);
};
~ArcUsbHostPermissionManager() override;
diff --git a/chrome/browser/ui/app_list/arc/arc_vpn_provider_unittest.cc b/chrome/browser/ui/app_list/arc/arc_vpn_provider_unittest.cc
index 2dde25c..d08640e 100644
--- a/chrome/browser/ui/app_list/arc/arc_vpn_provider_unittest.cc
+++ b/chrome/browser/ui/app_list/arc/arc_vpn_provider_unittest.cc
@@ -21,6 +21,10 @@
class ArcVpnObserver : public app_list::ArcVpnProviderManager::Observer {
public:
ArcVpnObserver() = default;
+
+ ArcVpnObserver(const ArcVpnObserver&) = delete;
+ ArcVpnObserver& operator=(const ArcVpnObserver&) = delete;
+
~ArcVpnObserver() override = default;
int GetArcVpnProviderUpdateCount(const std::string& package_name) {
@@ -51,8 +55,6 @@
private:
std::map<std::string, int> arc_vpn_provider_counter_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcVpnObserver);
};
class ArcVpnProviderTest : public AppListTestBase {
diff --git a/chrome/browser/ui/app_list/page_break_app_item.h b/chrome/browser/ui/app_list/page_break_app_item.h
index 03686c7..5d33a53 100644
--- a/chrome/browser/ui/app_list/page_break_app_item.h
+++ b/chrome/browser/ui/app_list/page_break_app_item.h
@@ -20,14 +20,15 @@
AppListModelUpdater* model_updater,
const app_list::AppListSyncableService::SyncItem* sync_item,
const std::string& app_id);
+
+ PageBreakAppItem(const PageBreakAppItem&) = delete;
+ PageBreakAppItem& operator=(const PageBreakAppItem&) = delete;
+
~PageBreakAppItem() override;
// ChromeAppListItem:
void Activate(int event_flags) override;
const char* GetItemType() const override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PageBreakAppItem);
};
#endif // CHROME_BROWSER_UI_APP_LIST_PAGE_BREAK_APP_ITEM_H_
diff --git a/chrome/browser/ui/app_list/search/app_result.h b/chrome/browser/ui/app_list/search/app_result.h
index caa2da22..0fbe14c 100644
--- a/chrome/browser/ui/app_list/search/app_result.h
+++ b/chrome/browser/ui/app_list/search/app_result.h
@@ -24,6 +24,9 @@
class AppResult : public ChromeSearchResult, public AppContextMenuDelegate {
public:
+ AppResult(const AppResult&) = delete;
+ AppResult& operator=(const AppResult&) = delete;
+
~AppResult() override;
void UpdateFromLastLaunchedOrInstalledTime(const base::Time& current_time,
@@ -55,8 +58,6 @@
AppListControllerDelegate* controller_;
base::WeakPtrFactory<AppResult> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AppResult);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/app_search_provider.cc b/chrome/browser/ui/app_list/search/app_search_provider.cc
index 3945b183..d482c48 100644
--- a/chrome/browser/ui/app_list/search/app_search_provider.cc
+++ b/chrome/browser/ui/app_list/search/app_search_provider.cc
@@ -145,6 +145,10 @@
last_launch_time_(last_launch_time),
install_time_(install_time),
installed_internally_(installed_internally) {}
+
+ App(const App&) = delete;
+ App& operator=(const App&) = delete;
+
~App() = default;
struct CompareByLastActivityTimeAndThenAppId {
@@ -251,14 +255,16 @@
// Set to true in case app was installed internally, by sync, policy or as a
// default app.
const bool installed_internally_;
-
- DISALLOW_COPY_AND_ASSIGN(App);
};
class AppSearchProvider::DataSource {
public:
DataSource(Profile* profile, AppSearchProvider* owner)
: profile_(profile), owner_(owner) {}
+
+ DataSource(const DataSource&) = delete;
+ DataSource& operator=(const DataSource&) = delete;
+
virtual ~DataSource() {}
virtual void AddApps(Apps* apps) = 0;
@@ -278,8 +284,6 @@
// Unowned pointers.
Profile* profile_;
AppSearchProvider* owner_;
-
- DISALLOW_COPY_AND_ASSIGN(DataSource);
};
namespace {
@@ -306,6 +310,9 @@
base::Unretained(owner)));
}
+ AppServiceDataSource(const AppServiceDataSource&) = delete;
+ AppServiceDataSource& operator=(const AppServiceDataSource&) = delete;
+
~AppServiceDataSource() override = default;
// AppSearchProvider::DataSource overrides:
@@ -407,8 +414,6 @@
apps::IconCache icon_cache_;
base::CallbackListSubscription foreign_session_updated_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(AppServiceDataSource);
};
} // namespace
diff --git a/chrome/browser/ui/app_list/search/app_search_provider.h b/chrome/browser/ui/app_list/search/app_search_provider.h
index 58098f3..c0daa98f 100644
--- a/chrome/browser/ui/app_list/search/app_search_provider.h
+++ b/chrome/browser/ui/app_list/search/app_search_provider.h
@@ -42,6 +42,10 @@
AppListControllerDelegate* list_controller,
base::Clock* clock,
AppListModelUpdater* model_updater);
+
+ AppSearchProvider(const AppSearchProvider&) = delete;
+ AppSearchProvider& operator=(const AppSearchProvider&) = delete;
+
~AppSearchProvider() override;
// SearchProvider overrides:
@@ -95,8 +99,6 @@
nullptr;
base::WeakPtrFactory<AppSearchProvider> refresh_apps_factory_{this};
base::WeakPtrFactory<AppSearchProvider> update_results_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AppSearchProvider);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc b/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
index 274bbd2..d3ba0785 100644
--- a/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
+++ b/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
@@ -145,6 +145,10 @@
scoped_feature_list_.InitWithFeatures(
{}, {app_list_features::kEnableFuzzyAppSearch});
}
+
+ AppSearchProviderTest(const AppSearchProviderTest&) = delete;
+ AppSearchProviderTest& operator=(const AppSearchProviderTest&) = delete;
+
~AppSearchProviderTest() override {}
// AppListTestBase overrides:
@@ -310,8 +314,6 @@
mock_sync_sessions_client_;
std::unique_ptr<sync_sessions::SyncedSessionTracker> session_tracker_;
std::unique_ptr<sync_sessions::OpenTabsUIDelegateImpl> open_tabs_ui_delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(AppSearchProviderTest);
};
TEST_F(AppSearchProviderTest, Basic) {
@@ -903,10 +905,13 @@
public ::testing::WithParamInterface<TestExtensionInstallType> {
public:
AppSearchProviderWithExtensionInstallType() = default;
- ~AppSearchProviderWithExtensionInstallType() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(AppSearchProviderWithExtensionInstallType);
+ AppSearchProviderWithExtensionInstallType(
+ const AppSearchProviderWithExtensionInstallType&) = delete;
+ AppSearchProviderWithExtensionInstallType& operator=(
+ const AppSearchProviderWithExtensionInstallType&) = delete;
+
+ ~AppSearchProviderWithExtensionInstallType() override = default;
};
TEST_P(AppSearchProviderWithExtensionInstallType, InstallInternallyRanking) {
@@ -1033,10 +1038,13 @@
public ::testing::WithParamInterface<TestArcAppInstallType> {
public:
AppSearchProviderWithArcAppInstallType() = default;
- ~AppSearchProviderWithArcAppInstallType() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(AppSearchProviderWithArcAppInstallType);
+ AppSearchProviderWithArcAppInstallType(
+ const AppSearchProviderWithArcAppInstallType&) = delete;
+ AppSearchProviderWithArcAppInstallType& operator=(
+ const AppSearchProviderWithArcAppInstallType&) = delete;
+
+ ~AppSearchProviderWithArcAppInstallType() override = default;
};
// TODO (879413): Enable this after resolving flakiness.
diff --git a/chrome/browser/ui/app_list/search/app_service_app_result.h b/chrome/browser/ui/app_list/search/app_service_app_result.h
index a997003..63690e6 100644
--- a/chrome/browser/ui/app_list/search/app_service_app_result.h
+++ b/chrome/browser/ui/app_list/search/app_service_app_result.h
@@ -36,6 +36,10 @@
AppListControllerDelegate* controller,
bool is_recommendation,
apps::IconLoader* icon_loader);
+
+ AppServiceAppResult(const AppServiceAppResult&) = delete;
+ AppServiceAppResult& operator=(const AppServiceAppResult&) = delete;
+
~AppServiceAppResult() override;
private:
@@ -94,8 +98,6 @@
favicon::LargeIconService* large_icon_service_ = nullptr;
base::WeakPtrFactory<AppServiceAppResult> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AppServiceAppResult);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/arc/arc_app_reinstall_search_provider.h b/chrome/browser/ui/app_list/search/arc/arc_app_reinstall_search_provider.h
index 1235517c..1209f16 100644
--- a/chrome/browser/ui/app_list/search/arc/arc_app_reinstall_search_provider.h
+++ b/chrome/browser/ui/app_list/search/arc/arc_app_reinstall_search_provider.h
@@ -73,6 +73,10 @@
ArcAppReinstallSearchProvider(Profile* profile,
unsigned int max_result_count);
+ ArcAppReinstallSearchProvider(const ArcAppReinstallSearchProvider&) = delete;
+ ArcAppReinstallSearchProvider& operator=(
+ const ArcAppReinstallSearchProvider&) = delete;
+
~ArcAppReinstallSearchProvider() override;
// SearchProvider:
@@ -177,7 +181,6 @@
std::unordered_map<std::string, gfx::ImageSkia> loading_icon_urls_;
base::WeakPtrFactory<ArcAppReinstallSearchProvider> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(ArcAppReinstallSearchProvider);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/arc/arc_app_shortcut_search_result.h b/chrome/browser/ui/app_list/search/arc/arc_app_shortcut_search_result.h
index 0c3e38e..8e06614 100644
--- a/chrome/browser/ui/app_list/search/arc/arc_app_shortcut_search_result.h
+++ b/chrome/browser/ui/app_list/search/arc/arc_app_shortcut_search_result.h
@@ -36,6 +36,11 @@
AppListControllerDelegate* list_controller,
bool is_recommendation,
const std::u16string& query);
+
+ ArcAppShortcutSearchResult(const ArcAppShortcutSearchResult&) = delete;
+ ArcAppShortcutSearchResult& operator=(const ArcAppShortcutSearchResult&) =
+ delete;
+
~ArcAppShortcutSearchResult() override;
// ChromeSearchResult:
@@ -64,8 +69,6 @@
AppListControllerDelegate* const list_controller_; // Owned by AppListClient.
base::WeakPtrFactory<ArcAppShortcutSearchResult> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppShortcutSearchResult);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/arc/arc_app_shortcuts_search_provider.h b/chrome/browser/ui/app_list/search/arc/arc_app_shortcuts_search_provider.h
index 094ac9b..7081c9d 100644
--- a/chrome/browser/ui/app_list/search/arc/arc_app_shortcuts_search_provider.h
+++ b/chrome/browser/ui/app_list/search/arc/arc_app_shortcuts_search_provider.h
@@ -23,6 +23,11 @@
ArcAppShortcutsSearchProvider(int max_results,
Profile* profile,
AppListControllerDelegate* list_controller);
+
+ ArcAppShortcutsSearchProvider(const ArcAppShortcutsSearchProvider&) = delete;
+ ArcAppShortcutsSearchProvider& operator=(
+ const ArcAppShortcutsSearchProvider&) = delete;
+
~ArcAppShortcutsSearchProvider() override;
// SearchProvider:
@@ -41,8 +46,6 @@
AppListControllerDelegate* const list_controller_; // Owned by AppListClient.
base::WeakPtrFactory<ArcAppShortcutsSearchProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppShortcutsSearchProvider);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider.h b/chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider.h
index f596c5a..0e39a06 100644
--- a/chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider.h
+++ b/chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider.h
@@ -26,6 +26,11 @@
ArcPlayStoreSearchProvider(int max_results,
Profile* profile,
AppListControllerDelegate* list_controller);
+
+ ArcPlayStoreSearchProvider(const ArcPlayStoreSearchProvider&) = delete;
+ ArcPlayStoreSearchProvider& operator=(const ArcPlayStoreSearchProvider&) =
+ delete;
+
~ArcPlayStoreSearchProvider() override;
// SearchProvider:
@@ -43,8 +48,6 @@
AppListControllerDelegate* const list_controller_; // Owned by AppListClient.
std::u16string last_query_; // Most recent query issued.
base::WeakPtrFactory<ArcPlayStoreSearchProvider> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcPlayStoreSearchProvider);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider_unittest.cc b/chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider_unittest.cc
index 66f5998..3a74541 100644
--- a/chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider_unittest.cc
+++ b/chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider_unittest.cc
@@ -30,6 +30,12 @@
class ArcPlayStoreSearchProviderTest : public AppListTestBase {
public:
ArcPlayStoreSearchProviderTest() = default;
+
+ ArcPlayStoreSearchProviderTest(const ArcPlayStoreSearchProviderTest&) =
+ delete;
+ ArcPlayStoreSearchProviderTest& operator=(
+ const ArcPlayStoreSearchProviderTest&) = delete;
+
~ArcPlayStoreSearchProviderTest() override = default;
// AppListTestBase:
@@ -63,8 +69,6 @@
private:
std::unique_ptr<::test::TestAppListControllerDelegate> controller_;
ArcAppTest arc_test_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcPlayStoreSearchProviderTest);
};
TEST_F(ArcPlayStoreSearchProviderTest, Basic) {
diff --git a/chrome/browser/ui/app_list/search/arc/arc_playstore_search_result.cc b/chrome/browser/ui/app_list/search/arc/arc_playstore_search_result.cc
index 93713198..ea262e5 100644
--- a/chrome/browser/ui/app_list/search/arc/arc_playstore_search_result.cc
+++ b/chrome/browser/ui/app_list/search/arc/arc_playstore_search_result.cc
@@ -42,6 +42,11 @@
public:
explicit BadgeBackgroundImageSource(int size)
: CanvasImageSource(gfx::Size(size, size)) {}
+
+ BadgeBackgroundImageSource(const BadgeBackgroundImageSource&) = delete;
+ BadgeBackgroundImageSource& operator=(const BadgeBackgroundImageSource&) =
+ delete;
+
~BadgeBackgroundImageSource() override = default;
private:
@@ -54,8 +59,6 @@
const float origin = static_cast<float>(size().width()) / 2;
canvas->DrawCircle(gfx::PointF(origin, origin), origin, flags);
}
-
- DISALLOW_COPY_AND_ASSIGN(BadgeBackgroundImageSource);
};
gfx::ImageSkia CreateBadgeIcon(const gfx::VectorIcon& vector_icon,
diff --git a/chrome/browser/ui/app_list/search/arc/arc_playstore_search_result.h b/chrome/browser/ui/app_list/search/arc/arc_playstore_search_result.h
index b3e6028..ba79060 100644
--- a/chrome/browser/ui/app_list/search/arc/arc_playstore_search_result.h
+++ b/chrome/browser/ui/app_list/search/arc/arc_playstore_search_result.h
@@ -33,6 +33,10 @@
Profile* profile,
AppListControllerDelegate* list_controller,
const std::u16string& query);
+
+ ArcPlayStoreSearchResult(const ArcPlayStoreSearchResult&) = delete;
+ ArcPlayStoreSearchResult& operator=(const ArcPlayStoreSearchResult&) = delete;
+
~ArcPlayStoreSearchResult() override;
// ChromeSearchResult overrides:
@@ -71,8 +75,6 @@
std::unique_ptr<ArcPlayStoreAppContextMenu> context_menu_;
base::WeakPtrFactory<ArcPlayStoreSearchResult> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcPlayStoreSearchResult);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/chrome_search_result.h b/chrome/browser/ui/app_list/search/chrome_search_result.h
index 57e3c55..c80f875 100644
--- a/chrome/browser/ui/app_list/search/chrome_search_result.h
+++ b/chrome/browser/ui/app_list/search/chrome_search_result.h
@@ -43,6 +43,10 @@
using IconShape = ash::SearchResultIconShape;
ChromeSearchResult();
+
+ ChromeSearchResult(const ChromeSearchResult&) = delete;
+ ChromeSearchResult& operator=(const ChromeSearchResult&) = delete;
+
virtual ~ChromeSearchResult();
const std::u16string& title() const { return metadata_->title; }
@@ -198,8 +202,6 @@
std::unique_ptr<ash::SearchResultMetadata> metadata_;
AppListModelUpdater* model_updater_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeSearchResult);
};
::std::ostream& operator<<(::std::ostream& os,
diff --git a/chrome/browser/ui/app_list/search/common/url_icon_source.h b/chrome/browser/ui/app_list/search/common/url_icon_source.h
index 675a24e..43d0150 100644
--- a/chrome/browser/ui/app_list/search/common/url_icon_source.h
+++ b/chrome/browser/ui/app_list/search/common/url_icon_source.h
@@ -40,6 +40,10 @@
const GURL& icon_url,
int icon_size,
int default_icon_resource_id);
+
+ UrlIconSource(const UrlIconSource&) = delete;
+ UrlIconSource& operator=(const UrlIconSource&) = delete;
+
~UrlIconSource() override;
private:
@@ -67,8 +71,6 @@
std::unique_ptr<network::SimpleURLLoader> simple_loader_;
gfx::ImageSkia icon_;
-
- DISALLOW_COPY_AND_ASSIGN(UrlIconSource);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder.h b/chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder.h
index 6ceb963..74050e2 100644
--- a/chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder.h
+++ b/chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder.h
@@ -36,6 +36,10 @@
using CrOSAction = std::tuple<CrOSActionName>;
CrOSActionRecorder();
+
+ CrOSActionRecorder(const CrOSActionRecorder&) = delete;
+ CrOSActionRecorder& operator=(const CrOSActionRecorder&) = delete;
+
~CrOSActionRecorder();
// Get the pointer of the singleton.
static CrOSActionRecorder* GetCrosActionRecorder();
@@ -110,8 +114,6 @@
scoped_refptr<base::SequencedTaskRunner> task_runner_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(CrOSActionRecorder);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/files/zero_state_file_provider.h b/chrome/browser/ui/app_list/search/files/zero_state_file_provider.h
index 72d8097..3bbad73 100644
--- a/chrome/browser/ui/app_list/search/files/zero_state_file_provider.h
+++ b/chrome/browser/ui/app_list/search/files/zero_state_file_provider.h
@@ -42,6 +42,10 @@
file_manager::file_tasks::FileTasksObserver {
public:
explicit ZeroStateFileProvider(Profile* profile);
+
+ ZeroStateFileProvider(const ZeroStateFileProvider&) = delete;
+ ZeroStateFileProvider& operator=(const ZeroStateFileProvider&) = delete;
+
~ZeroStateFileProvider() override;
// SearchProvider:
@@ -76,8 +80,6 @@
scoped_refptr<base::SequencedTaskRunner> task_runner_;
base::WeakPtrFactory<ZeroStateFileProvider> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ZeroStateFileProvider);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/mixer.cc b/chrome/browser/ui/app_list/search/mixer.cc
index 2e24e03c..aa2816c3 100644
--- a/chrome/browser/ui/app_list/search/mixer.cc
+++ b/chrome/browser/ui/app_list/search/mixer.cc
@@ -75,6 +75,10 @@
class Mixer::Group {
public:
explicit Group(size_t max_results) : max_results_(max_results) {}
+
+ Group(const Group&) = delete;
+ Group& operator=(const Group&) = delete;
+
~Group() {}
void AddProvider(SearchProvider* provider) {
@@ -110,8 +114,6 @@
Providers providers_; // Not owned.
SortedResults results_;
-
- DISALLOW_COPY_AND_ASSIGN(Group);
};
Mixer::Mixer(AppListModelUpdater* model_updater,
diff --git a/chrome/browser/ui/app_list/search/mixer.h b/chrome/browser/ui/app_list/search/mixer.h
index 589512d..d32275d 100644
--- a/chrome/browser/ui/app_list/search/mixer.h
+++ b/chrome/browser/ui/app_list/search/mixer.h
@@ -38,6 +38,10 @@
public:
Mixer(AppListModelUpdater* model_updater,
SearchControllerImpl* search_controller);
+
+ Mixer(const Mixer&) = delete;
+ Mixer& operator=(const Mixer&) = delete;
+
~Mixer();
// Adds a new mixer group. A "soft" maximum of |max_results| results will be
@@ -98,8 +102,6 @@
// Adaptive models used for re-ranking search results.
std::unique_ptr<SearchResultRanker> search_result_ranker_;
std::unique_ptr<ChipRanker> chip_ranker_;
-
- DISALLOW_COPY_AND_ASSIGN(Mixer);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/mixer_unittest.cc b/chrome/browser/ui/app_list/search/mixer_unittest.cc
index a537267b..ee4f472 100644
--- a/chrome/browser/ui/app_list/search/mixer_unittest.cc
+++ b/chrome/browser/ui/app_list/search/mixer_unittest.cc
@@ -44,6 +44,10 @@
SetTitle(base::UTF8ToUTF16(id));
set_relevance(relevance);
}
+
+ TestSearchResult(const TestSearchResult&) = delete;
+ TestSearchResult& operator=(const TestSearchResult&) = delete;
+
~TestSearchResult() override {}
// ChromeSearchResult overrides:
@@ -60,8 +64,6 @@
static int instantiation_count;
int instance_id_;
-
- DISALLOW_COPY_AND_ASSIGN(TestSearchResult);
};
int TestSearchResult::instantiation_count = 0;
@@ -75,6 +77,10 @@
last_result_has_display_index_(false),
display_type_(ash::SearchResultDisplayType::kList),
result_type_(result_type) {}
+
+ TestSearchProvider(const TestSearchProvider&) = delete;
+ TestSearchProvider& operator=(const TestSearchProvider&) = delete;
+
~TestSearchProvider() override {}
// SearchProvider overrides:
@@ -126,13 +132,15 @@
bool last_result_has_display_index_;
ChromeSearchResult::DisplayType display_type_;
SearchResultType result_type_;
-
- DISALLOW_COPY_AND_ASSIGN(TestSearchProvider);
};
class MixerTest : public testing::Test {
public:
MixerTest() {}
+
+ MixerTest(const MixerTest&) = delete;
+ MixerTest& operator=(const MixerTest&) = delete;
+
~MixerTest() override {}
// testing::Test overrides:
@@ -203,8 +211,6 @@
std::unique_ptr<SearchControllerImpl> search_controller_;
std::vector<std::unique_ptr<TestSearchProvider>> providers_;
-
- DISALLOW_COPY_AND_ASSIGN(MixerTest);
};
// Tests that results with display index defined, will be shown in the final
diff --git a/chrome/browser/ui/app_list/search/omnibox_provider.h b/chrome/browser/ui/app_list/search/omnibox_provider.h
index cc20c68..c4360ed 100644
--- a/chrome/browser/ui/app_list/search/omnibox_provider.h
+++ b/chrome/browser/ui/app_list/search/omnibox_provider.h
@@ -26,6 +26,10 @@
public:
explicit OmniboxProvider(Profile* profile,
AppListControllerDelegate* list_controller);
+
+ OmniboxProvider(const OmniboxProvider&) = delete;
+ OmniboxProvider& operator=(const OmniboxProvider&) = delete;
+
~OmniboxProvider() override;
// SearchProvider overrides:
@@ -53,10 +57,6 @@
std::unique_ptr<AutocompleteController> controller_;
FaviconCache favicon_cache_;
-
- // TODO(crbug.com/1247475): Score normalizers removed due to stability issues.
-
- DISALLOW_COPY_AND_ASSIGN(OmniboxProvider);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/omnibox_result_unittest.cc b/chrome/browser/ui/app_list/search/omnibox_result_unittest.cc
index 5f00272..19d9411 100644
--- a/chrome/browser/ui/app_list/search/omnibox_result_unittest.cc
+++ b/chrome/browser/ui/app_list/search/omnibox_result_unittest.cc
@@ -36,6 +36,10 @@
class OmniboxResultTest : public AppListTestBase {
public:
OmniboxResultTest() {}
+
+ OmniboxResultTest(const OmniboxResultTest&) = delete;
+ OmniboxResultTest& operator=(const OmniboxResultTest&) = delete;
+
~OmniboxResultTest() override {}
// AppListTestBase overrides:
@@ -77,8 +81,6 @@
private:
std::unique_ptr<::test::TestAppListControllerDelegate>
app_list_controller_delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(OmniboxResultTest);
};
TEST_F(OmniboxResultTest, Basic) {
diff --git a/chrome/browser/ui/app_list/search/search_provider.h b/chrome/browser/ui/app_list/search/search_provider.h
index a7a5bb2..7fd9a50a 100644
--- a/chrome/browser/ui/app_list/search/search_provider.h
+++ b/chrome/browser/ui/app_list/search/search_provider.h
@@ -26,6 +26,10 @@
using ResultChangedCallback = base::RepeatingClosure;
SearchProvider();
+
+ SearchProvider(const SearchProvider&) = delete;
+ SearchProvider& operator=(const SearchProvider&) = delete;
+
virtual ~SearchProvider();
// Invoked to start a query.
@@ -74,8 +78,6 @@
ResultChangedCallback result_changed_callback_;
SearchController* search_controller_;
Results results_;
-
- DISALLOW_COPY_AND_ASSIGN(SearchProvider);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/app_launch_event_logger.h b/chrome/browser/ui/app_list/search/search_result_ranker/app_launch_event_logger.h
index e1e7867..c2e3f816 100644
--- a/chrome/browser/ui/app_list/search/search_result_ranker/app_launch_event_logger.h
+++ b/chrome/browser/ui/app_list/search/search_result_ranker/app_launch_event_logger.h
@@ -49,6 +49,10 @@
class AppLaunchEventLogger {
public:
AppLaunchEventLogger();
+
+ AppLaunchEventLogger(const AppLaunchEventLogger&) = delete;
+ AppLaunchEventLogger& operator=(const AppLaunchEventLogger&) = delete;
+
virtual ~AppLaunchEventLogger();
// Processes a click on an app in the suggestion chip or search box and logs
@@ -155,8 +159,6 @@
scoped_refptr<base::SequencedTaskRunner> task_runner_;
base::WeakPtrFactory<AppLaunchEventLogger> weak_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(AppLaunchEventLogger);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/app_launch_predictor.h b/chrome/browser/ui/app_list/search/search_result_ranker/app_launch_predictor.h
index 7d25c6cb..ab2c2b7 100644
--- a/chrome/browser/ui/app_list/search/search_result_ranker/app_launch_predictor.h
+++ b/chrome/browser/ui/app_list/search/search_result_ranker/app_launch_predictor.h
@@ -45,6 +45,10 @@
class MrfuAppLaunchPredictor : public AppLaunchPredictor {
public:
MrfuAppLaunchPredictor();
+
+ MrfuAppLaunchPredictor(const MrfuAppLaunchPredictor&) = delete;
+ MrfuAppLaunchPredictor& operator=(const MrfuAppLaunchPredictor&) = delete;
+
~MrfuAppLaunchPredictor() override;
// AppLaunchPredictor:
@@ -83,8 +87,6 @@
// (1) Set a better initial value based on real user data.
// (2) Dynamically change this coeff instead of setting it as constant.
static constexpr float decay_coeff_ = 0.8f;
-
- DISALLOW_COPY_AND_ASSIGN(MrfuAppLaunchPredictor);
};
// SerializedMrfuAppLaunchPredictor is MrfuAppLaunchPredictor with supporting of
@@ -92,6 +94,12 @@
class SerializedMrfuAppLaunchPredictor : public MrfuAppLaunchPredictor {
public:
SerializedMrfuAppLaunchPredictor();
+
+ SerializedMrfuAppLaunchPredictor(const SerializedMrfuAppLaunchPredictor&) =
+ delete;
+ SerializedMrfuAppLaunchPredictor& operator=(
+ const SerializedMrfuAppLaunchPredictor&) = delete;
+
~SerializedMrfuAppLaunchPredictor() override;
// AppLaunchPredictor:
@@ -106,8 +114,6 @@
private:
// Last time the predictor was saved.
base::Time last_save_timestamp_;
-
- DISALLOW_COPY_AND_ASSIGN(SerializedMrfuAppLaunchPredictor);
};
// HourAppLaunchPredictor is a AppLaunchPredictor that uses hour of the day as
@@ -122,6 +128,10 @@
class HourAppLaunchPredictor : public AppLaunchPredictor {
public:
HourAppLaunchPredictor();
+
+ HourAppLaunchPredictor(const HourAppLaunchPredictor&) = delete;
+ HourAppLaunchPredictor& operator=(const HourAppLaunchPredictor&) = delete;
+
~HourAppLaunchPredictor() override;
// AppLaunchPredictor:
@@ -158,14 +168,16 @@
static constexpr float kWeeklyDecayCoeff = 0.8;
// Weights that are used to combine adjacent bins.
const std::vector<float> bin_weights_;
-
- DISALLOW_COPY_AND_ASSIGN(HourAppLaunchPredictor);
};
// Predictor for testing AppSearchResultRanker only.
class FakeAppLaunchPredictor : public AppLaunchPredictor {
public:
FakeAppLaunchPredictor() = default;
+
+ FakeAppLaunchPredictor(const FakeAppLaunchPredictor&) = delete;
+ FakeAppLaunchPredictor& operator=(const FakeAppLaunchPredictor&) = delete;
+
~FakeAppLaunchPredictor() override = default;
// Manually set |should_save_|;
@@ -186,8 +198,6 @@
bool should_save_ = false;
// The proto for this predictor.
AppLaunchPredictorProto proto_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeAppLaunchPredictor);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/app_search_result_ranker.h b/chrome/browser/ui/app_list/search/search_result_ranker/app_search_result_ranker.h
index 7520e7d..62bbe6e 100644
--- a/chrome/browser/ui/app_list/search/search_result_ranker/app_search_result_ranker.h
+++ b/chrome/browser/ui/app_list/search/search_result_ranker/app_search_result_ranker.h
@@ -34,6 +34,9 @@
AppSearchResultRanker(const base::FilePath& profile_path,
bool is_ephemeral_user);
+ AppSearchResultRanker(const AppSearchResultRanker&) = delete;
+ AppSearchResultRanker& operator=(const AppSearchResultRanker&) = delete;
+
~AppSearchResultRanker();
// Trains on the |app_id| and (possibly) updates its internal representation.
@@ -65,8 +68,6 @@
const base::FilePath predictor_filename_;
scoped_refptr<base::SequencedTaskRunner> task_runner_;
base::WeakPtrFactory<AppSearchResultRanker> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AppSearchResultRanker);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/chip_ranker_unittest.cc b/chrome/browser/ui/app_list/search/search_result_ranker/chip_ranker_unittest.cc
index ad1e625c..1cb4e6c 100644
--- a/chrome/browser/ui/app_list/search/search_result_ranker/chip_ranker_unittest.cc
+++ b/chrome/browser/ui/app_list/search/search_result_ranker/chip_ranker_unittest.cc
@@ -54,6 +54,10 @@
break;
}
}
+
+ TestSearchResult(const TestSearchResult&) = delete;
+ TestSearchResult& operator=(const TestSearchResult&) = delete;
+
~TestSearchResult() override {}
// ChromeSearchResult overrides:
@@ -63,8 +67,6 @@
static int instantiation_count;
int instance_id_;
-
- DISALLOW_COPY_AND_ASSIGN(TestSearchResult);
};
int TestSearchResult::instantiation_count = 0;
diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/frecency_store.h b/chrome/browser/ui/app_list/search/search_result_ranker/frecency_store.h
index ff031b3..7c9f56759 100644
--- a/chrome/browser/ui/app_list/search/search_result_ranker/frecency_store.h
+++ b/chrome/browser/ui/app_list/search/search_result_ranker/frecency_store.h
@@ -26,6 +26,10 @@
class FrecencyStore {
public:
FrecencyStore(int value_limit, float decay_coeff);
+
+ FrecencyStore(const FrecencyStore&) = delete;
+ FrecencyStore& operator=(const FrecencyStore&) = delete;
+
~FrecencyStore();
// Records all information about a value: its id and score, along with the
@@ -91,8 +95,6 @@
unsigned int num_updates_ = 0;
// The next ID available for a value to used. This is guaranteed to be unique.
unsigned int next_id_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(FrecencyStore);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/recurrence_predictor.h b/chrome/browser/ui/app_list/search/search_result_ranker/recurrence_predictor.h
index 12c8df1..7d29be6 100644
--- a/chrome/browser/ui/app_list/search/search_result_ranker/recurrence_predictor.h
+++ b/chrome/browser/ui/app_list/search/search_result_ranker/recurrence_predictor.h
@@ -81,6 +81,10 @@
explicit FakePredictor(const std::string& model_identifier);
FakePredictor(const FakePredictorConfig& config,
const std::string& model_identifier);
+
+ FakePredictor(const FakePredictor&) = delete;
+ FakePredictor& operator=(const FakePredictor&) = delete;
+
~FakePredictor() override;
// RecurrencePredictor:
@@ -95,8 +99,6 @@
private:
std::map<unsigned int, float> counts_;
-
- DISALLOW_COPY_AND_ASSIGN(FakePredictor);
};
// DefaultPredictor does no work on its own. Using this predictor makes the
@@ -106,6 +108,10 @@
public:
DefaultPredictor(const DefaultPredictorConfig& config,
const std::string& model_identifier);
+
+ DefaultPredictor(const DefaultPredictor&) = delete;
+ DefaultPredictor& operator=(const DefaultPredictor&) = delete;
+
~DefaultPredictor() override;
// RecurrencePredictor:
@@ -116,9 +122,6 @@
const char* GetPredictorName() const override;
static const char kPredictorName[];
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DefaultPredictor);
};
// A simple frequency predictor that scores targets by their normalized counts.
@@ -127,6 +130,10 @@
explicit FrequencyPredictor(const std::string& model_identifier);
FrequencyPredictor(const FrequencyPredictorConfig& config,
const std::string& model_identifier);
+
+ FrequencyPredictor(const FrequencyPredictor&) = delete;
+ FrequencyPredictor& operator=(const FrequencyPredictor&) = delete;
+
~FrequencyPredictor() override;
// RecurrencePredictor:
@@ -141,8 +148,6 @@
private:
std::map<unsigned int, int> counts_;
-
- DISALLOW_COPY_AND_ASSIGN(FrequencyPredictor);
};
// Represents a conditional probability table which stores the frequency of
@@ -158,6 +163,11 @@
const ConditionalFrequencyPredictorConfig& config,
const std::string& model_identifier);
explicit ConditionalFrequencyPredictor(const std::string& model_identifier);
+
+ ConditionalFrequencyPredictor(const ConditionalFrequencyPredictor&) = delete;
+ ConditionalFrequencyPredictor& operator=(
+ const ConditionalFrequencyPredictor&) = delete;
+
~ConditionalFrequencyPredictor() override;
// Stores a mapping from events to frequencies, along with the total frequency
@@ -196,8 +206,6 @@
private:
// Stores a mapping from conditions to events to frequencies.
std::map<unsigned int, ConditionalFrequencyPredictor::Events> table_;
-
- DISALLOW_COPY_AND_ASSIGN(ConditionalFrequencyPredictor);
};
// FrecencyPredictor ranks targets according to their frecency, and
@@ -217,6 +225,10 @@
public:
FrecencyPredictor(const FrecencyPredictorConfig& config,
const std::string& model_identifier);
+
+ FrecencyPredictor(const FrecencyPredictor&) = delete;
+ FrecencyPredictor& operator=(const FrecencyPredictor&) = delete;
+
~FrecencyPredictor() override;
// Records all information about a target: its id and score, along with the
@@ -253,8 +265,6 @@
// This stores all the data of the frecency predictor.
std::map<unsigned int, FrecencyPredictor::TargetData> targets_;
-
- DISALLOW_COPY_AND_ASSIGN(FrecencyPredictor);
};
// |HourBinPredictor| ranks targets according to their frequency during
@@ -264,6 +274,10 @@
public:
HourBinPredictor(const HourBinPredictorConfig& config,
const std::string& model_identifier);
+
+ HourBinPredictor(const HourBinPredictor&) = delete;
+ HourBinPredictor& operator=(const HourBinPredictor&) = delete;
+
~HourBinPredictor() override;
// RecurrencePredictor:
@@ -303,8 +317,6 @@
// How much to decay frequencies each week.
float weekly_decay_coeff_;
-
- DISALLOW_COPY_AND_ASSIGN(HourBinPredictor);
};
// A first-order Markov chain that predicts the next target from the previous.
@@ -313,6 +325,10 @@
public:
MarkovPredictor(const MarkovPredictorConfig& config,
const std::string& model_identifier);
+
+ MarkovPredictor(const MarkovPredictor&) = delete;
+ MarkovPredictor& operator=(const MarkovPredictor&) = delete;
+
~MarkovPredictor() override;
// RecurrencePredictor:
@@ -334,8 +350,6 @@
// The most recently observed target.
absl::optional<unsigned int> previous_target_;
-
- DISALLOW_COPY_AND_ASSIGN(MarkovPredictor);
};
// A predictor that uses a weighted ensemble of other predictors' scores. Any
@@ -354,6 +368,11 @@
public:
ExponentialWeightsEnsemble(const ExponentialWeightsEnsembleConfig& config,
const std::string& model_identifier);
+
+ ExponentialWeightsEnsemble(const ExponentialWeightsEnsemble&) = delete;
+ ExponentialWeightsEnsemble& operator=(const ExponentialWeightsEnsemble&) =
+ delete;
+
~ExponentialWeightsEnsemble() override;
// RecurrencePredictor:
@@ -375,8 +394,6 @@
predictors_;
float learning_rate_ = 0.0f;
-
- DISALLOW_COPY_AND_ASSIGN(ExponentialWeightsEnsemble);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/recurrence_ranker.h b/chrome/browser/ui/app_list/search/search_result_ranker/recurrence_ranker.h
index 81a341cb..08870c5 100644
--- a/chrome/browser/ui/app_list/search/search_result_ranker/recurrence_ranker.h
+++ b/chrome/browser/ui/app_list/search/search_result_ranker/recurrence_ranker.h
@@ -37,6 +37,10 @@
const base::FilePath& filepath,
const RecurrenceRankerConfigProto& config,
bool is_ephemeral_user);
+
+ RecurrenceRanker(const RecurrenceRanker&) = delete;
+ RecurrenceRanker& operator=(const RecurrenceRanker&) = delete;
+
~RecurrenceRanker();
// Record the use of a given target, and train the predictor on it. This may
@@ -161,8 +165,6 @@
scoped_refptr<base::SequencedTaskRunner> task_runner_;
base::WeakPtrFactory<RecurrenceRanker> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(RecurrenceRanker);
};
} // namespace app_list
diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker_unittest.cc b/chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker_unittest.cc
index aaf328c..070a44d 100644
--- a/chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker_unittest.cc
+++ b/chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker_unittest.cc
@@ -61,6 +61,10 @@
SetTitle(base::UTF8ToUTF16(id));
SetResultType(type);
}
+
+ TestSearchResult(const TestSearchResult&) = delete;
+ TestSearchResult& operator=(const TestSearchResult&) = delete;
+
~TestSearchResult() override {}
// ChromeSearchResult overrides:
@@ -70,8 +74,6 @@
static int instantiation_count;
int instance_id_;
-
- DISALLOW_COPY_AND_ASSIGN(TestSearchResult);
};
int TestSearchResult::instantiation_count = 0;
@@ -129,6 +131,10 @@
public:
SearchResultRankerTest()
: task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
+
+ SearchResultRankerTest(const SearchResultRankerTest&) = delete;
+ SearchResultRankerTest& operator=(const SearchResultRankerTest&) = delete;
+
~SearchResultRankerTest() override {}
// testing::Test overrides:
@@ -202,8 +208,6 @@
std::vector<base::Feature> all_feature_flags_ = {
app_list_features::kEnableAppRanker,
app_list_features::kEnableZeroStateMixedTypesRanker};
-
- DISALLOW_COPY_AND_ASSIGN(SearchResultRankerTest);
};
TEST_F(SearchResultRankerTest, MixedTypesRankersAreDisabledWithFlag) {
diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc
index 6669821..ae85020 100644
--- a/chrome/browser/ui/apps/chrome_app_delegate.cc
+++ b/chrome/browser/ui/apps/chrome_app_delegate.cc
@@ -137,6 +137,11 @@
: public content::WebContentsDelegate {
public:
NewWindowContentsDelegate() {}
+
+ NewWindowContentsDelegate(const NewWindowContentsDelegate&) = delete;
+ NewWindowContentsDelegate& operator=(const NewWindowContentsDelegate&) =
+ delete;
+
~NewWindowContentsDelegate() override {}
void BecomeOwningDeletageOf(
@@ -151,8 +156,6 @@
private:
std::vector<std::unique_ptr<content::WebContents>> owned_contents_;
-
- DISALLOW_COPY_AND_ASSIGN(NewWindowContentsDelegate);
};
content::WebContents*
diff --git a/chrome/browser/ui/apps/chrome_app_delegate.h b/chrome/browser/ui/apps/chrome_app_delegate.h
index 5b88210..8aa2acd 100644
--- a/chrome/browser/ui/apps/chrome_app_delegate.h
+++ b/chrome/browser/ui/apps/chrome_app_delegate.h
@@ -26,6 +26,10 @@
// Params:
// keep_alive: Whether this object should keep the browser alive.
explicit ChromeAppDelegate(Profile* profile, bool keep_alive);
+
+ ChromeAppDelegate(const ChromeAppDelegate&) = delete;
+ ChromeAppDelegate& operator=(const ChromeAppDelegate&) = delete;
+
~ChromeAppDelegate() override;
static void DisableExternalOpenForTesting();
@@ -97,8 +101,6 @@
base::OnceClosure terminating_callback_;
content::NotificationRegistrar registrar_;
base::WeakPtrFactory<ChromeAppDelegate> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeAppDelegate);
};
#endif // CHROME_BROWSER_UI_APPS_CHROME_APP_DELEGATE_H_
diff --git a/chrome/browser/ui/apps/chrome_app_window_client.h b/chrome/browser/ui/apps/chrome_app_window_client.h
index 66905cb..680c229 100644
--- a/chrome/browser/ui/apps/chrome_app_window_client.h
+++ b/chrome/browser/ui/apps/chrome_app_window_client.h
@@ -19,6 +19,10 @@
class ChromeAppWindowClient : public extensions::AppWindowClient {
public:
ChromeAppWindowClient();
+
+ ChromeAppWindowClient(const ChromeAppWindowClient&) = delete;
+ ChromeAppWindowClient& operator=(const ChromeAppWindowClient&) = delete;
+
~ChromeAppWindowClient() override;
// Get the LazyInstance for ChromeAppWindowClient.
@@ -46,8 +50,6 @@
static extensions::NativeAppWindow* CreateNativeAppWindowImpl(
extensions::AppWindow* window,
const extensions::AppWindow::CreateParams& params);
-
- DISALLOW_COPY_AND_ASSIGN(ChromeAppWindowClient);
};
#endif // CHROME_BROWSER_UI_APPS_CHROME_APP_WINDOW_CLIENT_H_
diff --git a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
index 6827210..c39a1d8e 100644
--- a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
+++ b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
@@ -45,6 +45,12 @@
public:
AcceleratorCommandsFullscreenBrowserTest()
: initial_show_state_(GetParam()) {}
+
+ AcceleratorCommandsFullscreenBrowserTest(
+ const AcceleratorCommandsFullscreenBrowserTest&) = delete;
+ AcceleratorCommandsFullscreenBrowserTest& operator=(
+ const AcceleratorCommandsFullscreenBrowserTest&) = delete;
+
virtual ~AcceleratorCommandsFullscreenBrowserTest() {}
// Sets |widget|'s show state to |initial_show_state_|.
@@ -67,8 +73,6 @@
private:
ui::WindowShowState initial_show_state_;
-
- DISALLOW_COPY_AND_ASSIGN(AcceleratorCommandsFullscreenBrowserTest);
};
// Test that toggling window fullscreen works properly.
@@ -179,6 +183,12 @@
public:
AcceleratorCommandsPlatformAppFullscreenBrowserTest()
: initial_show_state_(GetParam()) {}
+
+ AcceleratorCommandsPlatformAppFullscreenBrowserTest(
+ const AcceleratorCommandsPlatformAppFullscreenBrowserTest&) = delete;
+ AcceleratorCommandsPlatformAppFullscreenBrowserTest& operator=(
+ const AcceleratorCommandsPlatformAppFullscreenBrowserTest&) = delete;
+
virtual ~AcceleratorCommandsPlatformAppFullscreenBrowserTest() {}
// Sets |app_window|'s show state to |initial_show_state_|.
@@ -199,8 +209,6 @@
private:
ui::WindowShowState initial_show_state_;
-
- DISALLOW_COPY_AND_ASSIGN(AcceleratorCommandsPlatformAppFullscreenBrowserTest);
};
// Test the behavior of platform apps when ToggleFullscreen() is called.
diff --git a/chrome/browser/ui/ash/accessibility/accessibility_controller_client.h b/chrome/browser/ui/ash/accessibility/accessibility_controller_client.h
index b8029b7..a69e8134 100644
--- a/chrome/browser/ui/ash/accessibility/accessibility_controller_client.h
+++ b/chrome/browser/ui/ash/accessibility/accessibility_controller_client.h
@@ -13,6 +13,11 @@
: public ash::AccessibilityControllerClient {
public:
AccessibilityControllerClient();
+
+ AccessibilityControllerClient(const AccessibilityControllerClient&) = delete;
+ AccessibilityControllerClient& operator=(
+ const AccessibilityControllerClient&) = delete;
+
virtual ~AccessibilityControllerClient();
// ash::AccessibilityControllerClient:
@@ -37,9 +42,6 @@
void OnSelectToSpeakPanelAction(ash::SelectToSpeakPanelAction action,
double value) override;
void SetA11yOverrideWindow(aura::Window* a11y_override_window) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AccessibilityControllerClient);
};
#endif // CHROME_BROWSER_UI_ASH_ACCESSIBILITY_ACCESSIBILITY_CONTROLLER_CLIENT_H_
diff --git a/chrome/browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc b/chrome/browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc
index b2a98e1..9b5e164 100644
--- a/chrome/browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc
+++ b/chrome/browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc
@@ -25,6 +25,12 @@
class FakeAccessibilityControllerClient : public AccessibilityControllerClient {
public:
FakeAccessibilityControllerClient() = default;
+
+ FakeAccessibilityControllerClient(const FakeAccessibilityControllerClient&) =
+ delete;
+ FakeAccessibilityControllerClient& operator=(
+ const FakeAccessibilityControllerClient&) = delete;
+
~FakeAccessibilityControllerClient() override = default;
// AccessibilityControllerClient:
@@ -77,7 +83,6 @@
private:
bool dictation_on_ = false;
- DISALLOW_COPY_AND_ASSIGN(FakeAccessibilityControllerClient);
};
} // namespace
@@ -85,12 +90,16 @@
class AccessibilityControllerClientTest : public testing::Test {
public:
AccessibilityControllerClientTest() = default;
+
+ AccessibilityControllerClientTest(const AccessibilityControllerClientTest&) =
+ delete;
+ AccessibilityControllerClientTest& operator=(
+ const AccessibilityControllerClientTest&) = delete;
+
~AccessibilityControllerClientTest() override = default;
private:
content::BrowserTaskEnvironment task_environment_;
-
- DISALLOW_COPY_AND_ASSIGN(AccessibilityControllerClientTest);
};
TEST_F(AccessibilityControllerClientTest, MethodCalls) {
diff --git a/chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc b/chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc
index 5d1d941a..ec363f1f 100644
--- a/chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc
+++ b/chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc
@@ -54,6 +54,10 @@
class AXTreeSourceAuraTest : public ChromeViewsTestBase {
public:
AXTreeSourceAuraTest() {}
+
+ AXTreeSourceAuraTest(const AXTreeSourceAuraTest&) = delete;
+ AXTreeSourceAuraTest& operator=(const AXTreeSourceAuraTest&) = delete;
+
~AXTreeSourceAuraTest() override {}
void SetUp() override {
@@ -85,9 +89,6 @@
AXAuraObjCache cache_;
// A simulated desktop root with no delegate.
AXRootObjWrapper root_wrapper_{nullptr, &cache_};
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AXTreeSourceAuraTest);
};
TEST_F(AXTreeSourceAuraTest, Accessors) {
diff --git a/chrome/browser/ui/ash/accessibility/fake_accessibility_controller.h b/chrome/browser/ui/ash/accessibility/fake_accessibility_controller.h
index b924bbf..89d3d6b 100644
--- a/chrome/browser/ui/ash/accessibility/fake_accessibility_controller.h
+++ b/chrome/browser/ui/ash/accessibility/fake_accessibility_controller.h
@@ -12,6 +12,11 @@
class FakeAccessibilityController : ash::AccessibilityController {
public:
FakeAccessibilityController();
+
+ FakeAccessibilityController(const FakeAccessibilityController&) = delete;
+ FakeAccessibilityController& operator=(const FakeAccessibilityController&) =
+ delete;
+
~FakeAccessibilityController() override;
bool was_client_set() const { return was_client_set_; }
@@ -66,8 +71,6 @@
private:
bool was_client_set_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(FakeAccessibilityController);
};
#endif // CHROME_BROWSER_UI_ASH_ACCESSIBILITY_FAKE_ACCESSIBILITY_CONTROLLER_H_
diff --git a/chrome/browser/ui/ash/arc_custom_tab_modal_dialog_host.h b/chrome/browser/ui/ash/arc_custom_tab_modal_dialog_host.h
index d88cf78..e9fd022 100644
--- a/chrome/browser/ui/ash/arc_custom_tab_modal_dialog_host.h
+++ b/chrome/browser/ui/ash/arc_custom_tab_modal_dialog_host.h
@@ -40,6 +40,11 @@
public:
ArcCustomTabModalDialogHost(std::unique_ptr<arc::CustomTab> custom_tab,
content::WebContents* web_contents);
+
+ ArcCustomTabModalDialogHost(const ArcCustomTabModalDialogHost&) = delete;
+ ArcCustomTabModalDialogHost& operator=(const ArcCustomTabModalDialogHost&) =
+ delete;
+
~ArcCustomTabModalDialogHost() override = 0;
// content::WebContentsObserver:
@@ -63,8 +68,6 @@
private:
base::ObserverList<web_modal::ModalDialogHostObserver>::Unchecked
observer_list_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcCustomTabModalDialogHost);
};
#endif // CHROME_BROWSER_UI_ASH_ARC_CUSTOM_TAB_MODAL_DIALOG_HOST_H_
diff --git a/chrome/browser/ui/ash/ash_shell_init.h b/chrome/browser/ui/ash/ash_shell_init.h
index 8980039..1ee0c3c 100644
--- a/chrome/browser/ui/ash/ash_shell_init.h
+++ b/chrome/browser/ui/ash/ash_shell_init.h
@@ -11,10 +11,11 @@
class AshShellInit {
public:
AshShellInit();
- ~AshShellInit();
- private:
- DISALLOW_COPY_AND_ASSIGN(AshShellInit);
+ AshShellInit(const AshShellInit&) = delete;
+ AshShellInit& operator=(const AshShellInit&) = delete;
+
+ ~AshShellInit();
};
#endif // CHROME_BROWSER_UI_ASH_ASH_SHELL_INIT_H_
diff --git a/chrome/browser/ui/ash/ash_test_util.cc b/chrome/browser/ui/ash/ash_test_util.cc
index 68968e2..aa74507 100644
--- a/chrome/browser/ui/ash/ash_test_util.cc
+++ b/chrome/browser/ui/ash/ash_test_util.cc
@@ -24,6 +24,10 @@
: window_(window), type_(type) {
window->AddObserver(this);
}
+
+ SnapWaiter(const SnapWaiter&) = delete;
+ SnapWaiter& operator=(const SnapWaiter&) = delete;
+
~SnapWaiter() override { window_->RemoveObserver(this); }
// aura::WindowObserver:
@@ -44,8 +48,6 @@
aura::Window* window_;
chromeos::WindowStateType type_;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(SnapWaiter);
};
} // namespace
diff --git a/chrome/browser/ui/ash/assistant/assistant_browsertest.cc b/chrome/browser/ui/ash/assistant/assistant_browsertest.cc
index 09386388..2aa2247 100644
--- a/chrome/browser/ui/ash/assistant/assistant_browsertest.cc
+++ b/chrome/browser/ui/ash/assistant/assistant_browsertest.cc
@@ -50,6 +50,9 @@
chromeos::assistant::features::kEnableLibAssistantSandbox);
}
+ AssistantBrowserTest(const AssistantBrowserTest&) = delete;
+ AssistantBrowserTest& operator=(const AssistantBrowserTest&) = delete;
+
~AssistantBrowserTest() override = default;
AssistantTestMixin* tester() { return &tester_; }
@@ -121,8 +124,6 @@
base::test::ScopedFeatureList feature_list_;
AssistantTestMixin tester_{&mixin_host_, this, embedded_test_server(), kMode,
kVersion};
-
- DISALLOW_COPY_AND_ASSIGN(AssistantBrowserTest);
};
IN_PROC_BROWSER_TEST_F(AssistantBrowserTest,
diff --git a/chrome/browser/ui/ash/assistant/assistant_context_browsertest.cc b/chrome/browser/ui/ash/assistant/assistant_context_browsertest.cc
index fa613068..68db2a3b 100644
--- a/chrome/browser/ui/ash/assistant/assistant_context_browsertest.cc
+++ b/chrome/browser/ui/ash/assistant/assistant_context_browsertest.cc
@@ -55,6 +55,11 @@
class AssistantContextBrowserTest : public InProcessBrowserTest {
public:
AssistantContextBrowserTest() = default;
+
+ AssistantContextBrowserTest(const AssistantContextBrowserTest&) = delete;
+ AssistantContextBrowserTest& operator=(const AssistantContextBrowserTest&) =
+ delete;
+
~AssistantContextBrowserTest() override = default;
protected:
@@ -72,9 +77,6 @@
waiter.Wait();
return waiter.take_structure();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AssistantContextBrowserTest);
};
IN_PROC_BROWSER_TEST_F(AssistantContextBrowserTest,
diff --git a/chrome/browser/ui/ash/assistant/assistant_setup.h b/chrome/browser/ui/ash/assistant/assistant_setup.h
index a691f7cf..ce7fe307 100644
--- a/chrome/browser/ui/ash/assistant/assistant_setup.h
+++ b/chrome/browser/ui/ash/assistant/assistant_setup.h
@@ -22,6 +22,10 @@
public SearchAndAssistantEnabledChecker::Delegate {
public:
AssistantSetup();
+
+ AssistantSetup(const AssistantSetup&) = delete;
+ AssistantSetup& operator=(const AssistantSetup&) = delete;
+
~AssistantSetup() override;
// ash::AssistantSetup:
@@ -50,8 +54,6 @@
search_and_assistant_enabled_checker_;
base::WeakPtrFactory<AssistantSetup> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AssistantSetup);
};
#endif // CHROME_BROWSER_UI_ASH_ASSISTANT_ASSISTANT_SETUP_H_
diff --git a/chrome/browser/ui/ash/assistant/assistant_state_client.h b/chrome/browser/ui/ash/assistant/assistant_state_client.h
index c6e30f62..383dd270 100644
--- a/chrome/browser/ui/ash/assistant/assistant_state_client.h
+++ b/chrome/browser/ui/ash/assistant/assistant_state_client.h
@@ -17,6 +17,10 @@
public arc::ArcSessionManagerObserver {
public:
AssistantStateClient();
+
+ AssistantStateClient(const AssistantStateClient&) = delete;
+ AssistantStateClient& operator=(const AssistantStateClient&) = delete;
+
~AssistantStateClient() override;
private:
@@ -40,8 +44,6 @@
Profile* profile_ = nullptr;
base::WeakPtrFactory<AssistantStateClient> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AssistantStateClient);
};
#endif // CHROME_BROWSER_UI_ASH_ASSISTANT_ASSISTANT_STATE_CLIENT_H_
diff --git a/chrome/browser/ui/ash/assistant/assistant_test_mixin.h b/chrome/browser/ui/ash/assistant/assistant_test_mixin.h
index 4ef8e935..3f9cc67 100644
--- a/chrome/browser/ui/ash/assistant/assistant_test_mixin.h
+++ b/chrome/browser/ui/ash/assistant/assistant_test_mixin.h
@@ -50,6 +50,10 @@
net::EmbeddedTestServer* embedded_test_server,
FakeS3Mode mode,
int test_data_version);
+
+ AssistantTestMixin(const AssistantTestMixin&) = delete;
+ AssistantTestMixin& operator=(const AssistantTestMixin&) = delete;
+
~AssistantTestMixin() override;
// InProcessBrowserTestMixin overrides:
@@ -138,8 +142,6 @@
FakeS3Mode mode_;
std::unique_ptr<ash::AssistantTestApi> test_api_;
std::unique_ptr<LoggedInUserMixin> user_mixin_;
-
- DISALLOW_COPY_AND_ASSIGN(AssistantTestMixin);
};
} // namespace assistant
diff --git a/chrome/browser/ui/ash/assistant/device_actions.h b/chrome/browser/ui/ash/assistant/device_actions.h
index bb76755..78e1957 100644
--- a/chrome/browser/ui/ash/assistant/device_actions.h
+++ b/chrome/browser/ui/ash/assistant/device_actions.h
@@ -24,6 +24,10 @@
public ArcAppListPrefs::Observer {
public:
explicit DeviceActions(std::unique_ptr<DeviceActionsDelegate> delegate);
+
+ DeviceActions(const DeviceActions&) = delete;
+ DeviceActions& operator=(const DeviceActions&) = delete;
+
~DeviceActions() override;
// chromeos::assistant::DeviceActions overrides:
@@ -61,7 +65,6 @@
scoped_prefs_observations_{this};
base::ObserverList<chromeos::assistant::AppListEventSubscriber>
app_list_subscribers_;
- DISALLOW_COPY_AND_ASSIGN(DeviceActions);
};
#endif // CHROME_BROWSER_UI_ASH_ASSISTANT_DEVICE_ACTIONS_H_
diff --git a/chrome/browser/ui/ash/assistant/test_support/fake_s3_server.h b/chrome/browser/ui/ash/assistant/test_support/fake_s3_server.h
index 665fe7f..c3192a0 100644
--- a/chrome/browser/ui/ash/assistant/test_support/fake_s3_server.h
+++ b/chrome/browser/ui/ash/assistant/test_support/fake_s3_server.h
@@ -41,6 +41,10 @@
// does not exist, it will automatically looker for an older version of the
// file.
explicit FakeS3Server(int data_file_version);
+
+ FakeS3Server(const FakeS3Server&) = delete;
+ FakeS3Server& operator=(const FakeS3Server&) = delete;
+
~FakeS3Server();
// Starts the fake S3 server, and tells the Assistant service to use its URI
@@ -72,8 +76,6 @@
std::unique_ptr<PortSelector> port_selector_;
base::Process fake_s3_server_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeS3Server);
};
} // namespace assistant
diff --git a/chrome/browser/ui/ash/cast_config_controller_media_router.cc b/chrome/browser/ui/ash/cast_config_controller_media_router.cc
index 57640f5..72d835d 100644
--- a/chrome/browser/ui/ash/cast_config_controller_media_router.cc
+++ b/chrome/browser/ui/ash/cast_config_controller_media_router.cc
@@ -74,6 +74,10 @@
explicit CastDeviceCache(
const base::RepeatingClosure& update_devices_callback);
+
+ CastDeviceCache(const CastDeviceCache&) = delete;
+ CastDeviceCache& operator=(const CastDeviceCache&) = delete;
+
~CastDeviceCache() override;
// This may run |update_devices_callback_| before returning.
@@ -94,8 +98,6 @@
MediaRoutes routes_;
base::RepeatingClosure update_devices_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(CastDeviceCache);
};
CastDeviceCache::CastDeviceCache(
diff --git a/chrome/browser/ui/ash/cast_config_controller_media_router.h b/chrome/browser/ui/ash/cast_config_controller_media_router.h
index 7d79fff..41ba4999 100644
--- a/chrome/browser/ui/ash/cast_config_controller_media_router.h
+++ b/chrome/browser/ui/ash/cast_config_controller_media_router.h
@@ -27,6 +27,12 @@
public session_manager::SessionManagerObserver {
public:
CastConfigControllerMediaRouter();
+
+ CastConfigControllerMediaRouter(const CastConfigControllerMediaRouter&) =
+ delete;
+ CastConfigControllerMediaRouter& operator=(
+ const CastConfigControllerMediaRouter&) = delete;
+
~CastConfigControllerMediaRouter() override;
static void SetMediaRouterForTest(media_router::MediaRouter* media_router);
@@ -59,8 +65,6 @@
base::ScopedObservation<session_manager::SessionManager,
session_manager::SessionManagerObserver>
session_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CastConfigControllerMediaRouter);
};
#endif // CHROME_BROWSER_UI_ASH_CAST_CONFIG_CONTROLLER_MEDIA_ROUTER_H_
diff --git a/chrome/browser/ui/ash/chrome_accessibility_delegate.h b/chrome/browser/ui/ash/chrome_accessibility_delegate.h
index 015bd0f..b933845d 100644
--- a/chrome/browser/ui/ash/chrome_accessibility_delegate.h
+++ b/chrome/browser/ui/ash/chrome_accessibility_delegate.h
@@ -12,6 +12,11 @@
class ChromeAccessibilityDelegate : public ash::AccessibilityDelegate {
public:
ChromeAccessibilityDelegate();
+
+ ChromeAccessibilityDelegate(const ChromeAccessibilityDelegate&) = delete;
+ ChromeAccessibilityDelegate& operator=(const ChromeAccessibilityDelegate&) =
+ delete;
+
~ChromeAccessibilityDelegate() override;
// ash::AccessibilityDelegate:
@@ -20,9 +25,6 @@
bool ShouldShowAccessibilityMenu() const override;
void SaveScreenMagnifierScale(double scale) override;
double GetSavedScreenMagnifierScale() override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeAccessibilityDelegate);
};
#endif // CHROME_BROWSER_UI_ASH_CHROME_ACCESSIBILITY_DELEGATE_H_
diff --git a/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc
index 99b07ec..f6bf717 100644
--- a/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc
+++ b/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc
@@ -87,6 +87,11 @@
session_manager::SessionManager::Get()->AddObserver(this);
}
+ ChromeShelfControllerInitializer(const ChromeShelfControllerInitializer&) =
+ delete;
+ ChromeShelfControllerInitializer& operator=(
+ const ChromeShelfControllerInitializer&) = delete;
+
~ChromeShelfControllerInitializer() override {
if (!chrome_shelf_controller_)
session_manager::SessionManager::Get()->RemoveObserver(this);
@@ -115,8 +120,6 @@
private:
std::unique_ptr<ChromeShelfItemFactory> chrome_shelf_item_factory_;
std::unique_ptr<ChromeShelfController> chrome_shelf_controller_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeShelfControllerInitializer);
};
} // namespace internal
@@ -336,6 +339,11 @@
UserProfileLoadedObserver() {
session_observation_.Observe(session_manager::SessionManager::Get());
}
+
+ UserProfileLoadedObserver(const UserProfileLoadedObserver&) = delete;
+ UserProfileLoadedObserver& operator=(const UserProfileLoadedObserver&) =
+ delete;
+
~UserProfileLoadedObserver() override = default;
// session_manager::SessionManagerObserver:
@@ -358,6 +366,4 @@
base::ScopedObservation<session_manager::SessionManager,
session_manager::SessionManagerObserver>
session_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UserProfileLoadedObserver);
};
diff --git a/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.h b/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.h
index 4b034ee..65155a1 100644
--- a/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.h
+++ b/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.h
@@ -62,6 +62,12 @@
class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
public:
ChromeBrowserMainExtraPartsAsh();
+
+ ChromeBrowserMainExtraPartsAsh(const ChromeBrowserMainExtraPartsAsh&) =
+ delete;
+ ChromeBrowserMainExtraPartsAsh& operator=(
+ const ChromeBrowserMainExtraPartsAsh&) = delete;
+
~ChromeBrowserMainExtraPartsAsh() override;
// Overridden from ChromeBrowserMainExtraParts:
@@ -127,8 +133,6 @@
std::unique_ptr<NightLightClient> night_light_client_;
std::unique_ptr<AmbientClientImpl> ambient_client_;
std::unique_ptr<QuickAnswersBrowserClientImpl> quick_answers_browser_client_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh);
};
#endif // CHROME_BROWSER_UI_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_
diff --git a/chrome/browser/ui/ash/chrome_new_window_client.cc b/chrome/browser/ui/ash/chrome_new_window_client.cc
index a9a2196..1be001b 100644
--- a/chrome/browser/ui/ash/chrome_new_window_client.cc
+++ b/chrome/browser/ui/ash/chrome_new_window_client.cc
@@ -273,6 +273,9 @@
tab_restore_service_->AddObserver(this);
}
+ TabRestoreHelper(const TabRestoreHelper&) = delete;
+ TabRestoreHelper& operator=(const TabRestoreHelper&) = delete;
+
~TabRestoreHelper() override { tab_restore_service_->RemoveObserver(this); }
sessions::TabRestoreService* tab_restore_service() {
@@ -298,8 +301,6 @@
ChromeNewWindowClient* delegate_;
Profile* profile_;
sessions::TabRestoreService* tab_restore_service_;
-
- DISALLOW_COPY_AND_ASSIGN(TabRestoreHelper);
};
void ChromeNewWindowClient::NewTab() {
diff --git a/chrome/browser/ui/ash/chrome_new_window_client.h b/chrome/browser/ui/ash/chrome_new_window_client.h
index 35c63f0..bb016a07 100644
--- a/chrome/browser/ui/ash/chrome_new_window_client.h
+++ b/chrome/browser/ui/ash/chrome_new_window_client.h
@@ -32,6 +32,10 @@
public arc::ControlCameraAppDelegate {
public:
ChromeNewWindowClient();
+
+ ChromeNewWindowClient(const ChromeNewWindowClient&) = delete;
+ ChromeNewWindowClient& operator=(const ChromeNewWindowClient&) = delete;
+
~ChromeNewWindowClient() override;
static ChromeNewWindowClient* Get();
@@ -86,8 +90,6 @@
const std::map<arc::mojom::ChromePage, std::string> browser_settings_pages_;
const std::map<arc::mojom::ChromePage, std::string> about_pages_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeNewWindowClient);
};
#endif // CHROME_BROWSER_UI_ASH_CHROME_NEW_WINDOW_CLIENT_H_
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h
index c32cf27..c4f1fc7 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.h
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.h
@@ -13,6 +13,10 @@
class ChromeShellDelegate : public ash::ShellDelegate {
public:
ChromeShellDelegate();
+
+ ChromeShellDelegate(const ChromeShellDelegate&) = delete;
+ ChromeShellDelegate& operator=(const ChromeShellDelegate&) = delete;
+
~ChromeShellDelegate() override;
// ash::ShellDelegate:
@@ -58,9 +62,6 @@
static void SetDisableLoggingRedirectForTesting(bool value);
static void ResetDisableLoggingRedirectForTesting();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
};
#endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
diff --git a/chrome/browser/ui/ash/ime_controller_client_impl.h b/chrome/browser/ui/ash/ime_controller_client_impl.h
index 801a82a..52f8766 100644
--- a/chrome/browser/ui/ash/ime_controller_client_impl.h
+++ b/chrome/browser/ui/ash/ime_controller_client_impl.h
@@ -22,6 +22,10 @@
public:
explicit ImeControllerClientImpl(
chromeos::input_method::InputMethodManager* manager);
+
+ ImeControllerClientImpl(const ImeControllerClientImpl&) = delete;
+ ImeControllerClientImpl& operator=(const ImeControllerClientImpl&) = delete;
+
~ImeControllerClientImpl() override;
// Initializes and connects to ash.
@@ -88,8 +92,6 @@
// ImeController in ash.
ash::ImeController* ime_controller_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(ImeControllerClientImpl);
};
#endif // CHROME_BROWSER_UI_ASH_IME_CONTROLLER_CLIENT_IMPL_H_
diff --git a/chrome/browser/ui/ash/ime_controller_client_impl_unittest.cc b/chrome/browser/ui/ash/ime_controller_client_impl_unittest.cc
index 3560b79..6f3d4cc 100644
--- a/chrome/browser/ui/ash/ime_controller_client_impl_unittest.cc
+++ b/chrome/browser/ui/ash/ime_controller_client_impl_unittest.cc
@@ -153,6 +153,11 @@
input_method_manager_.delegate_.set_get_localized_string_callback(
base::BindRepeating(&GetLocalizedString));
}
+
+ ImeControllerClientImplTest(const ImeControllerClientImplTest&) = delete;
+ ImeControllerClientImplTest& operator=(const ImeControllerClientImplTest&) =
+ delete;
+
~ImeControllerClientImplTest() override = default;
protected:
@@ -163,8 +168,6 @@
private:
base::test::TaskEnvironment task_environment_;
-
- DISALLOW_COPY_AND_ASSIGN(ImeControllerClientImplTest);
};
TEST_F(ImeControllerClientImplTest, Construction) {
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_bounds_observer.h b/chrome/browser/ui/ash/keyboard/chrome_keyboard_bounds_observer.h
index 2b74d8a..23fb1ba 100644
--- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_bounds_observer.h
+++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_bounds_observer.h
@@ -23,6 +23,11 @@
public ChromeKeyboardControllerClient::Observer {
public:
explicit ChromeKeyboardBoundsObserver(aura::Window* keyboard_window);
+
+ ChromeKeyboardBoundsObserver(const ChromeKeyboardBoundsObserver&) = delete;
+ ChromeKeyboardBoundsObserver& operator=(const ChromeKeyboardBoundsObserver&) =
+ delete;
+
~ChromeKeyboardBoundsObserver() override;
// keyboard::ChromeKeyboardControllerClient::Observer:
@@ -50,8 +55,6 @@
aura::Window* const keyboard_window_;
std::set<views::Widget*> observed_widgets_;
gfx::Rect occluded_bounds_in_screen_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeKeyboardBoundsObserver);
};
#endif // CHROME_BROWSER_UI_ASH_KEYBOARD_CHROME_KEYBOARD_BOUNDS_OBSERVER_H_
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h b/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h
index bf550bfa..f1df994 100644
--- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h
+++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h
@@ -79,6 +79,11 @@
// Used in tests to determine whether this has been instantiated.
static bool HasInstance();
+ ChromeKeyboardControllerClient(const ChromeKeyboardControllerClient&) =
+ delete;
+ ChromeKeyboardControllerClient& operator=(
+ const ChromeKeyboardControllerClient&) = delete;
+
~ChromeKeyboardControllerClient() override;
// Called after ash::Shell is created.
@@ -211,8 +216,6 @@
GURL virtual_keyboard_url_for_test_;
base::WeakPtrFactory<ChromeKeyboardControllerClient> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeKeyboardControllerClient);
};
#endif // CHROME_BROWSER_UI_ASH_KEYBOARD_CHROME_KEYBOARD_CONTROLLER_CLIENT_H_
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.cc
index b738f199..f02c0448 100644
--- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.cc
+++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.cc
@@ -19,6 +19,10 @@
: public ash::KeyboardController {
public:
FakeKeyboardController() = default;
+
+ FakeKeyboardController(const FakeKeyboardController&) = delete;
+ FakeKeyboardController& operator=(const FakeKeyboardController&) = delete;
+
~FakeKeyboardController() override = default;
// ash::KeyboardController:
@@ -82,8 +86,6 @@
bool enabled_ = false;
bool visible_ = false;
base::ObserverList<ash::KeyboardControllerObserver>::Unchecked observers_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeKeyboardController);
};
// static
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.h b/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.h
index 64e41f3..ff318cc 100644
--- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.h
+++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.h
@@ -25,6 +25,12 @@
InitializeWithFake();
ChromeKeyboardControllerClientTestHelper();
+
+ ChromeKeyboardControllerClientTestHelper(
+ const ChromeKeyboardControllerClientTestHelper&) = delete;
+ ChromeKeyboardControllerClientTestHelper& operator=(
+ const ChromeKeyboardControllerClientTestHelper&) = delete;
+
~ChromeKeyboardControllerClientTestHelper();
void SetProfile(Profile* profile);
@@ -39,8 +45,6 @@
// Used when InitializeWithFake is called.
std::unique_ptr<FakeKeyboardController> fake_controller_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeKeyboardControllerClientTestHelper);
};
#endif // CHROME_BROWSER_UI_ASH_KEYBOARD_CHROME_KEYBOARD_CONTROLLER_CLIENT_TEST_HELPER_H_
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui.h b/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui.h
index 42f3d148..be6ccac 100644
--- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui.h
+++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui.h
@@ -32,6 +32,10 @@
public aura::WindowObserver {
public:
explicit ChromeKeyboardUI(content::BrowserContext* context);
+
+ ChromeKeyboardUI(const ChromeKeyboardUI&) = delete;
+ ChromeKeyboardUI& operator=(const ChromeKeyboardUI&) = delete;
+
~ChromeKeyboardUI() override;
// keyboard::KeyboardUI:
@@ -61,8 +65,6 @@
std::unique_ptr<ChromeKeyboardWebContents> keyboard_contents_;
std::unique_ptr<ui::Shadow> shadow_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeKeyboardUI);
};
#endif // CHROME_BROWSER_UI_ASH_KEYBOARD_CHROME_KEYBOARD_UI_H_
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui_factory.h b/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui_factory.h
index 1862583c..e007dee 100644
--- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui_factory.h
+++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui_factory.h
@@ -16,13 +16,15 @@
class ChromeKeyboardUIFactory : public keyboard::KeyboardUIFactory {
public:
ChromeKeyboardUIFactory();
+
+ ChromeKeyboardUIFactory(const ChromeKeyboardUIFactory&) = delete;
+ ChromeKeyboardUIFactory& operator=(const ChromeKeyboardUIFactory&) = delete;
+
~ChromeKeyboardUIFactory() override;
private:
// keyboard::KeyboardUIFactory:
std::unique_ptr<keyboard::KeyboardUI> CreateKeyboardUI() override;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeKeyboardUIFactory);
};
#endif // CHROME_BROWSER_UI_ASH_KEYBOARD_CHROME_KEYBOARD_UI_FACTORY_H_
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
index ef84e04d..ba376cc 100644
--- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
+++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
@@ -43,6 +43,12 @@
public content::WebContentsObserver {
public:
ChromeKeyboardContentsDelegate() = default;
+
+ ChromeKeyboardContentsDelegate(const ChromeKeyboardContentsDelegate&) =
+ delete;
+ ChromeKeyboardContentsDelegate& operator=(
+ const ChromeKeyboardContentsDelegate&) = delete;
+
~ChromeKeyboardContentsDelegate() override = default;
private:
@@ -127,8 +133,6 @@
// content::WebContentsObserver:
void WebContentsDestroyed() override { delete this; }
-
- DISALLOW_COPY_AND_ASSIGN(ChromeKeyboardContentsDelegate);
};
} // namespace
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.h b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.h
index 1ce544ce..b22b84f 100644
--- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.h
+++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.h
@@ -41,6 +41,11 @@
const GURL& url,
LoadCallback load_callback,
UnembedCallback unembed_callback);
+
+ ChromeKeyboardWebContents(const ChromeKeyboardWebContents&) = delete;
+ ChromeKeyboardWebContents& operator=(const ChromeKeyboardWebContents&) =
+ delete;
+
~ChromeKeyboardWebContents() override;
// Updates the keyboard URL if |url| does not match the existing url.
@@ -82,8 +87,6 @@
gfx::Size contents_size_;
base::WeakPtrFactory<ChromeKeyboardWebContents> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeKeyboardWebContents);
};
#endif // CHROME_BROWSER_UI_ASH_KEYBOARD_CHROME_KEYBOARD_WEB_CONTENTS_H_
diff --git a/chrome/browser/ui/ash/keyboard/keyboard_controller_browsertest.cc b/chrome/browser/ui/ash/keyboard/keyboard_controller_browsertest.cc
index 4a4b6055..f51264f 100644
--- a/chrome/browser/ui/ash/keyboard/keyboard_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/keyboard/keyboard_controller_browsertest.cc
@@ -40,6 +40,10 @@
explicit KeyboardVisibleWaiter(bool visible) : visible_(visible) {
ChromeKeyboardControllerClient::Get()->AddObserver(this);
}
+
+ KeyboardVisibleWaiter(const KeyboardVisibleWaiter&) = delete;
+ KeyboardVisibleWaiter& operator=(const KeyboardVisibleWaiter&) = delete;
+
~KeyboardVisibleWaiter() override {
ChromeKeyboardControllerClient::Get()->RemoveObserver(this);
}
@@ -61,8 +65,6 @@
private:
base::RunLoop run_loop_;
const bool visible_;
-
- DISALLOW_COPY_AND_ASSIGN(KeyboardVisibleWaiter);
};
class KeyboardLoadedWaiter : public ChromeKeyboardControllerClient::Observer {
@@ -70,6 +72,10 @@
KeyboardLoadedWaiter() {
ChromeKeyboardControllerClient::Get()->AddObserver(this);
}
+
+ KeyboardLoadedWaiter(const KeyboardLoadedWaiter&) = delete;
+ KeyboardLoadedWaiter& operator=(const KeyboardLoadedWaiter&) = delete;
+
~KeyboardLoadedWaiter() override {
ChromeKeyboardControllerClient::Get()->RemoveObserver(this);
}
@@ -85,8 +91,6 @@
private:
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(KeyboardLoadedWaiter);
};
class KeyboardOccludedBoundsChangeWaiter
@@ -95,6 +99,12 @@
KeyboardOccludedBoundsChangeWaiter() {
ChromeKeyboardControllerClient::Get()->AddObserver(this);
}
+
+ KeyboardOccludedBoundsChangeWaiter(
+ const KeyboardOccludedBoundsChangeWaiter&) = delete;
+ KeyboardOccludedBoundsChangeWaiter& operator=(
+ const KeyboardOccludedBoundsChangeWaiter&) = delete;
+
~KeyboardOccludedBoundsChangeWaiter() override {
ChromeKeyboardControllerClient::Get()->RemoveObserver(this);
}
@@ -108,8 +118,6 @@
private:
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(KeyboardOccludedBoundsChangeWaiter);
};
ui::InputMethod* GetInputMethod() {
@@ -124,6 +132,12 @@
class KeyboardControllerWebContentTest : public InProcessBrowserTest {
public:
KeyboardControllerWebContentTest() {}
+
+ KeyboardControllerWebContentTest(const KeyboardControllerWebContentTest&) =
+ delete;
+ KeyboardControllerWebContentTest& operator=(
+ const KeyboardControllerWebContentTest&) = delete;
+
~KeyboardControllerWebContentTest() override {}
void SetUp() override {
@@ -171,8 +185,6 @@
private:
std::unique_ptr<ui::DummyTextInputClient> client;
ui::ScopedTestInputMethodFactory scoped_test_input_method_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(KeyboardControllerWebContentTest);
};
// Test for crbug.com/404340. After enabling an IME in a different extension,
@@ -239,6 +251,12 @@
: public extensions::PlatformAppBrowserTest {
public:
KeyboardControllerAppWindowTest() {}
+
+ KeyboardControllerAppWindowTest(const KeyboardControllerAppWindowTest&) =
+ delete;
+ KeyboardControllerAppWindowTest& operator=(
+ const KeyboardControllerAppWindowTest&) = delete;
+
~KeyboardControllerAppWindowTest() override {}
// Ensure that the virtual keyboard is enabled.
@@ -265,9 +283,6 @@
extension_service()->AddExtension(extension.get());
return extension;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(KeyboardControllerAppWindowTest);
};
IN_PROC_BROWSER_TEST_F(KeyboardControllerAppWindowTest,
@@ -395,15 +410,17 @@
class KeyboardControllerStateTest : public InProcessBrowserTest {
public:
KeyboardControllerStateTest() {}
+
+ KeyboardControllerStateTest(const KeyboardControllerStateTest&) = delete;
+ KeyboardControllerStateTest& operator=(const KeyboardControllerStateTest&) =
+ delete;
+
~KeyboardControllerStateTest() override {}
// Ensure that the virtual keyboard is enabled.
void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(keyboard::switches::kEnableVirtualKeyboard);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(KeyboardControllerStateTest);
};
IN_PROC_BROWSER_TEST_F(KeyboardControllerStateTest, OpenTwice) {
diff --git a/chrome/browser/ui/ash/keyboard/keyboard_end_to_end_browsertest.cc b/chrome/browser/ui/ash/keyboard/keyboard_end_to_end_browsertest.cc
index 32d8310..9b36925 100644
--- a/chrome/browser/ui/ash/keyboard/keyboard_end_to_end_browsertest.cc
+++ b/chrome/browser/ui/ash/keyboard/keyboard_end_to_end_browsertest.cc
@@ -28,6 +28,10 @@
explicit KeyboardVisibleWaiter(bool visible) : visible_(visible) {
ChromeKeyboardControllerClient::Get()->AddObserver(this);
}
+
+ KeyboardVisibleWaiter(const KeyboardVisibleWaiter&) = delete;
+ KeyboardVisibleWaiter& operator=(const KeyboardVisibleWaiter&) = delete;
+
~KeyboardVisibleWaiter() override {
ChromeKeyboardControllerClient::Get()->RemoveObserver(this);
}
@@ -43,8 +47,6 @@
private:
base::RunLoop run_loop_;
const bool visible_;
-
- DISALLOW_COPY_AND_ASSIGN(KeyboardVisibleWaiter);
}; // namespace
bool WaitUntilShown() {
@@ -150,10 +152,13 @@
public:
KeyboardEndToEndFormTest()
: KeyboardEndToEndTest(base::FilePath("form.html")) {}
+
+ KeyboardEndToEndFormTest(const KeyboardEndToEndFormTest&) = delete;
+ KeyboardEndToEndFormTest& operator=(const KeyboardEndToEndFormTest&) = delete;
+
~KeyboardEndToEndFormTest() override {}
protected:
- DISALLOW_COPY_AND_ASSIGN(KeyboardEndToEndFormTest);
};
IN_PROC_BROWSER_TEST_F(KeyboardEndToEndFormTest, ClickTextFieldShowsKeyboard) {
@@ -252,10 +257,14 @@
public:
KeyboardEndToEndFocusTest()
: KeyboardEndToEndTest(base::FilePath("focus.html")) {}
+
+ KeyboardEndToEndFocusTest(const KeyboardEndToEndFocusTest&) = delete;
+ KeyboardEndToEndFocusTest& operator=(const KeyboardEndToEndFocusTest&) =
+ delete;
+
~KeyboardEndToEndFocusTest() override {}
protected:
- DISALLOW_COPY_AND_ASSIGN(KeyboardEndToEndFocusTest);
};
IN_PROC_BROWSER_TEST_F(KeyboardEndToEndFocusTest,
@@ -322,6 +331,12 @@
public:
KeyboardEndToEndOverscrollTest()
: KeyboardEndToEndTest(base::FilePath("form.html")) {}
+
+ KeyboardEndToEndOverscrollTest(const KeyboardEndToEndOverscrollTest&) =
+ delete;
+ KeyboardEndToEndOverscrollTest& operator=(
+ const KeyboardEndToEndOverscrollTest&) = delete;
+
~KeyboardEndToEndOverscrollTest() override {}
void FocusAndShowKeyboard() { ClickElementWithId(web_contents_, "username"); }
@@ -337,8 +352,6 @@
->GetVisibleViewportSize()
.height();
}
-
- DISALLOW_COPY_AND_ASSIGN(KeyboardEndToEndOverscrollTest);
};
IN_PROC_BROWSER_TEST_F(KeyboardEndToEndOverscrollTest,
diff --git a/chrome/browser/ui/ash/keyboard_shortcut_viewer_metadata_unittest.cc b/chrome/browser/ui/ash/keyboard_shortcut_viewer_metadata_unittest.cc
index c09c4368..5f17d45 100644
--- a/chrome/browser/ui/ash/keyboard_shortcut_viewer_metadata_unittest.cc
+++ b/chrome/browser/ui/ash/keyboard_shortcut_viewer_metadata_unittest.cc
@@ -122,6 +122,12 @@
class KeyboardShortcutViewerMetadataTest : public testing::Test {
public:
KeyboardShortcutViewerMetadataTest() = default;
+
+ KeyboardShortcutViewerMetadataTest(
+ const KeyboardShortcutViewerMetadataTest&) = delete;
+ KeyboardShortcutViewerMetadataTest& operator=(
+ const KeyboardShortcutViewerMetadataTest&) = delete;
+
~KeyboardShortcutViewerMetadataTest() override = default;
void SetUp() override {
@@ -144,9 +150,6 @@
// Chrome accelerator ids.
std::set<ash::AcceleratorId> chrome_accelerator_ids_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(KeyboardShortcutViewerMetadataTest);
};
} // namespace
diff --git a/chrome/browser/ui/ash/launcher_drag_interactive_uitest.cc b/chrome/browser/ui/ash/launcher_drag_interactive_uitest.cc
index 5110629..a6c36554 100644
--- a/chrome/browser/ui/ash/launcher_drag_interactive_uitest.cc
+++ b/chrome/browser/ui/ash/launcher_drag_interactive_uitest.cc
@@ -26,6 +26,11 @@
class LauncherDragClamshellModeTest : public UIPerformanceTest {
public:
LauncherDragClamshellModeTest() = default;
+
+ LauncherDragClamshellModeTest(const LauncherDragClamshellModeTest&) = delete;
+ LauncherDragClamshellModeTest& operator=(
+ const LauncherDragClamshellModeTest&) = delete;
+
~LauncherDragClamshellModeTest() override = default;
// UIPerformanceTest:
@@ -53,9 +58,6 @@
->GetDisplayNearestWindow(window)
.bounds();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LauncherDragClamshellModeTest);
};
// Drag to open the launcher from shelf. In tablet mode, swiping up from shelf
@@ -94,6 +96,10 @@
{chromeos::features::kShelfHotseat});
}
}
+
+ LauncherDragTest(const LauncherDragTest&) = delete;
+ LauncherDragTest& operator=(const LauncherDragTest&) = delete;
+
~LauncherDragTest() override = default;
// UIPerformanceTest:
@@ -115,8 +121,6 @@
private:
bool tablet_mode_ = false;
base::test::ScopedFeatureList scoped_features_;
-
- DISALLOW_COPY_AND_ASSIGN(LauncherDragTest);
};
IN_PROC_BROWSER_TEST_P(LauncherDragTest, Close) {
diff --git a/chrome/browser/ui/ash/launcher_page_switches_interactive_uitest.cc b/chrome/browser/ui/ash/launcher_page_switches_interactive_uitest.cc
index d1ef81fd..8428da52 100644
--- a/chrome/browser/ui/ash/launcher_page_switches_interactive_uitest.cc
+++ b/chrome/browser/ui/ash/launcher_page_switches_interactive_uitest.cc
@@ -27,6 +27,10 @@
explicit PageSwitchWaiter(ash::PaginationModel* model) : model_(model) {
model_->AddObserver(this);
}
+
+ PageSwitchWaiter(const PageSwitchWaiter&) = delete;
+ PageSwitchWaiter& operator=(const PageSwitchWaiter&) = delete;
+
~PageSwitchWaiter() override { model_->RemoveObserver(this); }
void Wait() { run_loop_.Run(); }
@@ -41,8 +45,6 @@
ash::PaginationModel* model_;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(PageSwitchWaiter);
};
} // namespace
@@ -51,6 +53,10 @@
public ::testing::WithParamInterface<bool> {
public:
LauncherPageSwitchesTest() = default;
+
+ LauncherPageSwitchesTest(const LauncherPageSwitchesTest&) = delete;
+ LauncherPageSwitchesTest& operator=(const LauncherPageSwitchesTest&) = delete;
+
~LauncherPageSwitchesTest() override = default;
// UIPerformanceTest:
@@ -103,8 +109,6 @@
private:
bool is_tablet_mode_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(LauncherPageSwitchesTest);
};
IN_PROC_BROWSER_TEST_P(LauncherPageSwitchesTest, SwitchToNextPage) {
@@ -139,6 +143,10 @@
class LauncherPageDragTest : public UIPerformanceTest {
public:
LauncherPageDragTest() = default;
+
+ LauncherPageDragTest(const LauncherPageDragTest&) = delete;
+ LauncherPageDragTest& operator=(const LauncherPageDragTest&) = delete;
+
~LauncherPageDragTest() override = default;
// UIPerformanceTest:
@@ -177,9 +185,6 @@
"ClamshellMode",
};
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LauncherPageDragTest);
};
IN_PROC_BROWSER_TEST_F(LauncherPageDragTest, Run) {
diff --git a/chrome/browser/ui/ash/login_screen_client_impl.h b/chrome/browser/ui/ash/login_screen_client_impl.h
index 41baa2e..c0a8495 100644
--- a/chrome/browser/ui/ash/login_screen_client_impl.h
+++ b/chrome/browser/ui/ash/login_screen_client_impl.h
@@ -32,6 +32,10 @@
class Delegate {
public:
Delegate();
+
+ Delegate(const Delegate&) = delete;
+ Delegate& operator=(const Delegate&) = delete;
+
virtual ~Delegate();
virtual void HandleAuthenticateUserWithPasswordOrPin(
const AccountId& account_id,
@@ -54,9 +58,6 @@
virtual void HandleLaunchPublicSession(const AccountId& account_id,
const std::string& locale,
const std::string& input_method) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Delegate);
};
// Handles methods related to parent access coming from ash into chrome.
@@ -68,6 +69,10 @@
};
LoginScreenClientImpl();
+
+ LoginScreenClientImpl(const LoginScreenClientImpl&) = delete;
+ LoginScreenClientImpl& operator=(const LoginScreenClientImpl&) = delete;
+
~LoginScreenClientImpl() override;
static bool HasInstance();
static LoginScreenClientImpl* Get();
@@ -155,8 +160,6 @@
base::ObserverList<LoginScreenShownObserver> login_screen_shown_observers_;
base::WeakPtrFactory<LoginScreenClientImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(LoginScreenClientImpl);
};
#endif // CHROME_BROWSER_UI_ASH_LOGIN_SCREEN_CLIENT_IMPL_H_
diff --git a/chrome/browser/ui/ash/media_client_impl.h b/chrome/browser/ui/ash/media_client_impl.h
index af16026..eb218a2 100644
--- a/chrome/browser/ui/ash/media_client_impl.h
+++ b/chrome/browser/ui/ash/media_client_impl.h
@@ -31,6 +31,10 @@
public media::CameraActiveClientObserver {
public:
MediaClientImpl();
+
+ MediaClientImpl(const MediaClientImpl&) = delete;
+ MediaClientImpl& operator=(const MediaClientImpl&) = delete;
+
~MediaClientImpl() override;
// Initializes and set as client for ash.
@@ -139,8 +143,6 @@
base::TimeTicks camera_switch_notification_shown_timestamp_;
base::WeakPtrFactory<MediaClientImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MediaClientImpl);
};
#endif // CHROME_BROWSER_UI_ASH_MEDIA_CLIENT_IMPL_H_
diff --git a/chrome/browser/ui/ash/media_client_impl_unittest.cc b/chrome/browser/ui/ash/media_client_impl_unittest.cc
index d99feef..48c0efdb 100644
--- a/chrome/browser/ui/ash/media_client_impl_unittest.cc
+++ b/chrome/browser/ui/ash/media_client_impl_unittest.cc
@@ -30,6 +30,10 @@
class TestMediaController : public ash::MediaController {
public:
TestMediaController() = default;
+
+ TestMediaController(const TestMediaController&) = delete;
+ TestMediaController& operator=(const TestMediaController&) = delete;
+
~TestMediaController() override = default;
// ash::MediaController:
@@ -51,13 +55,15 @@
private:
bool force_media_client_key_handling_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(TestMediaController);
};
class TestMediaKeysDelegate : public ui::MediaKeysListener::Delegate {
public:
TestMediaKeysDelegate() = default;
+
+ TestMediaKeysDelegate(const TestMediaKeysDelegate&) = delete;
+ TestMediaKeysDelegate& operator=(const TestMediaKeysDelegate&) = delete;
+
~TestMediaKeysDelegate() override = default;
void OnMediaKeysAccelerator(const ui::Accelerator& accelerator) override {
@@ -72,8 +78,6 @@
private:
absl::optional<ui::Accelerator> last_media_key_;
-
- DISALLOW_COPY_AND_ASSIGN(TestMediaKeysDelegate);
};
} // namespace
@@ -81,6 +85,10 @@
class MediaClientTest : public BrowserWithTestWindowTest {
public:
MediaClientTest() = default;
+
+ MediaClientTest(const MediaClientTest&) = delete;
+ MediaClientTest& operator=(const MediaClientTest&) = delete;
+
~MediaClientTest() override = default;
void SetUp() override {
@@ -141,8 +149,6 @@
std::unique_ptr<Browser> alt_browser_;
std::unique_ptr<BrowserWindow> alt_window_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaClientTest);
};
class MediaClientAppUsingCameraTest : public testing::Test {
diff --git a/chrome/browser/ui/ash/multi_user/multi_profile_support.cc b/chrome/browser/ui/ash/multi_user/multi_profile_support.cc
index 87977aeb..0179adcb 100644
--- a/chrome/browser/ui/ash/multi_user/multi_profile_support.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_profile_support.cc
@@ -91,6 +91,10 @@
class AppObserver : public extensions::AppWindowRegistry::Observer {
public:
explicit AppObserver(const std::string& user_id) : user_id_(user_id) {}
+
+ AppObserver(const AppObserver&) = delete;
+ AppObserver& operator=(const AppObserver&) = delete;
+
~AppObserver() override {}
// AppWindowRegistry::Observer overrides:
@@ -103,8 +107,6 @@
private:
std::string user_id_;
-
- DISALLOW_COPY_AND_ASSIGN(AppObserver);
};
// static
diff --git a/chrome/browser/ui/ash/multi_user/multi_profile_support.h b/chrome/browser/ui/ash/multi_user/multi_profile_support.h
index 836d2b07..ed16a56 100644
--- a/chrome/browser/ui/ash/multi_user/multi_profile_support.h
+++ b/chrome/browser/ui/ash/multi_user/multi_profile_support.h
@@ -39,6 +39,10 @@
public:
// Create the manager and use |active_account_id| as the active user.
explicit MultiProfileSupport(const AccountId& active_account_id);
+
+ MultiProfileSupport(const MultiProfileSupport&) = delete;
+ MultiProfileSupport& operator=(const MultiProfileSupport&) = delete;
+
~MultiProfileSupport() override;
static MultiProfileSupport* GetInstanceForTest() { return instance_; }
@@ -77,8 +81,6 @@
AccountIdToAppWindowObserver account_id_to_app_observer_;
std::unique_ptr<ash::MultiUserWindowManager> multi_user_window_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(MultiProfileSupport);
};
#endif // CHROME_BROWSER_UI_ASH_MULTI_USER_MULTI_PROFILE_SUPPORT_H_
diff --git a/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc
index 331c1c9..8a0dfc4 100644
--- a/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc
@@ -1379,6 +1379,10 @@
class TestWindowObserver : public aura::WindowObserver {
public:
TestWindowObserver() : resize_calls_(0) {}
+
+ TestWindowObserver(const TestWindowObserver&) = delete;
+ TestWindowObserver& operator=(const TestWindowObserver&) = delete;
+
~TestWindowObserver() override {}
void OnWindowBoundsChanged(aura::Window* window,
@@ -1392,8 +1396,6 @@
private:
int resize_calls_;
-
- DISALLOW_COPY_AND_ASSIGN(TestWindowObserver);
};
// Test that switching between different user won't change the activated windows
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
index 754c82c..2cf36ba 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
@@ -32,6 +32,11 @@
public ui::SimpleMenuModel::Delegate {
public:
explicit MultiUserContextMenuChromeos(aura::Window* window);
+
+ MultiUserContextMenuChromeos(const MultiUserContextMenuChromeos&) = delete;
+ MultiUserContextMenuChromeos& operator=(const MultiUserContextMenuChromeos&) =
+ delete;
+
~MultiUserContextMenuChromeos() override {}
// SimpleMenuModel::Delegate:
@@ -42,8 +47,6 @@
private:
// The window for which this menu is.
aura::Window* window_;
-
- DISALLOW_COPY_AND_ASSIGN(MultiUserContextMenuChromeos);
};
MultiUserContextMenuChromeos::MultiUserContextMenuChromeos(aura::Window* window)
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc
index 439aade..3bc969f8 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc
@@ -31,6 +31,10 @@
class MultiUserUtilTest : public ChromeAshTestBase {
public:
MultiUserUtilTest() {}
+
+ MultiUserUtilTest(const MultiUserUtilTest&) = delete;
+ MultiUserUtilTest& operator=(const MultiUserUtilTest&) = delete;
+
~MultiUserUtilTest() override {}
void SetUp() override {
@@ -86,8 +90,6 @@
// |fake_user_manager_| is owned by |user_manager_enabler_|.
FakeChromeUserManager* fake_user_manager_;
std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
-
- DISALLOW_COPY_AND_ASSIGN(MultiUserUtilTest);
};
// Test that during the session it will always return a valid account id if a
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h
index 900e4ab..7661323e 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h
@@ -13,6 +13,11 @@
class MultiUserWindowManagerStub : public ash::MultiUserWindowManager {
public:
MultiUserWindowManagerStub();
+
+ MultiUserWindowManagerStub(const MultiUserWindowManagerStub&) = delete;
+ MultiUserWindowManagerStub& operator=(const MultiUserWindowManagerStub&) =
+ delete;
+
~MultiUserWindowManagerStub() override;
// MultiUserWindowManager overrides:
@@ -28,9 +33,6 @@
void AddObserver(ash::MultiUserWindowManagerObserver* observer) override;
void RemoveObserver(ash::MultiUserWindowManagerObserver* observer) override;
const AccountId& CurrentAccountId() const override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MultiUserWindowManagerStub);
};
#endif // CHROME_BROWSER_UI_ASH_MULTI_USER_MULTI_USER_WINDOW_MANAGER_STUB_H_
diff --git a/chrome/browser/ui/ash/multi_user/test_multi_user_window_manager.h b/chrome/browser/ui/ash/multi_user/test_multi_user_window_manager.h
index 29394f4..082778a 100644
--- a/chrome/browser/ui/ash/multi_user/test_multi_user_window_manager.h
+++ b/chrome/browser/ui/ash/multi_user/test_multi_user_window_manager.h
@@ -17,6 +17,10 @@
// |browser| which is shown on |desktop_owner|'s desktop.
class TestMultiUserWindowManager : public ash::MultiUserWindowManager {
public:
+ TestMultiUserWindowManager(const TestMultiUserWindowManager&) = delete;
+ TestMultiUserWindowManager& operator=(const TestMultiUserWindowManager&) =
+ delete;
+
~TestMultiUserWindowManager() override;
// Creates an installs TestMultiUserWindowManager as the
@@ -57,8 +61,6 @@
AccountId created_window_shown_for_;
// The current selected active user.
AccountId current_account_id_;
-
- DISALLOW_COPY_AND_ASSIGN(TestMultiUserWindowManager);
};
#endif // CHROME_BROWSER_UI_ASH_MULTI_USER_TEST_MULTI_USER_WINDOW_MANAGER_H_
diff --git a/chrome/browser/ui/ash/network/enrollment_dialog_view.cc b/chrome/browser/ui/ash/network/enrollment_dialog_view.cc
index 4e10cde..d00ef19 100644
--- a/chrome/browser/ui/ash/network/enrollment_dialog_view.cc
+++ b/chrome/browser/ui/ash/network/enrollment_dialog_view.cc
@@ -190,6 +190,10 @@
DialogEnrollmentDelegate(const std::string& network_guid,
const std::string& network_name,
Profile* profile);
+
+ DialogEnrollmentDelegate(const DialogEnrollmentDelegate&) = delete;
+ DialogEnrollmentDelegate& operator=(const DialogEnrollmentDelegate&) = delete;
+
~DialogEnrollmentDelegate();
bool Enroll(const std::vector<std::string>& uri_list);
@@ -198,8 +202,6 @@
std::string network_guid_;
std::string network_name_;
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(DialogEnrollmentDelegate);
};
DialogEnrollmentDelegate::DialogEnrollmentDelegate(
diff --git a/chrome/browser/ui/ash/network/mobile_data_notifications.h b/chrome/browser/ui/ash/network/mobile_data_notifications.h
index 182c113..248043c9 100644
--- a/chrome/browser/ui/ash/network/mobile_data_notifications.h
+++ b/chrome/browser/ui/ash/network/mobile_data_notifications.h
@@ -36,6 +36,10 @@
public session_manager::SessionManagerObserver {
public:
MobileDataNotifications();
+
+ MobileDataNotifications(const MobileDataNotifications&) = delete;
+ MobileDataNotifications& operator=(const MobileDataNotifications&) = delete;
+
~MobileDataNotifications() override;
// NetworkStateHandlerObserver:
@@ -77,8 +81,6 @@
base::OneShotTimer one_shot_notification_check_delay_;
base::WeakPtrFactory<MobileDataNotifications> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MobileDataNotifications);
};
#endif // CHROME_BROWSER_UI_ASH_NETWORK_MOBILE_DATA_NOTIFICATIONS_H_
diff --git a/chrome/browser/ui/ash/network/mobile_data_notifications_unittest.cc b/chrome/browser/ui/ash/network/mobile_data_notifications_unittest.cc
index 87398ff..dd839cd 100644
--- a/chrome/browser/ui/ash/network/mobile_data_notifications_unittest.cc
+++ b/chrome/browser/ui/ash/network/mobile_data_notifications_unittest.cc
@@ -45,6 +45,11 @@
class NetworkConnectTestDelegate : public chromeos::NetworkConnect::Delegate {
public:
NetworkConnectTestDelegate() {}
+
+ NetworkConnectTestDelegate(const NetworkConnectTestDelegate&) = delete;
+ NetworkConnectTestDelegate& operator=(const NetworkConnectTestDelegate&) =
+ delete;
+
~NetworkConnectTestDelegate() override {}
void ShowNetworkConfigure(const std::string& network_id) override {}
@@ -57,14 +62,16 @@
void ShowNetworkConnectError(const std::string& error_name,
const std::string& network_id) override {}
void ShowMobileActivationError(const std::string& network_id) override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NetworkConnectTestDelegate);
};
class MobileDataNotificationsTest : public testing::Test {
public:
MobileDataNotificationsTest() {}
+
+ MobileDataNotificationsTest(const MobileDataNotificationsTest&) = delete;
+ MobileDataNotificationsTest& operator=(const MobileDataNotificationsTest&) =
+ delete;
+
~MobileDataNotificationsTest() override {}
void SetUp() override {
@@ -161,8 +168,6 @@
ash::FakeChromeUserManager* user_manager_;
std::unique_ptr<TestingProfileManager> profile_manager_;
std::unique_ptr<NotificationDisplayServiceTester> display_service_;
-
- DISALLOW_COPY_AND_ASSIGN(MobileDataNotificationsTest);
};
// Verify that basic network setup does not trigger notification.
diff --git a/chrome/browser/ui/ash/network/network_connect_delegate_chromeos.h b/chrome/browser/ui/ash/network/network_connect_delegate_chromeos.h
index 5f7a933..a60d7a3 100644
--- a/chrome/browser/ui/ash/network/network_connect_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/network/network_connect_delegate_chromeos.h
@@ -23,6 +23,12 @@
: public chromeos::NetworkConnect::Delegate {
public:
NetworkConnectDelegateChromeOS();
+
+ NetworkConnectDelegateChromeOS(const NetworkConnectDelegateChromeOS&) =
+ delete;
+ NetworkConnectDelegateChromeOS& operator=(
+ const NetworkConnectDelegateChromeOS&) = delete;
+
~NetworkConnectDelegateChromeOS() override;
void ShowNetworkConfigure(const std::string& network_id) override;
@@ -38,8 +44,6 @@
private:
std::unique_ptr<chromeos::NetworkStateNotifier> network_state_notifier_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkConnectDelegateChromeOS);
};
#endif // CHROME_BROWSER_UI_ASH_NETWORK_NETWORK_CONNECT_DELEGATE_CHROMEOS_H_
diff --git a/chrome/browser/ui/ash/network/network_portal_notification_controller.h b/chrome/browser/ui/ash/network/network_portal_notification_controller.h
index 36f95b8..1038cae 100644
--- a/chrome/browser/ui/ash/network/network_portal_notification_controller.h
+++ b/chrome/browser/ui/ash/network/network_portal_notification_controller.h
@@ -38,6 +38,12 @@
explicit NetworkPortalNotificationController(
NetworkPortalDetector* network_portal_dectector);
+
+ NetworkPortalNotificationController(
+ const NetworkPortalNotificationController&) = delete;
+ NetworkPortalNotificationController& operator=(
+ const NetworkPortalNotificationController&) = delete;
+
~NetworkPortalNotificationController() override;
// Creates NetworkPortalWebDialog.
@@ -87,8 +93,6 @@
bool ignore_no_network_for_testing_ = false;
base::WeakPtrFactory<NetworkPortalNotificationController> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NetworkPortalNotificationController);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/ash/network/network_portal_notification_controller_unittest.cc b/chrome/browser/ui/ash/network/network_portal_notification_controller_unittest.cc
index 970d6ead..15ea02a5 100644
--- a/chrome/browser/ui/ash/network/network_portal_notification_controller_unittest.cc
+++ b/chrome/browser/ui/ash/network/network_portal_notification_controller_unittest.cc
@@ -36,6 +36,12 @@
: public BrowserWithTestWindowTest {
public:
NetworkPortalNotificationControllerTest() : controller_(nullptr) {}
+
+ NetworkPortalNotificationControllerTest(
+ const NetworkPortalNotificationControllerTest&) = delete;
+ NetworkPortalNotificationControllerTest& operator=(
+ const NetworkPortalNotificationControllerTest&) = delete;
+
~NetworkPortalNotificationControllerTest() override {}
void SetUp() override {
@@ -60,9 +66,6 @@
std::unique_ptr<NotificationDisplayServiceTester> display_service_;
NetworkPortalNotificationController controller_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NetworkPortalNotificationControllerTest);
};
TEST_F(NetworkPortalNotificationControllerTest, NetworkStateChanged) {
diff --git a/chrome/browser/ui/ash/network/network_state_notifier.h b/chrome/browser/ui/ash/network/network_state_notifier.h
index 0db251bc..4656ea4a 100644
--- a/chrome/browser/ui/ash/network/network_state_notifier.h
+++ b/chrome/browser/ui/ash/network/network_state_notifier.h
@@ -40,6 +40,10 @@
public NetworkStateHandlerObserver {
public:
NetworkStateNotifier();
+
+ NetworkStateNotifier(const NetworkStateNotifier&) = delete;
+ NetworkStateNotifier& operator=(const NetworkStateNotifier&) = delete;
+
~NetworkStateNotifier() override;
// Show a connection error notification. If |error_name| matches an error
@@ -138,8 +142,6 @@
std::set<std::string> cellular_activating_guids_;
base::WeakPtrFactory<NetworkStateNotifier> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NetworkStateNotifier);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/ash/network/network_state_notifier_unittest.cc b/chrome/browser/ui/ash/network/network_state_notifier_unittest.cc
index 61667ee..dd9c6d7 100644
--- a/chrome/browser/ui/ash/network/network_state_notifier_unittest.cc
+++ b/chrome/browser/ui/ash/network/network_state_notifier_unittest.cc
@@ -52,6 +52,11 @@
NetworkConnectTestDelegate(
std::unique_ptr<NetworkStateNotifier> network_state_notifier)
: network_state_notifier_(std::move(network_state_notifier)) {}
+
+ NetworkConnectTestDelegate(const NetworkConnectTestDelegate&) = delete;
+ NetworkConnectTestDelegate& operator=(const NetworkConnectTestDelegate&) =
+ delete;
+
~NetworkConnectTestDelegate() override = default;
// NetworkConnect::Delegate
@@ -71,8 +76,6 @@
private:
std::unique_ptr<NetworkStateNotifier> network_state_notifier_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkConnectTestDelegate);
};
} // namespace
@@ -80,6 +83,10 @@
class NetworkStateNotifierTest : public BrowserWithTestWindowTest {
public:
NetworkStateNotifierTest() = default;
+
+ NetworkStateNotifierTest(const NetworkStateNotifierTest&) = delete;
+ NetworkStateNotifierTest& operator=(const NetworkStateNotifierTest&) = delete;
+
~NetworkStateNotifierTest() override = default;
void SetUp() override {
@@ -220,9 +227,6 @@
std::unique_ptr<NetworkConnectTestDelegate> network_connect_delegate_;
TestingPrefServiceSimple user_prefs_;
TestingPrefServiceSimple local_state_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NetworkStateNotifierTest);
};
TEST_F(NetworkStateNotifierTest, WiFiConnectionFailure) {
diff --git a/chrome/browser/ui/ash/network/tether_notification_presenter.h b/chrome/browser/ui/ash/network/tether_notification_presenter.h
index 8b343a0..0744b8be1 100644
--- a/chrome/browser/ui/ash/network/tether_notification_presenter.h
+++ b/chrome/browser/ui/ash/network/tether_notification_presenter.h
@@ -36,6 +36,11 @@
// instance.
TetherNotificationPresenter(Profile* profile,
NetworkConnect* network_connect);
+
+ TetherNotificationPresenter(const TetherNotificationPresenter&) = delete;
+ TetherNotificationPresenter& operator=(const TetherNotificationPresenter&) =
+ delete;
+
~TetherNotificationPresenter() override;
// NotificationPresenter:
@@ -117,8 +122,6 @@
// in the "multiple hotspots available" mode, this pointer is null.
std::unique_ptr<std::string> hotspot_nearby_device_id_;
base::WeakPtrFactory<TetherNotificationPresenter> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TetherNotificationPresenter);
};
} // namespace tether
diff --git a/chrome/browser/ui/ash/overview_animations_interactive_uitest.cc b/chrome/browser/ui/ash/overview_animations_interactive_uitest.cc
index b10a13c07b..7e9287c2 100644
--- a/chrome/browser/ui/ash/overview_animations_interactive_uitest.cc
+++ b/chrome/browser/ui/ash/overview_animations_interactive_uitest.cc
@@ -24,6 +24,10 @@
public testing::WithParamInterface<::testing::tuple<int, bool, bool>> {
public:
OverviewAnimationsTest() = default;
+
+ OverviewAnimationsTest(const OverviewAnimationsTest&) = delete;
+ OverviewAnimationsTest& operator=(const OverviewAnimationsTest&) = delete;
+
~OverviewAnimationsTest() override = default;
// UIPerformanceTest:
@@ -70,7 +74,6 @@
private:
bool tablet_mode_ = false;
- DISALLOW_COPY_AND_ASSIGN(OverviewAnimationsTest);
};
// TODO(https://crbug.com/1033653) flaky test
diff --git a/chrome/browser/ui/ash/screen_orientation_delegate_chromeos.h b/chrome/browser/ui/ash/screen_orientation_delegate_chromeos.h
index 8c3af9a..8e3606e 100644
--- a/chrome/browser/ui/ash/screen_orientation_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/screen_orientation_delegate_chromeos.h
@@ -12,6 +12,12 @@
: public content::ScreenOrientationDelegate {
public:
ScreenOrientationDelegateChromeos();
+
+ ScreenOrientationDelegateChromeos(const ScreenOrientationDelegateChromeos&) =
+ delete;
+ ScreenOrientationDelegateChromeos& operator=(
+ const ScreenOrientationDelegateChromeos&) = delete;
+
~ScreenOrientationDelegateChromeos() override;
private:
@@ -21,8 +27,6 @@
device::mojom::ScreenOrientationLockType lock_orientation) override;
bool ScreenOrientationProviderSupported() override;
void Unlock(content::WebContents* web_contents) override;
-
- DISALLOW_COPY_AND_ASSIGN(ScreenOrientationDelegateChromeos);
};
#endif // CHROME_BROWSER_UI_ASH_SCREEN_ORIENTATION_DELEGATE_CHROMEOS_H_
diff --git a/chrome/browser/ui/ash/session_controller_client_impl.h b/chrome/browser/ui/ash/session_controller_client_impl.h
index db60e71a..a174fab 100644
--- a/chrome/browser/ui/ash/session_controller_client_impl.h
+++ b/chrome/browser/ui/ash/session_controller_client_impl.h
@@ -48,6 +48,11 @@
public crosapi::BrowserManagerObserver {
public:
SessionControllerClientImpl();
+
+ SessionControllerClientImpl(const SessionControllerClientImpl&) = delete;
+ SessionControllerClientImpl& operator=(const SessionControllerClientImpl&) =
+ delete;
+
~SessionControllerClientImpl() override;
void Init();
@@ -180,8 +185,6 @@
std::unique_ptr<ash::UserSession> last_sent_user_session_;
base::WeakPtrFactory<SessionControllerClientImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SessionControllerClientImpl);
};
#endif // CHROME_BROWSER_UI_ASH_SESSION_CONTROLLER_CLIENT_IMPL_H_
diff --git a/chrome/browser/ui/ash/session_controller_client_impl_unittest.cc b/chrome/browser/ui/ash/session_controller_client_impl_unittest.cc
index 38af163..bf542f1 100644
--- a/chrome/browser/ui/ash/session_controller_client_impl_unittest.cc
+++ b/chrome/browser/ui/ash/session_controller_client_impl_unittest.cc
@@ -58,6 +58,10 @@
class TestChromeUserManager : public ash::FakeChromeUserManager {
public:
TestChromeUserManager() = default;
+
+ TestChromeUserManager(const TestChromeUserManager&) = delete;
+ TestChromeUserManager& operator=(const TestChromeUserManager&) = delete;
+
~TestChromeUserManager() override = default;
// user_manager::UserManager:
@@ -90,9 +94,6 @@
return unlock_users;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestChromeUserManager);
};
} // namespace
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.h b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.h
index 80091eb..7a21551 100644
--- a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.h
+++ b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.h
@@ -45,6 +45,12 @@
using ProfileList = std::vector<Profile*>;
explicit AppServiceAppWindowShelfController(ChromeShelfController* owner);
+
+ AppServiceAppWindowShelfController(
+ const AppServiceAppWindowShelfController&) = delete;
+ AppServiceAppWindowShelfController& operator=(
+ const AppServiceAppWindowShelfController&) = delete;
+
~AppServiceAppWindowShelfController() override;
// AppWindowShelfController:
@@ -152,8 +158,6 @@
// A list of windows added for users.
WindowList window_list_;
-
- DISALLOW_COPY_AND_ASSIGN(AppServiceAppWindowShelfController);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_APP_SERVICE_APP_SERVICE_APP_WINDOW_SHELF_CONTROLLER_H_
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_instance_registry_helper.h b/chrome/browser/ui/ash/shelf/app_service/app_service_instance_registry_helper.h
index a790814..afdaccf3 100644
--- a/chrome/browser/ui/ash/shelf/app_service/app_service_instance_registry_helper.h
+++ b/chrome/browser/ui/ash/shelf/app_service/app_service_instance_registry_helper.h
@@ -31,6 +31,12 @@
public:
explicit AppServiceInstanceRegistryHelper(
AppServiceAppWindowShelfController* controller);
+
+ AppServiceInstanceRegistryHelper(const AppServiceInstanceRegistryHelper&) =
+ delete;
+ AppServiceInstanceRegistryHelper& operator=(
+ const AppServiceInstanceRegistryHelper&) = delete;
+
~AppServiceInstanceRegistryHelper();
void ActiveUserChanged();
@@ -144,8 +150,6 @@
// Maps the tab instance to the browser window in the browser.
std::map<apps::Instance::InstanceKey, aura::Window*>
tab_instance_to_browser_window_;
-
- DISALLOW_COPY_AND_ASSIGN(AppServiceInstanceRegistryHelper);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_APP_SERVICE_APP_SERVICE_INSTANCE_REGISTRY_HELPER_H_
diff --git a/chrome/browser/ui/ash/shelf/app_service/shelf_app_service_app_updater.h b/chrome/browser/ui/ash/shelf/app_service/shelf_app_service_app_updater.h
index 90666f4..38013f9 100644
--- a/chrome/browser/ui/ash/shelf/app_service/shelf_app_service_app_updater.h
+++ b/chrome/browser/ui/ash/shelf/app_service/shelf_app_service_app_updater.h
@@ -22,6 +22,11 @@
public:
ShelfAppServiceAppUpdater(Delegate* delegate,
content::BrowserContext* browser_context);
+
+ ShelfAppServiceAppUpdater(const ShelfAppServiceAppUpdater&) = delete;
+ ShelfAppServiceAppUpdater& operator=(const ShelfAppServiceAppUpdater&) =
+ delete;
+
~ShelfAppServiceAppUpdater() override;
// apps::AppRegistryCache::Observer overrides:
@@ -32,8 +37,6 @@
private:
void OnShowInShelfChanged(const std::string& app_id, bool show_in_shelf);
std::set<std::string> installed_apps_;
-
- DISALLOW_COPY_AND_ASSIGN(ShelfAppServiceAppUpdater);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_APP_SERVICE_SHELF_APP_SERVICE_APP_UPDATER_H_
diff --git a/chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller.h b/chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller.h
index 0bc1dba..572dcdd 100644
--- a/chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller.h
+++ b/chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller.h
@@ -35,6 +35,12 @@
public BrowserListObserver {
public:
explicit AppShortcutShelfItemController(const ash::ShelfID& shelf_id);
+
+ AppShortcutShelfItemController(const AppShortcutShelfItemController&) =
+ delete;
+ AppShortcutShelfItemController& operator=(
+ const AppShortcutShelfItemController&) = delete;
+
~AppShortcutShelfItemController() override;
// ash::ShelfItemDelegate overrides:
@@ -106,8 +112,6 @@
bool app_menu_cached_by_browsers_ = false;
std::unique_ptr<ShelfContextMenu> context_menu_;
-
- DISALLOW_COPY_AND_ASSIGN(AppShortcutShelfItemController);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_APP_SHORTCUT_SHELF_ITEM_CONTROLLER_H_
diff --git a/chrome/browser/ui/ash/shelf/app_window_base.h b/chrome/browser/ui/ash/shelf/app_window_base.h
index a8b7d71..2ab1902 100644
--- a/chrome/browser/ui/ash/shelf/app_window_base.h
+++ b/chrome/browser/ui/ash/shelf/app_window_base.h
@@ -33,6 +33,9 @@
AppWindowBase(const ash::ShelfID& shelf_id, views::Widget* widget);
+ AppWindowBase(const AppWindowBase&) = delete;
+ AppWindowBase& operator=(const AppWindowBase&) = delete;
+
virtual ~AppWindowBase();
void SetController(AppWindowShelfItemController* controller);
@@ -80,8 +83,6 @@
ash::ShelfID shelf_id_;
views::Widget* const widget_;
AppWindowShelfItemController* controller_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(AppWindowBase);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_APP_WINDOW_BASE_H_
diff --git a/chrome/browser/ui/ash/shelf/app_window_shelf_controller.h b/chrome/browser/ui/ash/shelf/app_window_shelf_controller.h
index a7c6881..0b769a8 100644
--- a/chrome/browser/ui/ash/shelf/app_window_shelf_controller.h
+++ b/chrome/browser/ui/ash/shelf/app_window_shelf_controller.h
@@ -26,6 +26,9 @@
class AppWindowShelfController : public wm::ActivationChangeObserver,
public ash::ShelfModelObserver {
public:
+ AppWindowShelfController(const AppWindowShelfController&) = delete;
+ AppWindowShelfController& operator=(const AppWindowShelfController&) = delete;
+
~AppWindowShelfController() override;
// Called by ChromeShelfController when the active user changed and the
@@ -62,8 +65,6 @@
void ShelfItemDelegateChanged(const ash::ShelfID& id,
ash::ShelfItemDelegate* old_delegate,
ash::ShelfItemDelegate* delegate) override;
-
- DISALLOW_COPY_AND_ASSIGN(AppWindowShelfController);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_APP_WINDOW_SHELF_CONTROLLER_H_
diff --git a/chrome/browser/ui/ash/shelf/app_window_shelf_item_controller.h b/chrome/browser/ui/ash/shelf/app_window_shelf_item_controller.h
index e6f12022..aaae1ea 100644
--- a/chrome/browser/ui/ash/shelf/app_window_shelf_item_controller.h
+++ b/chrome/browser/ui/ash/shelf/app_window_shelf_item_controller.h
@@ -29,6 +29,11 @@
using WindowList = std::list<AppWindowBase*>;
explicit AppWindowShelfItemController(const ash::ShelfID& shelf_id);
+
+ AppWindowShelfItemController(const AppWindowShelfItemController&) = delete;
+ AppWindowShelfItemController& operator=(const AppWindowShelfItemController&) =
+ delete;
+
~AppWindowShelfItemController() override;
void AddWindow(AppWindowBase* window);
@@ -103,8 +108,6 @@
observed_windows_{this};
std::unique_ptr<ShelfContextMenu> context_menu_;
-
- DISALLOW_COPY_AND_ASSIGN(AppWindowShelfItemController);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_APP_WINDOW_SHELF_ITEM_CONTROLLER_H_
diff --git a/chrome/browser/ui/ash/shelf/arc_app_shelf_browsertest.cc b/chrome/browser/ui/ash/shelf/arc_app_shelf_browsertest.cc
index 28ca0189..0652571 100644
--- a/chrome/browser/ui/ash/shelf/arc_app_shelf_browsertest.cc
+++ b/chrome/browser/ui/ash/shelf/arc_app_shelf_browsertest.cc
@@ -196,6 +196,10 @@
class ArcAppShelfBrowserTest : public extensions::ExtensionBrowserTest {
public:
ArcAppShelfBrowserTest() = default;
+
+ ArcAppShelfBrowserTest(const ArcAppShelfBrowserTest&) = delete;
+ ArcAppShelfBrowserTest& operator=(const ArcAppShelfBrowserTest&) = delete;
+
~ArcAppShelfBrowserTest() override = default;
protected:
@@ -355,17 +359,18 @@
private:
std::unique_ptr<arc::FakeAppInstance> app_instance_;
std::unique_ptr<exo::WMHelper> wm_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppShelfBrowserTest);
};
class ArcAppDeferredShelfBrowserTest : public ArcAppShelfBrowserTest {
public:
ArcAppDeferredShelfBrowserTest() = default;
- ~ArcAppDeferredShelfBrowserTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(ArcAppDeferredShelfBrowserTest);
+ ArcAppDeferredShelfBrowserTest(const ArcAppDeferredShelfBrowserTest&) =
+ delete;
+ ArcAppDeferredShelfBrowserTest& operator=(
+ const ArcAppDeferredShelfBrowserTest&) = delete;
+
+ ~ArcAppDeferredShelfBrowserTest() override = default;
};
IN_PROC_BROWSER_TEST_F(ArcAppDeferredShelfBrowserTest,
@@ -420,15 +425,18 @@
public testing::WithParamInterface<TestParameter> {
public:
ArcAppDeferredShelfWithParamsBrowserTest() = default;
+
+ ArcAppDeferredShelfWithParamsBrowserTest(
+ const ArcAppDeferredShelfWithParamsBrowserTest&) = delete;
+ ArcAppDeferredShelfWithParamsBrowserTest& operator=(
+ const ArcAppDeferredShelfWithParamsBrowserTest&) = delete;
+
~ArcAppDeferredShelfWithParamsBrowserTest() override = default;
protected:
bool is_pinned() const { return std::get<1>(GetParam()); }
TestAction test_action() const { return std::get<0>(GetParam()); }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ArcAppDeferredShelfWithParamsBrowserTest);
};
// This tests simulates normal workflow for starting ARC app in deferred mode.
diff --git a/chrome/browser/ui/ash/shelf/arc_app_window.h b/chrome/browser/ui/ash/shelf/arc_app_window.h
index 3c5017f..a37ad2d 100644
--- a/chrome/browser/ui/ash/shelf/arc_app_window.h
+++ b/chrome/browser/ui/ash/shelf/arc_app_window.h
@@ -38,6 +38,9 @@
ArcAppWindowDelegate* owner,
Profile* profile);
+ ArcAppWindow(const ArcAppWindow&) = delete;
+ ArcAppWindow& operator=(const ArcAppWindow&) = delete;
+
~ArcAppWindow() override;
void SetFullscreenMode(FullScreenMode mode) override;
@@ -81,8 +84,6 @@
// Loads the ARC app icon to the window icon keys. Nullptr once a custom icon
// has been successfully set.
std::unique_ptr<AppServiceAppIconLoader> app_icon_loader_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppWindow);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_ARC_APP_WINDOW_H_
diff --git a/chrome/browser/ui/ash/shelf/arc_playstore_shortcut_shelf_item_controller.h b/chrome/browser/ui/ash/shelf/arc_playstore_shortcut_shelf_item_controller.h
index bd764ff..0cdd4e86 100644
--- a/chrome/browser/ui/ash/shelf/arc_playstore_shortcut_shelf_item_controller.h
+++ b/chrome/browser/ui/ash/shelf/arc_playstore_shortcut_shelf_item_controller.h
@@ -16,6 +16,12 @@
: public AppShortcutShelfItemController {
public:
ArcPlaystoreShortcutShelfItemController();
+
+ ArcPlaystoreShortcutShelfItemController(
+ const ArcPlaystoreShortcutShelfItemController&) = delete;
+ ArcPlaystoreShortcutShelfItemController& operator=(
+ const ArcPlaystoreShortcutShelfItemController&) = delete;
+
~ArcPlaystoreShortcutShelfItemController() override;
// AppShortcutShelfItemController overrides:
@@ -27,8 +33,6 @@
private:
std::unique_ptr<ArcAppLauncher> playstore_launcher_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcPlaystoreShortcutShelfItemController);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_ARC_PLAYSTORE_SHORTCUT_SHELF_ITEM_CONTROLLER_H_
diff --git a/chrome/browser/ui/ash/shelf/arc_shelf_spinner_item_controller.h b/chrome/browser/ui/ash/shelf/arc_shelf_spinner_item_controller.h
index eb7881b..cad585c 100644
--- a/chrome/browser/ui/ash/shelf/arc_shelf_spinner_item_controller.h
+++ b/chrome/browser/ui/ash/shelf/arc_shelf_spinner_item_controller.h
@@ -31,6 +31,10 @@
arc::UserInteractionType user_interaction_type,
arc::mojom::WindowInfoPtr window_info);
+ ArcShelfSpinnerItemController(const ArcShelfSpinnerItemController&) = delete;
+ ArcShelfSpinnerItemController& operator=(
+ const ArcShelfSpinnerItemController&) = delete;
+
~ArcShelfSpinnerItemController() override;
// ShelfSpinnerItemController:
@@ -73,8 +77,6 @@
std::unique_ptr<base::OneShotTimer> close_timer_;
base::WeakPtrFactory<ArcShelfSpinnerItemController> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcShelfSpinnerItemController);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_ARC_SHELF_SPINNER_ITEM_CONTROLLER_H_
diff --git a/chrome/browser/ui/ash/shelf/browser_shortcut_shelf_item_controller.h b/chrome/browser/ui/ash/shelf/browser_shortcut_shelf_item_controller.h
index 3042849..e021ee6 100644
--- a/chrome/browser/ui/ash/shelf/browser_shortcut_shelf_item_controller.h
+++ b/chrome/browser/ui/ash/shelf/browser_shortcut_shelf_item_controller.h
@@ -24,6 +24,11 @@
public:
explicit BrowserShortcutShelfItemController(ash::ShelfModel* shelf_model);
+ BrowserShortcutShelfItemController(
+ const BrowserShortcutShelfItemController&) = delete;
+ BrowserShortcutShelfItemController& operator=(
+ const BrowserShortcutShelfItemController&) = delete;
+
~BrowserShortcutShelfItemController() override;
// Check if there is any active browsers windows.
@@ -62,8 +67,6 @@
std::vector<std::pair<Browser*, size_t>> app_menu_items_;
std::unique_ptr<ShelfContextMenu> context_menu_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserShortcutShelfItemController);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_BROWSER_SHORTCUT_SHELF_ITEM_CONTROLLER_H_
diff --git a/chrome/browser/ui/ash/shelf/browser_status_monitor.cc b/chrome/browser/ui/ash/shelf/browser_status_monitor.cc
index 52ceaf1..b99be7ba 100644
--- a/chrome/browser/ui/ash/shelf/browser_status_monitor.cc
+++ b/chrome/browser/ui/ash/shelf/browser_status_monitor.cc
@@ -54,6 +54,9 @@
BrowserStatusMonitor* monitor)
: content::WebContentsObserver(contents), monitor_(monitor) {}
+ LocalWebContentsObserver(const LocalWebContentsObserver&) = delete;
+ LocalWebContentsObserver& operator=(const LocalWebContentsObserver&) = delete;
+
~LocalWebContentsObserver() override = default;
// content::WebContentsObserver
@@ -77,8 +80,6 @@
private:
BrowserStatusMonitor* monitor_;
-
- DISALLOW_COPY_AND_ASSIGN(LocalWebContentsObserver);
};
BrowserStatusMonitor::BrowserStatusMonitor(
diff --git a/chrome/browser/ui/ash/shelf/browser_status_monitor.h b/chrome/browser/ui/ash/shelf/browser_status_monitor.h
index 8e3b407..cadd6ab2 100644
--- a/chrome/browser/ui/ash/shelf/browser_status_monitor.h
+++ b/chrome/browser/ui/ash/shelf/browser_status_monitor.h
@@ -29,6 +29,10 @@
public TabStripModelObserver {
public:
explicit BrowserStatusMonitor(ChromeShelfController* shelf_controller);
+
+ BrowserStatusMonitor(const BrowserStatusMonitor&) = delete;
+ BrowserStatusMonitor& operator=(const BrowserStatusMonitor&) = delete;
+
~BrowserStatusMonitor() override;
// Do the initialization work. Note: the init phase is separate from
@@ -119,8 +123,6 @@
// another.
std::set<content::WebContents*> tabs_in_transit_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(BrowserStatusMonitor);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_BROWSER_STATUS_MONITOR_H_
diff --git a/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc b/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc
index 639dcd9..06dbc5b2 100644
--- a/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc
+++ b/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc
@@ -138,6 +138,12 @@
DCHECK(user_manager::UserManager::IsInitialized());
user_manager::UserManager::Get()->AddSessionStateObserver(this);
}
+
+ ChromeShelfControllerUserSwitchObserver(
+ const ChromeShelfControllerUserSwitchObserver&) = delete;
+ ChromeShelfControllerUserSwitchObserver& operator=(
+ const ChromeShelfControllerUserSwitchObserver&) = delete;
+
~ChromeShelfControllerUserSwitchObserver() override {
user_manager::UserManager::Get()->RemoveSessionStateObserver(this);
}
@@ -158,8 +164,6 @@
// Users which were just added to the system, but which profiles were not yet
// (fully) loaded.
std::set<std::string> added_user_ids_waiting_for_profiles_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeShelfControllerUserSwitchObserver);
};
void ChromeShelfControllerUserSwitchObserver::UserAddedToSession(
diff --git a/chrome/browser/ui/ash/shelf/chrome_shelf_controller.h b/chrome/browser/ui/ash/shelf/chrome_shelf_controller.h
index 329f19b..2c4c641 100644
--- a/chrome/browser/ui/ash/shelf/chrome_shelf_controller.h
+++ b/chrome/browser/ui/ash/shelf/chrome_shelf_controller.h
@@ -77,6 +77,10 @@
ChromeShelfController(Profile* profile,
ash::ShelfModel* model,
ChromeShelfItemFactory* shelf_item_factory);
+
+ ChromeShelfController(const ChromeShelfController&) = delete;
+ ChromeShelfController& operator=(const ChromeShelfController&) = delete;
+
~ChromeShelfController() override;
Profile* profile() const { return profile_; }
@@ -474,8 +478,6 @@
scoped_refptr<base::SequencedTaskRunner> standard_icon_task_runner_;
base::WeakPtrFactory<ChromeShelfController> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeShelfController);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_CHROME_SHELF_CONTROLLER_H_
diff --git a/chrome/browser/ui/ash/shelf/crostini_app_display.h b/chrome/browser/ui/ash/shelf/crostini_app_display.h
index c14b487..a272305 100644
--- a/chrome/browser/ui/ash/shelf/crostini_app_display.h
+++ b/chrome/browser/ui/ash/shelf/crostini_app_display.h
@@ -15,6 +15,10 @@
class CrostiniAppDisplay {
public:
CrostiniAppDisplay();
+
+ CrostiniAppDisplay(const CrostiniAppDisplay&) = delete;
+ CrostiniAppDisplay& operator=(const CrostiniAppDisplay&) = delete;
+
~CrostiniAppDisplay();
// Register that |app_id| app should be shown in |display_id| monitor.
@@ -29,8 +33,6 @@
std::map<std::string, int64_t> app_id_to_display_id_;
std::deque<std::string> app_ids_;
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniAppDisplay);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_CROSTINI_APP_DISPLAY_H_
diff --git a/chrome/browser/ui/ash/shelf/extension_shelf_context_menu.h b/chrome/browser/ui/ash/shelf/extension_shelf_context_menu.h
index 0c59409..4267a6e 100644
--- a/chrome/browser/ui/ash/shelf/extension_shelf_context_menu.h
+++ b/chrome/browser/ui/ash/shelf/extension_shelf_context_menu.h
@@ -21,6 +21,11 @@
ExtensionShelfContextMenu(ChromeShelfController* controller,
const ash::ShelfItem* item,
int64_t display_id);
+
+ ExtensionShelfContextMenu(const ExtensionShelfContextMenu&) = delete;
+ ExtensionShelfContextMenu& operator=(const ExtensionShelfContextMenu&) =
+ delete;
+
~ExtensionShelfContextMenu() override;
// ShelfContextMenu overrides:
@@ -47,8 +52,6 @@
std::unique_ptr<ui::SimpleMenuModel> open_new_submenu_model_;
std::unique_ptr<extensions::ContextMenuMatcher> extension_items_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionShelfContextMenu);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_EXTENSION_SHELF_CONTEXT_MENU_H_
diff --git a/chrome/browser/ui/ash/shelf/extension_uninstaller.h b/chrome/browser/ui/ash/shelf/extension_uninstaller.h
index c5baaea..f75afe2 100644
--- a/chrome/browser/ui/ash/shelf/extension_uninstaller.h
+++ b/chrome/browser/ui/ash/shelf/extension_uninstaller.h
@@ -23,6 +23,10 @@
ExtensionUninstaller(Profile* profile,
const std::string& extension_id,
gfx::NativeWindow parent_window = nullptr);
+
+ ExtensionUninstaller(const ExtensionUninstaller&) = delete;
+ ExtensionUninstaller& operator=(const ExtensionUninstaller&) = delete;
+
~ExtensionUninstaller() override;
void Run();
@@ -38,8 +42,6 @@
std::string app_id_;
gfx::NativeWindow parent_window_; // Can be null.
std::unique_ptr<extensions::ExtensionUninstallDialog> dialog_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionUninstaller);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_EXTENSION_UNINSTALLER_H_
diff --git a/chrome/browser/ui/ash/shelf/settings_window_observer.cc b/chrome/browser/ui/ash/shelf/settings_window_observer.cc
index 5c00f6d4..0a34339 100644
--- a/chrome/browser/ui/ash/shelf/settings_window_observer.cc
+++ b/chrome/browser/ui/ash/shelf/settings_window_observer.cc
@@ -22,6 +22,12 @@
class AuraWindowSettingsTitleTracker : public aura::WindowTracker {
public:
AuraWindowSettingsTitleTracker() {}
+
+ AuraWindowSettingsTitleTracker(const AuraWindowSettingsTitleTracker&) =
+ delete;
+ AuraWindowSettingsTitleTracker& operator=(
+ const AuraWindowSettingsTitleTracker&) = delete;
+
~AuraWindowSettingsTitleTracker() override {}
// aura::WindowTracker:
@@ -29,9 +35,6 @@
// Name the window "Settings" instead of "Google Chrome - Settings".
window->SetTitle(l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AuraWindowSettingsTitleTracker);
};
} // namespace
diff --git a/chrome/browser/ui/ash/shelf/settings_window_observer.h b/chrome/browser/ui/ash/shelf/settings_window_observer.h
index 366c7844..c2c2b7f 100644
--- a/chrome/browser/ui/ash/shelf/settings_window_observer.h
+++ b/chrome/browser/ui/ash/shelf/settings_window_observer.h
@@ -16,6 +16,10 @@
class SettingsWindowObserver : public chrome::SettingsWindowManagerObserver {
public:
SettingsWindowObserver();
+
+ SettingsWindowObserver(const SettingsWindowObserver&) = delete;
+ SettingsWindowObserver& operator=(const SettingsWindowObserver&) = delete;
+
~SettingsWindowObserver() override;
// chrome::SettingsWindowManagerObserver:
@@ -24,8 +28,6 @@
private:
// Set of windows whose title is forced to 'Settings.'
std::unique_ptr<aura::WindowTracker> aura_window_tracker_;
-
- DISALLOW_COPY_AND_ASSIGN(SettingsWindowObserver);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_SETTINGS_WINDOW_OBSERVER_H_
diff --git a/chrome/browser/ui/ash/shelf/shelf_context_menu.h b/chrome/browser/ui/ash/shelf/shelf_context_menu.h
index a88b860..208a9cf9 100644
--- a/chrome/browser/ui/ash/shelf/shelf_context_menu.h
+++ b/chrome/browser/ui/ash/shelf/shelf_context_menu.h
@@ -16,6 +16,9 @@
// A base class for browser, extension, and ARC shelf item context menus.
class ShelfContextMenu : public ui::SimpleMenuModel::Delegate {
public:
+ ShelfContextMenu(const ShelfContextMenu&) = delete;
+ ShelfContextMenu& operator=(const ShelfContextMenu&) = delete;
+
~ShelfContextMenu() override;
// Static function to create a context menu instance.
@@ -66,8 +69,6 @@
const ash::ShelfItem item_;
const int64_t display_id_;
-
- DISALLOW_COPY_AND_ASSIGN(ShelfContextMenu);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_SHELF_CONTEXT_MENU_H_
diff --git a/chrome/browser/ui/ash/shelf/shelf_controller_helper.h b/chrome/browser/ui/ash/shelf/shelf_controller_helper.h
index ff95950..bfe3e0c 100644
--- a/chrome/browser/ui/ash/shelf/shelf_controller_helper.h
+++ b/chrome/browser/ui/ash/shelf/shelf_controller_helper.h
@@ -25,6 +25,10 @@
class ShelfControllerHelper : public ExtensionEnableFlowDelegate {
public:
explicit ShelfControllerHelper(Profile* profile);
+
+ ShelfControllerHelper(const ShelfControllerHelper&) = delete;
+ ShelfControllerHelper& operator=(const ShelfControllerHelper&) = delete;
+
~ShelfControllerHelper() override;
// Helper function to return the title associated with |app_id|.
@@ -73,8 +77,6 @@
// The currently active profile for the usage of |GetAppID|.
Profile* profile_;
std::unique_ptr<ExtensionEnableFlow> extension_enable_flow_;
-
- DISALLOW_COPY_AND_ASSIGN(ShelfControllerHelper);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_SHELF_CONTROLLER_HELPER_H_
diff --git a/chrome/browser/ui/ash/shelf/shelf_extension_app_updater.h b/chrome/browser/ui/ash/shelf/shelf_extension_app_updater.h
index 18a4f98f..c89f2454 100644
--- a/chrome/browser/ui/ash/shelf/shelf_extension_app_updater.h
+++ b/chrome/browser/ui/ash/shelf/shelf_extension_app_updater.h
@@ -17,6 +17,10 @@
ShelfExtensionAppUpdater(Delegate* delegate,
content::BrowserContext* browser_context,
bool extensions_only);
+
+ ShelfExtensionAppUpdater(const ShelfExtensionAppUpdater&) = delete;
+ ShelfExtensionAppUpdater& operator=(const ShelfExtensionAppUpdater&) = delete;
+
~ShelfExtensionAppUpdater() override;
// ExtensionRegistryObserver:
@@ -51,8 +55,6 @@
// Handles life-cycle events for extensions only if true, otherwise handles
// life-cycle events for both Chrome apps and extensions.
const bool extensions_only_;
-
- DISALLOW_COPY_AND_ASSIGN(ShelfExtensionAppUpdater);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_SHELF_EXTENSION_APP_UPDATER_H_
diff --git a/chrome/browser/ui/ash/shelf/shelf_spinner_controller.cc b/chrome/browser/ui/ash/shelf/shelf_spinner_controller.cc
index 1d7cbc3d..8839bd1 100644
--- a/chrome/browser/ui/ash/shelf/shelf_spinner_controller.cc
+++ b/chrome/browser/ui/ash/shelf/shelf_spinner_controller.cc
@@ -115,6 +115,9 @@
kInactiveHslShift),
kInactiveTransparency)) {}
+ SpinningEffectSource(const SpinningEffectSource&) = delete;
+ SpinningEffectSource& operator=(const SpinningEffectSource&) = delete;
+
~SpinningEffectSource() override {}
// gfx::CanvasImageSource override.
@@ -152,8 +155,6 @@
ShelfSpinnerController::ShelfSpinnerData data_;
const gfx::ImageSkia active_image_;
const gfx::ImageSkia inactive_image_;
-
- DISALLOW_COPY_AND_ASSIGN(SpinningEffectSource);
};
} // namespace
diff --git a/chrome/browser/ui/ash/shelf/shelf_spinner_controller.h b/chrome/browser/ui/ash/shelf/shelf_spinner_controller.h
index bd82f650..e8df519 100644
--- a/chrome/browser/ui/ash/shelf/shelf_spinner_controller.h
+++ b/chrome/browser/ui/ash/shelf/shelf_spinner_controller.h
@@ -37,6 +37,10 @@
class ShelfSpinnerData;
explicit ShelfSpinnerController(ChromeShelfController* owner);
+
+ ShelfSpinnerController(const ShelfSpinnerController&) = delete;
+ ShelfSpinnerController& operator=(const ShelfSpinnerController&) = delete;
+
~ShelfSpinnerController() override;
bool HasApp(const std::string& app_id) const;
@@ -108,8 +112,6 @@
// Always keep this the last member of this class.
base::WeakPtrFactory<ShelfSpinnerController> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ShelfSpinnerController);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_SHELF_SPINNER_CONTROLLER_H_
diff --git a/chrome/browser/ui/ash/shelf/shelf_spinner_item_controller.h b/chrome/browser/ui/ash/shelf/shelf_spinner_item_controller.h
index c6eba487..7486c813 100644
--- a/chrome/browser/ui/ash/shelf/shelf_spinner_item_controller.h
+++ b/chrome/browser/ui/ash/shelf/shelf_spinner_item_controller.h
@@ -25,6 +25,10 @@
public:
explicit ShelfSpinnerItemController(const std::string& app_id);
+ ShelfSpinnerItemController(const ShelfSpinnerItemController&) = delete;
+ ShelfSpinnerItemController& operator=(const ShelfSpinnerItemController&) =
+ delete;
+
~ShelfSpinnerItemController() override;
virtual void SetHost(const base::WeakPtr<ShelfSpinnerController>& host);
@@ -45,8 +49,6 @@
const base::Time start_time_;
std::unique_ptr<ShelfContextMenu> context_menu_;
-
- DISALLOW_COPY_AND_ASSIGN(ShelfSpinnerItemController);
};
#endif // CHROME_BROWSER_UI_ASH_SHELF_SHELF_SPINNER_ITEM_CONTROLLER_H_
diff --git a/chrome/browser/ui/ash/system_tray_client_impl.h b/chrome/browser/ui/ash/system_tray_client_impl.h
index 97562b6f..d824de7 100644
--- a/chrome/browser/ui/ash/system_tray_client_impl.h
+++ b/chrome/browser/ui/ash/system_tray_client_impl.h
@@ -30,6 +30,10 @@
public UpgradeObserver {
public:
SystemTrayClientImpl();
+
+ SystemTrayClientImpl(const SystemTrayClientImpl&) = delete;
+ SystemTrayClientImpl& operator=(const SystemTrayClientImpl&) = delete;
+
~SystemTrayClientImpl() override;
static SystemTrayClientImpl* Get();
@@ -136,8 +140,6 @@
std::string last_enterprise_account_domain_manager_;
std::unique_ptr<EnterpriseAccountObserver> enterprise_account_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(SystemTrayClientImpl);
};
#endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_CLIENT_IMPL_H_
diff --git a/chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc b/chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc
index 2cb0c486..024bb80 100644
--- a/chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc
+++ b/chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc
@@ -81,6 +81,10 @@
account_id2_ = login_mixin_.users()[1].account_id;
}
+ SystemTrayClientClockTest(const SystemTrayClientClockTest&) = delete;
+ SystemTrayClientClockTest& operator=(const SystemTrayClientClockTest&) =
+ delete;
+
~SystemTrayClientClockTest() override = default;
void SetupUserProfile(const AccountId& account_id, bool use_24_hour_clock) {
@@ -95,9 +99,6 @@
AccountId account_id1_;
AccountId account_id2_;
ash::LoginManagerMixin login_mixin_{&mixin_host_};
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SystemTrayClientClockTest);
};
// Test that clock type is taken from user profile for current active user.
diff --git a/chrome/browser/ui/ash/tab_scrubber_browsertest.cc b/chrome/browser/ui/ash/tab_scrubber_browsertest.cc
index 5b48544..14c5cfa 100644
--- a/chrome/browser/ui/ash/tab_scrubber_browsertest.cc
+++ b/chrome/browser/ui/ash/tab_scrubber_browsertest.cc
@@ -44,6 +44,10 @@
immersive_controller_->AddObserver(this);
}
+ ImmersiveRevealEndedWaiter(const ImmersiveRevealEndedWaiter&) = delete;
+ ImmersiveRevealEndedWaiter& operator=(const ImmersiveRevealEndedWaiter&) =
+ delete;
+
~ImmersiveRevealEndedWaiter() override {
if (immersive_controller_)
immersive_controller_->RemoveObserver(this);
@@ -75,8 +79,6 @@
ImmersiveModeController* immersive_controller_;
base::OnceClosure quit_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(ImmersiveRevealEndedWaiter);
};
} // namespace
@@ -278,6 +280,9 @@
TabScrubber::GetInstance()->FinishScrub(true);
}
+ ScrollGenerator(const ScrollGenerator&) = delete;
+ ScrollGenerator& operator=(const ScrollGenerator&) = delete;
+
~ScrollGenerator() {
ui::ScrollEvent fling_start(
ui::ET_SCROLL_FLING_START, gfx::Point(), time_for_next_event_, 0,
@@ -302,8 +307,6 @@
ui::test::EventGenerator* event_generator_;
base::TimeTicks time_for_next_event_ = ui::EventTimeForNow();
int last_x_offset_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(ScrollGenerator);
};
std::unique_ptr<ui::test::EventGenerator> CreateEventGenerator(
diff --git a/chrome/browser/ui/ash/tablet_mode_page_behavior.h b/chrome/browser/ui/ash/tablet_mode_page_behavior.h
index 3a2dfb5..5cb0196 100644
--- a/chrome/browser/ui/ash/tablet_mode_page_behavior.h
+++ b/chrome/browser/ui/ash/tablet_mode_page_behavior.h
@@ -22,6 +22,10 @@
public TabStripModelObserver {
public:
TabletModePageBehavior();
+
+ TabletModePageBehavior(const TabletModePageBehavior&) = delete;
+ TabletModePageBehavior& operator=(const TabletModePageBehavior&) = delete;
+
~TabletModePageBehavior() override;
// Notify the tablet mode change.
@@ -54,8 +58,6 @@
// to observe webcontents being added to the tabstrips in order to trigger
// a refresh of its WebKit prefs.
std::unique_ptr<BrowserTabStripTracker> tab_strip_tracker_;
-
- DISALLOW_COPY_AND_ASSIGN(TabletModePageBehavior);
};
#endif // CHROME_BROWSER_UI_ASH_TABLET_MODE_PAGE_BEHAVIOR_H_
diff --git a/chrome/browser/ui/ash/tablet_mode_page_behavior_browsertest.cc b/chrome/browser/ui/ash/tablet_mode_page_behavior_browsertest.cc
index 47decf95..e4d74a0 100644
--- a/chrome/browser/ui/ash/tablet_mode_page_behavior_browsertest.cc
+++ b/chrome/browser/ui/ash/tablet_mode_page_behavior_browsertest.cc
@@ -26,6 +26,11 @@
class TabletModePageBehaviorTest : public InProcessBrowserTest {
public:
TabletModePageBehaviorTest() = default;
+
+ TabletModePageBehaviorTest(const TabletModePageBehaviorTest&) = delete;
+ TabletModePageBehaviorTest& operator=(const TabletModePageBehaviorTest&) =
+ delete;
+
~TabletModePageBehaviorTest() override = default;
// InProcessBrowserTest:
@@ -81,8 +86,6 @@
private:
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(TabletModePageBehaviorTest);
};
IN_PROC_BROWSER_TEST_F(TabletModePageBehaviorTest,
diff --git a/chrome/browser/ui/ash/test_ime_controller.h b/chrome/browser/ui/ash/test_ime_controller.h
index 909124e..cc7313b 100644
--- a/chrome/browser/ui/ash/test_ime_controller.h
+++ b/chrome/browser/ui/ash/test_ime_controller.h
@@ -28,6 +28,10 @@
public ash::ImeController {
public:
TestImeController();
+
+ TestImeController(const TestImeController&) = delete;
+ TestImeController& operator=(const TestImeController&) = delete;
+
~TestImeController() override;
// ash::ImeController:
@@ -59,9 +63,6 @@
bool is_emoji_enabled_ = false;
bool is_handwriting_enabled_ = false;
bool is_voice_enabled_ = false;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestImeController);
};
#endif // CHROME_BROWSER_UI_ASH_TEST_IME_CONTROLLER_H_
diff --git a/chrome/browser/ui/ash/test_login_screen.h b/chrome/browser/ui/ash/test_login_screen.h
index 624273905..c46c97c 100644
--- a/chrome/browser/ui/ash/test_login_screen.h
+++ b/chrome/browser/ui/ash/test_login_screen.h
@@ -21,6 +21,10 @@
class TestLoginScreen : public ash::LoginScreen {
public:
TestLoginScreen();
+
+ TestLoginScreen(const TestLoginScreen&) = delete;
+ TestLoginScreen& operator=(const TestLoginScreen&) = delete;
+
~TestLoginScreen() override;
// ash::LoginScreen:
@@ -48,8 +52,6 @@
private:
TestLoginScreenModel test_screen_model_;
-
- DISALLOW_COPY_AND_ASSIGN(TestLoginScreen);
};
#endif // CHROME_BROWSER_UI_ASH_TEST_LOGIN_SCREEN_H_
diff --git a/chrome/browser/ui/ash/test_login_screen_model.h b/chrome/browser/ui/ash/test_login_screen_model.h
index dec73fb7..2cf3c7b3 100644
--- a/chrome/browser/ui/ash/test_login_screen_model.h
+++ b/chrome/browser/ui/ash/test_login_screen_model.h
@@ -11,6 +11,10 @@
class TestLoginScreenModel : public ash::LoginScreenModel {
public:
TestLoginScreenModel();
+
+ TestLoginScreenModel(const TestLoginScreenModel&) = delete;
+ TestLoginScreenModel& operator=(const TestLoginScreenModel&) = delete;
+
~TestLoginScreenModel() override;
// ash::LoginScreenModel:
@@ -59,9 +63,6 @@
bool show_full_management_disclosure) override;
void HandleFocusLeavingLockScreenApps(bool reverse) override;
void NotifyOobeDialogState(ash::OobeDialogState state) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestLoginScreenModel);
};
#endif // CHROME_BROWSER_UI_ASH_TEST_LOGIN_SCREEN_MODEL_H_
diff --git a/chrome/browser/ui/ash/test_session_controller.h b/chrome/browser/ui/ash/test_session_controller.h
index 037ca10..dfaca49 100644
--- a/chrome/browser/ui/ash/test_session_controller.h
+++ b/chrome/browser/ui/ash/test_session_controller.h
@@ -17,6 +17,10 @@
class TestSessionController : public ash::SessionController {
public:
TestSessionController();
+
+ TestSessionController(const TestSessionController&) = delete;
+ TestSessionController& operator=(const TestSessionController&) = delete;
+
~TestSessionController() override;
const absl::optional<ash::SessionInfo>& last_session_info() const {
@@ -87,8 +91,6 @@
int set_user_session_order_count_ = 0;
bool is_screen_locked_ = false;
base::ObserverList<ash::SessionObserver> observers_;
-
- DISALLOW_COPY_AND_ASSIGN(TestSessionController);
};
#endif // CHROME_BROWSER_UI_ASH_TEST_SESSION_CONTROLLER_H_
diff --git a/chrome/browser/ui/ash/test_wallpaper_controller.h b/chrome/browser/ui/ash/test_wallpaper_controller.h
index c18aabc..8b21f9f7 100644
--- a/chrome/browser/ui/ash/test_wallpaper_controller.h
+++ b/chrome/browser/ui/ash/test_wallpaper_controller.h
@@ -18,6 +18,10 @@
class TestWallpaperController : public ash::WallpaperController {
public:
TestWallpaperController();
+
+ TestWallpaperController(const TestWallpaperController&) = delete;
+ TestWallpaperController& operator=(const TestWallpaperController&) = delete;
+
~TestWallpaperController() override;
// Simulates showing the wallpaper on screen by updating |current_wallpaper|
@@ -127,8 +131,6 @@
base::ObserverList<ash::WallpaperControllerObserver>::Unchecked observers_;
gfx::ImageSkia current_wallpaper;
-
- DISALLOW_COPY_AND_ASSIGN(TestWallpaperController);
};
#endif // CHROME_BROWSER_UI_ASH_TEST_WALLPAPER_CONTROLLER_H_
diff --git a/chrome/browser/ui/ash/volume_controller_browsertest.cc b/chrome/browser/ui/ash/volume_controller_browsertest.cc
index 71196d0..1980113 100644
--- a/chrome/browser/ui/ash/volume_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/volume_controller_browsertest.cc
@@ -26,6 +26,10 @@
class SoundsManagerTestImpl : public audio::SoundsManager {
public:
SoundsManagerTestImpl() = default;
+
+ SoundsManagerTestImpl(const SoundsManagerTestImpl&) = delete;
+ SoundsManagerTestImpl& operator=(const SoundsManagerTestImpl&) = delete;
+
~SoundsManagerTestImpl() override {}
bool Initialize(SoundKey key, const base::StringPiece& /* data */) override {
@@ -51,13 +55,15 @@
private:
std::map<SoundKey, bool> is_sound_initialized_;
std::map<SoundKey, int> num_play_requests_;
-
- DISALLOW_COPY_AND_ASSIGN(SoundsManagerTestImpl);
};
class VolumeControllerTest : public InProcessBrowserTest {
public:
VolumeControllerTest() {}
+
+ VolumeControllerTest(const VolumeControllerTest&) = delete;
+ VolumeControllerTest& operator=(const VolumeControllerTest&) = delete;
+
~VolumeControllerTest() override {}
void SetUpOnMainThread() override {
@@ -81,9 +87,6 @@
protected:
ash::CrasAudioHandler* audio_handler_; // Not owned.
-
- private:
- DISALLOW_COPY_AND_ASSIGN(VolumeControllerTest);
};
IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeUpAndDown) {
@@ -157,6 +160,11 @@
class VolumeControllerSoundsTest : public VolumeControllerTest {
public:
VolumeControllerSoundsTest() : sounds_manager_(NULL) {}
+
+ VolumeControllerSoundsTest(const VolumeControllerSoundsTest&) = delete;
+ VolumeControllerSoundsTest& operator=(const VolumeControllerSoundsTest&) =
+ delete;
+
~VolumeControllerSoundsTest() override {}
void SetUpInProcessBrowserTestFixture() override {
@@ -176,8 +184,6 @@
private:
SoundsManagerTestImpl* sounds_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(VolumeControllerSoundsTest);
};
IN_PROC_BROWSER_TEST_F(VolumeControllerSoundsTest, Simple) {
@@ -229,15 +235,18 @@
class VolumeControllerSoundsDisabledTest : public VolumeControllerSoundsTest {
public:
VolumeControllerSoundsDisabledTest() {}
+
+ VolumeControllerSoundsDisabledTest(
+ const VolumeControllerSoundsDisabledTest&) = delete;
+ VolumeControllerSoundsDisabledTest& operator=(
+ const VolumeControllerSoundsDisabledTest&) = delete;
+
~VolumeControllerSoundsDisabledTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
VolumeControllerSoundsTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(chromeos::switches::kDisableVolumeAdjustSound);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(VolumeControllerSoundsDisabledTest);
};
IN_PROC_BROWSER_TEST_F(VolumeControllerSoundsDisabledTest, VolumeAdjustSounds) {
diff --git a/chrome/browser/ui/ash/vpn_list_forwarder.h b/chrome/browser/ui/ash/vpn_list_forwarder.h
index 0482c36..291bf2e 100644
--- a/chrome/browser/ui/ash/vpn_list_forwarder.h
+++ b/chrome/browser/ui/ash/vpn_list_forwarder.h
@@ -28,6 +28,10 @@
public user_manager::UserManager::UserSessionStateObserver {
public:
VpnListForwarder();
+
+ VpnListForwarder(const VpnListForwarder&) = delete;
+ VpnListForwarder& operator=(const VpnListForwarder&) = delete;
+
~VpnListForwarder() override;
// app_list::ArcVpnProviderManager::Observer:
@@ -83,8 +87,6 @@
vpn_providers_;
base::WeakPtrFactory<VpnListForwarder> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(VpnListForwarder);
};
#endif // CHROME_BROWSER_UI_ASH_VPN_LIST_FORWARDER_H_
diff --git a/chrome/browser/ui/ash/wallpaper_controller_client_impl.h b/chrome/browser/ui/ash/wallpaper_controller_client_impl.h
index 52578d2a..dc936e2 100644
--- a/chrome/browser/ui/ash/wallpaper_controller_client_impl.h
+++ b/chrome/browser/ui/ash/wallpaper_controller_client_impl.h
@@ -39,6 +39,11 @@
public file_manager::VolumeManagerObserver {
public:
WallpaperControllerClientImpl();
+
+ WallpaperControllerClientImpl(const WallpaperControllerClientImpl&) = delete;
+ WallpaperControllerClientImpl& operator=(
+ const WallpaperControllerClientImpl&) = delete;
+
~WallpaperControllerClientImpl() override;
// Initializes and connects to ash.
@@ -189,8 +194,6 @@
base::WeakPtrFactory<WallpaperControllerClientImpl> weak_factory_{this};
base::WeakPtrFactory<WallpaperControllerClientImpl> storage_weak_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(WallpaperControllerClientImpl);
};
#endif // CHROME_BROWSER_UI_ASH_WALLPAPER_CONTROLLER_CLIENT_IMPL_H_
diff --git a/chrome/browser/ui/ash/wallpaper_controller_client_impl_unittest.cc b/chrome/browser/ui/ash/wallpaper_controller_client_impl_unittest.cc
index 70a94f2..b10efdbc 100644
--- a/chrome/browser/ui/ash/wallpaper_controller_client_impl_unittest.cc
+++ b/chrome/browser/ui/ash/wallpaper_controller_client_impl_unittest.cc
@@ -26,6 +26,12 @@
user_manager_ = std::make_unique<user_manager::ScopedUserManager>(
std::move(fake_user_manager));
}
+
+ WallpaperControllerClientImplTest(const WallpaperControllerClientImplTest&) =
+ delete;
+ WallpaperControllerClientImplTest& operator=(
+ const WallpaperControllerClientImplTest&) = delete;
+
~WallpaperControllerClientImplTest() override = default;
private:
@@ -33,8 +39,6 @@
ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
base::test::TaskEnvironment task_environment_;
std::unique_ptr<user_manager::ScopedUserManager> user_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(WallpaperControllerClientImplTest);
};
TEST_F(WallpaperControllerClientImplTest, Construction) {
diff --git a/chrome/browser/ui/aura/accessibility/automation_manager_aura_browsertest.cc b/chrome/browser/ui/aura/accessibility/automation_manager_aura_browsertest.cc
index 07f02669..e3d308c 100644
--- a/chrome/browser/ui/aura/accessibility/automation_manager_aura_browsertest.cc
+++ b/chrome/browser/ui/aura/accessibility/automation_manager_aura_browsertest.cc
@@ -79,6 +79,9 @@
this);
}
+ AutomationEventWaiter(const AutomationEventWaiter&) = delete;
+ AutomationEventWaiter& operator=(const AutomationEventWaiter&) = delete;
+
virtual ~AutomationEventWaiter() {
// Don't bother to reconnect to AutomationEventRouter because it's not
// relevant to the tests.
@@ -173,8 +176,6 @@
std::unique_ptr<ui::AXEvent> matched_wait_for_event_;
ax::mojom::Event event_type_to_wait_for_ = ax::mojom::Event::kNone;
ui::AXNodeID event_target_node_id_to_wait_for_ = ui::kInvalidAXNodeID;
-
- DISALLOW_COPY_AND_ASSIGN(AutomationEventWaiter);
};
ui::TableColumn TestTableColumn(int id, const std::string& title) {
diff --git a/chrome/browser/ui/aura/native_window_tracker_aura.h b/chrome/browser/ui/aura/native_window_tracker_aura.h
index 015141cf..423691f 100644
--- a/chrome/browser/ui/aura/native_window_tracker_aura.h
+++ b/chrome/browser/ui/aura/native_window_tracker_aura.h
@@ -13,6 +13,10 @@
public aura::WindowObserver {
public:
explicit NativeWindowTrackerAura(gfx::NativeWindow window);
+
+ NativeWindowTrackerAura(const NativeWindowTrackerAura&) = delete;
+ NativeWindowTrackerAura& operator=(const NativeWindowTrackerAura&) = delete;
+
~NativeWindowTrackerAura() override;
// NativeWindowTracker:
@@ -23,8 +27,6 @@
void OnWindowDestroying(aura::Window* window) override;
aura::Window* window_;
-
- DISALLOW_COPY_AND_ASSIGN(NativeWindowTrackerAura);
};
#endif // CHROME_BROWSER_UI_AURA_NATIVE_WINDOW_TRACKER_AURA_H_
diff --git a/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h b/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h
index 0a022a6..cab1f53b 100644
--- a/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h
+++ b/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h
@@ -23,6 +23,11 @@
class WebDragBookmarkHandlerAura : public content::WebDragDestDelegate {
public:
WebDragBookmarkHandlerAura();
+
+ WebDragBookmarkHandlerAura(const WebDragBookmarkHandlerAura&) = delete;
+ WebDragBookmarkHandlerAura& operator=(const WebDragBookmarkHandlerAura&) =
+ delete;
+
~WebDragBookmarkHandlerAura() override;
// Overridden from content::WebDragDestDelegate:
@@ -44,8 +49,6 @@
// The bookmark data for the active drag. Empty when there is no active drag.
bookmarks::BookmarkNodeData bookmark_drag_data_;
-
- DISALLOW_COPY_AND_ASSIGN(WebDragBookmarkHandlerAura);
};
#endif // CHROME_BROWSER_UI_AURA_TAB_CONTENTS_WEB_DRAG_BOOKMARK_HANDLER_AURA_H_
diff --git a/chrome/browser/ui/autofill/autofill_bubble_handler.h b/chrome/browser/ui/autofill/autofill_bubble_handler.h
index 47780f5..254b7f62 100644
--- a/chrome/browser/ui/autofill/autofill_bubble_handler.h
+++ b/chrome/browser/ui/autofill/autofill_bubble_handler.h
@@ -27,6 +27,10 @@
class AutofillBubbleHandler {
public:
AutofillBubbleHandler() = default;
+
+ AutofillBubbleHandler(const AutofillBubbleHandler&) = delete;
+ AutofillBubbleHandler& operator=(const AutofillBubbleHandler&) = delete;
+
virtual ~AutofillBubbleHandler() = default;
virtual AutofillBubbleBase* ShowSaveCreditCardBubble(
@@ -71,11 +75,6 @@
// save to be landed to see if we need to merge password saved and credit card
// saved functions.
virtual void OnPasswordSaved() = 0;
-
- // TODO(crbug.com/964127): Move password bubble here.
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AutofillBubbleHandler);
};
} // namespace autofill
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl_mac.h b/chrome/browser/ui/autofill/autofill_popup_controller_impl_mac.h
index 2b43491..a9f036f 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl_mac.h
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl_mac.h
@@ -19,6 +19,11 @@
const gfx::RectF& element_bounds,
base::i18n::TextDirection text_direction);
+ AutofillPopupControllerImplMac(const AutofillPopupControllerImplMac&) =
+ delete;
+ AutofillPopupControllerImplMac& operator=(
+ const AutofillPopupControllerImplMac&) = delete;
+
~AutofillPopupControllerImplMac() override;
// Shows the popup, or updates the existing popup with the given values.
@@ -43,8 +48,6 @@
// True if the popup contains credit card items.
BOOL is_credit_card_popup_;
-
- DISALLOW_COPY_AND_ASSIGN(AutofillPopupControllerImplMac);
};
} // namespace autofill
diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.h b/chrome/browser/ui/autofill/chrome_autofill_client.h
index 60c4dea1..7e3340a 100644
--- a/chrome/browser/ui/autofill/chrome_autofill_client.h
+++ b/chrome/browser/ui/autofill/chrome_autofill_client.h
@@ -53,6 +53,9 @@
#endif // !defined(OS_ANDROID)
{
public:
+ ChromeAutofillClient(const ChromeAutofillClient&) = delete;
+ ChromeAutofillClient& operator=(const ChromeAutofillClient&) = delete;
+
~ChromeAutofillClient() override;
// AutofillClient:
@@ -217,8 +220,6 @@
AutofillErrorDialogControllerImpl autofill_error_dialog_controller_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(ChromeAutofillClient);
};
} // namespace autofill
diff --git a/chrome/browser/ui/autofill/test/test_autofill_bubble_handler.h b/chrome/browser/ui/autofill/test/test_autofill_bubble_handler.h
index 16b8d66..450c718 100644
--- a/chrome/browser/ui/autofill/test/test_autofill_bubble_handler.h
+++ b/chrome/browser/ui/autofill/test/test_autofill_bubble_handler.h
@@ -25,6 +25,11 @@
class TestAutofillBubbleHandler : public AutofillBubbleHandler {
public:
TestAutofillBubbleHandler();
+
+ TestAutofillBubbleHandler(const TestAutofillBubbleHandler&) = delete;
+ TestAutofillBubbleHandler& operator=(const TestAutofillBubbleHandler&) =
+ delete;
+
~TestAutofillBubbleHandler() override;
// AutofillBubbleHandler:
@@ -69,8 +74,6 @@
std::unique_ptr<TestAutofillBubble> update_address_profile_bubble_view_;
std::unique_ptr<TestAutofillBubble> edit_address_profile_bubble_view_;
std::unique_ptr<TestAutofillBubble> virtual_card_manual_fallback_bubble_view_;
-
- DISALLOW_COPY_AND_ASSIGN(TestAutofillBubbleHandler);
};
} // namespace autofill
diff --git a/chrome/browser/ui/blocked_content/framebust_block_tab_helper.h b/chrome/browser/ui/blocked_content/framebust_block_tab_helper.h
index a7d69f1..26e6978 100644
--- a/chrome/browser/ui/blocked_content/framebust_block_tab_helper.h
+++ b/chrome/browser/ui/blocked_content/framebust_block_tab_helper.h
@@ -27,6 +27,9 @@
using ClickCallback = base::OnceCallback<
void(const GURL&, size_t /* index */, size_t /* total_size */)>;
+ FramebustBlockTabHelper(const FramebustBlockTabHelper&) = delete;
+ FramebustBlockTabHelper& operator=(const FramebustBlockTabHelper&) = delete;
+
~FramebustBlockTabHelper() override;
// Shows the blocked Framebust icon in the Omnibox for the |blocked_url|.
@@ -67,8 +70,6 @@
std::vector<ClickCallback> callbacks_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(FramebustBlockTabHelper);
};
#endif // CHROME_BROWSER_UI_BLOCKED_CONTENT_FRAMEBUST_BLOCK_TAB_HELPER_H_
diff --git a/chrome/browser/ui/blocked_content/popunder_preventer.h b/chrome/browser/ui/blocked_content/popunder_preventer.h
index 5d7a3fac..5dba618 100644
--- a/chrome/browser/ui/blocked_content/popunder_preventer.h
+++ b/chrome/browser/ui/blocked_content/popunder_preventer.h
@@ -16,6 +16,10 @@
class PopunderPreventer : public content::WebContentsObserver {
public:
explicit PopunderPreventer(content::WebContents* activating_contents);
+
+ PopunderPreventer(const PopunderPreventer&) = delete;
+ PopunderPreventer& operator=(const PopunderPreventer&) = delete;
+
~PopunderPreventer() override;
private:
@@ -23,8 +27,6 @@
void WebContentsDestroyed() override;
content::WebContents* popup_;
-
- DISALLOW_COPY_AND_ASSIGN(PopunderPreventer);
};
#endif // CHROME_BROWSER_UI_BLOCKED_CONTENT_POPUNDER_PREVENTER_H_
diff --git a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
index 8207c29..6cda5a1 100644
--- a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
+++ b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
@@ -108,6 +108,10 @@
class PopupBlockerBrowserTest : public InProcessBrowserTest {
public:
PopupBlockerBrowserTest() {}
+
+ PopupBlockerBrowserTest(const PopupBlockerBrowserTest&) = delete;
+ PopupBlockerBrowserTest& operator=(const PopupBlockerBrowserTest&) = delete;
+
~PopupBlockerBrowserTest() override {}
// InProcessBrowserTest:
@@ -238,9 +242,6 @@
return web_contents;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PopupBlockerBrowserTest);
};
IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, BlockWebContentsCreation) {
diff --git a/chrome/browser/ui/blocked_content/popup_opener_tab_helper_unittest.cc b/chrome/browser/ui/blocked_content/popup_opener_tab_helper_unittest.cc
index 6c988ed..e6eb2ad 100644
--- a/chrome/browser/ui/blocked_content/popup_opener_tab_helper_unittest.cc
+++ b/chrome/browser/ui/blocked_content/popup_opener_tab_helper_unittest.cc
@@ -60,6 +60,10 @@
class PopupOpenerTabHelperTest : public ChromeRenderViewHostTestHarness {
public:
PopupOpenerTabHelperTest() : ChromeRenderViewHostTestHarness() {}
+
+ PopupOpenerTabHelperTest(const PopupOpenerTabHelperTest&) = delete;
+ PopupOpenerTabHelperTest& operator=(const PopupOpenerTabHelperTest&) = delete;
+
~PopupOpenerTabHelperTest() override {}
void SetUp() override {
@@ -124,8 +128,6 @@
base::SimpleTestTickClock raw_clock_;
std::vector<std::unique_ptr<content::WebContents>> popups_;
-
- DISALLOW_COPY_AND_ASSIGN(PopupOpenerTabHelperTest);
};
TEST_F(PopupOpenerTabHelperTest, LogVisibleTime) {
@@ -407,6 +409,10 @@
scoped_feature_list_->InitAndEnableFeature(
TabUnderNavigationThrottle::kBlockTabUnders);
}
+
+ BlockTabUnderTest(const BlockTabUnderTest&) = delete;
+ BlockTabUnderTest& operator=(const BlockTabUnderTest&) = delete;
+
~BlockTabUnderTest() override = default;
infobars::InfoBarAndroid* GetInfoBar() {
@@ -445,8 +451,6 @@
private:
std::vector<GURL> blocked_urls_;
-
- DISALLOW_COPY_AND_ASSIGN(BlockTabUnderTest);
};
TEST_F(BlockTabUnderTest, SimpleTabUnder_IsBlocked) {
diff --git a/chrome/browser/ui/blocked_content/popup_tracker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_tracker_browsertest.cc
index fddb6d98..85db46ad 100644
--- a/chrome/browser/ui/blocked_content/popup_tracker_browsertest.cc
+++ b/chrome/browser/ui/blocked_content/popup_tracker_browsertest.cc
@@ -350,6 +350,12 @@
class SafeBrowsingPopupTrackerBrowserTest : public PopupTrackerBrowserTest {
public:
SafeBrowsingPopupTrackerBrowserTest() = default;
+
+ SafeBrowsingPopupTrackerBrowserTest(
+ const SafeBrowsingPopupTrackerBrowserTest&) = delete;
+ SafeBrowsingPopupTrackerBrowserTest& operator=(
+ const SafeBrowsingPopupTrackerBrowserTest&) = delete;
+
~SafeBrowsingPopupTrackerBrowserTest() override = default;
void SetUp() override {
@@ -393,8 +399,6 @@
private:
std::unique_ptr<TestSafeBrowsingDatabaseHelper> database_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(SafeBrowsingPopupTrackerBrowserTest);
};
// Pop-ups closed before navigation has finished will receive no safe browsing
diff --git a/chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc
index f770ca2..a8663ea0 100644
--- a/chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc
+++ b/chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc
@@ -97,6 +97,11 @@
{});
}
+ SafeBrowsingTriggeredPopupBlockerBrowserTest(
+ const SafeBrowsingTriggeredPopupBlockerBrowserTest&) = delete;
+ SafeBrowsingTriggeredPopupBlockerBrowserTest& operator=(
+ const SafeBrowsingTriggeredPopupBlockerBrowserTest&) = delete;
+
~SafeBrowsingTriggeredPopupBlockerBrowserTest() override {}
void SetUp() override {
@@ -167,8 +172,6 @@
std::unique_ptr<blocked_content::SafeBrowsingTriggeredPopupBlocker>
popup_blocker_;
testing::NiceMock<policy::MockConfigurationPolicyProvider> provider_;
-
- DISALLOW_COPY_AND_ASSIGN(SafeBrowsingTriggeredPopupBlockerBrowserTest);
};
class SafeBrowsingTriggeredPopupBlockerDisabledTest
@@ -189,6 +192,12 @@
SafeBrowsingTriggeredInterceptingBrowserTest()
: safe_browsing_server_(
std::make_unique<net::test_server::EmbeddedTestServer>()) {}
+
+ SafeBrowsingTriggeredInterceptingBrowserTest(
+ const SafeBrowsingTriggeredInterceptingBrowserTest&) = delete;
+ SafeBrowsingTriggeredInterceptingBrowserTest& operator=(
+ const SafeBrowsingTriggeredInterceptingBrowserTest&) = delete;
+
~SafeBrowsingTriggeredInterceptingBrowserTest() override {}
// SafeBrowsingTriggeredPopupBlockerBrowserTest:
@@ -232,7 +241,6 @@
private:
std::unique_ptr<net::test_server::EmbeddedTestServer> safe_browsing_server_;
- DISALLOW_COPY_AND_ASSIGN(SafeBrowsingTriggeredInterceptingBrowserTest);
};
IN_PROC_BROWSER_TEST_F(SafeBrowsingTriggeredPopupBlockerDisabledTest,
diff --git a/chrome/browser/ui/blocked_content/tab_under_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/tab_under_blocker_browsertest.cc
index 186a851..49785c2 100644
--- a/chrome/browser/ui/blocked_content/tab_under_blocker_browsertest.cc
+++ b/chrome/browser/ui/blocked_content/tab_under_blocker_browsertest.cc
@@ -54,6 +54,10 @@
policy::BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_);
}
+ TabUnderBlockerBrowserTest(const TabUnderBlockerBrowserTest&) = delete;
+ TabUnderBlockerBrowserTest& operator=(const TabUnderBlockerBrowserTest&) =
+ delete;
+
~TabUnderBlockerBrowserTest() override {}
void SetUpOnMainThread() override {
@@ -91,8 +95,6 @@
private:
base::test::ScopedFeatureList scoped_feature_list_;
testing::NiceMock<policy::MockConfigurationPolicyProvider> provider_;
-
- DISALLOW_COPY_AND_ASSIGN(TabUnderBlockerBrowserTest);
};
IN_PROC_BROWSER_TEST_F(TabUnderBlockerBrowserTest, SimpleTabUnder_IsBlocked) {
diff --git a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.h b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.h
index e9b9c33a..9aa7dfb 100644
--- a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.h
+++ b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.h
@@ -71,6 +71,10 @@
static std::unique_ptr<content::NavigationThrottle> MaybeCreate(
content::NavigationHandle* handle);
+ TabUnderNavigationThrottle(const TabUnderNavigationThrottle&) = delete;
+ TabUnderNavigationThrottle& operator=(const TabUnderNavigationThrottle&) =
+ delete;
+
~TabUnderNavigationThrottle() override;
private:
@@ -110,8 +114,6 @@
// True if the throttle has seen a tab under.
bool seen_tab_under_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(TabUnderNavigationThrottle);
};
#endif // CHROME_BROWSER_UI_BLOCKED_CONTENT_TAB_UNDER_NAVIGATION_THROTTLE_H_
diff --git a/chrome/browser/ui/bluetooth/chrome_extension_bluetooth_chooser.h b/chrome/browser/ui/bluetooth/chrome_extension_bluetooth_chooser.h
index ddefdb5..fb74917 100644
--- a/chrome/browser/ui/bluetooth/chrome_extension_bluetooth_chooser.h
+++ b/chrome/browser/ui/bluetooth/chrome_extension_bluetooth_chooser.h
@@ -27,6 +27,12 @@
ChromeExtensionBluetoothChooser(
content::RenderFrameHost* frame,
const content::BluetoothChooser::EventHandler& event_handler);
+
+ ChromeExtensionBluetoothChooser(const ChromeExtensionBluetoothChooser&) =
+ delete;
+ ChromeExtensionBluetoothChooser& operator=(
+ const ChromeExtensionBluetoothChooser&) = delete;
+
~ChromeExtensionBluetoothChooser() override;
// content::BluetoothChooser:
@@ -43,8 +49,6 @@
// Weak. DeviceChooserContentView[Cocoa] owns it.
permissions::BluetoothChooserController* bluetooth_chooser_controller_;
std::unique_ptr<ChromeExtensionChooserDialog> chooser_dialog_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeExtensionBluetoothChooser);
};
#endif // CHROME_BROWSER_UI_BLUETOOTH_CHROME_EXTENSION_BLUETOOTH_CHOOSER_H_
diff --git a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc
index aebf5215..bc987e3 100644
--- a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc
@@ -64,6 +64,11 @@
class TestBookmarkTabHelperObserver : public BookmarkTabHelperObserver {
public:
TestBookmarkTabHelperObserver() : starred_(false) {}
+
+ TestBookmarkTabHelperObserver(const TestBookmarkTabHelperObserver&) = delete;
+ TestBookmarkTabHelperObserver& operator=(
+ const TestBookmarkTabHelperObserver&) = delete;
+
~TestBookmarkTabHelperObserver() override {}
void URLStarredChanged(content::WebContents*, bool starred) override {
@@ -73,8 +78,6 @@
private:
bool starred_;
-
- DISALLOW_COPY_AND_ASSIGN(TestBookmarkTabHelperObserver);
};
class BookmarkBrowsertest : public InProcessBrowserTest {
diff --git a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h
index f20edac2..a37df5d 100644
--- a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h
+++ b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h
@@ -19,6 +19,11 @@
public BrowserListObserver {
public:
explicit BookmarkBubbleSignInDelegate(Browser* browser);
+
+ BookmarkBubbleSignInDelegate(const BookmarkBubbleSignInDelegate&) = delete;
+ BookmarkBubbleSignInDelegate& operator=(const BookmarkBubbleSignInDelegate&) =
+ delete;
+
~BookmarkBubbleSignInDelegate() override;
// BubbleSyncPromoDelegate:
@@ -36,8 +41,6 @@
// The profile associated with |browser_|.
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(BookmarkBubbleSignInDelegate);
};
#endif // CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_BUBBLE_SIGN_IN_DELEGATE_H_
diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h
index 95d5b3f49..48833bf 100644
--- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h
+++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h
@@ -63,6 +63,11 @@
BookmarkLaunchLocation opened_from,
const bookmarks::BookmarkNode* parent,
const std::vector<const bookmarks::BookmarkNode*>& selection);
+
+ BookmarkContextMenuController(const BookmarkContextMenuController&) = delete;
+ BookmarkContextMenuController& operator=(
+ const BookmarkContextMenuController&) = delete;
+
~BookmarkContextMenuController() override;
ui::SimpleMenuModel* menu_model() { return menu_model_.get(); }
@@ -103,8 +108,6 @@
std::unique_ptr<ui::SimpleMenuModel> menu_model_;
// Used to detect deletion of |this| executing a command.
base::WeakPtrFactory<BookmarkContextMenuController> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenuController);
};
#endif // CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_CONTEXT_MENU_CONTROLLER_H_
diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
index 1b6e8d0b..caee7bc 100644
--- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
+++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
@@ -27,6 +27,11 @@
public:
RecentlyUsedFoldersComboModel(bookmarks::BookmarkModel* model,
const bookmarks::BookmarkNode* node);
+
+ RecentlyUsedFoldersComboModel(const RecentlyUsedFoldersComboModel&) = delete;
+ RecentlyUsedFoldersComboModel& operator=(
+ const RecentlyUsedFoldersComboModel&) = delete;
+
~RecentlyUsedFoldersComboModel() override;
// Overridden from ui::ComboboxModel:
@@ -88,8 +93,6 @@
const bookmarks::BookmarkNode* const parent_node_;
base::ObserverList<ui::ComboboxModelObserver> observers_;
-
- DISALLOW_COPY_AND_ASSIGN(RecentlyUsedFoldersComboModel);
};
#endif // CHROME_BROWSER_UI_BOOKMARKS_RECENTLY_USED_FOLDERS_COMBO_MODEL_H_
diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
index 91887df..f7a4147 100644
--- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
+++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
@@ -23,6 +23,11 @@
class TestComboboxModelObserver : public ui::ComboboxModelObserver {
public:
TestComboboxModelObserver() : changed_(false) {}
+
+ TestComboboxModelObserver(const TestComboboxModelObserver&) = delete;
+ TestComboboxModelObserver& operator=(const TestComboboxModelObserver&) =
+ delete;
+
~TestComboboxModelObserver() override {}
// Returns whether the model changed and clears changed state.
@@ -39,8 +44,6 @@
private:
bool changed_;
-
- DISALLOW_COPY_AND_ASSIGN(TestComboboxModelObserver);
};
class RecentlyUsedFoldersComboModelTest : public testing::Test {
diff --git a/chrome/browser/ui/browser_close_unittest.cc b/chrome/browser/ui/browser_close_unittest.cc
index 8ecc7fa6..f571aa2 100644
--- a/chrome/browser/ui/browser_close_unittest.cc
+++ b/chrome/browser/ui/browser_close_unittest.cc
@@ -27,6 +27,11 @@
class TestingDownloadCoreService : public DownloadCoreService {
public:
TestingDownloadCoreService() : download_count_(0) {}
+
+ TestingDownloadCoreService(const TestingDownloadCoreService&) = delete;
+ TestingDownloadCoreService& operator=(const TestingDownloadCoreService&) =
+ delete;
+
~TestingDownloadCoreService() override {}
// All methods that aren't expected to be called in the execution of
@@ -75,8 +80,6 @@
private:
int download_count_;
-
- DISALLOW_COPY_AND_ASSIGN(TestingDownloadCoreService);
};
static std::unique_ptr<KeyedService> CreateTestingDownloadCoreService(
diff --git a/chrome/browser/ui/browser_command_controller.h b/chrome/browser/ui/browser_command_controller.h
index 417d49ad..9f606f4 100644
--- a/chrome/browser/ui/browser_command_controller.h
+++ b/chrome/browser/ui/browser_command_controller.h
@@ -35,6 +35,10 @@
public sessions::TabRestoreServiceObserver {
public:
explicit BrowserCommandController(Browser* browser);
+
+ BrowserCommandController(const BrowserCommandController&) = delete;
+ BrowserCommandController& operator=(const BrowserCommandController&) = delete;
+
~BrowserCommandController() override;
// Returns true if |command_id| is a reserved command whose keyboard shortcuts
@@ -211,8 +215,6 @@
// In locked fullscreen mode disallow enabling/disabling commands.
bool is_locked_fullscreen_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserCommandController);
};
} // namespace chrome
diff --git a/chrome/browser/ui/browser_command_controller_browsertest.cc b/chrome/browser/ui/browser_command_controller_browsertest.cc
index c2bee05..2682c8b9 100644
--- a/chrome/browser/ui/browser_command_controller_browsertest.cc
+++ b/chrome/browser/ui/browser_command_controller_browsertest.cc
@@ -45,6 +45,12 @@
class BrowserCommandControllerBrowserTest : public InProcessBrowserTest {
public:
BrowserCommandControllerBrowserTest() {}
+
+ BrowserCommandControllerBrowserTest(
+ const BrowserCommandControllerBrowserTest&) = delete;
+ BrowserCommandControllerBrowserTest& operator=(
+ const BrowserCommandControllerBrowserTest&) = delete;
+
~BrowserCommandControllerBrowserTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -53,9 +59,6 @@
chromeos::switches::kIgnoreUserProfileMappingForTests);
#endif
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BrowserCommandControllerBrowserTest);
};
// Verify that showing a constrained window disables find.
diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc
index 1f074c4..1741c14 100644
--- a/chrome/browser/ui/browser_command_controller_unittest.cc
+++ b/chrome/browser/ui/browser_command_controller_unittest.cc
@@ -263,6 +263,10 @@
toolbar_showing_(false),
test_browser_(test_browser) {}
+ FullscreenTestBrowserWindow(const FullscreenTestBrowserWindow&) = delete;
+ FullscreenTestBrowserWindow& operator=(const FullscreenTestBrowserWindow&) =
+ delete;
+
~FullscreenTestBrowserWindow() override {}
// TestBrowserWindow overrides:
@@ -295,8 +299,6 @@
bool fullscreen_;
bool toolbar_showing_;
BrowserCommandControllerFullscreenTest* test_browser_;
-
- DISALLOW_COPY_AND_ASSIGN(FullscreenTestBrowserWindow);
};
// Test that uses FullscreenTestBrowserWindow for its window.
@@ -304,6 +306,12 @@
: public BrowserWithTestWindowTest {
public:
BrowserCommandControllerFullscreenTest() = default;
+
+ BrowserCommandControllerFullscreenTest(
+ const BrowserCommandControllerFullscreenTest&) = delete;
+ BrowserCommandControllerFullscreenTest& operator=(
+ const BrowserCommandControllerFullscreenTest&) = delete;
+
~BrowserCommandControllerFullscreenTest() override = default;
Browser* GetBrowser() { return BrowserWithTestWindowTest::browser(); }
@@ -312,9 +320,6 @@
std::unique_ptr<BrowserWindow> CreateBrowserWindow() override {
return std::make_unique<FullscreenTestBrowserWindow>(this);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BrowserCommandControllerFullscreenTest);
};
Profile* FullscreenTestBrowserWindow::GetProfile() {
diff --git a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.h b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.h
index d10dd72..b1cd0f4 100644
--- a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.h
+++ b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.h
@@ -17,6 +17,12 @@
: public ContentSettingBubbleModelDelegate {
public:
explicit BrowserContentSettingBubbleModelDelegate(Browser* browser);
+
+ BrowserContentSettingBubbleModelDelegate(
+ const BrowserContentSettingBubbleModelDelegate&) = delete;
+ BrowserContentSettingBubbleModelDelegate& operator=(
+ const BrowserContentSettingBubbleModelDelegate&) = delete;
+
~BrowserContentSettingBubbleModelDelegate() override;
// ContentSettingBubbleModelDelegate implementation:
@@ -27,8 +33,6 @@
private:
Browser* const browser_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserContentSettingBubbleModelDelegate);
};
#endif // CHROME_BROWSER_UI_BROWSER_CONTENT_SETTING_BUBBLE_MODEL_DELEGATE_H_
diff --git a/chrome/browser/ui/browser_finder_chromeos_browsertest.cc b/chrome/browser/ui/browser_finder_chromeos_browsertest.cc
index 425804d3..a0721966 100644
--- a/chrome/browser/ui/browser_finder_chromeos_browsertest.cc
+++ b/chrome/browser/ui/browser_finder_chromeos_browsertest.cc
@@ -18,6 +18,11 @@
class BrowserFinderWithDesksTest : public InProcessBrowserTest {
public:
BrowserFinderWithDesksTest() = default;
+
+ BrowserFinderWithDesksTest(const BrowserFinderWithDesksTest&) = delete;
+ BrowserFinderWithDesksTest& operator=(const BrowserFinderWithDesksTest&) =
+ delete;
+
~BrowserFinderWithDesksTest() override = default;
// InProcessBrowserTest:
@@ -37,9 +42,6 @@
ActivateBrowser(new_browser);
return new_browser;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BrowserFinderWithDesksTest);
};
} // namespace
diff --git a/chrome/browser/ui/browser_instant_controller.h b/chrome/browser/ui/browser_instant_controller.h
index 4d10545..b7bab635 100644
--- a/chrome/browser/ui/browser_instant_controller.h
+++ b/chrome/browser/ui/browser_instant_controller.h
@@ -27,6 +27,10 @@
class BrowserInstantController {
public:
explicit BrowserInstantController(Browser* browser);
+
+ BrowserInstantController(const BrowserInstantController&) = delete;
+ BrowserInstantController& operator=(const BrowserInstantController&) = delete;
+
~BrowserInstantController();
private:
@@ -40,8 +44,6 @@
InstantController instant_;
std::unique_ptr<SearchEngineBaseURLTracker> search_engine_base_url_tracker_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserInstantController);
};
#endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_
diff --git a/chrome/browser/ui/browser_live_tab_context.h b/chrome/browser/ui/browser_live_tab_context.h
index 1e7123d..ad221e6b 100644
--- a/chrome/browser/ui/browser_live_tab_context.h
+++ b/chrome/browser/ui/browser_live_tab_context.h
@@ -31,6 +31,10 @@
class BrowserLiveTabContext : public sessions::LiveTabContext {
public:
explicit BrowserLiveTabContext(Browser* browser) : browser_(browser) {}
+
+ BrowserLiveTabContext(const BrowserLiveTabContext&) = delete;
+ BrowserLiveTabContext& operator=(const BrowserLiveTabContext&) = delete;
+
~BrowserLiveTabContext() override {}
// Overridden from LiveTabContext:
@@ -102,8 +106,6 @@
private:
Browser* const browser_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserLiveTabContext);
};
#endif // CHROME_BROWSER_UI_BROWSER_LIVE_TAB_CONTEXT_H_
diff --git a/chrome/browser/ui/browser_location_bar_model_delegate.h b/chrome/browser/ui/browser_location_bar_model_delegate.h
index 9467fb2e..cda7025 100644
--- a/chrome/browser/ui/browser_location_bar_model_delegate.h
+++ b/chrome/browser/ui/browser_location_bar_model_delegate.h
@@ -16,6 +16,12 @@
class BrowserLocationBarModelDelegate : public ChromeLocationBarModelDelegate {
public:
explicit BrowserLocationBarModelDelegate(Browser* browser);
+
+ BrowserLocationBarModelDelegate(const BrowserLocationBarModelDelegate&) =
+ delete;
+ BrowserLocationBarModelDelegate& operator=(
+ const BrowserLocationBarModelDelegate&) = delete;
+
~BrowserLocationBarModelDelegate() override;
// ChromeLocationBarModelDelegate:
@@ -23,8 +29,6 @@
private:
Browser* const browser_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserLocationBarModelDelegate);
};
#endif // CHROME_BROWSER_UI_BROWSER_LOCATION_BAR_MODEL_DELEGATE_H_
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index 5fe37b7..2c6cad79 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -384,6 +384,10 @@
explicit ScopedBrowserShower(NavigateParams* params,
content::WebContents** contents)
: params_(params), contents_(contents) {}
+
+ ScopedBrowserShower(const ScopedBrowserShower&) = delete;
+ ScopedBrowserShower& operator=(const ScopedBrowserShower&) = delete;
+
~ScopedBrowserShower() {
if (params_->window_action == NavigateParams::SHOW_WINDOW_INACTIVE) {
params_->browser->window()->ShowInactive();
@@ -403,7 +407,6 @@
private:
NavigateParams* params_;
content::WebContents** contents_;
- DISALLOW_COPY_AND_ASSIGN(ScopedBrowserShower);
};
std::unique_ptr<content::WebContents> CreateTargetContents(
diff --git a/chrome/browser/ui/browser_tab_restorer.cc b/chrome/browser/ui/browser_tab_restorer.cc
index 820546e..8e85c43 100644
--- a/chrome/browser/ui/browser_tab_restorer.cc
+++ b/chrome/browser/ui/browser_tab_restorer.cc
@@ -34,6 +34,9 @@
public BrowserListObserver,
public base::SupportsUserData::Data {
public:
+ BrowserTabRestorer(const BrowserTabRestorer&) = delete;
+ BrowserTabRestorer& operator=(const BrowserTabRestorer&) = delete;
+
~BrowserTabRestorer() override;
static void CreateIfNecessary(Browser* browser);
@@ -51,8 +54,6 @@
Browser* browser_;
sessions::TabRestoreService* tab_restore_service_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserTabRestorer);
};
BrowserTabRestorer::~BrowserTabRestorer() {
diff --git a/chrome/browser/ui/browser_tab_strip_model_delegate.h b/chrome/browser/ui/browser_tab_strip_model_delegate.h
index b73f27e3..cabe691 100644
--- a/chrome/browser/ui/browser_tab_strip_model_delegate.h
+++ b/chrome/browser/ui/browser_tab_strip_model_delegate.h
@@ -21,6 +21,11 @@
class BrowserTabStripModelDelegate : public TabStripModelDelegate {
public:
explicit BrowserTabStripModelDelegate(Browser* browser);
+
+ BrowserTabStripModelDelegate(const BrowserTabStripModelDelegate&) = delete;
+ BrowserTabStripModelDelegate& operator=(const BrowserTabStripModelDelegate&) =
+ delete;
+
~BrowserTabStripModelDelegate() override;
private:
@@ -66,8 +71,6 @@
// The following factory is used to close the frame at a later time.
base::WeakPtrFactory<BrowserTabStripModelDelegate> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BrowserTabStripModelDelegate);
};
} // namespace chrome
diff --git a/chrome/browser/ui/browser_tab_strip_tracker.h b/chrome/browser/ui/browser_tab_strip_tracker.h
index 20dfe22..74ab81c 100644
--- a/chrome/browser/ui/browser_tab_strip_tracker.h
+++ b/chrome/browser/ui/browser_tab_strip_tracker.h
@@ -21,6 +21,10 @@
// tracked. If nullptr, all Browsers are tracked.
BrowserTabStripTracker(TabStripModelObserver* tab_strip_model_observer,
BrowserTabStripTrackerDelegate* delegate);
+
+ BrowserTabStripTracker(const BrowserTabStripTracker&) = delete;
+ BrowserTabStripTracker& operator=(const BrowserTabStripTracker&) = delete;
+
~BrowserTabStripTracker() override;
// Registers the TabStripModelObserver on existing tracked Browsers and starts
@@ -52,8 +56,6 @@
TabStripModelObserver* const tab_strip_model_observer_;
BrowserTabStripTrackerDelegate* const delegate_;
bool is_processing_initial_browsers_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserTabStripTracker);
};
#endif // CHROME_BROWSER_UI_BROWSER_TAB_STRIP_TRACKER_H_
diff --git a/chrome/browser/ui/browser_unittest.cc b/chrome/browser/ui/browser_unittest.cc
index 93513b34..d6d0942 100644
--- a/chrome/browser/ui/browser_unittest.cc
+++ b/chrome/browser/ui/browser_unittest.cc
@@ -34,6 +34,10 @@
class BrowserUnitTest : public BrowserWithTestWindowTest {
public:
BrowserUnitTest() {}
+
+ BrowserUnitTest(const BrowserUnitTest&) = delete;
+ BrowserUnitTest& operator=(const BrowserUnitTest&) = delete;
+
~BrowserUnitTest() override {}
// Caller owns the memory.
@@ -41,9 +45,6 @@
return WebContentsTester::CreateTestWebContents(
profile(), SiteInstance::Create(profile()));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BrowserUnitTest);
};
// Ensure crashed tabs are not reloaded when selected. crbug.com/232323
@@ -278,6 +279,10 @@
class BrowserBookmarkBarTest : public BrowserWithTestWindowTest {
public:
BrowserBookmarkBarTest() {}
+
+ BrowserBookmarkBarTest(const BrowserBookmarkBarTest&) = delete;
+ BrowserBookmarkBarTest& operator=(const BrowserBookmarkBarTest&) = delete;
+
~BrowserBookmarkBarTest() override {}
protected:
@@ -302,6 +307,12 @@
public:
BookmarkBarStateTestBrowserWindow()
: browser_(nullptr), bookmark_bar_state_(BookmarkBar::HIDDEN) {}
+
+ BookmarkBarStateTestBrowserWindow(
+ const BookmarkBarStateTestBrowserWindow&) = delete;
+ BookmarkBarStateTestBrowserWindow& operator=(
+ const BookmarkBarStateTestBrowserWindow&) = delete;
+
~BookmarkBarStateTestBrowserWindow() override {}
void set_browser(Browser* browser) { browser_ = browser; }
@@ -329,11 +340,7 @@
Browser* browser_; // Weak ptr.
BookmarkBar::State bookmark_bar_state_;
-
- DISALLOW_COPY_AND_ASSIGN(BookmarkBarStateTestBrowserWindow);
};
-
- DISALLOW_COPY_AND_ASSIGN(BrowserBookmarkBarTest);
};
// Ensure bookmark bar states in Browser and BrowserWindow are in sync after
diff --git a/chrome/browser/ui/browser_window_state.cc b/chrome/browser/ui/browser_window_state.cc
index 1b8fb4e..65f0d678 100644
--- a/chrome/browser/ui/browser_window_state.cc
+++ b/chrome/browser/ui/browser_window_state.cc
@@ -56,6 +56,10 @@
: DictionaryPrefUpdate(service, prefs::kAppWindowPlacement),
window_name_(window_name) {}
+ WindowPlacementPrefUpdate(const WindowPlacementPrefUpdate&) = delete;
+ WindowPlacementPrefUpdate& operator=(const WindowPlacementPrefUpdate&) =
+ delete;
+
~WindowPlacementPrefUpdate() override {}
base::DictionaryValue* Get() override {
@@ -71,8 +75,6 @@
private:
const std::string window_name_;
-
- DISALLOW_COPY_AND_ASSIGN(WindowPlacementPrefUpdate);
};
} // namespace
diff --git a/chrome/browser/ui/chrome_select_file_policy.h b/chrome/browser/ui/chrome_select_file_policy.h
index dd55433..9f3f693 100644
--- a/chrome/browser/ui/chrome_select_file_policy.h
+++ b/chrome/browser/ui/chrome_select_file_policy.h
@@ -18,6 +18,10 @@
class ChromeSelectFilePolicy : public ui::SelectFilePolicy {
public:
explicit ChromeSelectFilePolicy(content::WebContents* source_contents);
+
+ ChromeSelectFilePolicy(const ChromeSelectFilePolicy&) = delete;
+ ChromeSelectFilePolicy& operator=(const ChromeSelectFilePolicy&) = delete;
+
~ChromeSelectFilePolicy() override;
// Overridden from ui::SelectFilePolicy:
@@ -29,8 +33,6 @@
private:
content::WebContents* source_contents_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeSelectFilePolicy);
};
#endif // CHROME_BROWSER_UI_CHROME_SELECT_FILE_POLICY_H_
diff --git a/chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h b/chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h
index ca956c6..174f06a 100644
--- a/chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h
+++ b/chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h
@@ -13,14 +13,17 @@
: public web_modal::WebContentsModalDialogManagerDelegate {
public:
ChromeWebModalDialogManagerDelegate();
+
+ ChromeWebModalDialogManagerDelegate(
+ const ChromeWebModalDialogManagerDelegate&) = delete;
+ ChromeWebModalDialogManagerDelegate& operator=(
+ const ChromeWebModalDialogManagerDelegate&) = delete;
+
~ChromeWebModalDialogManagerDelegate() override;
protected:
// Overridden from web_modal::WebContentsModalDialogManagerDelegate:
bool IsWebContentsVisible(content::WebContents* web_contents) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeWebModalDialogManagerDelegate);
};
#endif // CHROME_BROWSER_UI_CHROME_WEB_MODAL_DIALOG_MANAGER_DELEGATE_H_
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
index fb601f1..fd628b3 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
@@ -42,6 +42,10 @@
class BookmarkMenuBridge : public bookmarks::BookmarkModelObserver {
public:
BookmarkMenuBridge(Profile* profile, NSMenu* menu_root);
+
+ BookmarkMenuBridge(const BookmarkMenuBridge&) = delete;
+ BookmarkMenuBridge& operator=(const BookmarkMenuBridge&) = delete;
+
~BookmarkMenuBridge() override;
// bookmarks::BookmarkModelObserver:
@@ -148,8 +152,6 @@
// In order to appropriately update items in the bookmark menu, without
// forcing a rebuild, map the model's nodes to menu items.
std::map<const bookmarks::BookmarkNode*, NSMenuItem*> bookmark_nodes_;
-
- DISALLOW_COPY_AND_ASSIGN(BookmarkMenuBridge);
};
#endif // CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_MENU_BRIDGE_H_
diff --git a/chrome/browser/ui/cocoa/browser_window_mac_browsertest.mm b/chrome/browser/ui/cocoa/browser_window_mac_browsertest.mm
index 28b6013..022c069 100644
--- a/chrome/browser/ui/cocoa/browser_window_mac_browsertest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_mac_browsertest.mm
@@ -63,15 +63,16 @@
class BrowserWindowMacA11yTest : public BrowserWindowMacTest {
public:
BrowserWindowMacA11yTest() = default;
+
+ BrowserWindowMacA11yTest(const BrowserWindowMacA11yTest&) = delete;
+ BrowserWindowMacA11yTest& operator=(const BrowserWindowMacA11yTest&) = delete;
+
~BrowserWindowMacA11yTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
BrowserWindowMacTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kForceRendererAccessibility);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BrowserWindowMacA11yTest);
};
IN_PROC_BROWSER_TEST_F(BrowserWindowMacA11yTest, A11yTreeIsWellFormed) {
diff --git a/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.h b/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.h
index e70bc86..f6537a8fa 100644
--- a/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.h
+++ b/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.h
@@ -28,6 +28,11 @@
explicit FullscreenToolbarAnimationController(
FullscreenToolbarController* owner);
+ FullscreenToolbarAnimationController(
+ const FullscreenToolbarAnimationController&) = delete;
+ FullscreenToolbarAnimationController& operator=(
+ const FullscreenToolbarAnimationController&) = delete;
+
~FullscreenToolbarAnimationController() override;
// Called by |owner_| when the fullscreen toolbar layout is updated.
@@ -81,8 +86,6 @@
// True when the toolbar is dropped to show tabstrip changes.
BOOL should_hide_toolbar_after_delay_;
-
- DISALLOW_COPY_AND_ASSIGN(FullscreenToolbarAnimationController);
};
#endif // CHROME_BROWSER_UI_COCOA_FULLSCREEN_FULLSCREEN_TOOLBAR_ANIMATION_CONTROLLER_H_
diff --git a/chrome/browser/ui/cocoa/handoff_active_url_observer.h b/chrome/browser/ui/cocoa/handoff_active_url_observer.h
index dba4dc5..e07e393 100644
--- a/chrome/browser/ui/cocoa/handoff_active_url_observer.h
+++ b/chrome/browser/ui/cocoa/handoff_active_url_observer.h
@@ -25,6 +25,10 @@
public content::WebContentsObserver {
public:
explicit HandoffActiveURLObserver(HandoffActiveURLObserverDelegate* delegate);
+
+ HandoffActiveURLObserver(const HandoffActiveURLObserver&) = delete;
+ HandoffActiveURLObserver& operator=(const HandoffActiveURLObserver&) = delete;
+
~HandoffActiveURLObserver() override;
private:
@@ -61,8 +65,6 @@
// This pointer is always up to date, and points to the most recently
// activated browser, or nullptr if no browsers exist.
Browser* active_browser_;
-
- DISALLOW_COPY_AND_ASSIGN(HandoffActiveURLObserver);
};
#endif // CHROME_BROWSER_UI_COCOA_HANDOFF_ACTIVE_URL_OBSERVER_H_
diff --git a/chrome/browser/ui/cocoa/handoff_active_url_observer_bridge.h b/chrome/browser/ui/cocoa/handoff_active_url_observer_bridge.h
index 6b038b3..7ffd7e87 100644
--- a/chrome/browser/ui/cocoa/handoff_active_url_observer_bridge.h
+++ b/chrome/browser/ui/cocoa/handoff_active_url_observer_bridge.h
@@ -31,6 +31,11 @@
explicit HandoffActiveURLObserverBridge(
NSObject<HandoffActiveURLObserverBridgeDelegate>* delegate);
+ HandoffActiveURLObserverBridge(const HandoffActiveURLObserverBridge&) =
+ delete;
+ HandoffActiveURLObserverBridge& operator=(
+ const HandoffActiveURLObserverBridge&) = delete;
+
~HandoffActiveURLObserverBridge() override;
private:
@@ -41,8 +46,6 @@
// The C++ object that this class acts as a bridge for.
std::unique_ptr<HandoffActiveURLObserver> observer_;
-
- DISALLOW_COPY_AND_ASSIGN(HandoffActiveURLObserverBridge);
};
#endif // CHROME_BROWSER_UI_COCOA_HANDOFF_ACTIVE_URL_OBSERVER_BRIDGE_H_
diff --git a/chrome/browser/ui/cocoa/native_window_tracker_cocoa.h b/chrome/browser/ui/cocoa/native_window_tracker_cocoa.h
index 622b267..25b56c1 100644
--- a/chrome/browser/ui/cocoa/native_window_tracker_cocoa.h
+++ b/chrome/browser/ui/cocoa/native_window_tracker_cocoa.h
@@ -14,6 +14,10 @@
class NativeWindowTrackerCocoa : public NativeWindowTracker {
public:
explicit NativeWindowTrackerCocoa(gfx::NativeWindow window);
+
+ NativeWindowTrackerCocoa(const NativeWindowTrackerCocoa&) = delete;
+ NativeWindowTrackerCocoa& operator=(const NativeWindowTrackerCocoa&) = delete;
+
~NativeWindowTrackerCocoa() override;
// NativeWindowTracker:
@@ -21,8 +25,6 @@
private:
base::scoped_nsobject<BridgedNativeWindowTracker> bridge_;
-
- DISALLOW_COPY_AND_ASSIGN(NativeWindowTrackerCocoa);
};
#endif // CHROME_BROWSER_UI_COCOA_NATIVE_WINDOW_TRACKER_COCOA_H_
diff --git a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h
index 4f4e8d9..7d57763 100644
--- a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h
+++ b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h
@@ -19,6 +19,10 @@
public:
RenderViewContextMenuMac(content::RenderFrameHost* render_frame_host,
const content::ContextMenuParams& params);
+
+ RenderViewContextMenuMac(const RenderViewContextMenuMac&) = delete;
+ RenderViewContextMenuMac& operator=(const RenderViewContextMenuMac&) = delete;
+
~RenderViewContextMenuMac() override;
void Show() override {}
@@ -52,8 +56,6 @@
// The context menu that adds and handles Speech and BiDi.
ui::TextServicesContextMenu text_services_context_menu_;
-
- DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenuMac);
};
#endif // CHROME_BROWSER_UI_COCOA_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_MAC_H_
diff --git a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.h b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.h
index e02068a..6c8b91b1 100644
--- a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.h
+++ b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.h
@@ -21,6 +21,10 @@
const content::ContextMenuParams& params,
NSView* parent_view);
+ RenderViewContextMenuMacCocoa(const RenderViewContextMenuMacCocoa&) = delete;
+ RenderViewContextMenuMacCocoa& operator=(
+ const RenderViewContextMenuMacCocoa&) = delete;
+
~RenderViewContextMenuMacCocoa() override;
// RenderViewContextMenuViewsMac:
@@ -43,8 +47,6 @@
// The Cocoa parent view.
NSView* parent_view_;
-
- DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenuMacCocoa);
};
// The ChromeSwizzleServicesMenuUpdater filters Services menu items in the
diff --git a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm
index 4a88baa3b..d4b848d 100644
--- a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm
+++ b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm
@@ -159,6 +159,9 @@
explicit ToolkitDelegateMacCocoa(RenderViewContextMenuMacCocoa* context_menu)
: context_menu_(context_menu) {}
+ ToolkitDelegateMacCocoa(const ToolkitDelegateMacCocoa&) = delete;
+ ToolkitDelegateMacCocoa& operator=(const ToolkitDelegateMacCocoa&) = delete;
+
~ToolkitDelegateMacCocoa() override {}
private:
@@ -177,7 +180,6 @@
}
RenderViewContextMenuMacCocoa* context_menu_;
- DISALLOW_COPY_AND_ASSIGN(ToolkitDelegateMacCocoa);
};
// Obj-C bridge class that is the target of all items in the context menu.
diff --git a/chrome/browser/ui/cocoa/scoped_menu_bar_lock.h b/chrome/browser/ui/cocoa/scoped_menu_bar_lock.h
index 6df7feb..fca1374 100644
--- a/chrome/browser/ui/cocoa/scoped_menu_bar_lock.h
+++ b/chrome/browser/ui/cocoa/scoped_menu_bar_lock.h
@@ -15,10 +15,11 @@
class ScopedMenuBarLock {
public:
ScopedMenuBarLock();
- ~ScopedMenuBarLock();
- private:
- DISALLOW_COPY_AND_ASSIGN(ScopedMenuBarLock);
+ ScopedMenuBarLock(const ScopedMenuBarLock&) = delete;
+ ScopedMenuBarLock& operator=(const ScopedMenuBarLock&) = delete;
+
+ ~ScopedMenuBarLock();
};
#endif // CHROME_BROWSER_UI_COCOA_SCOPED_MENU_BAR_LOCK_H_
diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h
index 83cd6c3c..5924eed 100644
--- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h
+++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h
@@ -23,6 +23,10 @@
class StatusIconMac : public StatusIcon {
public:
StatusIconMac();
+
+ StatusIconMac(const StatusIconMac&) = delete;
+ StatusIconMac& operator=(const StatusIconMac&) = delete;
+
~StatusIconMac() override;
// Overridden from StatusIcon.
@@ -60,8 +64,6 @@
// Status menu shown when right-clicking the system icon, if it has been
// created by |UpdatePlatformContextMenu|.
base::scoped_nsobject<MenuControllerCocoa> menu_;
-
- DISALLOW_COPY_AND_ASSIGN(StatusIconMac);
};
#endif // CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_ICON_MAC_H_
diff --git a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h
index a7058315..89c6a551 100644
--- a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h
+++ b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h
@@ -31,6 +31,12 @@
public ContextMenuDelegate {
public:
explicit ChromeWebContentsViewDelegateMac(content::WebContents* web_contents);
+
+ ChromeWebContentsViewDelegateMac(const ChromeWebContentsViewDelegateMac&) =
+ delete;
+ ChromeWebContentsViewDelegateMac& operator=(
+ const ChromeWebContentsViewDelegateMac&) = delete;
+
~ChromeWebContentsViewDelegateMac() override;
// Overridden from WebContentsViewDelegate:
@@ -74,8 +80,6 @@
// The WebContents that owns the view.
content::WebContents* web_contents_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeWebContentsViewDelegateMac);
};
#endif // __OBJC__
diff --git a/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h b/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h
index 7118942..703aeda3 100644
--- a/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h
+++ b/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h
@@ -21,6 +21,11 @@
class WebDragBookmarkHandlerMac : public content::WebDragDestDelegate {
public:
WebDragBookmarkHandlerMac();
+
+ WebDragBookmarkHandlerMac(const WebDragBookmarkHandlerMac&) = delete;
+ WebDragBookmarkHandlerMac& operator=(const WebDragBookmarkHandlerMac&) =
+ delete;
+
~WebDragBookmarkHandlerMac() override;
// Overridden from content::WebDragDestDelegate:
@@ -41,8 +46,6 @@
// The bookmark data for the current tab. This will be empty if there is not
// a native bookmark drag.
bookmarks::BookmarkNodeData bookmark_drag_data_;
-
- DISALLOW_COPY_AND_ASSIGN(WebDragBookmarkHandlerMac);
};
#endif // CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_WEB_DRAG_BOOKMARK_HANDLER_MAC_H_
diff --git a/chrome/browser/ui/cocoa/tab_menu_bridge.h b/chrome/browser/ui/cocoa/tab_menu_bridge.h
index 1985168c..71087f2e 100644
--- a/chrome/browser/ui/cocoa/tab_menu_bridge.h
+++ b/chrome/browser/ui/cocoa/tab_menu_bridge.h
@@ -30,6 +30,10 @@
public:
// The |menu_item| contains the actual menu this class manages.
TabMenuBridge(TabStripModel* model, NSMenuItem* menu_item);
+
+ TabMenuBridge(const TabMenuBridge&) = delete;
+ TabMenuBridge& operator=(const TabMenuBridge&) = delete;
+
~TabMenuBridge() override;
// It's legal to call this method more than once - it will clear all the
@@ -66,8 +70,6 @@
// non-dynamic section of the menu. This offset is used to map menu items to
// their underlying tabs.
int dynamic_items_start_;
-
- DISALLOW_COPY_AND_ASSIGN(TabMenuBridge);
};
#endif // CHROME_BROWSER_UI_COCOA_TAB_MENU_BRIDGE_H_
diff --git a/chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm b/chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm
index aacd3459..caaca76 100644
--- a/chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm
+++ b/chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm
@@ -42,6 +42,10 @@
class TaskManagerMacTest : public InProcessBrowserTest {
public:
TaskManagerMacTest() {}
+
+ TaskManagerMacTest(const TaskManagerMacTest&) = delete;
+ TaskManagerMacTest& operator=(const TaskManagerMacTest&) = delete;
+
~TaskManagerMacTest() override {}
void SetUpOnMainThread() override {
@@ -113,9 +117,6 @@
}
return -1;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TaskManagerMacTest);
};
// Tests that all defined columns have a corresponding string IDs for keying
diff --git a/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm b/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm
index 9fe558e..ffb09377 100644
--- a/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm
+++ b/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm
@@ -169,6 +169,10 @@
bool show_home_button() { return show_home_button_.GetValue(); }
+ TouchBarNotificationBridge(const TouchBarNotificationBridge&) = delete;
+ TouchBarNotificationBridge& operator=(const TouchBarNotificationBridge&) =
+ delete;
+
~TouchBarNotificationBridge() override {
BrowserList::RemoveObserver(this);
browser_->tab_strip_model()->RemoveObserver(this);
@@ -256,8 +260,6 @@
BooleanPrefMember show_home_button_;
PrefChangeRegistrar profile_pref_registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(TouchBarNotificationBridge);
};
} // namespace
diff --git a/chrome/browser/ui/confirm_bubble_model.h b/chrome/browser/ui/confirm_bubble_model.h
index cbea63123..2d6f2fa5 100644
--- a/chrome/browser/ui/confirm_bubble_model.h
+++ b/chrome/browser/ui/confirm_bubble_model.h
@@ -18,6 +18,10 @@
class ConfirmBubbleModel {
public:
ConfirmBubbleModel();
+
+ ConfirmBubbleModel(const ConfirmBubbleModel&) = delete;
+ ConfirmBubbleModel& operator=(const ConfirmBubbleModel&) = delete;
+
virtual ~ConfirmBubbleModel();
// Returns the title string and the message string to be displayed for this
@@ -44,9 +48,6 @@
// Called when the link is clicked.
virtual void OpenHelpPage();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ConfirmBubbleModel);
};
#endif // CHROME_BROWSER_UI_CONFIRM_BUBBLE_MODEL_H_
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index 2ba7d62..50f6a2f2 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -339,6 +339,11 @@
ContentSettingMixedScriptBubbleModel(Delegate* delegate,
WebContents* web_contents);
+ ContentSettingMixedScriptBubbleModel(
+ const ContentSettingMixedScriptBubbleModel&) = delete;
+ ContentSettingMixedScriptBubbleModel& operator=(
+ const ContentSettingMixedScriptBubbleModel&) = delete;
+
~ContentSettingMixedScriptBubbleModel() override {}
private:
@@ -347,8 +352,6 @@
// ContentSettingBubbleModel:
void OnLearnMoreClicked() override;
void OnCustomLinkClicked() override;
-
- DISALLOW_COPY_AND_ASSIGN(ContentSettingMixedScriptBubbleModel);
};
ContentSettingMixedScriptBubbleModel::ContentSettingMixedScriptBubbleModel(
@@ -658,6 +661,12 @@
public:
ContentSettingCookiesBubbleModel(Delegate* delegate,
WebContents* web_contents);
+
+ ContentSettingCookiesBubbleModel(const ContentSettingCookiesBubbleModel&) =
+ delete;
+ ContentSettingCookiesBubbleModel& operator=(
+ const ContentSettingCookiesBubbleModel&) = delete;
+
~ContentSettingCookiesBubbleModel() override;
// ContentSettingBubbleModel:
@@ -665,8 +674,6 @@
private:
void OnCustomLinkClicked() override;
-
- DISALLOW_COPY_AND_ASSIGN(ContentSettingCookiesBubbleModel);
};
ContentSettingCookiesBubbleModel::ContentSettingCookiesBubbleModel(
@@ -701,6 +708,12 @@
public blocked_content::UrlListManager::Observer {
public:
ContentSettingPopupBubbleModel(Delegate* delegate, WebContents* web_contents);
+
+ ContentSettingPopupBubbleModel(const ContentSettingPopupBubbleModel&) =
+ delete;
+ ContentSettingPopupBubbleModel& operator=(
+ const ContentSettingPopupBubbleModel&) = delete;
+
~ContentSettingPopupBubbleModel() override;
// ContentSettingBubbleModel:
@@ -719,8 +732,6 @@
base::ScopedObservation<blocked_content::UrlListManager,
blocked_content::UrlListManager::Observer>
url_list_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ContentSettingPopupBubbleModel);
};
ContentSettingPopupBubbleModel::ContentSettingPopupBubbleModel(
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.h b/chrome/browser/ui/content_settings/content_setting_bubble_model.h
index ce3a3bce..e31c0717 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.h
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.h
@@ -317,6 +317,11 @@
ContentSettingRPHBubbleModel(Delegate* delegate,
content::WebContents* web_contents,
ProtocolHandlerRegistry* registry);
+
+ ContentSettingRPHBubbleModel(const ContentSettingRPHBubbleModel&) = delete;
+ ContentSettingRPHBubbleModel& operator=(const ContentSettingRPHBubbleModel&) =
+ delete;
+
~ContentSettingRPHBubbleModel() override;
// ContentSettingBubbleModel:
@@ -332,8 +337,6 @@
ProtocolHandlerRegistry* registry_;
ProtocolHandler pending_handler_;
ProtocolHandler previous_handler_;
-
- DISALLOW_COPY_AND_ASSIGN(ContentSettingRPHBubbleModel);
};
// The model of the content settings bubble for media settings.
@@ -342,6 +345,11 @@
ContentSettingMediaStreamBubbleModel(Delegate* delegate,
content::WebContents* web_contents);
+ ContentSettingMediaStreamBubbleModel(
+ const ContentSettingMediaStreamBubbleModel&) = delete;
+ ContentSettingMediaStreamBubbleModel& operator=(
+ const ContentSettingMediaStreamBubbleModel&) = delete;
+
~ContentSettingMediaStreamBubbleModel() override;
// ContentSettingBubbleModel:
@@ -399,8 +407,6 @@
ContentSetting radio_item_setting_[2];
// The state of the microphone and camera access.
content_settings::PageSpecificContentSettings::MicrophoneCameraState state_;
-
- DISALLOW_COPY_AND_ASSIGN(ContentSettingMediaStreamBubbleModel);
};
// The model of a bubble that acts as a quiet permission request prompt for
@@ -413,6 +419,11 @@
ContentSettingQuietRequestBubbleModel(Delegate* delegate,
content::WebContents* web_contents);
+ ContentSettingQuietRequestBubbleModel(
+ const ContentSettingQuietRequestBubbleModel&) = delete;
+ ContentSettingQuietRequestBubbleModel& operator=(
+ const ContentSettingQuietRequestBubbleModel&) = delete;
+
~ContentSettingQuietRequestBubbleModel() override;
private:
@@ -424,8 +435,6 @@
void OnDoneButtonClicked() override;
void OnCancelButtonClicked() override;
ContentSettingQuietRequestBubbleModel* AsQuietRequestBubbleModel() override;
-
- DISALLOW_COPY_AND_ASSIGN(ContentSettingQuietRequestBubbleModel);
};
// The model for the deceptive content bubble.
@@ -436,6 +445,11 @@
Delegate* delegate,
content::WebContents* web_contents);
+ ContentSettingSubresourceFilterBubbleModel(
+ const ContentSettingSubresourceFilterBubbleModel&) = delete;
+ ContentSettingSubresourceFilterBubbleModel& operator=(
+ const ContentSettingSubresourceFilterBubbleModel&) = delete;
+
~ContentSettingSubresourceFilterBubbleModel() override;
private:
@@ -451,8 +465,6 @@
void CommitChanges() override;
bool is_checked_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ContentSettingSubresourceFilterBubbleModel);
};
// The model for automatic downloads setting.
@@ -460,6 +472,12 @@
public:
ContentSettingDownloadsBubbleModel(Delegate* delegate,
content::WebContents* web_contents);
+
+ ContentSettingDownloadsBubbleModel(
+ const ContentSettingDownloadsBubbleModel&) = delete;
+ ContentSettingDownloadsBubbleModel& operator=(
+ const ContentSettingDownloadsBubbleModel&) = delete;
+
~ContentSettingDownloadsBubbleModel() override;
// ContentSettingBubbleModel overrides:
@@ -473,8 +491,6 @@
// ContentSettingBubbleModel overrides:
void OnManageButtonClicked() override;
-
- DISALLOW_COPY_AND_ASSIGN(ContentSettingDownloadsBubbleModel);
};
class ContentSettingSingleRadioGroup : public ContentSettingSimpleBubbleModel {
@@ -482,6 +498,12 @@
ContentSettingSingleRadioGroup(Delegate* delegate,
content::WebContents* web_contents,
ContentSettingsType content_type);
+
+ ContentSettingSingleRadioGroup(const ContentSettingSingleRadioGroup&) =
+ delete;
+ ContentSettingSingleRadioGroup& operator=(
+ const ContentSettingSingleRadioGroup&) = delete;
+
~ContentSettingSingleRadioGroup() override;
// ContentSettingSimpleBubbleModel:
@@ -499,8 +521,6 @@
void SetNarrowestContentSetting(ContentSetting setting);
ContentSetting block_setting_;
-
- DISALLOW_COPY_AND_ASSIGN(ContentSettingSingleRadioGroup);
};
// The bubble that informs users that Chrome does not have access to Location
@@ -543,6 +563,11 @@
ContentSettingFramebustBlockBubbleModel(Delegate* delegate,
content::WebContents* web_contents);
+ ContentSettingFramebustBlockBubbleModel(
+ const ContentSettingFramebustBlockBubbleModel&) = delete;
+ ContentSettingFramebustBlockBubbleModel& operator=(
+ const ContentSettingFramebustBlockBubbleModel&) = delete;
+
~ContentSettingFramebustBlockBubbleModel() override;
// ContentSettingBubbleModel:
@@ -559,8 +584,6 @@
base::ScopedObservation<blocked_content::UrlListManager,
blocked_content::UrlListManager::Observer>
url_list_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ContentSettingFramebustBlockBubbleModel);
};
#endif // !defined(OS_ANDROID)
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model.h b/chrome/browser/ui/content_settings/content_setting_image_model.h
index e8ea2b4..0ed31dd 100644
--- a/chrome/browser/ui/content_settings/content_setting_image_model.h
+++ b/chrome/browser/ui/content_settings/content_setting_image_model.h
@@ -53,6 +53,9 @@
NUM_IMAGE_TYPES
};
+ ContentSettingImageModel(const ContentSettingImageModel&) = delete;
+ ContentSettingImageModel& operator=(const ContentSettingImageModel&) = delete;
+
virtual ~ContentSettingImageModel() {}
// Generates a vector of all image models to be used within one window.
@@ -155,7 +158,6 @@
const bool image_type_should_notify_accessibility_;
bool should_auto_open_bubble_ = false;
bool should_show_promo_ = false;
- DISALLOW_COPY_AND_ASSIGN(ContentSettingImageModel);
};
// A subclass for an image model tied to a single content type.
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_states.h b/chrome/browser/ui/content_settings/content_setting_image_model_states.h
index 73b18aa1..e40be1f1 100644
--- a/chrome/browser/ui/content_settings/content_setting_image_model_states.h
+++ b/chrome/browser/ui/content_settings/content_setting_image_model_states.h
@@ -17,6 +17,11 @@
class ContentSettingImageModelStates
: public content::WebContentsUserData<ContentSettingImageModelStates> {
public:
+ ContentSettingImageModelStates(const ContentSettingImageModelStates&) =
+ delete;
+ ContentSettingImageModelStates& operator=(
+ const ContentSettingImageModelStates&) = delete;
+
~ContentSettingImageModelStates() override;
static ContentSettingImageModelStates* Get(content::WebContents* contents);
@@ -60,8 +65,6 @@
bool promo_was_shown_[static_cast<int>(ImageType::NUM_IMAGE_TYPES)] = {};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(ContentSettingImageModelStates);
};
#endif // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_STATES_H_
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
index 6a924e2..955d3b7 100644
--- a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
+++ b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
@@ -67,6 +67,12 @@
explicit TestQuietNotificationPermissionUiSelector(
QuietUiReason simulated_reason_for_quiet_ui)
: simulated_reason_for_quiet_ui_(simulated_reason_for_quiet_ui) {}
+
+ TestQuietNotificationPermissionUiSelector(
+ const TestQuietNotificationPermissionUiSelector&) = delete;
+ TestQuietNotificationPermissionUiSelector& operator=(
+ const TestQuietNotificationPermissionUiSelector&) = delete;
+
~TestQuietNotificationPermissionUiSelector() override = default;
protected:
@@ -84,8 +90,6 @@
private:
QuietUiReason simulated_reason_for_quiet_ui_;
-
- DISALLOW_COPY_AND_ASSIGN(TestQuietNotificationPermissionUiSelector);
};
class ContentSettingImageModelTest : public BrowserWithTestWindowTest {
@@ -93,6 +97,11 @@
ContentSettingImageModelTest()
: request_(permissions::RequestType::kNotifications,
permissions::PermissionRequestGestureType::GESTURE) {}
+
+ ContentSettingImageModelTest(const ContentSettingImageModelTest&) = delete;
+ ContentSettingImageModelTest& operator=(const ContentSettingImageModelTest&) =
+ delete;
+
~ContentSettingImageModelTest() override {}
content::WebContents* web_contents() {
@@ -138,9 +147,6 @@
permissions::MockPermissionRequest request_;
permissions::PermissionRequestManager* manager_ = nullptr;
content::NavigationController* controller_ = nullptr;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ContentSettingImageModelTest);
};
TEST_F(ContentSettingImageModelTest, Update) {
diff --git a/chrome/browser/ui/content_settings/media_authorization_wrapper_test.h b/chrome/browser/ui/content_settings/media_authorization_wrapper_test.h
index 3b8af3ed..930ca5d 100644
--- a/chrome/browser/ui/content_settings/media_authorization_wrapper_test.h
+++ b/chrome/browser/ui/content_settings/media_authorization_wrapper_test.h
@@ -22,6 +22,11 @@
: public system_media_permissions::MediaAuthorizationWrapper {
public:
MediaAuthorizationWrapperTest() = default;
+
+ MediaAuthorizationWrapperTest(const MediaAuthorizationWrapperTest&) = delete;
+ MediaAuthorizationWrapperTest& operator=(
+ const MediaAuthorizationWrapperTest&) = delete;
+
~MediaAuthorizationWrapperTest() override = default;
void SetMockMediaPermissionStatus(AuthStatus status);
@@ -33,8 +38,6 @@
private:
AuthStatus permission_status_ = kNotDetermined;
-
- DISALLOW_COPY_AND_ASSIGN(MediaAuthorizationWrapperTest);
};
#endif // CHROME_BROWSER_UI_CONTENT_SETTINGS_MEDIA_AUTHORIZATION_WRAPPER_TEST_H_
diff --git a/chrome/browser/ui/cookie_controls/cookie_controls_service.h b/chrome/browser/ui/cookie_controls/cookie_controls_service.h
index 119b6c7a..f681eb3 100644
--- a/chrome/browser/ui/cookie_controls/cookie_controls_service.h
+++ b/chrome/browser/ui/cookie_controls/cookie_controls_service.h
@@ -36,6 +36,9 @@
virtual void OnThirdPartyCookieBlockingPolicyChanged() {}
};
+ CookieControlsService(const CookieControlsService&) = delete;
+ CookieControlsService& operator=(const CookieControlsService&) = delete;
+
~CookieControlsService() override;
void Init();
@@ -71,8 +74,6 @@
cookie_observations_{this};
base::ObserverList<Observer> observers_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieControlsService);
};
#endif // CHROME_BROWSER_UI_COOKIE_CONTROLS_COOKIE_CONTROLS_SERVICE_H_
diff --git a/chrome/browser/ui/cookie_controls/cookie_controls_service_unittest.cc b/chrome/browser/ui/cookie_controls/cookie_controls_service_unittest.cc
index b28c4b8..1d661dc 100644
--- a/chrome/browser/ui/cookie_controls/cookie_controls_service_unittest.cc
+++ b/chrome/browser/ui/cookie_controls/cookie_controls_service_unittest.cc
@@ -26,6 +26,10 @@
checked_ = false;
}
+ CookieControlsServiceObserver(const CookieControlsServiceObserver&) = delete;
+ CookieControlsServiceObserver& operator=(
+ const CookieControlsServiceObserver&) = delete;
+
~CookieControlsServiceObserver() override = default;
CookieControlsService* GetService() { return service_; }
@@ -40,8 +44,6 @@
private:
CookieControlsService* service_;
bool checked_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieControlsServiceObserver);
};
class CookieControlsServiceTest : public ChromeRenderViewHostTestHarness {
diff --git a/chrome/browser/ui/enterprise_startup_dialog.h b/chrome/browser/ui/enterprise_startup_dialog.h
index d7487efd..6d81f4b 100644
--- a/chrome/browser/ui/enterprise_startup_dialog.h
+++ b/chrome/browser/ui/enterprise_startup_dialog.h
@@ -29,6 +29,9 @@
using DialogResultCallback =
base::OnceCallback<void(bool was_accepted, bool can_show_browser_window)>;
+ EnterpriseStartupDialog(const EnterpriseStartupDialog&) = delete;
+ EnterpriseStartupDialog& operator=(const EnterpriseStartupDialog&) = delete;
+
virtual ~EnterpriseStartupDialog() = default;
// Show the dialog. Please note that the dialog won't contain any
@@ -51,9 +54,6 @@
protected:
EnterpriseStartupDialog() = default;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(EnterpriseStartupDialog);
};
} // namespace policy
diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h
index f4dd20b..061c16ef 100644
--- a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h
+++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h
@@ -33,6 +33,10 @@
ExclusiveAccessBubble(ExclusiveAccessManager* manager,
const GURL& url,
ExclusiveAccessBubbleType bubble_type);
+
+ ExclusiveAccessBubble(const ExclusiveAccessBubble&) = delete;
+ ExclusiveAccessBubble& operator=(const ExclusiveAccessBubble&) = delete;
+
~ExclusiveAccessBubble() override;
// Informs the ExclusiveAccessBubble of some user input, which may update
@@ -137,8 +141,6 @@
// if the mouse has moved since our last check. Only used in non-simplified
// fullscreen mode.
gfx::Point last_mouse_pos_;
-
- DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessBubble);
};
#endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_BUBBLE_H_
diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_controller_base.h b/chrome/browser/ui/exclusive_access/exclusive_access_controller_base.h
index c750162..55a6d2c 100644
--- a/chrome/browser/ui/exclusive_access/exclusive_access_controller_base.h
+++ b/chrome/browser/ui/exclusive_access/exclusive_access_controller_base.h
@@ -25,6 +25,11 @@
class ExclusiveAccessControllerBase : public content::NotificationObserver {
public:
explicit ExclusiveAccessControllerBase(ExclusiveAccessManager* manager);
+
+ ExclusiveAccessControllerBase(const ExclusiveAccessControllerBase&) = delete;
+ ExclusiveAccessControllerBase& operator=(
+ const ExclusiveAccessControllerBase&) = delete;
+
~ExclusiveAccessControllerBase() override;
GURL GetExclusiveAccessBubbleURL() const;
@@ -87,8 +92,6 @@
// The number of bubble re-shows for the current session (reset upon exiting).
int bubble_reshow_count_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessControllerBase);
};
#endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_CONTROLLER_BASE_H_
diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_manager.h b/chrome/browser/ui/exclusive_access/exclusive_access_manager.h
index a20c9fbe..e28cc3c 100644
--- a/chrome/browser/ui/exclusive_access/exclusive_access_manager.h
+++ b/chrome/browser/ui/exclusive_access/exclusive_access_manager.h
@@ -29,6 +29,10 @@
public:
explicit ExclusiveAccessManager(
ExclusiveAccessContext* exclusive_access_context);
+
+ ExclusiveAccessManager(const ExclusiveAccessManager&) = delete;
+ ExclusiveAccessManager& operator=(const ExclusiveAccessManager&) = delete;
+
~ExclusiveAccessManager();
FullscreenController* fullscreen_controller() {
@@ -77,8 +81,6 @@
FullscreenController fullscreen_controller_;
KeyboardLockController keyboard_lock_controller_;
MouseLockController mouse_lock_controller_;
-
- DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessManager);
};
#endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_
diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_test.h b/chrome/browser/ui/exclusive_access/exclusive_access_test.h
index c2836b8c..85b8056 100644
--- a/chrome/browser/ui/exclusive_access/exclusive_access_test.h
+++ b/chrome/browser/ui/exclusive_access/exclusive_access_test.h
@@ -35,6 +35,12 @@
class FullscreenNotificationObserver : public FullscreenObserver {
public:
explicit FullscreenNotificationObserver(Browser* browser);
+
+ FullscreenNotificationObserver(const FullscreenNotificationObserver&) =
+ delete;
+ FullscreenNotificationObserver& operator=(
+ const FullscreenNotificationObserver&) = delete;
+
~FullscreenNotificationObserver() override;
// Runs a loop until a fullscreen change is seen (unless one has already been
@@ -49,8 +55,6 @@
base::ScopedObservation<FullscreenController, FullscreenObserver>
observation_{this};
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(FullscreenNotificationObserver);
};
// Test fixture with convenience functions for fullscreen, keyboard lock, and
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.h b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
index dc5ac2c..6d7709d 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.h
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
@@ -53,6 +53,10 @@
class FullscreenController : public ExclusiveAccessControllerBase {
public:
explicit FullscreenController(ExclusiveAccessManager* manager);
+
+ FullscreenController(const FullscreenController&) = delete;
+ FullscreenController& operator=(const FullscreenController&) = delete;
+
~FullscreenController() override;
void AddObserver(FullscreenObserver* observer);
@@ -205,8 +209,6 @@
base::ObserverList<FullscreenObserver> observer_list_;
base::WeakPtrFactory<FullscreenController> ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FullscreenController);
};
#endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_H_
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc
index 07955a3..f955818 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc
@@ -33,6 +33,12 @@
public FullscreenControllerStateTest {
public:
FullscreenControllerStateInteractiveTest() = default;
+
+ FullscreenControllerStateInteractiveTest(
+ const FullscreenControllerStateInteractiveTest&) = delete;
+ FullscreenControllerStateInteractiveTest& operator=(
+ const FullscreenControllerStateInteractiveTest&) = delete;
+
~FullscreenControllerStateInteractiveTest() override = default;
// InProcessBrowserTest:
@@ -47,9 +53,6 @@
// FullscreenControllerStateTest:
Browser* GetBrowser() override { return InProcessBrowserTest::browser(); }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FullscreenControllerStateInteractiveTest);
};
// Soak tests ------------------------------------------------------------------
@@ -122,4 +125,3 @@
= new content::MessageLoopRunner();
message_loop->Run();
}
-
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.h b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.h
index 4f52b67..a4e88d3 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.h
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.h
@@ -64,6 +64,11 @@
static const int kMaxStateNameLength = 39;
FullscreenControllerStateTest();
+
+ FullscreenControllerStateTest(const FullscreenControllerStateTest&) = delete;
+ FullscreenControllerStateTest& operator=(
+ const FullscreenControllerStateTest&) = delete;
+
virtual ~FullscreenControllerStateTest();
static const char* GetStateString(State state);
@@ -196,8 +201,6 @@
// Log of operations reported on errors via GetAndClearDebugLog().
std::ostringstream debugging_log_;
-
- DISALLOW_COPY_AND_ASSIGN(FullscreenControllerStateTest);
};
#endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_STATE_TEST_H_
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_interactive_browsertest.cc b/chrome/browser/ui/exclusive_access/fullscreen_interactive_browsertest.cc
index 7e0334a9..5605958e 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_interactive_browsertest.cc
+++ b/chrome/browser/ui/exclusive_access/fullscreen_interactive_browsertest.cc
@@ -53,6 +53,12 @@
class FullscreenInteractiveBrowserTest : public InProcessBrowserTest {
public:
FullscreenInteractiveBrowserTest() {}
+
+ FullscreenInteractiveBrowserTest(const FullscreenInteractiveBrowserTest&) =
+ delete;
+ FullscreenInteractiveBrowserTest& operator=(
+ const FullscreenInteractiveBrowserTest&) = delete;
+
~FullscreenInteractiveBrowserTest() override {}
void SetUpOnMainThread() override {
@@ -63,9 +69,6 @@
ASSERT_TRUE(embedded_test_server()->Start());
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FullscreenInteractiveBrowserTest);
};
// TODO(jonross): Investigate the flakiness on Linux and Mac. Sheriff if this
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h b/chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h
index 4355213..4b22fc0 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h
+++ b/chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h
@@ -22,6 +22,10 @@
class FullscreenWithinTabHelper
: public content::WebContentsUserData<FullscreenWithinTabHelper> {
public:
+ FullscreenWithinTabHelper(const FullscreenWithinTabHelper&) = delete;
+ FullscreenWithinTabHelper& operator=(const FullscreenWithinTabHelper&) =
+ delete;
+
~FullscreenWithinTabHelper() override;
bool is_fullscreen_within_tab() const { return is_fullscreen_within_tab_; }
@@ -41,8 +45,6 @@
bool is_fullscreen_within_tab_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(FullscreenWithinTabHelper);
};
#endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_WITHIN_TAB_HELPER_H_
diff --git a/chrome/browser/ui/exclusive_access/keyboard_lock_controller.h b/chrome/browser/ui/exclusive_access/keyboard_lock_controller.h
index 2a2fa12..90a39d2 100644
--- a/chrome/browser/ui/exclusive_access/keyboard_lock_controller.h
+++ b/chrome/browser/ui/exclusive_access/keyboard_lock_controller.h
@@ -28,6 +28,10 @@
class KeyboardLockController : public ExclusiveAccessControllerBase {
public:
explicit KeyboardLockController(ExclusiveAccessManager* manager);
+
+ KeyboardLockController(const KeyboardLockController&) = delete;
+ KeyboardLockController& operator=(const KeyboardLockController&) = delete;
+
~KeyboardLockController() override;
// Requests KeyboardLock for |web_contents|, request is allowed if
@@ -103,8 +107,6 @@
const base::TickClock* esc_repeat_tick_clock_ = nullptr;
base::circular_deque<base::TimeTicks> esc_keypress_tracker_;
-
- DISALLOW_COPY_AND_ASSIGN(KeyboardLockController);
};
#endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_KEYBOARD_LOCK_CONTROLLER_H_
diff --git a/chrome/browser/ui/exclusive_access/mouse_lock_controller.h b/chrome/browser/ui/exclusive_access/mouse_lock_controller.h
index ca591edd..595c271 100644
--- a/chrome/browser/ui/exclusive_access/mouse_lock_controller.h
+++ b/chrome/browser/ui/exclusive_access/mouse_lock_controller.h
@@ -19,6 +19,10 @@
class MouseLockController : public ExclusiveAccessControllerBase {
public:
explicit MouseLockController(ExclusiveAccessManager* manager);
+
+ MouseLockController(const MouseLockController&) = delete;
+ MouseLockController& operator=(const MouseLockController&) = delete;
+
~MouseLockController() override;
// Returns true if the mouse is locked.
@@ -94,8 +98,6 @@
base::TimeTicks last_user_escape_time_;
base::WeakPtrFactory<MouseLockController> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MouseLockController);
};
#endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_MOUSE_LOCK_CONTROLLER_H_
diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc
index 188d17d..a578cf67 100644
--- a/chrome/browser/ui/extensions/application_launch.cc
+++ b/chrome/browser/ui/extensions/application_launch.cc
@@ -81,6 +81,9 @@
extension_id_(extension_id),
callback_(std::move(callback)) {}
+ EnableViaDialogFlow(const EnableViaDialogFlow&) = delete;
+ EnableViaDialogFlow& operator=(const EnableViaDialogFlow&) = delete;
+
~EnableViaDialogFlow() override {}
void Run() {
@@ -109,8 +112,6 @@
std::string extension_id_;
base::OnceClosure callback_;
std::unique_ptr<ExtensionEnableFlow> flow_;
-
- DISALLOW_COPY_AND_ASSIGN(EnableViaDialogFlow);
};
const Extension* GetExtension(Profile* profile,
diff --git a/chrome/browser/ui/extensions/blocked_action_bubble_delegate.h b/chrome/browser/ui/extensions/blocked_action_bubble_delegate.h
index e836ee1..7e414f6d 100644
--- a/chrome/browser/ui/extensions/blocked_action_bubble_delegate.h
+++ b/chrome/browser/ui/extensions/blocked_action_bubble_delegate.h
@@ -15,6 +15,11 @@
public:
BlockedActionBubbleDelegate(base::OnceCallback<void(CloseAction)> callback,
const std::string& extension_id);
+
+ BlockedActionBubbleDelegate(const BlockedActionBubbleDelegate&) = delete;
+ BlockedActionBubbleDelegate& operator=(const BlockedActionBubbleDelegate&) =
+ delete;
+
~BlockedActionBubbleDelegate() override;
private:
@@ -35,8 +40,6 @@
base::OnceCallback<void(CloseAction)> callback_;
std::string extension_id_;
-
- DISALLOW_COPY_AND_ASSIGN(BlockedActionBubbleDelegate);
};
#endif // CHROME_BROWSER_UI_EXTENSIONS_BLOCKED_ACTION_BUBBLE_DELEGATE_H_
diff --git a/chrome/browser/ui/extensions/extension_action_test_helper.h b/chrome/browser/ui/extensions/extension_action_test_helper.h
index bcdcfa3..dcfb54e 100644
--- a/chrome/browser/ui/extensions/extension_action_test_helper.h
+++ b/chrome/browser/ui/extensions/extension_action_test_helper.h
@@ -34,6 +34,10 @@
Browser* browser,
bool is_real_window = true);
+ ExtensionActionTestHelper(const ExtensionActionTestHelper&) = delete;
+ ExtensionActionTestHelper& operator=(const ExtensionActionTestHelper&) =
+ delete;
+
virtual ~ExtensionActionTestHelper() {}
// Returns the number of browser action buttons in the window toolbar.
@@ -114,9 +118,6 @@
protected:
ExtensionActionTestHelper() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ExtensionActionTestHelper);
};
#endif // CHROME_BROWSER_UI_EXTENSIONS_EXTENSION_ACTION_TEST_HELPER_H_
diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.h b/chrome/browser/ui/extensions/extension_action_view_controller.h
index 8d950624..53a5f7b 100644
--- a/chrome/browser/ui/extensions/extension_action_view_controller.h
+++ b/chrome/browser/ui/extensions/extension_action_view_controller.h
@@ -50,6 +50,10 @@
Browser* browser,
ExtensionsContainer* extensions_container);
+ ExtensionActionViewController(const ExtensionActionViewController&) = delete;
+ ExtensionActionViewController& operator=(
+ const ExtensionActionViewController&) = delete;
+
~ExtensionActionViewController() override;
// ToolbarActionViewController:
@@ -210,8 +214,6 @@
popup_host_observation_{this};
base::WeakPtrFactory<ExtensionActionViewController> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionActionViewController);
};
#endif // CHROME_BROWSER_UI_EXTENSIONS_EXTENSION_ACTION_VIEW_CONTROLLER_H_
diff --git a/chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc b/chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc
index bf173082..e2e2090 100644
--- a/chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc
+++ b/chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc
@@ -362,6 +362,12 @@
};
ExtensionActionViewControllerGrayscaleTest() {}
+
+ ExtensionActionViewControllerGrayscaleTest(
+ const ExtensionActionViewControllerGrayscaleTest&) = delete;
+ ExtensionActionViewControllerGrayscaleTest& operator=(
+ const ExtensionActionViewControllerGrayscaleTest&) = delete;
+
~ExtensionActionViewControllerGrayscaleTest() override = default;
void RunGrayscaleTest(PermissionType permission_type);
@@ -373,8 +379,6 @@
content::WebContents* web_contents,
scoped_refptr<const extensions::Extension> extensions,
PermissionType permission_type);
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionActionViewControllerGrayscaleTest);
};
void ExtensionActionViewControllerGrayscaleTest::RunGrayscaleTest(
diff --git a/chrome/browser/ui/extensions/extension_enable_flow.h b/chrome/browser/ui/extensions/extension_enable_flow.h
index c83c8cd..34a8b07 100644
--- a/chrome/browser/ui/extensions/extension_enable_flow.h
+++ b/chrome/browser/ui/extensions/extension_enable_flow.h
@@ -42,6 +42,10 @@
ExtensionEnableFlow(Profile* profile,
const std::string& extension_id,
ExtensionEnableFlowDelegate* delegate);
+
+ ExtensionEnableFlow(const ExtensionEnableFlow&) = delete;
+ ExtensionEnableFlow& operator=(const ExtensionEnableFlow&) = delete;
+
~ExtensionEnableFlow() override;
// Starts the flow and the logic continues on |delegate_| after enabling is
@@ -128,8 +132,6 @@
load_error_observation_{this};
base::WeakPtrFactory<ExtensionEnableFlow> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionEnableFlow);
};
#endif // CHROME_BROWSER_UI_EXTENSIONS_EXTENSION_ENABLE_FLOW_H_
diff --git a/chrome/browser/ui/extensions/extension_enable_flow_browsertest.cc b/chrome/browser/ui/extensions/extension_enable_flow_browsertest.cc
index 27de3a7..e543e8b8 100644
--- a/chrome/browser/ui/extensions/extension_enable_flow_browsertest.cc
+++ b/chrome/browser/ui/extensions/extension_enable_flow_browsertest.cc
@@ -25,6 +25,10 @@
public:
explicit TestManagementProvider(const extensions::ExtensionId& extension_id)
: extension_id_(extension_id) {}
+
+ TestManagementProvider(const TestManagementProvider&) = delete;
+ TestManagementProvider& operator=(const TestManagementProvider&) = delete;
+
~TestManagementProvider() override {}
// MananagementPolicy::Provider:
@@ -37,8 +41,6 @@
private:
const extensions::ExtensionId extension_id_;
-
- DISALLOW_COPY_AND_ASSIGN(TestManagementProvider);
};
} // namespace
diff --git a/chrome/browser/ui/extensions/extension_install_ui_default.h b/chrome/browser/ui/extensions/extension_install_ui_default.h
index db59905..11c5e05 100644
--- a/chrome/browser/ui/extensions/extension_install_ui_default.h
+++ b/chrome/browser/ui/extensions/extension_install_ui_default.h
@@ -19,6 +19,11 @@
class ExtensionInstallUIDefault : public extensions::ExtensionInstallUI {
public:
explicit ExtensionInstallUIDefault(content::BrowserContext* context);
+
+ ExtensionInstallUIDefault(const ExtensionInstallUIDefault&) = delete;
+ ExtensionInstallUIDefault& operator=(const ExtensionInstallUIDefault&) =
+ delete;
+
~ExtensionInstallUIDefault() override;
// ExtensionInstallUI:
@@ -46,8 +51,6 @@
// Whether to show an installed bubble on app install, or use the default
// action of opening a new tab page.
bool use_app_installed_bubble_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionInstallUIDefault);
};
#endif // CHROME_BROWSER_UI_EXTENSIONS_EXTENSION_INSTALL_UI_DEFAULT_H_
diff --git a/chrome/browser/ui/extensions/extension_message_bubble_bridge.h b/chrome/browser/ui/extensions/extension_message_bubble_bridge.h
index fe2740a..beb6f8a 100644
--- a/chrome/browser/ui/extensions/extension_message_bubble_bridge.h
+++ b/chrome/browser/ui/extensions/extension_message_bubble_bridge.h
@@ -21,6 +21,11 @@
public:
explicit ExtensionMessageBubbleBridge(
std::unique_ptr<extensions::ExtensionMessageBubbleController> controller);
+
+ ExtensionMessageBubbleBridge(const ExtensionMessageBubbleBridge&) = delete;
+ ExtensionMessageBubbleBridge& operator=(const ExtensionMessageBubbleBridge&) =
+ delete;
+
~ExtensionMessageBubbleBridge() override;
private:
@@ -40,8 +45,6 @@
void OnBubbleClosed(CloseAction action) override;
std::unique_ptr<extensions::ExtensionMessageBubbleController> controller_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleBridge);
};
#endif // CHROME_BROWSER_UI_EXTENSIONS_EXTENSION_MESSAGE_BUBBLE_BRIDGE_H_
diff --git a/chrome/browser/ui/extensions/extension_message_bubble_bridge_unittest.cc b/chrome/browser/ui/extensions/extension_message_bubble_bridge_unittest.cc
index 22fbb815..8930da0 100644
--- a/chrome/browser/ui/extensions/extension_message_bubble_bridge_unittest.cc
+++ b/chrome/browser/ui/extensions/extension_message_bubble_bridge_unittest.cc
@@ -52,6 +52,12 @@
: public extensions::ExtensionServiceTestWithInstall {
public:
ExtensionMessageBubbleBridgeUnitTest() {}
+
+ ExtensionMessageBubbleBridgeUnitTest(
+ const ExtensionMessageBubbleBridgeUnitTest&) = delete;
+ ExtensionMessageBubbleBridgeUnitTest& operator=(
+ const ExtensionMessageBubbleBridgeUnitTest&) = delete;
+
~ExtensionMessageBubbleBridgeUnitTest() override {}
Browser* browser() { return browser_.get(); }
@@ -78,8 +84,6 @@
std::unique_ptr<TestBrowserWindow> browser_window_;
std::unique_ptr<Browser> browser_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleBridgeUnitTest);
};
TEST_F(ExtensionMessageBubbleBridgeUnitTest,
diff --git a/chrome/browser/ui/extensions/extension_message_bubble_factory.h b/chrome/browser/ui/extensions/extension_message_bubble_factory.h
index e123cc9..b4ae19e 100644
--- a/chrome/browser/ui/extensions/extension_message_bubble_factory.h
+++ b/chrome/browser/ui/extensions/extension_message_bubble_factory.h
@@ -28,6 +28,11 @@
};
explicit ExtensionMessageBubbleFactory(Browser* browser);
+
+ ExtensionMessageBubbleFactory(const ExtensionMessageBubbleFactory&) = delete;
+ ExtensionMessageBubbleFactory& operator=(
+ const ExtensionMessageBubbleFactory&) = delete;
+
~ExtensionMessageBubbleFactory();
// Returns the controller for the bubble that should be shown, if any.
@@ -38,8 +43,6 @@
private:
Browser* const browser_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleFactory);
};
#endif // CHROME_BROWSER_UI_EXTENSIONS_EXTENSION_MESSAGE_BUBBLE_FACTORY_H_
diff --git a/chrome/browser/ui/extensions/hosted_app_browser_controller.h b/chrome/browser/ui/extensions/hosted_app_browser_controller.h
index e37f493..522904c 100644
--- a/chrome/browser/ui/extensions/hosted_app_browser_controller.h
+++ b/chrome/browser/ui/extensions/hosted_app_browser_controller.h
@@ -32,6 +32,11 @@
public ExtensionUninstallDialog::Delegate {
public:
explicit HostedAppBrowserController(Browser* browser);
+
+ HostedAppBrowserController(const HostedAppBrowserController&) = delete;
+ HostedAppBrowserController& operator=(const HostedAppBrowserController&) =
+ delete;
+
~HostedAppBrowserController() override;
// web_app::AppBrowserController:
@@ -73,7 +78,6 @@
std::unique_ptr<ExtensionUninstallDialog> uninstall_dialog_;
base::WeakPtrFactory<HostedAppBrowserController> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(HostedAppBrowserController);
};
} // namespace extensions
diff --git a/chrome/browser/ui/extensions/hosted_app_browsertest.cc b/chrome/browser/ui/extensions/hosted_app_browsertest.cc
index d1cc746..32a822e 100644
--- a/chrome/browser/ui/extensions/hosted_app_browsertest.cc
+++ b/chrome/browser/ui/extensions/hosted_app_browsertest.cc
@@ -180,6 +180,10 @@
scoped_feature_list_.InitAndDisableFeature(
predictors::kSpeculativePreconnectFeature);
}
+
+ HostedOrWebAppTest(const HostedOrWebAppTest&) = delete;
+ HostedOrWebAppTest& operator=(const HostedOrWebAppTest&) = delete;
+
~HostedOrWebAppTest() override = default;
void SetUp() override {
@@ -335,7 +339,6 @@
content::ContentMockCertVerifier cert_verifier_;
web_app::ScopedOsHooksSuppress os_hooks_suppress_;
- DISALLOW_COPY_AND_ASSIGN(HostedOrWebAppTest);
};
// Tests that "Open link in new tab" opens a link in a foreground tab.
@@ -738,6 +741,11 @@
class HostedAppProcessModelTest : public HostedOrWebAppTest {
public:
HostedAppProcessModelTest() = default;
+
+ HostedAppProcessModelTest(const HostedAppProcessModelTest&) = delete;
+ HostedAppProcessModelTest& operator=(const HostedAppProcessModelTest&) =
+ delete;
+
~HostedAppProcessModelTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -884,9 +892,6 @@
GURL isolated_url_;
GURL isolated_url_outside_app_;
GURL cross_site_url_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(HostedAppProcessModelTest);
};
// Tests that same-site iframes stay inside the hosted app process, even when
@@ -1987,6 +1992,11 @@
class HostedAppOriginIsolationTest : public HostedOrWebAppTest {
public:
HostedAppOriginIsolationTest() = default;
+
+ HostedAppOriginIsolationTest(const HostedAppOriginIsolationTest&) = delete;
+ HostedAppOriginIsolationTest& operator=(const HostedAppOriginIsolationTest&) =
+ delete;
+
~HostedAppOriginIsolationTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -2059,9 +2069,6 @@
web_contents->GetMainFrame()->GetLastCommittedOrigin());
// If we get here without a crash, the test has passed.
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(HostedAppOriginIsolationTest);
};
// This test case implements creis@'s repro case from
diff --git a/chrome/browser/ui/extensions/icon_with_badge_image_source.h b/chrome/browser/ui/extensions/icon_with_badge_image_source.h
index 0210f0df..7e03e5e 100644
--- a/chrome/browser/ui/extensions/icon_with_badge_image_source.h
+++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.h
@@ -26,17 +26,22 @@
Badge(const std::string& text,
SkColor text_color,
SkColor background_color);
+
+ Badge(const Badge&) = delete;
+ Badge& operator=(const Badge&) = delete;
+
~Badge();
std::string text;
SkColor text_color;
SkColor background_color;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Badge);
};
explicit IconWithBadgeImageSource(const gfx::Size& size);
+
+ IconWithBadgeImageSource(const IconWithBadgeImageSource&) = delete;
+ IconWithBadgeImageSource& operator=(const IconWithBadgeImageSource&) = delete;
+
~IconWithBadgeImageSource() override;
void SetIcon(const gfx::Image& icon);
@@ -91,8 +96,6 @@
// Whether or not to paint a decoration to indicate that the extension has
// had actions blocked.
bool paint_blocked_actions_decoration_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(IconWithBadgeImageSource);
};
#endif // CHROME_BROWSER_UI_EXTENSIONS_ICON_WITH_BADGE_IMAGE_SOURCE_H_
diff --git a/chrome/browser/ui/find_bar/find_bar_controller.h b/chrome/browser/ui/find_bar/find_bar_controller.h
index bc8d820..ec4d42a2 100644
--- a/chrome/browser/ui/find_bar/find_bar_controller.h
+++ b/chrome/browser/ui/find_bar/find_bar_controller.h
@@ -36,6 +36,9 @@
public:
explicit FindBarController(std::unique_ptr<FindBar> find_bar);
+ FindBarController(const FindBarController&) = delete;
+ FindBarController& operator=(const FindBarController&) = delete;
+
~FindBarController() override;
// Shows the find bar. Any previous search string will again be visible.
@@ -112,8 +115,6 @@
base::ScopedObservation<find_in_page::FindTabHelper,
find_in_page::FindResultObserver>
find_tab_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FindBarController);
};
#endif // CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_CONTROLLER_H_
diff --git a/chrome/browser/ui/find_bar/find_bar_platform_helper.h b/chrome/browser/ui/find_bar/find_bar_platform_helper.h
index 37e5148..ef7ba00 100644
--- a/chrome/browser/ui/find_bar/find_bar_platform_helper.h
+++ b/chrome/browser/ui/find_bar/find_bar_platform_helper.h
@@ -18,6 +18,9 @@
static std::unique_ptr<FindBarPlatformHelper> Create(
FindBarController* find_bar_controller);
+ FindBarPlatformHelper(const FindBarPlatformHelper&) = delete;
+ FindBarPlatformHelper& operator=(const FindBarPlatformHelper&) = delete;
+
virtual ~FindBarPlatformHelper();
// Called when the user changes the find text to |text|.
@@ -28,9 +31,6 @@
// Owns FindBarPlatformHelper.
FindBarController* const find_bar_controller_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FindBarPlatformHelper);
};
#endif // CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_PLATFORM_HELPER_H_
diff --git a/chrome/browser/ui/find_bar/find_bar_platform_helper_mac.mm b/chrome/browser/ui/find_bar/find_bar_platform_helper_mac.mm
index 901b806..3e19e08 100644
--- a/chrome/browser/ui/find_bar/find_bar_platform_helper_mac.mm
+++ b/chrome/browser/ui/find_bar/find_bar_platform_helper_mac.mm
@@ -36,6 +36,9 @@
UpdateFindBarControllerFromPasteboard();
}
+ FindBarPlatformHelperMac(const FindBarPlatformHelperMac&) = delete;
+ FindBarPlatformHelperMac& operator=(const FindBarPlatformHelperMac&) = delete;
+
~FindBarPlatformHelperMac() override {
[[NSNotificationCenter defaultCenter]
removeObserver:find_pasteboard_notification_observer_];
@@ -86,8 +89,6 @@
}
id find_pasteboard_notification_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(FindBarPlatformHelperMac);
};
} // namespace
diff --git a/chrome/browser/ui/find_bar/find_bar_platform_helper_mac_browsertest.mm b/chrome/browser/ui/find_bar/find_bar_platform_helper_mac_browsertest.mm
index 8f12078e..21185e42 100644
--- a/chrome/browser/ui/find_bar/find_bar_platform_helper_mac_browsertest.mm
+++ b/chrome/browser/ui/find_bar/find_bar_platform_helper_mac_browsertest.mm
@@ -38,6 +38,11 @@
class FindBarPlatformHelperMacTest : public InProcessBrowserTest {
public:
FindBarPlatformHelperMacTest() {}
+
+ FindBarPlatformHelperMacTest(const FindBarPlatformHelperMacTest&) = delete;
+ FindBarPlatformHelperMacTest& operator=(const FindBarPlatformHelperMacTest&) =
+ delete;
+
~FindBarPlatformHelperMacTest() override = default;
void SetUpOnMainThread() override {
@@ -52,8 +57,6 @@
private:
NSString* old_find_text_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(FindBarPlatformHelperMacTest);
};
// Tests that the find bar is populated with the pasteboard at construction.
diff --git a/chrome/browser/ui/find_bar/find_bar_platform_helper_mac_interactive_uitest.mm b/chrome/browser/ui/find_bar/find_bar_platform_helper_mac_interactive_uitest.mm
index 1ce4562..378dd1d2 100644
--- a/chrome/browser/ui/find_bar/find_bar_platform_helper_mac_interactive_uitest.mm
+++ b/chrome/browser/ui/find_bar/find_bar_platform_helper_mac_interactive_uitest.mm
@@ -37,6 +37,12 @@
class FindBarPlatformHelperMacInteractiveUITest : public InProcessBrowserTest {
public:
FindBarPlatformHelperMacInteractiveUITest() {}
+
+ FindBarPlatformHelperMacInteractiveUITest(
+ const FindBarPlatformHelperMacInteractiveUITest&) = delete;
+ FindBarPlatformHelperMacInteractiveUITest& operator=(
+ const FindBarPlatformHelperMacInteractiveUITest&) = delete;
+
~FindBarPlatformHelperMacInteractiveUITest() override = default;
void SetUpOnMainThread() override {
@@ -51,8 +57,6 @@
private:
NSString* old_find_text_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(FindBarPlatformHelperMacInteractiveUITest);
};
// Tests that the pasteboard is updated when the find bar is changed.
diff --git a/chrome/browser/ui/find_bar/find_bar_state.h b/chrome/browser/ui/find_bar/find_bar_state.h
index e734f4f3..be37bc1 100644
--- a/chrome/browser/ui/find_bar/find_bar_state.h
+++ b/chrome/browser/ui/find_bar/find_bar_state.h
@@ -23,6 +23,10 @@
public find_in_page::FindTabHelper::Delegate {
public:
explicit FindBarState(content::BrowserContext* browser_context);
+
+ FindBarState(const FindBarState&) = delete;
+ FindBarState& operator=(const FindBarState&) = delete;
+
~FindBarState() override;
// Creates a find_in_page::FindTabHelper for the given contents and sets the
@@ -36,8 +40,6 @@
private:
Profile* profile_;
std::u16string last_prepopulate_text_;
-
- DISALLOW_COPY_AND_ASSIGN(FindBarState);
};
#endif // CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_STATE_H_
diff --git a/chrome/browser/ui/fullscreen_keyboard_browsertest_base.h b/chrome/browser/ui/fullscreen_keyboard_browsertest_base.h
index 93f8173..fc0f8225 100644
--- a/chrome/browser/ui/fullscreen_keyboard_browsertest_base.h
+++ b/chrome/browser/ui/fullscreen_keyboard_browsertest_base.h
@@ -21,6 +21,12 @@
class FullscreenKeyboardBrowserTestBase : public InProcessBrowserTest {
public:
FullscreenKeyboardBrowserTestBase();
+
+ FullscreenKeyboardBrowserTestBase(const FullscreenKeyboardBrowserTestBase&) =
+ delete;
+ FullscreenKeyboardBrowserTestBase& operator=(
+ const FullscreenKeyboardBrowserTestBase&) = delete;
+
~FullscreenKeyboardBrowserTestBase() override;
protected:
@@ -124,8 +130,6 @@
// The expected output from the web page. This string is generated by
// appending key presses from Send* functions above.
std::string expected_result_;
-
- DISALLOW_COPY_AND_ASSIGN(FullscreenKeyboardBrowserTestBase);
};
#endif // CHROME_BROWSER_UI_FULLSCREEN_KEYBOARD_BROWSERTEST_BASE_H_
diff --git a/chrome/browser/ui/global_error/global_error.h b/chrome/browser/ui/global_error/global_error.h
index 5c4066a..fca56542 100644
--- a/chrome/browser/ui/global_error/global_error.h
+++ b/chrome/browser/ui/global_error/global_error.h
@@ -61,6 +61,11 @@
public base::SupportsWeakPtr<GlobalErrorWithStandardBubble> {
public:
GlobalErrorWithStandardBubble();
+
+ GlobalErrorWithStandardBubble(const GlobalErrorWithStandardBubble&) = delete;
+ GlobalErrorWithStandardBubble& operator=(
+ const GlobalErrorWithStandardBubble&) = delete;
+
~GlobalErrorWithStandardBubble() override;
// Override these methods to customize the contents of the error bubble:
@@ -94,8 +99,6 @@
private:
bool has_shown_bubble_view_ = false;
GlobalErrorBubbleViewBase* bubble_view_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(GlobalErrorWithStandardBubble);
};
#endif // CHROME_BROWSER_UI_GLOBAL_ERROR_GLOBAL_ERROR_H_
diff --git a/chrome/browser/ui/global_error/global_error_browsertest.cc b/chrome/browser/ui/global_error/global_error_browsertest.cc
index 283365bd..e8d27c3 100644
--- a/chrome/browser/ui/global_error/global_error_browsertest.cc
+++ b/chrome/browser/ui/global_error/global_error_browsertest.cc
@@ -89,6 +89,9 @@
scoped_observation_.Observe(service_);
}
+ GlobalErrorWaiter(const GlobalErrorWaiter&) = delete;
+ GlobalErrorWaiter& operator=(const GlobalErrorWaiter&) = delete;
+
~GlobalErrorWaiter() override = default;
// GlobalErrorObserver
@@ -104,8 +107,6 @@
GlobalErrorService* service_;
base::ScopedObservation<GlobalErrorService, GlobalErrorObserver>
scoped_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(GlobalErrorWaiter);
};
} // namespace
diff --git a/chrome/browser/ui/global_error/global_error_service.h b/chrome/browser/ui/global_error/global_error_service.h
index b2c7818..4fbd538 100644
--- a/chrome/browser/ui/global_error/global_error_service.h
+++ b/chrome/browser/ui/global_error/global_error_service.h
@@ -28,6 +28,10 @@
// Constructs a GlobalErrorService object.
GlobalErrorService();
+
+ GlobalErrorService(const GlobalErrorService&) = delete;
+ GlobalErrorService& operator=(const GlobalErrorService&) = delete;
+
~GlobalErrorService() override;
void AddObserver(GlobalErrorObserver* observer);
@@ -77,8 +81,6 @@
GlobalErrorList all_errors_;
std::map<GlobalError*, std::unique_ptr<GlobalError>> owned_errors_;
-
- DISALLOW_COPY_AND_ASSIGN(GlobalErrorService);
};
#endif // CHROME_BROWSER_UI_GLOBAL_ERROR_GLOBAL_ERROR_SERVICE_H_
diff --git a/chrome/browser/ui/global_error/global_error_service_unittest.cc b/chrome/browser/ui/global_error/global_error_service_unittest.cc
index 8b86e62a..aa1d6c2 100644
--- a/chrome/browser/ui/global_error/global_error_service_unittest.cc
+++ b/chrome/browser/ui/global_error/global_error_service_unittest.cc
@@ -17,6 +17,10 @@
class BaseError : public GlobalError {
public:
BaseError() { ++count_; }
+
+ BaseError(const BaseError&) = delete;
+ BaseError& operator=(const BaseError&) = delete;
+
~BaseError() override { --count_; }
static int count() { return count_; }
@@ -40,8 +44,6 @@
private:
// This tracks the number BaseError objects that are currently instantiated.
static int count_;
-
- DISALLOW_COPY_AND_ASSIGN(BaseError);
};
int BaseError::count_ = 0;
diff --git a/chrome/browser/ui/global_error/global_error_waiter.h b/chrome/browser/ui/global_error/global_error_waiter.h
index 81a4c5ae..97f82ade 100644
--- a/chrome/browser/ui/global_error/global_error_waiter.h
+++ b/chrome/browser/ui/global_error/global_error_waiter.h
@@ -20,6 +20,10 @@
class GlobalErrorWaiter : public GlobalErrorObserver {
public:
explicit GlobalErrorWaiter(Profile* profile);
+
+ GlobalErrorWaiter(const GlobalErrorWaiter&) = delete;
+ GlobalErrorWaiter& operator=(const GlobalErrorWaiter&) = delete;
+
~GlobalErrorWaiter() override;
// GlobalErrorObserver:
@@ -34,8 +38,6 @@
base::RunLoop run_loop_;
base::ScopedObservation<GlobalErrorService, GlobalErrorObserver>
scoped_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(GlobalErrorWaiter);
};
} // namespace test
diff --git a/chrome/browser/ui/global_media_controls/test_helper.h b/chrome/browser/ui/global_media_controls/test_helper.h
index e4f84c1..bfe74585 100644
--- a/chrome/browser/ui/global_media_controls/test_helper.h
+++ b/chrome/browser/ui/global_media_controls/test_helper.h
@@ -45,6 +45,10 @@
class MockMediaDialogDelegate : public MediaDialogDelegate {
public:
MockMediaDialogDelegate();
+
+ MockMediaDialogDelegate(const MockMediaDialogDelegate&) = delete;
+ MockMediaDialogDelegate& operator=(const MockMediaDialogDelegate&) = delete;
+
~MockMediaDialogDelegate() override;
void Open(MediaNotificationService* service);
@@ -65,8 +69,6 @@
private:
MediaNotificationService* service_;
-
- DISALLOW_COPY_AND_ASSIGN(MockMediaDialogDelegate);
};
class MockMediaItemsManager : public MediaItemsManager {
diff --git a/chrome/browser/ui/hats/hats_helper.h b/chrome/browser/ui/hats/hats_helper.h
index 63a1772c..e509f4e 100644
--- a/chrome/browser/ui/hats/hats_helper.h
+++ b/chrome/browser/ui/hats/hats_helper.h
@@ -20,6 +20,9 @@
class HatsHelper : public content::WebContentsObserver,
public content::WebContentsUserData<HatsHelper> {
public:
+ HatsHelper(const HatsHelper&) = delete;
+ HatsHelper& operator=(const HatsHelper&) = delete;
+
~HatsHelper() override;
private:
@@ -34,8 +37,6 @@
Profile* profile() const;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(HatsHelper);
};
#endif // CHROME_BROWSER_UI_HATS_HATS_HELPER_H_
diff --git a/chrome/browser/ui/hats/hats_service_browsertest.cc b/chrome/browser/ui/hats/hats_service_browsertest.cc
index 0b1f2a3..7549c62 100644
--- a/chrome/browser/ui/hats/hats_service_browsertest.cc
+++ b/chrome/browser/ui/hats/hats_service_browsertest.cc
@@ -57,6 +57,9 @@
&consent_);
}
+ ScopedSetMetricsConsent(const ScopedSetMetricsConsent&) = delete;
+ ScopedSetMetricsConsent& operator=(const ScopedSetMetricsConsent&) = delete;
+
~ScopedSetMetricsConsent() {
ChromeMetricsServiceAccessor::SetMetricsAndCrashReportingForTesting(
nullptr);
@@ -64,8 +67,6 @@
private:
const bool consent_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedSetMetricsConsent);
};
class HatsServiceBrowserTestBase : public InProcessBrowserTest {
diff --git a/chrome/browser/ui/hid/hid_chooser.h b/chrome/browser/ui/hid/hid_chooser.h
index 97e7096..d76e1673 100644
--- a/chrome/browser/ui/hid/hid_chooser.h
+++ b/chrome/browser/ui/hid/hid_chooser.h
@@ -13,12 +13,14 @@
class HidChooser : public content::HidChooser {
public:
explicit HidChooser(base::OnceClosure close_closure);
+
+ HidChooser(const HidChooser&) = delete;
+ HidChooser& operator=(const HidChooser&) = delete;
+
~HidChooser() override = default;
private:
base::ScopedClosureRunner closure_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(HidChooser);
};
#endif // CHROME_BROWSER_UI_HID_HID_CHOOSER_H_
diff --git a/chrome/browser/ui/hung_plugin_tab_helper.h b/chrome/browser/ui/hung_plugin_tab_helper.h
index d5bb5ca..d5e0e5b 100644
--- a/chrome/browser/ui/hung_plugin_tab_helper.h
+++ b/chrome/browser/ui/hung_plugin_tab_helper.h
@@ -36,6 +36,9 @@
public infobars::InfoBarManager::Observer,
public content::WebContentsUserData<HungPluginTabHelper> {
public:
+ HungPluginTabHelper(const HungPluginTabHelper&) = delete;
+ HungPluginTabHelper& operator=(const HungPluginTabHelper&) = delete;
+
~HungPluginTabHelper() override;
// content::WebContentsObserver:
@@ -74,8 +77,6 @@
infobar_observations_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(HungPluginTabHelper);
};
#endif // CHROME_BROWSER_UI_HUNG_PLUGIN_TAB_HELPER_H_
diff --git a/chrome/browser/ui/hung_renderer/hung_renderer_interactive_uitest.cc b/chrome/browser/ui/hung_renderer/hung_renderer_interactive_uitest.cc
index 028cbc93..82e2ff3 100644
--- a/chrome/browser/ui/hung_renderer/hung_renderer_interactive_uitest.cc
+++ b/chrome/browser/ui/hung_renderer/hung_renderer_interactive_uitest.cc
@@ -21,15 +21,17 @@
class HungRendererNavigationTest : public InProcessBrowserTest {
public:
HungRendererNavigationTest() {}
+
+ HungRendererNavigationTest(const HungRendererNavigationTest&) = delete;
+ HungRendererNavigationTest& operator=(const HungRendererNavigationTest&) =
+ delete;
+
~HungRendererNavigationTest() override {}
protected:
void SetUpOnMainThread() override {
host_resolver()->AddRule("*", "127.0.0.1");
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(HungRendererNavigationTest);
};
// Verify that a cross-process navigation will dismiss the hung renderer
diff --git a/chrome/browser/ui/intent_picker_tab_helper.h b/chrome/browser/ui/intent_picker_tab_helper.h
index 2108c9e..f7cf5465 100644
--- a/chrome/browser/ui/intent_picker_tab_helper.h
+++ b/chrome/browser/ui/intent_picker_tab_helper.h
@@ -25,6 +25,9 @@
public content::WebContentsUserData<IntentPickerTabHelper>,
public web_app::AppRegistrarObserver {
public:
+ IntentPickerTabHelper(const IntentPickerTabHelper&) = delete;
+ IntentPickerTabHelper& operator=(const IntentPickerTabHelper&) = delete;
+
~IntentPickerTabHelper() override;
static void SetShouldShowIcon(content::WebContents* web_contents,
@@ -71,8 +74,6 @@
registrar_observation_{this};
base::WeakPtrFactory<IntentPickerTabHelper> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(IntentPickerTabHelper);
};
#endif // CHROME_BROWSER_UI_INTENT_PICKER_TAB_HELPER_H_
diff --git a/chrome/browser/ui/interventions/framebust_block_message_delegate.h b/chrome/browser/ui/interventions/framebust_block_message_delegate.h
index decf30d..b6278d2 100644
--- a/chrome/browser/ui/interventions/framebust_block_message_delegate.h
+++ b/chrome/browser/ui/interventions/framebust_block_message_delegate.h
@@ -38,6 +38,11 @@
FramebustBlockMessageDelegate(content::WebContents* web_contents,
const GURL& blocked_url,
OutcomeCallback intervention_callback);
+
+ FramebustBlockMessageDelegate(const FramebustBlockMessageDelegate&) = delete;
+ FramebustBlockMessageDelegate& operator=(
+ const FramebustBlockMessageDelegate&) = delete;
+
~FramebustBlockMessageDelegate() override;
const GURL& GetBlockedUrl() const;
@@ -59,8 +64,6 @@
// The URL that was the redirection target in the blocked framebust attempt.
const GURL blocked_url_;
-
- DISALLOW_COPY_AND_ASSIGN(FramebustBlockMessageDelegate);
};
#endif // CHROME_BROWSER_UI_INTERVENTIONS_FRAMEBUST_BLOCK_MESSAGE_DELEGATE_H_
diff --git a/chrome/browser/ui/interventions/intervention_infobar_delegate.h b/chrome/browser/ui/interventions/intervention_infobar_delegate.h
index 52f7ff0..316ff2c 100644
--- a/chrome/browser/ui/interventions/intervention_infobar_delegate.h
+++ b/chrome/browser/ui/interventions/intervention_infobar_delegate.h
@@ -21,6 +21,11 @@
InterventionInfoBarDelegate(
infobars::InfoBarDelegate::InfoBarIdentifier identifier,
InterventionDelegate* intervention_delegate);
+
+ InterventionInfoBarDelegate(const InterventionInfoBarDelegate&) = delete;
+ InterventionInfoBarDelegate& operator=(const InterventionInfoBarDelegate&) =
+ delete;
+
~InterventionInfoBarDelegate() override;
// infobars::InfoBarDelegate:
@@ -33,8 +38,6 @@
// Weak pointer, the delegate is guaranteed to outlive this object.
InterventionDelegate* intervention_delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(InterventionInfoBarDelegate);
};
#endif // CHROME_BROWSER_UI_INTERVENTIONS_INTERVENTION_INFOBAR_DELEGATE_H_
diff --git a/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.h b/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.h
index 05bb128..450f2b72 100644
--- a/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.h
+++ b/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.h
@@ -20,6 +20,12 @@
public:
explicit JavaScriptTabModalDialogManagerDelegateDesktop(
content::WebContents* web_contents);
+
+ JavaScriptTabModalDialogManagerDelegateDesktop(
+ const JavaScriptTabModalDialogManagerDelegateDesktop&) = delete;
+ JavaScriptTabModalDialogManagerDelegateDesktop& operator=(
+ const JavaScriptTabModalDialogManagerDelegateDesktop&) = delete;
+
~JavaScriptTabModalDialogManagerDelegateDesktop() override;
// javascript_dialogs::TabModalDialogManagerDelegate
@@ -70,8 +76,6 @@
// be different from the WebContents that requested the dialog, such as with
// Chrome app <webview>s.
content::WebContents* web_contents_;
-
- DISALLOW_COPY_AND_ASSIGN(JavaScriptTabModalDialogManagerDelegateDesktop);
};
#endif // CHROME_BROWSER_UI_JAVASCRIPT_DIALOGS_JAVASCRIPT_TAB_MODAL_DIALOG_MANAGER_DELEGATE_DESKTOP_H_
diff --git a/chrome/browser/ui/keyboard_lock_interactive_browsertest.cc b/chrome/browser/ui/keyboard_lock_interactive_browsertest.cc
index 79371afe..dace6a2 100644
--- a/chrome/browser/ui/keyboard_lock_interactive_browsertest.cc
+++ b/chrome/browser/ui/keyboard_lock_interactive_browsertest.cc
@@ -81,6 +81,12 @@
: public FullscreenKeyboardBrowserTestBase {
public:
KeyboardLockInteractiveBrowserTest();
+
+ KeyboardLockInteractiveBrowserTest(
+ const KeyboardLockInteractiveBrowserTest&) = delete;
+ KeyboardLockInteractiveBrowserTest& operator=(
+ const KeyboardLockInteractiveBrowserTest&) = delete;
+
~KeyboardLockInteractiveBrowserTest() override;
// FullscreenKeyboardBrowserTestBase implementation.
@@ -114,8 +120,6 @@
#if defined(OS_MAC)
ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(KeyboardLockInteractiveBrowserTest);
};
KeyboardLockInteractiveBrowserTest::KeyboardLockInteractiveBrowserTest()
diff --git a/chrome/browser/ui/login/login_handler_test_utils.h b/chrome/browser/ui/login/login_handler_test_utils.h
index bf277a0..4a23ee9a 100644
--- a/chrome/browser/ui/login/login_handler_test_utils.h
+++ b/chrome/browser/ui/login/login_handler_test_utils.h
@@ -20,6 +20,12 @@
class LoginPromptBrowserTestObserver : public content::NotificationObserver {
public:
LoginPromptBrowserTestObserver();
+
+ LoginPromptBrowserTestObserver(const LoginPromptBrowserTestObserver&) =
+ delete;
+ LoginPromptBrowserTestObserver& operator=(
+ const LoginPromptBrowserTestObserver&) = delete;
+
~LoginPromptBrowserTestObserver() override;
void Observe(int type,
@@ -52,8 +58,6 @@
private:
content::NotificationRegistrar registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(LoginPromptBrowserTestObserver);
};
template <int T>
diff --git a/chrome/browser/ui/login/login_handler_unittest.cc b/chrome/browser/ui/login/login_handler_unittest.cc
index f9bf5f9..0ed15cc 100644
--- a/chrome/browser/ui/login/login_handler_unittest.cc
+++ b/chrome/browser/ui/login/login_handler_unittest.cc
@@ -117,10 +117,13 @@
class LoginHandlerWithWebContentsTest : public ChromeRenderViewHostTestHarness {
public:
LoginHandlerWithWebContentsTest() {}
- ~LoginHandlerWithWebContentsTest() override {}
- private:
- DISALLOW_COPY_AND_ASSIGN(LoginHandlerWithWebContentsTest);
+ LoginHandlerWithWebContentsTest(const LoginHandlerWithWebContentsTest&) =
+ delete;
+ LoginHandlerWithWebContentsTest& operator=(
+ const LoginHandlerWithWebContentsTest&) = delete;
+
+ ~LoginHandlerWithWebContentsTest() override {}
};
} // namespace
diff --git a/chrome/browser/ui/login/login_tab_helper.h b/chrome/browser/ui/login/login_tab_helper.h
index 336daf6..d19a556 100644
--- a/chrome/browser/ui/login/login_tab_helper.h
+++ b/chrome/browser/ui/login/login_tab_helper.h
@@ -28,6 +28,9 @@
class LoginTabHelper : public content::WebContentsObserver,
public content::WebContentsUserData<LoginTabHelper> {
public:
+ LoginTabHelper(const LoginTabHelper&) = delete;
+ LoginTabHelper& operator=(const LoginTabHelper&) = delete;
+
~LoginTabHelper() override;
std::unique_ptr<content::LoginDelegate> CreateAndStartMainFrameLoginDelegate(
@@ -120,8 +123,6 @@
base::WeakPtrFactory<LoginTabHelper> weak_ptr_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(LoginTabHelper);
};
#endif // CHROME_BROWSER_UI_LOGIN_LOGIN_TAB_HELPER_H_
diff --git a/chrome/browser/ui/managed_ui_browsertest.cc b/chrome/browser/ui/managed_ui_browsertest.cc
index c750976a..d5fad55 100644
--- a/chrome/browser/ui/managed_ui_browsertest.cc
+++ b/chrome/browser/ui/managed_ui_browsertest.cc
@@ -26,6 +26,10 @@
class ManagedUiTest : public InProcessBrowserTest {
public:
ManagedUiTest() = default;
+
+ ManagedUiTest(const ManagedUiTest&) = delete;
+ ManagedUiTest& operator=(const ManagedUiTest&) = delete;
+
~ManagedUiTest() override = default;
void SetUpInProcessBrowserTestFixture() override {
@@ -39,8 +43,6 @@
private:
testing::NiceMock<policy::MockConfigurationPolicyProvider> provider_;
-
- DISALLOW_COPY_AND_ASSIGN(ManagedUiTest);
};
IN_PROC_BROWSER_TEST_F(ManagedUiTest, ShouldDisplayManagedUiNoPolicies) {
diff --git a/chrome/browser/ui/media_router/cast_modes_with_media_sources.h b/chrome/browser/ui/media_router/cast_modes_with_media_sources.h
index 3db06a5..26650c77 100644
--- a/chrome/browser/ui/media_router/cast_modes_with_media_sources.h
+++ b/chrome/browser/ui/media_router/cast_modes_with_media_sources.h
@@ -22,6 +22,11 @@
public:
explicit CastModesWithMediaSources(const MediaSink& sink);
CastModesWithMediaSources(CastModesWithMediaSources&& other);
+
+ CastModesWithMediaSources(const CastModesWithMediaSources&) = delete;
+ CastModesWithMediaSources& operator=(const CastModesWithMediaSources&) =
+ delete;
+
~CastModesWithMediaSources();
const MediaSink& sink() const { return sink_; }
@@ -47,8 +52,6 @@
MediaSink sink_;
std::map<MediaCastMode, std::unordered_set<MediaSource, MediaSource::Hash>>
cast_modes_;
-
- DISALLOW_COPY_AND_ASSIGN(CastModesWithMediaSources);
};
} // namespace media_router
diff --git a/chrome/browser/ui/media_router/media_router_ui.h b/chrome/browser/ui/media_router/media_router_ui.h
index 2e1a22b..01a92e0 100644
--- a/chrome/browser/ui/media_router/media_router_ui.h
+++ b/chrome/browser/ui/media_router/media_router_ui.h
@@ -57,6 +57,10 @@
public MediaRouterFileDialog::MediaRouterFileDialogDelegate {
public:
explicit MediaRouterUI(content::WebContents* initiator);
+
+ MediaRouterUI(const MediaRouterUI&) = delete;
+ MediaRouterUI& operator=(const MediaRouterUI&) = delete;
+
~MediaRouterUI() override;
// CastDialogController:
@@ -177,6 +181,10 @@
class UiIssuesObserver : public IssuesObserver {
public:
UiIssuesObserver(IssueManager* issue_manager, MediaRouterUI* ui);
+
+ UiIssuesObserver(const UiIssuesObserver&) = delete;
+ UiIssuesObserver& operator=(const UiIssuesObserver&) = delete;
+
~UiIssuesObserver() override;
// IssuesObserver:
@@ -186,8 +194,6 @@
private:
// Reference back to the owning MediaRouterUI instance.
MediaRouterUI* const ui_;
-
- DISALLOW_COPY_AND_ASSIGN(UiIssuesObserver);
};
class UIMediaRoutesObserver : public MediaRoutesObserver {
@@ -198,6 +204,10 @@
UIMediaRoutesObserver(MediaRouter* router,
const MediaSource::Id& source_id,
const RoutesUpdatedCallback& callback);
+
+ UIMediaRoutesObserver(const UIMediaRoutesObserver&) = delete;
+ UIMediaRoutesObserver& operator=(const UIMediaRoutesObserver&) = delete;
+
~UIMediaRoutesObserver() override;
// MediaRoutesObserver:
@@ -208,8 +218,6 @@
private:
// Callback to the owning MediaRouterUI instance.
RoutesUpdatedCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(UIMediaRoutesObserver);
};
std::vector<MediaSource> GetSourcesForCastMode(MediaCastMode cast_mode) const;
@@ -423,8 +431,6 @@
// NOTE: Weak pointers must be invalidated before all other member variables.
// Therefore |weak_factory_| must be placed at the end.
base::WeakPtrFactory<MediaRouterUI> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MediaRouterUI);
};
} // namespace media_router
diff --git a/chrome/browser/ui/media_router/media_router_ui_service.h b/chrome/browser/ui/media_router/media_router_ui_service.h
index 0833467..2e6487cb 100644
--- a/chrome/browser/ui/media_router/media_router_ui_service.h
+++ b/chrome/browser/ui/media_router/media_router_ui_service.h
@@ -29,6 +29,10 @@
MediaRouterUIService(
Profile* profile,
std::unique_ptr<MediaRouterActionController> action_controller);
+
+ MediaRouterUIService(const MediaRouterUIService&) = delete;
+ MediaRouterUIService& operator=(const MediaRouterUIService&) = delete;
+
~MediaRouterUIService() override;
// KeyedService:
@@ -52,8 +56,6 @@
std::unique_ptr<PrefChangeRegistrar> profile_pref_registrar_;
base::ObserverList<Observer>::Unchecked observers_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaRouterUIService);
};
} // namespace media_router
diff --git a/chrome/browser/ui/media_router/presentation_receiver_window_controller.h b/chrome/browser/ui/media_router/presentation_receiver_window_controller.h
index 058ec72..45cd02e 100644
--- a/chrome/browser/ui/media_router/presentation_receiver_window_controller.h
+++ b/chrome/browser/ui/media_router/presentation_receiver_window_controller.h
@@ -49,6 +49,11 @@
base::OnceClosure termination_callback,
TitleChangeCallback title_change_callback);
+ PresentationReceiverWindowController(
+ const PresentationReceiverWindowController&) = delete;
+ PresentationReceiverWindowController& operator=(
+ const PresentationReceiverWindowController&) = delete;
+
~PresentationReceiverWindowController() final;
// WiredDisplayPresentationReceiver overrides.
@@ -117,8 +122,6 @@
TitleChangeCallback title_change_callback_;
media_router::PresentationNavigationPolicy navigation_policy_;
-
- DISALLOW_COPY_AND_ASSIGN(PresentationReceiverWindowController);
};
#endif // CHROME_BROWSER_UI_MEDIA_ROUTER_PRESENTATION_RECEIVER_WINDOW_CONTROLLER_H_
diff --git a/chrome/browser/ui/media_router/query_result_manager.h b/chrome/browser/ui/media_router/query_result_manager.h
index efd38d3..0511c82 100644
--- a/chrome/browser/ui/media_router/query_result_manager.h
+++ b/chrome/browser/ui/media_router/query_result_manager.h
@@ -73,6 +73,10 @@
};
explicit QueryResultManager(MediaRouter* media_router);
+
+ QueryResultManager(const QueryResultManager&) = delete;
+ QueryResultManager& operator=(const QueryResultManager&) = delete;
+
~QueryResultManager();
// Adds/removes an observer that is notified with query results.
@@ -184,8 +188,6 @@
// Not owned by this object.
MediaRouter* const router_;
-
- DISALLOW_COPY_AND_ASSIGN(QueryResultManager);
};
} // namespace media_router
diff --git a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h
index 54c1f3f..4ace59b 100644
--- a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h
+++ b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h
@@ -25,6 +25,10 @@
// to the infobar manager for |web_contents|.
class AlternateNavInfoBarDelegate : public infobars::InfoBarDelegate {
public:
+ AlternateNavInfoBarDelegate(const AlternateNavInfoBarDelegate&) = delete;
+ AlternateNavInfoBarDelegate& operator=(const AlternateNavInfoBarDelegate&) =
+ delete;
+
~AlternateNavInfoBarDelegate() override;
// Creates the delegate for omnibox navigations that have suggested URLs.
@@ -70,8 +74,6 @@
// navigation link, this will be removed from history.
// For search navigations this is the search URL.
const GURL original_url_;
-
- DISALLOW_COPY_AND_ASSIGN(AlternateNavInfoBarDelegate);
};
#endif // CHROME_BROWSER_UI_OMNIBOX_ALTERNATE_NAV_INFOBAR_DELEGATE_H_
diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_client.h b/chrome/browser/ui/omnibox/chrome_omnibox_client.h
index 014d2fe0..c768428 100644
--- a/chrome/browser/ui/omnibox/chrome_omnibox_client.h
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.h
@@ -26,6 +26,10 @@
class ChromeOmniboxClient : public OmniboxClient {
public:
ChromeOmniboxClient(OmniboxEditController* controller, Profile* profile);
+
+ ChromeOmniboxClient(const ChromeOmniboxClient&) = delete;
+ ChromeOmniboxClient& operator=(const ChromeOmniboxClient&) = delete;
+
~ChromeOmniboxClient() override;
// OmniboxClient.
@@ -111,8 +115,6 @@
FaviconCache favicon_cache_;
base::WeakPtrFactory<ChromeOmniboxClient> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeOmniboxClient);
};
#endif // CHROME_BROWSER_UI_OMNIBOX_CHROME_OMNIBOX_CLIENT_H_
diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
index 75184c38..da355d50 100644
--- a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
@@ -62,6 +62,12 @@
const std::u16string& text,
const AutocompleteMatch& match,
const AutocompleteMatch& alternate_nav_match);
+
+ ChromeOmniboxNavigationObserver(const ChromeOmniboxNavigationObserver&) =
+ delete;
+ ChromeOmniboxNavigationObserver& operator=(
+ const ChromeOmniboxNavigationObserver&) = delete;
+
~ChromeOmniboxNavigationObserver() override;
LoadState load_state() const { return load_state_; }
@@ -143,8 +149,6 @@
FetchState fetch_state_;
content::NotificationRegistrar registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeOmniboxNavigationObserver);
};
#endif // CHROME_BROWSER_UI_OMNIBOX_CHROME_OMNIBOX_NAVIGATION_OBSERVER_H_
diff --git a/chrome/browser/ui/page_info/permission_menu_model.h b/chrome/browser/ui/page_info/permission_menu_model.h
index 2f075d7..a97fd48 100644
--- a/chrome/browser/ui/page_info/permission_menu_model.h
+++ b/chrome/browser/ui/page_info/permission_menu_model.h
@@ -24,6 +24,10 @@
PermissionMenuModel(ChromePageInfoUiDelegate* delegate,
const PageInfo::PermissionInfo& info,
ChangeCallback callback);
+
+ PermissionMenuModel(const PermissionMenuModel&) = delete;
+ PermissionMenuModel& operator=(const PermissionMenuModel&) = delete;
+
~PermissionMenuModel() override;
// Overridden from ui::SimpleMenuModel::Delegate:
@@ -37,8 +41,6 @@
// Callback to be called when the permission's setting is changed.
ChangeCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(PermissionMenuModel);
};
#endif // CHROME_BROWSER_UI_PAGE_INFO_PERMISSION_MENU_MODEL_H_
diff --git a/chrome/browser/ui/passwords/account_avatar_fetcher.h b/chrome/browser/ui/passwords/account_avatar_fetcher.h
index f70f969..26caf56 100644
--- a/chrome/browser/ui/passwords/account_avatar_fetcher.h
+++ b/chrome/browser/ui/passwords/account_avatar_fetcher.h
@@ -33,6 +33,9 @@
const GURL& url,
const base::WeakPtr<AccountAvatarFetcherDelegate>& delegate);
+ AccountAvatarFetcher(const AccountAvatarFetcher&) = delete;
+ AccountAvatarFetcher& operator=(const AccountAvatarFetcher&) = delete;
+
~AccountAvatarFetcher() override;
void Start(network::mojom::URLLoaderFactory* loader_factory);
@@ -43,8 +46,6 @@
BitmapFetcher fetcher_;
base::WeakPtr<AccountAvatarFetcherDelegate> delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(AccountAvatarFetcher);
};
#endif // CHROME_BROWSER_UI_PASSWORDS_ACCOUNT_AVATAR_FETCHER_H_
diff --git a/chrome/browser/ui/passwords/credential_leak_dialog_controller_impl.h b/chrome/browser/ui/passwords/credential_leak_dialog_controller_impl.h
index a0a76349..d435ad9 100644
--- a/chrome/browser/ui/passwords/credential_leak_dialog_controller_impl.h
+++ b/chrome/browser/ui/passwords/credential_leak_dialog_controller_impl.h
@@ -20,6 +20,12 @@
CredentialLeakDialogControllerImpl(
PasswordsLeakDialogDelegate* delegate,
password_manager::CredentialLeakType leak_type);
+
+ CredentialLeakDialogControllerImpl(
+ const CredentialLeakDialogControllerImpl&) = delete;
+ CredentialLeakDialogControllerImpl& operator=(
+ const CredentialLeakDialogControllerImpl&) = delete;
+
~CredentialLeakDialogControllerImpl() override;
// Pop up the credential leak dialog.
@@ -44,8 +50,6 @@
CredentialLeakPrompt* credential_leak_dialog_ = nullptr;
PasswordsLeakDialogDelegate* delegate_;
const password_manager::CredentialLeakType leak_type_;
-
- DISALLOW_COPY_AND_ASSIGN(CredentialLeakDialogControllerImpl);
};
#endif // CHROME_BROWSER_UI_PASSWORDS_CREDENTIAL_LEAK_DIALOG_CONTROLLER_IMPL_H_
diff --git a/chrome/browser/ui/passwords/credential_manager_dialog_controller_impl.h b/chrome/browser/ui/passwords/credential_manager_dialog_controller_impl.h
index 4e6c8c01..2215df8 100644
--- a/chrome/browser/ui/passwords/credential_manager_dialog_controller_impl.h
+++ b/chrome/browser/ui/passwords/credential_manager_dialog_controller_impl.h
@@ -23,6 +23,12 @@
public:
CredentialManagerDialogControllerImpl(Profile* profile,
PasswordsModelDelegate* delegate);
+
+ CredentialManagerDialogControllerImpl(
+ const CredentialManagerDialogControllerImpl&) = delete;
+ CredentialManagerDialogControllerImpl& operator=(
+ const CredentialManagerDialogControllerImpl&) = delete;
+
~CredentialManagerDialogControllerImpl() override;
// Pop up the account chooser dialog.
@@ -57,8 +63,6 @@
AutoSigninFirstRunPrompt* autosignin_dialog_;
std::vector<std::unique_ptr<password_manager::PasswordForm>>
local_credentials_;
-
- DISALLOW_COPY_AND_ASSIGN(CredentialManagerDialogControllerImpl);
};
#endif // CHROME_BROWSER_UI_PASSWORDS_CREDENTIAL_MANAGER_DIALOG_CONTROLLER_IMPL_H_
diff --git a/chrome/browser/ui/passwords/credential_manager_dialog_controller_mock.h b/chrome/browser/ui/passwords/credential_manager_dialog_controller_mock.h
index 2acbbb5..66140e4 100644
--- a/chrome/browser/ui/passwords/credential_manager_dialog_controller_mock.h
+++ b/chrome/browser/ui/passwords/credential_manager_dialog_controller_mock.h
@@ -13,6 +13,12 @@
: public CredentialManagerDialogController {
public:
CredentialManagerDialogControllerMock();
+
+ CredentialManagerDialogControllerMock(
+ const CredentialManagerDialogControllerMock&) = delete;
+ CredentialManagerDialogControllerMock& operator=(
+ const CredentialManagerDialogControllerMock&) = delete;
+
~CredentialManagerDialogControllerMock() override;
MOCK_CONST_METHOD0(GetLocalForms, const FormsVector&());
@@ -29,9 +35,6 @@
MOCK_METHOD0(OnAutoSigninOK, void());
MOCK_METHOD0(OnAutoSigninTurnOff, void());
MOCK_METHOD0(OnCloseDialog, void());
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CredentialManagerDialogControllerMock);
};
#endif // CHROME_BROWSER_UI_PASSWORDS_CREDENTIAL_MANAGER_DIALOG_CONTROLLER_MOCK_H_
diff --git a/chrome/browser/ui/passwords/manage_passwords_state.h b/chrome/browser/ui/passwords/manage_passwords_state.h
index f48212e..bd8dce7 100644
--- a/chrome/browser/ui/passwords/manage_passwords_state.h
+++ b/chrome/browser/ui/passwords/manage_passwords_state.h
@@ -29,6 +29,10 @@
base::OnceCallback<void(const password_manager::PasswordForm*)>;
ManagePasswordsState();
+
+ ManagePasswordsState(const ManagePasswordsState&) = delete;
+ ManagePasswordsState& operator=(const ManagePasswordsState&) = delete;
+
~ManagePasswordsState();
// The embedder of this class has to set the client for logging.
@@ -164,8 +168,6 @@
// Whether the last attempt to authenticate to opt-in using password account
// storage failed.
bool auth_for_account_storage_opt_in_failed_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ManagePasswordsState);
};
#endif // CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_STATE_H_
diff --git a/chrome/browser/ui/passwords/manage_passwords_test.h b/chrome/browser/ui/passwords/manage_passwords_test.h
index 9dbeeb7..c8341d1b 100644
--- a/chrome/browser/ui/passwords/manage_passwords_test.h
+++ b/chrome/browser/ui/passwords/manage_passwords_test.h
@@ -28,6 +28,10 @@
class ManagePasswordsTest : public IdentityBrowserTestBase {
public:
ManagePasswordsTest();
+
+ ManagePasswordsTest(const ManagePasswordsTest&) = delete;
+ ManagePasswordsTest& operator=(const ManagePasswordsTest&) = delete;
+
~ManagePasswordsTest() override;
// InProcessBrowserTest:
@@ -85,8 +89,6 @@
password_manager::FakeFormFetcher fetcher_;
base::CallbackListSubscription create_services_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(ManagePasswordsTest);
};
#endif // CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_TEST_H_
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller.h b/chrome/browser/ui/passwords/manage_passwords_ui_controller.h
index 62eb366c..abbe83e 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller.h
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller.h
@@ -57,6 +57,10 @@
public PasswordsModelDelegate,
public PasswordsClientUIDelegate {
public:
+ ManagePasswordsUIController(const ManagePasswordsUIController&) = delete;
+ ManagePasswordsUIController& operator=(const ManagePasswordsUIController&) =
+ delete;
+
~ManagePasswordsUIController() override;
#if defined(UNIT_TEST)
@@ -353,8 +357,6 @@
base::WeakPtrFactory<ManagePasswordsUIController> weak_ptr_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(ManagePasswordsUIController);
};
#endif // CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_UI_CONTROLLER_H_
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h b/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h
index a72dffc..51f9a03 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h
@@ -17,6 +17,12 @@
public:
explicit ManagePasswordsUIControllerMock(
content::WebContents* contents);
+
+ ManagePasswordsUIControllerMock(const ManagePasswordsUIControllerMock&) =
+ delete;
+ ManagePasswordsUIControllerMock& operator=(
+ const ManagePasswordsUIControllerMock&) = delete;
+
~ManagePasswordsUIControllerMock() override;
MOCK_CONST_METHOD0(GetOrigin, url::Origin());
@@ -44,9 +50,6 @@
void(password_manager::ManagePasswordsReferrer));
MOCK_METHOD0(NavigateToChromeSignIn, void());
MOCK_METHOD0(OnDialogHidden, void());
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ManagePasswordsUIControllerMock);
};
#endif // CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_UI_CONTROLLER_MOCK_H_
diff --git a/chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc
index ce63845d..e8beb2e 100644
--- a/chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc
@@ -33,6 +33,9 @@
bundle_(GetOrCreateSharedInstance()),
app_locale_(g_browser_process->GetApplicationLocale()) {}
+ ScopedResourceOverride(const ScopedResourceOverride&) = delete;
+ ScopedResourceOverride& operator=(const ScopedResourceOverride&) = delete;
+
~ScopedResourceOverride() {
if (had_shared_instance_) {
// Reloading the resources will discard all overrides.
@@ -59,8 +62,6 @@
const bool had_shared_instance_; // Was there a shared bundle before?
ui::ResourceBundle& bundle_; // The shared bundle.
const std::string app_locale_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedResourceOverride);
};
const struct {
diff --git a/chrome/browser/ui/passwords/password_base_dialog_controller.h b/chrome/browser/ui/passwords/password_base_dialog_controller.h
index e898fb9..36a3a02 100644
--- a/chrome/browser/ui/passwords/password_base_dialog_controller.h
+++ b/chrome/browser/ui/passwords/password_base_dialog_controller.h
@@ -10,13 +10,16 @@
class PasswordBaseDialogController {
public:
PasswordBaseDialogController() = default;
+
+ PasswordBaseDialogController(const PasswordBaseDialogController&) = delete;
+ PasswordBaseDialogController& operator=(const PasswordBaseDialogController&) =
+ delete;
+
virtual ~PasswordBaseDialogController() = default;
// Returns true if account chooser dialog created by derived credential
// manager controller is active.
virtual bool IsShowingAccountChooser() const = 0;
-
- DISALLOW_COPY_AND_ASSIGN(PasswordBaseDialogController);
};
#endif // CHROME_BROWSER_UI_PASSWORDS_PASSWORD_BASE_DIALOG_CONTROLLER_H_
diff --git a/chrome/browser/ui/passwords/password_generation_popup_controller_impl.h b/chrome/browser/ui/passwords/password_generation_popup_controller_impl.h
index 952981dd..a697475 100644
--- a/chrome/browser/ui/passwords/password_generation_popup_controller_impl.h
+++ b/chrome/browser/ui/passwords/password_generation_popup_controller_impl.h
@@ -77,6 +77,12 @@
PasswordGenerationPopupObserver* observer,
content::WebContents* web_contents,
content::RenderFrameHost* frame);
+
+ PasswordGenerationPopupControllerImpl(
+ const PasswordGenerationPopupControllerImpl&) = delete;
+ PasswordGenerationPopupControllerImpl& operator=(
+ const PasswordGenerationPopupControllerImpl&) = delete;
+
~PasswordGenerationPopupControllerImpl() override;
// Create a PasswordGenerationPopupView if one doesn't already exist.
@@ -192,8 +198,6 @@
base::WeakPtrFactory<PasswordGenerationPopupControllerImpl> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(PasswordGenerationPopupControllerImpl);
};
#endif // CHROME_BROWSER_UI_PASSWORDS_PASSWORD_GENERATION_POPUP_CONTROLLER_IMPL_H_
diff --git a/chrome/browser/ui/passwords/passwords_leak_dialog_delegate_mock.h b/chrome/browser/ui/passwords/passwords_leak_dialog_delegate_mock.h
index 2c559afa..e6299b09 100644
--- a/chrome/browser/ui/passwords/passwords_leak_dialog_delegate_mock.h
+++ b/chrome/browser/ui/passwords/passwords_leak_dialog_delegate_mock.h
@@ -12,6 +12,12 @@
class PasswordsLeakDialogDelegateMock : public PasswordsLeakDialogDelegate {
public:
PasswordsLeakDialogDelegateMock();
+
+ PasswordsLeakDialogDelegateMock(const PasswordsLeakDialogDelegateMock&) =
+ delete;
+ PasswordsLeakDialogDelegateMock& operator=(
+ const PasswordsLeakDialogDelegateMock&) = delete;
+
~PasswordsLeakDialogDelegateMock() override;
MOCK_METHOD(void, OnLeakDialogHidden, (), (override));
@@ -19,9 +25,6 @@
NavigateToPasswordCheckup,
(password_manager::PasswordCheckReferrer),
(override));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PasswordsLeakDialogDelegateMock);
};
#endif // CHROME_BROWSER_UI_PASSWORDS_PASSWORDS_LEAK_DIALOG_DELEGATE_MOCK_H_
diff --git a/chrome/browser/ui/passwords/passwords_model_delegate_mock.h b/chrome/browser/ui/passwords/passwords_model_delegate_mock.h
index a3de1ed..41b483f 100644
--- a/chrome/browser/ui/passwords/passwords_model_delegate_mock.h
+++ b/chrome/browser/ui/passwords/passwords_model_delegate_mock.h
@@ -19,6 +19,11 @@
public base::SupportsWeakPtr<PasswordsModelDelegateMock> {
public:
PasswordsModelDelegateMock();
+
+ PasswordsModelDelegateMock(const PasswordsModelDelegateMock&) = delete;
+ PasswordsModelDelegateMock& operator=(const PasswordsModelDelegateMock&) =
+ delete;
+
~PasswordsModelDelegateMock() override;
MOCK_METHOD(content::WebContents*, GetWebContents, (), (const override));
@@ -110,9 +115,6 @@
ArePasswordsRevealedWhenBubbleIsOpened,
(),
(const override));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PasswordsModelDelegateMock);
};
#endif // CHROME_BROWSER_UI_PASSWORDS_PASSWORDS_MODEL_DELEGATE_MOCK_H_
diff --git a/chrome/browser/ui/passwords/settings/password_manager_porter.h b/chrome/browser/ui/passwords/settings/password_manager_porter.h
index 245818b..17f23fb 100644
--- a/chrome/browser/ui/passwords/settings/password_manager_porter.h
+++ b/chrome/browser/ui/passwords/settings/password_manager_porter.h
@@ -41,6 +41,10 @@
PasswordManagerPorter(password_manager::CredentialProviderInterface*
credential_provider_interface,
ProgressCallback on_export_progress_callback);
+
+ PasswordManagerPorter(const PasswordManagerPorter&) = delete;
+ PasswordManagerPorter& operator=(const PasswordManagerPorter&) = delete;
+
~PasswordManagerPorter() override;
void set_web_contents(content::WebContents* web_contents) {
@@ -103,8 +107,6 @@
// Caching the current WebContents for when PresentFileSelector is called.
content::WebContents* web_contents_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(PasswordManagerPorter);
};
#endif // CHROME_BROWSER_UI_PASSWORDS_SETTINGS_PASSWORD_MANAGER_PORTER_H_
diff --git a/chrome/browser/ui/passwords/settings/password_manager_porter_unittest.cc b/chrome/browser/ui/passwords/settings/password_manager_porter_unittest.cc
index aacf9dd..be00026 100644
--- a/chrome/browser/ui/passwords/settings/password_manager_porter_unittest.cc
+++ b/chrome/browser/ui/passwords/settings/password_manager_porter_unittest.cc
@@ -179,6 +179,11 @@
nullptr,
base::BindRepeating([](password_manager::ExportProgressStatus,
const std::string&) -> void {})) {}
+
+ MockPasswordManagerExporter(const MockPasswordManagerExporter&) = delete;
+ MockPasswordManagerExporter& operator=(const MockPasswordManagerExporter&) =
+ delete;
+
~MockPasswordManagerExporter() override = default;
MOCK_METHOD0(PreparePasswordsForExport, void());
@@ -186,9 +191,6 @@
MOCK_METHOD1(SetDestination, void(const base::FilePath&));
MOCK_METHOD0(GetExportProgressStatus,
password_manager::ExportProgressStatus());
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockPasswordManagerExporter);
};
class PasswordManagerPorterTest : public ChromeRenderViewHostTestHarness {
diff --git a/chrome/browser/ui/passwords/settings/password_manager_presenter.cc b/chrome/browser/ui/passwords/settings/password_manager_presenter.cc
index ff47cf5..01fb4a7 100644
--- a/chrome/browser/ui/passwords/settings/password_manager_presenter.cc
+++ b/chrome/browser/ui/passwords/settings/password_manager_presenter.cc
@@ -124,6 +124,10 @@
public:
RemovePasswordOperation(PasswordManagerPresenter* page,
const password_manager::PasswordForm& form);
+
+ RemovePasswordOperation(const RemovePasswordOperation&) = delete;
+ RemovePasswordOperation& operator=(const RemovePasswordOperation&) = delete;
+
~RemovePasswordOperation() override;
// UndoOperation:
@@ -134,8 +138,6 @@
private:
PasswordManagerPresenter* page_;
password_manager::PasswordForm form_;
-
- DISALLOW_COPY_AND_ASSIGN(RemovePasswordOperation);
};
RemovePasswordOperation::RemovePasswordOperation(
@@ -161,6 +163,10 @@
public:
AddPasswordOperation(PasswordManagerPresenter* page,
const password_manager::PasswordForm& password_form);
+
+ AddPasswordOperation(const AddPasswordOperation&) = delete;
+ AddPasswordOperation& operator=(const AddPasswordOperation&) = delete;
+
~AddPasswordOperation() override;
// UndoOperation:
@@ -171,8 +177,6 @@
private:
PasswordManagerPresenter* page_;
password_manager::PasswordForm form_;
-
- DISALLOW_COPY_AND_ASSIGN(AddPasswordOperation);
};
AddPasswordOperation::AddPasswordOperation(
diff --git a/chrome/browser/ui/passwords/settings/password_manager_presenter.h b/chrome/browser/ui/passwords/settings/password_manager_presenter.h
index 626a00c..a6d0b2a1 100644
--- a/chrome/browser/ui/passwords/settings/password_manager_presenter.h
+++ b/chrome/browser/ui/passwords/settings/password_manager_presenter.h
@@ -42,6 +42,10 @@
public:
// |password_view| the UI view that owns this presenter, must not be NULL.
explicit PasswordManagerPresenter(PasswordUIView* password_view);
+
+ PasswordManagerPresenter(const PasswordManagerPresenter&) = delete;
+ PasswordManagerPresenter& operator=(const PasswordManagerPresenter&) = delete;
+
~PasswordManagerPresenter() override;
void Initialize();
@@ -185,8 +189,6 @@
// Contains the helpers currently executing moving tasks.
MovePasswordToAccountStoreHelperList move_to_account_helpers_;
-
- DISALLOW_COPY_AND_ASSIGN(PasswordManagerPresenter);
};
#endif // CHROME_BROWSER_UI_PASSWORDS_SETTINGS_PASSWORD_MANAGER_PRESENTER_H_
diff --git a/chrome/browser/ui/passwords/settings/password_ui_view_mock.h b/chrome/browser/ui/passwords/settings/password_ui_view_mock.h
index 2ee1880..7cf254b 100644
--- a/chrome/browser/ui/passwords/settings/password_ui_view_mock.h
+++ b/chrome/browser/ui/passwords/settings/password_ui_view_mock.h
@@ -17,6 +17,10 @@
class MockPasswordUIView : public PasswordUIView {
public:
explicit MockPasswordUIView(Profile* profile);
+
+ MockPasswordUIView(const MockPasswordUIView&) = delete;
+ MockPasswordUIView& operator=(const MockPasswordUIView&) = delete;
+
~MockPasswordUIView() override;
Profile* GetProfile() override;
@@ -36,8 +40,6 @@
private:
Profile* profile_;
PasswordManagerPresenter password_manager_presenter_;
-
- DISALLOW_COPY_AND_ASSIGN(MockPasswordUIView);
};
#endif // CHROME_BROWSER_UI_PASSWORDS_SETTINGS_PASSWORD_UI_VIEW_MOCK_H_
diff --git a/chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h b/chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h
index 247c79a..6962b413 100644
--- a/chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h
+++ b/chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h
@@ -12,6 +12,12 @@
: public pdf::PDFWebContentsHelperClient {
public:
ChromePDFWebContentsHelperClient();
+
+ ChromePDFWebContentsHelperClient(const ChromePDFWebContentsHelperClient&) =
+ delete;
+ ChromePDFWebContentsHelperClient& operator=(
+ const ChromePDFWebContentsHelperClient&) = delete;
+
~ChromePDFWebContentsHelperClient() override;
private:
@@ -21,8 +27,6 @@
void OnPDFHasUnsupportedFeature(content::WebContents* contents) override;
void OnSaveURL(content::WebContents* contents) override;
void SetPluginCanSave(content::WebContents* contents, bool can_save) override;
-
- DISALLOW_COPY_AND_ASSIGN(ChromePDFWebContentsHelperClient);
};
#endif // CHROME_BROWSER_UI_PDF_CHROME_PDF_WEB_CONTENTS_HELPER_CLIENT_H_
diff --git a/chrome/browser/ui/permission_bubble/permission_bubble_browser_test_util.h b/chrome/browser/ui/permission_bubble/permission_bubble_browser_test_util.h
index 45a80de1..cf60dc02 100644
--- a/chrome/browser/ui/permission_bubble/permission_bubble_browser_test_util.h
+++ b/chrome/browser/ui/permission_bubble/permission_bubble_browser_test_util.h
@@ -31,6 +31,12 @@
: public permissions::PermissionPrompt::Delegate {
public:
TestPermissionBubbleViewDelegate();
+
+ TestPermissionBubbleViewDelegate(const TestPermissionBubbleViewDelegate&) =
+ delete;
+ TestPermissionBubbleViewDelegate& operator=(
+ const TestPermissionBubbleViewDelegate&) = delete;
+
~TestPermissionBubbleViewDelegate() override;
const std::vector<permissions::PermissionRequest*>& Requests() override;
@@ -52,8 +58,6 @@
private:
std::vector<permissions::PermissionRequest*> requests_;
-
- DISALLOW_COPY_AND_ASSIGN(TestPermissionBubbleViewDelegate);
};
// Use this class to test on a default window or an app window. Inheriting from
@@ -62,6 +66,11 @@
class PermissionBubbleBrowserTest : public extensions::ExtensionBrowserTest {
public:
PermissionBubbleBrowserTest();
+
+ PermissionBubbleBrowserTest(const PermissionBubbleBrowserTest&) = delete;
+ PermissionBubbleBrowserTest& operator=(const PermissionBubbleBrowserTest&) =
+ delete;
+
~PermissionBubbleBrowserTest() override;
void SetUpOnMainThread() override;
@@ -76,14 +85,18 @@
private:
TestPermissionBubbleViewDelegate test_delegate_;
std::vector<std::unique_ptr<permissions::PermissionRequest>> requests_;
-
- DISALLOW_COPY_AND_ASSIGN(PermissionBubbleBrowserTest);
};
// Use this class to test on a kiosk window.
class PermissionBubbleKioskBrowserTest : public PermissionBubbleBrowserTest {
public:
PermissionBubbleKioskBrowserTest();
+
+ PermissionBubbleKioskBrowserTest(const PermissionBubbleKioskBrowserTest&) =
+ delete;
+ PermissionBubbleKioskBrowserTest& operator=(
+ const PermissionBubbleKioskBrowserTest&) = delete;
+
~PermissionBubbleKioskBrowserTest() override;
void SetUpCommandLine(base::CommandLine* command_line) override;
@@ -95,8 +108,6 @@
// time.
ui::test::ScopedFakeNSWindowFullscreen faked_fullscreen_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(PermissionBubbleKioskBrowserTest);
};
#endif // CHROME_BROWSER_UI_PERMISSION_BUBBLE_PERMISSION_BUBBLE_BROWSER_TEST_UTIL_H_
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.h b/chrome/browser/ui/prefs/prefs_tab_helper.h
index 577380d..44a58c15 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper.h
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.h
@@ -31,6 +31,9 @@
class PrefsTabHelper : public ThemeServiceObserver,
public content::WebContentsUserData<PrefsTabHelper> {
public:
+ PrefsTabHelper(const PrefsTabHelper&) = delete;
+ PrefsTabHelper& operator=(const PrefsTabHelper&) = delete;
+
~PrefsTabHelper() override;
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -66,8 +69,6 @@
base::WeakPtrFactory<PrefsTabHelper> weak_ptr_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(PrefsTabHelper);
};
#endif // CHROME_BROWSER_UI_PREFS_PREFS_TAB_HELPER_H_
diff --git a/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.h b/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.h
index 624c47fa..62dd71c 100644
--- a/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.h
+++ b/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.h
@@ -23,6 +23,11 @@
class QRCodeGeneratorBubbleController
: public content::WebContentsUserData<QRCodeGeneratorBubbleController> {
public:
+ QRCodeGeneratorBubbleController(const QRCodeGeneratorBubbleController&) =
+ delete;
+ QRCodeGeneratorBubbleController& operator=(
+ const QRCodeGeneratorBubbleController&) = delete;
+
~QRCodeGeneratorBubbleController() override;
// Returns whether the generator is available for a given page.
@@ -65,8 +70,6 @@
bool bubble_shown_ = false;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(QRCodeGeneratorBubbleController);
};
} // namespace qrcode_generator
diff --git a/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller_unittest.cc b/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller_unittest.cc
index 34ebc50..fdab4710 100644
--- a/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller_unittest.cc
+++ b/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller_unittest.cc
@@ -16,10 +16,12 @@
public:
QRCodeGeneratorBubbleControllerTest() = default;
- ~QRCodeGeneratorBubbleControllerTest() override = default;
+ QRCodeGeneratorBubbleControllerTest(
+ const QRCodeGeneratorBubbleControllerTest&) = delete;
+ QRCodeGeneratorBubbleControllerTest& operator=(
+ const QRCodeGeneratorBubbleControllerTest&) = delete;
- private:
- DISALLOW_COPY_AND_ASSIGN(QRCodeGeneratorBubbleControllerTest);
+ ~QRCodeGeneratorBubbleControllerTest() override = default;
};
TEST_F(QRCodeGeneratorBubbleControllerTest, AllowedURLs) {
diff --git a/chrome/browser/ui/recently_audible_helper.h b/chrome/browser/ui/recently_audible_helper.h
index 761665c..20881380 100644
--- a/chrome/browser/ui/recently_audible_helper.h
+++ b/chrome/browser/ui/recently_audible_helper.h
@@ -33,6 +33,9 @@
base::RepeatingCallbackList<void(bool was_recently_audible)>;
using Callback = CallbackList::CallbackType;
+ RecentlyAudibleHelper(const RecentlyAudibleHelper&) = delete;
+ RecentlyAudibleHelper& operator=(const RecentlyAudibleHelper&) = delete;
+
~RecentlyAudibleHelper() override;
// Returns true if the WebContents was ever audible over its lifetime.
@@ -95,8 +98,6 @@
const base::TickClock* tick_clock_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(RecentlyAudibleHelper);
};
#endif // CHROME_BROWSER_UI_RECENTLY_AUDIBLE_HELPER_H_
diff --git a/chrome/browser/ui/recently_audible_helper_unittest.cc b/chrome/browser/ui/recently_audible_helper_unittest.cc
index b153687..9c72798 100644
--- a/chrome/browser/ui/recently_audible_helper_unittest.cc
+++ b/chrome/browser/ui/recently_audible_helper_unittest.cc
@@ -20,6 +20,10 @@
public:
RecentlyAudibleHelperTest() = default;
+ RecentlyAudibleHelperTest(const RecentlyAudibleHelperTest&) = delete;
+ RecentlyAudibleHelperTest& operator=(const RecentlyAudibleHelperTest&) =
+ delete;
+
~RecentlyAudibleHelperTest() override {}
void SetUp() override {
@@ -118,8 +122,6 @@
base::CallbackListSubscription subscription_;
std::list<bool> recently_audible_messages_;
-
- DISALLOW_COPY_AND_ASSIGN(RecentlyAudibleHelperTest);
};
TEST_F(RecentlyAudibleHelperTest, AllStateTransitions) {
diff --git a/chrome/browser/ui/renderer_event_injection_browsertest.cc b/chrome/browser/ui/renderer_event_injection_browsertest.cc
index 9999418..1c002c3 100644
--- a/chrome/browser/ui/renderer_event_injection_browsertest.cc
+++ b/chrome/browser/ui/renderer_event_injection_browsertest.cc
@@ -40,6 +40,11 @@
public ::testing::WithParamInterface<const char*> {
public:
RendererEventInjectionTest() {}
+
+ RendererEventInjectionTest(const RendererEventInjectionTest&) = delete;
+ RendererEventInjectionTest& operator=(const RendererEventInjectionTest&) =
+ delete;
+
~RendererEventInjectionTest() override {}
// InProcessBrowserTest:
@@ -66,8 +71,6 @@
private:
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(RendererEventInjectionTest);
};
// Detects when a touch press is received.
@@ -77,6 +80,10 @@
TouchEventObserver(const gfx::Point& location,
base::RepeatingClosure quit_closure)
: expected_location_(location), quit_closure_(std::move(quit_closure)) {}
+
+ TouchEventObserver(const TouchEventObserver&) = delete;
+ TouchEventObserver& operator=(const TouchEventObserver&) = delete;
+
~TouchEventObserver() override = default;
private:
@@ -102,8 +109,6 @@
const gfx::Point expected_location_;
base::RepeatingClosure quit_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(TouchEventObserver);
};
IN_PROC_BROWSER_TEST_P(RendererEventInjectionTest, TestRootTransform) {
diff --git a/chrome/browser/ui/sad_tab.h b/chrome/browser/ui/sad_tab.h
index 1768659..3eb19c8 100644
--- a/chrome/browser/ui/sad_tab.h
+++ b/chrome/browser/ui/sad_tab.h
@@ -29,6 +29,9 @@
// Returns true if the sad tab should be shown.
static bool ShouldShow(base::TerminationStatus status);
+ SadTab(const SadTab&) = delete;
+ SadTab& operator=(const SadTab&) = delete;
+
virtual ~SadTab() {}
// Called when the sad tab needs to be reinstalled in its window,
@@ -73,8 +76,6 @@
// True if repeatedly crashing and the browser is Google Chrome branded.
bool show_feedback_button_;
bool recorded_paint_;
-
- DISALLOW_COPY_AND_ASSIGN(SadTab);
};
#endif // CHROME_BROWSER_UI_SAD_TAB_H_
diff --git a/chrome/browser/ui/sad_tab_helper.h b/chrome/browser/ui/sad_tab_helper.h
index a8691134..118c74d 100644
--- a/chrome/browser/ui/sad_tab_helper.h
+++ b/chrome/browser/ui/sad_tab_helper.h
@@ -33,6 +33,9 @@
class SadTabHelper : public content::WebContentsObserver,
public content::WebContentsUserData<SadTabHelper> {
public:
+ SadTabHelper(const SadTabHelper&) = delete;
+ SadTabHelper& operator=(const SadTabHelper&) = delete;
+
~SadTabHelper() override;
SadTab* sad_tab() { return sad_tab_.get(); }
@@ -59,8 +62,6 @@
std::unique_ptr<SadTab> sad_tab_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(SadTabHelper);
};
#endif // CHROME_BROWSER_UI_SAD_TAB_HELPER_H_
diff --git a/chrome/browser/ui/scoped_tabbed_browser_displayer.h b/chrome/browser/ui/scoped_tabbed_browser_displayer.h
index c0dd5320..ad70cd234 100644
--- a/chrome/browser/ui/scoped_tabbed_browser_displayer.h
+++ b/chrome/browser/ui/scoped_tabbed_browser_displayer.h
@@ -20,14 +20,17 @@
class ScopedTabbedBrowserDisplayer {
public:
explicit ScopedTabbedBrowserDisplayer(Profile* profile);
+
+ ScopedTabbedBrowserDisplayer(const ScopedTabbedBrowserDisplayer&) = delete;
+ ScopedTabbedBrowserDisplayer& operator=(const ScopedTabbedBrowserDisplayer&) =
+ delete;
+
~ScopedTabbedBrowserDisplayer();
Browser* browser() { return browser_; }
private:
Browser* browser_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedTabbedBrowserDisplayer);
};
} // namespace chrome
diff --git a/chrome/browser/ui/screen_capture_notification_ui.h b/chrome/browser/ui/screen_capture_notification_ui.h
index ac266b1..c9d7a12 100644
--- a/chrome/browser/ui/screen_capture_notification_ui.h
+++ b/chrome/browser/ui/screen_capture_notification_ui.h
@@ -16,15 +16,17 @@
class ScreenCaptureNotificationUI : public MediaStreamUI {
public:
ScreenCaptureNotificationUI() = default;
+
+ ScreenCaptureNotificationUI(const ScreenCaptureNotificationUI&) = delete;
+ ScreenCaptureNotificationUI& operator=(const ScreenCaptureNotificationUI&) =
+ delete;
+
~ScreenCaptureNotificationUI() override = default;
// Creates platform-specific screen capture notification UI. |text| specifies
// the text that should be shown in the notification.
static std::unique_ptr<ScreenCaptureNotificationUI> Create(
const std::u16string& text);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ScreenCaptureNotificationUI);
};
#endif // CHROME_BROWSER_UI_SCREEN_CAPTURE_NOTIFICATION_UI_H_
diff --git a/chrome/browser/ui/screen_capture_notification_ui_browsertest.cc b/chrome/browser/ui/screen_capture_notification_ui_browsertest.cc
index 0fed973..4e7bc250 100644
--- a/chrome/browser/ui/screen_capture_notification_ui_browsertest.cc
+++ b/chrome/browser/ui/screen_capture_notification_ui_browsertest.cc
@@ -18,6 +18,12 @@
class ScreenCaptureNotificationUiBrowserTest : public DialogBrowserTest {
public:
ScreenCaptureNotificationUiBrowserTest() = default;
+
+ ScreenCaptureNotificationUiBrowserTest(
+ const ScreenCaptureNotificationUiBrowserTest&) = delete;
+ ScreenCaptureNotificationUiBrowserTest& operator=(
+ const ScreenCaptureNotificationUiBrowserTest&) = delete;
+
~ScreenCaptureNotificationUiBrowserTest() override = default;
// TestBrowserUi:
@@ -65,8 +71,6 @@
std::unique_ptr<ScreenCaptureNotificationUI> screen_capture_notification_ui_;
gfx::NativeViewId on_started_result_;
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(ScreenCaptureNotificationUiBrowserTest);
};
IN_PROC_BROWSER_TEST_F(ScreenCaptureNotificationUiBrowserTest, InvokeUi) {
diff --git a/chrome/browser/ui/search/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc
index dd808525..a708b18c 100644
--- a/chrome/browser/ui/search/instant_controller.cc
+++ b/chrome/browser/ui/search/instant_controller.cc
@@ -25,6 +25,10 @@
base::RepeatingClosure callback)
: content::WebContentsObserver(web_contents),
callback_(std::move(callback)) {}
+
+ TabObserver(const TabObserver&) = delete;
+ TabObserver& operator=(const TabObserver&) = delete;
+
~TabObserver() override = default;
private:
@@ -37,8 +41,6 @@
}
base::RepeatingClosure callback_;
-
- DISALLOW_COPY_AND_ASSIGN(TabObserver);
};
InstantController::InstantController(Profile* profile,
diff --git a/chrome/browser/ui/search/instant_controller.h b/chrome/browser/ui/search/instant_controller.h
index aabfb16b..ff16a95 100644
--- a/chrome/browser/ui/search/instant_controller.h
+++ b/chrome/browser/ui/search/instant_controller.h
@@ -32,6 +32,10 @@
class InstantController : public TabStripModelObserver {
public:
explicit InstantController(Profile* profile, TabStripModel* tab_strip_model);
+
+ InstantController(const InstantController&) = delete;
+ InstantController& operator=(const InstantController&) = delete;
+
~InstantController() override;
// TabStripModelObserver:
@@ -56,8 +60,6 @@
// Observes the currently active tab, and calls us back if it becomes an NTP.
std::unique_ptr<TabObserver> tab_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(InstantController);
};
#endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
diff --git a/chrome/browser/ui/search/ntp_user_data_logger.h b/chrome/browser/ui/search/ntp_user_data_logger.h
index d677d0d..716dd49 100644
--- a/chrome/browser/ui/search/ntp_user_data_logger.h
+++ b/chrome/browser/ui/search/ntp_user_data_logger.h
@@ -27,6 +27,10 @@
public:
// Creates a NTPUserDataLogger. MUST be called only when the NTP is active.
NTPUserDataLogger(Profile* profile, const GURL& ntp_url);
+
+ NTPUserDataLogger(const NTPUserDataLogger&) = delete;
+ NTPUserDataLogger& operator=(const NTPUserDataLogger&) = delete;
+
virtual ~NTPUserDataLogger();
// Called when a One Google Bar fetch has been completed after |duration|.
@@ -100,8 +104,6 @@
// The profile in which this New Tab Page was loaded.
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(NTPUserDataLogger);
};
#endif // CHROME_BROWSER_UI_SEARCH_NTP_USER_DATA_LOGGER_H_
diff --git a/chrome/browser/ui/search/search_ipc_router.h b/chrome/browser/ui/search/search_ipc_router.h
index 5bab0c4..eda8d392 100644
--- a/chrome/browser/ui/search/search_ipc_router.h
+++ b/chrome/browser/ui/search/search_ipc_router.h
@@ -105,6 +105,11 @@
class EmbeddedSearchClientFactory {
public:
EmbeddedSearchClientFactory() = default;
+
+ EmbeddedSearchClientFactory(const EmbeddedSearchClientFactory&) = delete;
+ EmbeddedSearchClientFactory& operator=(const EmbeddedSearchClientFactory&) =
+ delete;
+
virtual ~EmbeddedSearchClientFactory() = default;
// The returned pointer is owned by the factory.
@@ -114,14 +119,15 @@
mojo::PendingAssociatedReceiver<search::mojom::EmbeddedSearchConnector>
receiver,
content::RenderFrameHost* rfh) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(EmbeddedSearchClientFactory);
};
SearchIPCRouter(content::WebContents* web_contents,
Delegate* delegate,
std::unique_ptr<Policy> policy);
+
+ SearchIPCRouter(const SearchIPCRouter&) = delete;
+ SearchIPCRouter& operator=(const SearchIPCRouter&) = delete;
+
~SearchIPCRouter() override;
void BindEmbeddedSearchConnecter(
@@ -211,8 +217,6 @@
mojo::AssociatedReceiver<search::mojom::EmbeddedSearch> receiver_{this};
std::unique_ptr<EmbeddedSearchClientFactory> embedded_search_client_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(SearchIPCRouter);
};
#endif // CHROME_BROWSER_UI_SEARCH_SEARCH_IPC_ROUTER_H_
diff --git a/chrome/browser/ui/search/search_ipc_router_policy_impl.h b/chrome/browser/ui/search/search_ipc_router_policy_impl.h
index 5353403..e63ec514c 100644
--- a/chrome/browser/ui/search/search_ipc_router_policy_impl.h
+++ b/chrome/browser/ui/search/search_ipc_router_policy_impl.h
@@ -21,6 +21,11 @@
class SearchIPCRouterPolicyImpl : public SearchIPCRouter::Policy {
public:
explicit SearchIPCRouterPolicyImpl(content::WebContents* web_contents);
+
+ SearchIPCRouterPolicyImpl(const SearchIPCRouterPolicyImpl&) = delete;
+ SearchIPCRouterPolicyImpl& operator=(const SearchIPCRouterPolicyImpl&) =
+ delete;
+
~SearchIPCRouterPolicyImpl() override;
private:
@@ -45,8 +50,6 @@
content::WebContents* web_contents_;
bool is_incognito_;
-
- DISALLOW_COPY_AND_ASSIGN(SearchIPCRouterPolicyImpl);
};
#endif // CHROME_BROWSER_UI_SEARCH_SEARCH_IPC_ROUTER_POLICY_IMPL_H_
diff --git a/chrome/browser/ui/search/search_tab_helper.h b/chrome/browser/ui/search/search_tab_helper.h
index 3760ae15..58fc1670 100644
--- a/chrome/browser/ui/search/search_tab_helper.h
+++ b/chrome/browser/ui/search/search_tab_helper.h
@@ -54,6 +54,9 @@
public SearchIPCRouter::Delegate,
public OmniboxTabHelper::Observer {
public:
+ SearchTabHelper(const SearchTabHelper&) = delete;
+ SearchTabHelper& operator=(const SearchTabHelper&) = delete;
+
~SearchTabHelper() override;
static void BindEmbeddedSearchConnecter(
@@ -150,8 +153,6 @@
WEB_CONTENTS_USER_DATA_KEY_DECL();
base::WeakPtrFactory<SearchTabHelper> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SearchTabHelper);
};
#endif // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
diff --git a/chrome/browser/ui/search_engines/edit_search_engine_controller.h b/chrome/browser/ui/search_engines/edit_search_engine_controller.h
index eeddcb2..5e410c3 100644
--- a/chrome/browser/ui/search_engines/edit_search_engine_controller.h
+++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.h
@@ -38,6 +38,11 @@
TemplateURL* template_url,
EditSearchEngineControllerDelegate* edit_keyword_delegate,
Profile* profile);
+
+ EditSearchEngineController(const EditSearchEngineController&) = delete;
+ EditSearchEngineController& operator=(const EditSearchEngineController&) =
+ delete;
+
~EditSearchEngineController() {}
// Returns true if the value of |title_input| is a valid search engine name.
@@ -83,8 +88,6 @@
// Profile whose TemplateURLService we're modifying.
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(EditSearchEngineController);
};
#endif // CHROME_BROWSER_UI_SEARCH_ENGINES_EDIT_SEARCH_ENGINE_CONTROLLER_H_
diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.h b/chrome/browser/ui/search_engines/keyword_editor_controller.h
index 37284dd..214d5bf 100644
--- a/chrome/browser/ui/search_engines/keyword_editor_controller.h
+++ b/chrome/browser/ui/search_engines/keyword_editor_controller.h
@@ -18,6 +18,10 @@
class KeywordEditorController {
public:
explicit KeywordEditorController(Profile* profile);
+
+ KeywordEditorController(const KeywordEditorController&) = delete;
+ KeywordEditorController& operator=(const KeywordEditorController&) = delete;
+
~KeywordEditorController();
// Invoked when the user succesfully fills out the add keyword dialog.
@@ -81,8 +85,6 @@
// Model for the TableView.
std::unique_ptr<TemplateURLTableModel> table_model_;
-
- DISALLOW_COPY_AND_ASSIGN(KeywordEditorController);
};
#endif // CHROME_BROWSER_UI_SEARCH_ENGINES_KEYWORD_EDITOR_CONTROLLER_H_
diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.h b/chrome/browser/ui/search_engines/search_engine_tab_helper.h
index 6492852..11641b8 100644
--- a/chrome/browser/ui/search_engines/search_engine_tab_helper.h
+++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.h
@@ -33,6 +33,9 @@
chrome::mojom::OpenSearchDescriptionDocumentHandler> receiver,
content::RenderFrameHost* rfh);
+ SearchEngineTabHelper(const SearchEngineTabHelper&) = delete;
+ SearchEngineTabHelper& operator=(const SearchEngineTabHelper&) = delete;
+
~SearchEngineTabHelper() override;
// content::WebContentsObserver overrides.
@@ -71,8 +74,6 @@
favicon_driver_observation_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(SearchEngineTabHelper);
};
#endif // CHROME_BROWSER_UI_SEARCH_ENGINES_SEARCH_ENGINE_TAB_HELPER_H_
diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc
index 252f4177f..28ab89c 100644
--- a/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc
+++ b/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc
@@ -45,14 +45,17 @@
&TemplateURLServiceObserver::StopLoop, base::Unretained(this)));
service->Load();
}
+
+ TemplateURLServiceObserver(const TemplateURLServiceObserver&) = delete;
+ TemplateURLServiceObserver& operator=(const TemplateURLServiceObserver&) =
+ delete;
+
~TemplateURLServiceObserver() {}
private:
void StopLoop() { runner_->Quit(); }
base::RunLoop* runner_;
base::CallbackListSubscription template_url_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(TemplateURLServiceObserver);
};
testing::AssertionResult VerifyTemplateURLServiceLoad(
@@ -72,6 +75,12 @@
class SearchEngineTabHelperBrowserTest : public InProcessBrowserTest {
public:
SearchEngineTabHelperBrowserTest() = default;
+
+ SearchEngineTabHelperBrowserTest(const SearchEngineTabHelperBrowserTest&) =
+ delete;
+ SearchEngineTabHelperBrowserTest& operator=(
+ const SearchEngineTabHelperBrowserTest&) = delete;
+
~SearchEngineTabHelperBrowserTest() override = default;
private:
@@ -107,8 +116,6 @@
}
void SetUpOnMainThread() override { ASSERT_TRUE(StartTestServer()); }
-
- DISALLOW_COPY_AND_ASSIGN(SearchEngineTabHelperBrowserTest);
};
IN_PROC_BROWSER_TEST_F(SearchEngineTabHelperBrowserTest,
diff --git a/chrome/browser/ui/search_engines/template_url_table_model.h b/chrome/browser/ui/search_engines/template_url_table_model.h
index e42bfce..173aa599 100644
--- a/chrome/browser/ui/search_engines/template_url_table_model.h
+++ b/chrome/browser/ui/search_engines/template_url_table_model.h
@@ -32,6 +32,9 @@
public:
explicit TemplateURLTableModel(TemplateURLService* template_url_service);
+ TemplateURLTableModel(const TemplateURLTableModel&) = delete;
+ TemplateURLTableModel& operator=(const TemplateURLTableModel&) = delete;
+
~TemplateURLTableModel() override;
// Reloads the entries from the TemplateURLService. This should ONLY be
@@ -113,8 +116,6 @@
// Index of the last other engine in entries_. This is used to determine the
// group boundaries.
int last_other_engine_index_;
-
- DISALLOW_COPY_AND_ASSIGN(TemplateURLTableModel);
};
diff --git a/chrome/browser/ui/send_tab_to_self/send_tab_to_self_bubble_controller.h b/chrome/browser/ui/send_tab_to_self/send_tab_to_self_bubble_controller.h
index 2b457e6a..c3ff4d6 100644
--- a/chrome/browser/ui/send_tab_to_self/send_tab_to_self_bubble_controller.h
+++ b/chrome/browser/ui/send_tab_to_self/send_tab_to_self_bubble_controller.h
@@ -37,6 +37,10 @@
class SendTabToSelfBubbleController
: public content::WebContentsUserData<SendTabToSelfBubbleController> {
public:
+ SendTabToSelfBubbleController(const SendTabToSelfBubbleController&) = delete;
+ SendTabToSelfBubbleController& operator=(
+ const SendTabToSelfBubbleController&) = delete;
+
~SendTabToSelfBubbleController() override;
static SendTabToSelfBubbleController* CreateOrGetFromWebContents(
@@ -106,8 +110,6 @@
bool bubble_shown_ = false;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(SendTabToSelfBubbleController);
};
} // namespace send_tab_to_self
diff --git a/chrome/browser/ui/send_tab_to_self/send_tab_to_self_sub_menu_model.h b/chrome/browser/ui/send_tab_to_self/send_tab_to_self_sub_menu_model.h
index a92c770f..116bb8d4 100644
--- a/chrome/browser/ui/send_tab_to_self/send_tab_to_self_sub_menu_model.h
+++ b/chrome/browser/ui/send_tab_to_self/send_tab_to_self_sub_menu_model.h
@@ -39,6 +39,11 @@
SendTabToSelfSubMenuModel(content::WebContents* tab,
SendTabToSelfMenuType menu_type,
const GURL& link_url);
+
+ SendTabToSelfSubMenuModel(const SendTabToSelfSubMenuModel&) = delete;
+ SendTabToSelfSubMenuModel& operator=(const SendTabToSelfSubMenuModel&) =
+ delete;
+
~SendTabToSelfSubMenuModel() override;
// Overridden from ui::SimpleMenuModel::Delegate:
@@ -60,8 +65,6 @@
const SendTabToSelfMenuType menu_type_;
const GURL link_url_;
std::vector<ValidDeviceItem> valid_device_items_;
-
- DISALLOW_COPY_AND_ASSIGN(SendTabToSelfSubMenuModel);
};
} // namespace send_tab_to_self
diff --git a/chrome/browser/ui/serial/serial_chooser.h b/chrome/browser/ui/serial/serial_chooser.h
index d273953f..a2c3689 100644
--- a/chrome/browser/ui/serial/serial_chooser.h
+++ b/chrome/browser/ui/serial/serial_chooser.h
@@ -13,12 +13,14 @@
class SerialChooser : public content::SerialChooser {
public:
explicit SerialChooser(base::OnceClosure close_closure);
+
+ SerialChooser(const SerialChooser&) = delete;
+ SerialChooser& operator=(const SerialChooser&) = delete;
+
~SerialChooser() override = default;
private:
base::ScopedClosureRunner closure_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(SerialChooser);
};
#endif // CHROME_BROWSER_UI_SERIAL_SERIAL_CHOOSER_H_
diff --git a/chrome/browser/ui/serial/serial_chooser_controller.h b/chrome/browser/ui/serial/serial_chooser_controller.h
index fb772483..2df63948 100644
--- a/chrome/browser/ui/serial/serial_chooser_controller.h
+++ b/chrome/browser/ui/serial/serial_chooser_controller.h
@@ -31,6 +31,10 @@
content::RenderFrameHost* render_frame_host,
std::vector<blink::mojom::SerialPortFilterPtr> filters,
content::SerialChooser::Callback callback);
+
+ SerialChooserController(const SerialChooserController&) = delete;
+ SerialChooserController& operator=(const SerialChooserController&) = delete;
+
~SerialChooserController() override;
// permissions::ChooserController:
@@ -72,8 +76,6 @@
std::vector<device::mojom::SerialPortInfoPtr> ports_;
base::WeakPtrFactory<SerialChooserController> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SerialChooserController);
};
#endif // CHROME_BROWSER_UI_SERIAL_SERIAL_CHOOSER_CONTROLLER_H_
diff --git a/chrome/browser/ui/session_crashed_bubble.h b/chrome/browser/ui/session_crashed_bubble.h
index 3742cd7b..5597af6 100644
--- a/chrome/browser/ui/session_crashed_bubble.h
+++ b/chrome/browser/ui/session_crashed_bubble.h
@@ -22,13 +22,13 @@
static void ShowIfNotOffTheRecordProfile(Browser* browser,
bool skip_tab_checking);
+ SessionCrashedBubble(const SessionCrashedBubble&) = delete;
+ SessionCrashedBubble& operator=(const SessionCrashedBubble&) = delete;
+
virtual ~SessionCrashedBubble() {}
protected:
SessionCrashedBubble() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SessionCrashedBubble);
};
#endif // CHROME_BROWSER_UI_SESSION_CRASHED_BUBBLE_H_
diff --git a/chrome/browser/ui/settings_window_manager_browsertest_chromeos.cc b/chrome/browser/ui/settings_window_manager_browsertest_chromeos.cc
index b14643e8..37bc3bb 100644
--- a/chrome/browser/ui/settings_window_manager_browsertest_chromeos.cc
+++ b/chrome/browser/ui/settings_window_manager_browsertest_chromeos.cc
@@ -58,6 +58,10 @@
.InstallSystemAppsForTesting();
}
+ SettingsWindowManagerTest(const SettingsWindowManagerTest&) = delete;
+ SettingsWindowManagerTest& operator=(const SettingsWindowManagerTest&) =
+ delete;
+
~SettingsWindowManagerTest() override = default;
void ShowSettingsForProfile(Profile* profile) {
@@ -80,8 +84,6 @@
protected:
chrome::SettingsWindowManager* settings_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(SettingsWindowManagerTest);
};
IN_PROC_BROWSER_TEST_F(SettingsWindowManagerTest, OpenSettingsWindow) {
diff --git a/chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h b/chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h
index b67c938a..8e5ea4d6 100644
--- a/chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h
+++ b/chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h
@@ -36,6 +36,10 @@
class SharingHubBubbleController
: public content::WebContentsUserData<SharingHubBubbleController> {
public:
+ SharingHubBubbleController(const SharingHubBubbleController&) = delete;
+ SharingHubBubbleController& operator=(const SharingHubBubbleController&) =
+ delete;
+
~SharingHubBubbleController() override;
static SharingHubBubbleController* CreateOrGetFromWebContents(
@@ -95,8 +99,6 @@
SharingHubModel* sharing_hub_model_ = nullptr;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(SharingHubBubbleController);
};
} // namespace sharing_hub
diff --git a/chrome/browser/ui/sharing_hub/sharing_hub_sub_menu_model.h b/chrome/browser/ui/sharing_hub/sharing_hub_sub_menu_model.h
index 633badf..f605f35 100644
--- a/chrome/browser/ui/sharing_hub/sharing_hub_sub_menu_model.h
+++ b/chrome/browser/ui/sharing_hub/sharing_hub_sub_menu_model.h
@@ -19,6 +19,10 @@
public ui::SimpleMenuModel::Delegate {
public:
explicit SharingHubSubMenuModel(Browser* browser);
+
+ SharingHubSubMenuModel(const SharingHubSubMenuModel&) = delete;
+ SharingHubSubMenuModel& operator=(const SharingHubSubMenuModel&) = delete;
+
~SharingHubSubMenuModel() override;
// Overridden from ui::SimpleMenuModel::Delegate:
@@ -36,8 +40,6 @@
// A list of user action names mapped to action id.
std::map<int, std::string> user_actions_by_id_;
-
- DISALLOW_COPY_AND_ASSIGN(SharingHubSubMenuModel);
};
} // namespace sharing_hub
diff --git a/chrome/browser/ui/sharing_hub/sharing_hub_sub_menu_model_unittest.cc b/chrome/browser/ui/sharing_hub/sharing_hub_sub_menu_model_unittest.cc
index 6273714..8b85cfb0 100644
--- a/chrome/browser/ui/sharing_hub/sharing_hub_sub_menu_model_unittest.cc
+++ b/chrome/browser/ui/sharing_hub/sharing_hub_sub_menu_model_unittest.cc
@@ -11,10 +11,12 @@
class SharingHubSubMenuModelTest : public BrowserWithTestWindowTest {
public:
SharingHubSubMenuModelTest() = default;
- ~SharingHubSubMenuModelTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(SharingHubSubMenuModelTest);
+ SharingHubSubMenuModelTest(const SharingHubSubMenuModelTest&) = delete;
+ SharingHubSubMenuModelTest& operator=(const SharingHubSubMenuModelTest&) =
+ delete;
+
+ ~SharingHubSubMenuModelTest() override = default;
};
TEST_F(SharingHubSubMenuModelTest, DISABLED_EnableItemsBySharable) {
diff --git a/chrome/browser/ui/signin_view_controller.h b/chrome/browser/ui/signin_view_controller.h
index d258cd1..f8f93de 100644
--- a/chrome/browser/ui/signin_view_controller.h
+++ b/chrome/browser/ui/signin_view_controller.h
@@ -65,6 +65,10 @@
};
explicit SigninViewController(Browser* browser);
+
+ SigninViewController(const SigninViewController&) = delete;
+ SigninViewController& operator=(const SigninViewController&) = delete;
+
~SigninViewController() override;
// Returns true if the signin flow should be shown for |mode|.
@@ -190,8 +194,6 @@
delegate_observation_{this};
base::WeakPtrFactory<SigninViewController> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SigninViewController);
};
#endif // CHROME_BROWSER_UI_SIGNIN_VIEW_CONTROLLER_H_
diff --git a/chrome/browser/ui/sync/browser_synced_tab_delegate.h b/chrome/browser/ui/sync/browser_synced_tab_delegate.h
index 0ec9d5c..5d99033 100644
--- a/chrome/browser/ui/sync/browser_synced_tab_delegate.h
+++ b/chrome/browser/ui/sync/browser_synced_tab_delegate.h
@@ -20,6 +20,9 @@
: public TabContentsSyncedTabDelegate,
public content::WebContentsUserData<BrowserSyncedTabDelegate> {
public:
+ BrowserSyncedTabDelegate(const BrowserSyncedTabDelegate&) = delete;
+ BrowserSyncedTabDelegate& operator=(const BrowserSyncedTabDelegate&) = delete;
+
~BrowserSyncedTabDelegate() override;
// SyncedTabDelegate:
@@ -32,8 +35,6 @@
friend class content::WebContentsUserData<BrowserSyncedTabDelegate>;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(BrowserSyncedTabDelegate);
};
#endif // CHROME_BROWSER_UI_SYNC_BROWSER_SYNCED_TAB_DELEGATE_H_
diff --git a/chrome/browser/ui/sync/browser_synced_window_delegate.h b/chrome/browser/ui/sync/browser_synced_window_delegate.h
index 4a9bafc..a5e2c274 100644
--- a/chrome/browser/ui/sync/browser_synced_window_delegate.h
+++ b/chrome/browser/ui/sync/browser_synced_window_delegate.h
@@ -22,6 +22,11 @@
class BrowserSyncedWindowDelegate : public sync_sessions::SyncedWindowDelegate {
public:
explicit BrowserSyncedWindowDelegate(Browser* browser);
+
+ BrowserSyncedWindowDelegate(const BrowserSyncedWindowDelegate&) = delete;
+ BrowserSyncedWindowDelegate& operator=(const BrowserSyncedWindowDelegate&) =
+ delete;
+
~BrowserSyncedWindowDelegate() override;
// SyncedWindowDelegate:
@@ -39,8 +44,6 @@
private:
Browser* const browser_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserSyncedWindowDelegate);
};
#endif // CHROME_BROWSER_UI_SYNC_BROWSER_SYNCED_WINDOW_DELEGATE_H_
diff --git a/chrome/browser/ui/sync/browser_synced_window_delegates_getter.h b/chrome/browser/ui/sync/browser_synced_window_delegates_getter.h
index 6f2cbde..bd9f06b 100644
--- a/chrome/browser/ui/sync/browser_synced_window_delegates_getter.h
+++ b/chrome/browser/ui/sync/browser_synced_window_delegates_getter.h
@@ -18,6 +18,12 @@
: public sync_sessions::SyncedWindowDelegatesGetter {
public:
explicit BrowserSyncedWindowDelegatesGetter(Profile* profile);
+
+ BrowserSyncedWindowDelegatesGetter(
+ const BrowserSyncedWindowDelegatesGetter&) = delete;
+ BrowserSyncedWindowDelegatesGetter& operator=(
+ const BrowserSyncedWindowDelegatesGetter&) = delete;
+
~BrowserSyncedWindowDelegatesGetter() override;
// SyncedWindowDelegatesGetter implementation
@@ -26,8 +32,6 @@
private:
Profile* const profile_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserSyncedWindowDelegatesGetter);
};
} // namespace browser_sync
diff --git a/chrome/browser/ui/sync/one_click_signin_links_delegate.h b/chrome/browser/ui/sync/one_click_signin_links_delegate.h
index e43c3d06..b14fe35 100644
--- a/chrome/browser/ui/sync/one_click_signin_links_delegate.h
+++ b/chrome/browser/ui/sync/one_click_signin_links_delegate.h
@@ -10,14 +10,15 @@
// Handles link clicks in the OneClickSigninDialogView.
class OneClickSigninLinksDelegate {
public:
+ OneClickSigninLinksDelegate(const OneClickSigninLinksDelegate&) = delete;
+ OneClickSigninLinksDelegate& operator=(const OneClickSigninLinksDelegate&) =
+ delete;
+
virtual ~OneClickSigninLinksDelegate() {}
virtual void OnLearnMoreLinkClicked(bool is_dialog) = 0;
protected:
OneClickSigninLinksDelegate() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(OneClickSigninLinksDelegate);
};
#endif // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_LINKS_DELEGATE_H_
diff --git a/chrome/browser/ui/sync/one_click_signin_links_delegate_impl.h b/chrome/browser/ui/sync/one_click_signin_links_delegate_impl.h
index f82b74b..9b369fb 100644
--- a/chrome/browser/ui/sync/one_click_signin_links_delegate_impl.h
+++ b/chrome/browser/ui/sync/one_click_signin_links_delegate_impl.h
@@ -15,6 +15,12 @@
public:
// |browser| must outlive the delegate.
explicit OneClickSigninLinksDelegateImpl(Browser* browser);
+
+ OneClickSigninLinksDelegateImpl(const OneClickSigninLinksDelegateImpl&) =
+ delete;
+ OneClickSigninLinksDelegateImpl& operator=(
+ const OneClickSigninLinksDelegateImpl&) = delete;
+
~OneClickSigninLinksDelegateImpl() override;
private:
@@ -23,8 +29,6 @@
// Browser in which the links should be opened.
Browser* const browser_;
-
- DISALLOW_COPY_AND_ASSIGN(OneClickSigninLinksDelegateImpl);
};
#endif // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_LINKS_DELEGATE_IMPL_H_
diff --git a/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h b/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h
index 0f06e30..82c1b04 100644
--- a/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h
+++ b/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h
@@ -26,6 +26,11 @@
class TabContentsSyncedTabDelegate : public sync_sessions::SyncedTabDelegate {
public:
TabContentsSyncedTabDelegate();
+
+ TabContentsSyncedTabDelegate(const TabContentsSyncedTabDelegate&) = delete;
+ TabContentsSyncedTabDelegate& operator=(const TabContentsSyncedTabDelegate&) =
+ delete;
+
~TabContentsSyncedTabDelegate() override;
// SyncedTabDelegate:
@@ -58,8 +63,6 @@
const tasks::TaskTabHelper* task_tab_helper() const;
content::WebContents* web_contents_;
-
- DISALLOW_COPY_AND_ASSIGN(TabContentsSyncedTabDelegate);
};
#endif // CHROME_BROWSER_UI_SYNC_TAB_CONTENTS_SYNCED_TAB_DELEGATE_H_
diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.h b/chrome/browser/ui/tab_contents/core_tab_helper.h
index facbbfe..a61a132 100644
--- a/chrome/browser/ui/tab_contents/core_tab_helper.h
+++ b/chrome/browser/ui/tab_contents/core_tab_helper.h
@@ -24,6 +24,9 @@
class CoreTabHelper : public content::WebContentsObserver,
public content::WebContentsUserData<CoreTabHelper> {
public:
+ CoreTabHelper(const CoreTabHelper&) = delete;
+ CoreTabHelper& operator=(const CoreTabHelper&) = delete;
+
~CoreTabHelper() override;
// Initial title assigned to NavigationEntries from Navigate.
@@ -125,8 +128,6 @@
base::WeakPtrFactory<CoreTabHelper> weak_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(CoreTabHelper);
};
#endif // CHROME_BROWSER_UI_TAB_CONTENTS_CORE_TAB_HELPER_H_
diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_delegate.h b/chrome/browser/ui/tab_modal_confirm_dialog_delegate.h
index f4a2dbff2..20becba 100644
--- a/chrome/browser/ui/tab_modal_confirm_dialog_delegate.h
+++ b/chrome/browser/ui/tab_modal_confirm_dialog_delegate.h
@@ -25,12 +25,15 @@
class TabModalConfirmDialogCloseDelegate {
public:
TabModalConfirmDialogCloseDelegate() {}
+
+ TabModalConfirmDialogCloseDelegate(
+ const TabModalConfirmDialogCloseDelegate&) = delete;
+ TabModalConfirmDialogCloseDelegate& operator=(
+ const TabModalConfirmDialogCloseDelegate&) = delete;
+
virtual ~TabModalConfirmDialogCloseDelegate() {}
virtual void CloseDialog() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TabModalConfirmDialogCloseDelegate);
};
// This class acts as the delegate for a simple tab-modal dialog confirming
@@ -38,6 +41,11 @@
class TabModalConfirmDialogDelegate : public content::WebContentsObserver {
public:
explicit TabModalConfirmDialogDelegate(content::WebContents* web_contents);
+
+ TabModalConfirmDialogDelegate(const TabModalConfirmDialogDelegate&) = delete;
+ TabModalConfirmDialogDelegate& operator=(
+ const TabModalConfirmDialogDelegate&) = delete;
+
~TabModalConfirmDialogDelegate() override;
void set_close_delegate(TabModalConfirmDialogCloseDelegate* close_delegate) {
@@ -135,8 +143,6 @@
// True iff we are in the process of closing, to avoid running callbacks
// multiple times.
bool closing_;
-
- DISALLOW_COPY_AND_ASSIGN(TabModalConfirmDialogDelegate);
};
#endif // CHROME_BROWSER_UI_TAB_MODAL_CONFIRM_DIALOG_DELEGATE_H_
diff --git a/chrome/browser/ui/tab_ui_helper.h b/chrome/browser/ui/tab_ui_helper.h
index 6e5c4cf..9e99989 100644
--- a/chrome/browser/ui/tab_ui_helper.h
+++ b/chrome/browser/ui/tab_ui_helper.h
@@ -25,6 +25,9 @@
class TabUIHelper : public content::WebContentsObserver,
public content::WebContentsUserData<TabUIHelper> {
public:
+ TabUIHelper(const TabUIHelper&) = delete;
+ TabUIHelper& operator=(const TabUIHelper&) = delete;
+
~TabUIHelper() override;
// Get the title of the tab. When the associated WebContents' title is empty,
@@ -87,8 +90,6 @@
base::WeakPtrFactory<TabUIHelper> weak_ptr_factory_{this};
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(TabUIHelper);
};
#endif // CHROME_BROWSER_UI_TAB_UI_HELPER_H_
diff --git a/chrome/browser/ui/tabs/existing_base_sub_menu_model.h b/chrome/browser/ui/tabs/existing_base_sub_menu_model.h
index 12b914a8..24fb508 100644
--- a/chrome/browser/ui/tabs/existing_base_sub_menu_model.h
+++ b/chrome/browser/ui/tabs/existing_base_sub_menu_model.h
@@ -48,6 +48,9 @@
static constexpr int kMinExistingWindowCommandId = 1001;
static constexpr int kMinExistingTabGroupCommandId = 1301;
+ ExistingBaseSubMenuModel(const ExistingBaseSubMenuModel&) = delete;
+ ExistingBaseSubMenuModel& operator=(const ExistingBaseSubMenuModel&) = delete;
+
~ExistingBaseSubMenuModel() override;
const base::flat_map<int, int>& command_id_to_target_index_for_testing() {
@@ -121,8 +124,6 @@
// Stores a mapping from a menu item's command id to its target index (e.g.
// tab-group index or browser index).
base::flat_map<int, int> command_id_to_target_index_;
-
- DISALLOW_COPY_AND_ASSIGN(ExistingBaseSubMenuModel);
};
#endif // CHROME_BROWSER_UI_TABS_EXISTING_BASE_SUB_MENU_MODEL_H_
diff --git a/chrome/browser/ui/test/test_app_window_icon_observer.h b/chrome/browser/ui/test/test_app_window_icon_observer.h
index e167941..e5c46c5 100644
--- a/chrome/browser/ui/test/test_app_window_icon_observer.h
+++ b/chrome/browser/ui/test/test_app_window_icon_observer.h
@@ -25,6 +25,11 @@
public aura::WindowObserver {
public:
explicit TestAppWindowIconObserver(content::BrowserContext* context);
+
+ TestAppWindowIconObserver(const TestAppWindowIconObserver&) = delete;
+ TestAppWindowIconObserver& operator=(const TestAppWindowIconObserver&) =
+ delete;
+
~TestAppWindowIconObserver() override;
// Waits for one icon update.
@@ -57,8 +62,6 @@
gfx::ImageSkia last_app_icon_;
gfx::ImageSkia expected_image_skia_;
base::OnceClosure icon_image_updated_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(TestAppWindowIconObserver);
};
#endif // CHROME_BROWSER_UI_TEST_TEST_APP_WINDOW_ICON_OBSERVER_H_
diff --git a/chrome/browser/ui/test/test_confirm_bubble_model.h b/chrome/browser/ui/test/test_confirm_bubble_model.h
index e1baffe..38f79af7 100644
--- a/chrome/browser/ui/test/test_confirm_bubble_model.h
+++ b/chrome/browser/ui/test/test_confirm_bubble_model.h
@@ -17,6 +17,10 @@
bool* accept_clicked,
bool* cancel_clicked,
bool* link_clicked);
+
+ TestConfirmBubbleModel(const TestConfirmBubbleModel&) = delete;
+ TestConfirmBubbleModel& operator=(const TestConfirmBubbleModel&) = delete;
+
~TestConfirmBubbleModel() override;
// ConfirmBubbleModel overrides:
@@ -33,8 +37,6 @@
bool* accept_clicked_;
bool* cancel_clicked_;
bool* link_clicked_;
-
- DISALLOW_COPY_AND_ASSIGN(TestConfirmBubbleModel);
};
#endif // CHROME_BROWSER_UI_TEST_TEST_CONFIRM_BUBBLE_MODEL_H_
diff --git a/chrome/browser/ui/thumbnails/thumbnail_tab_helper.h b/chrome/browser/ui/thumbnails/thumbnail_tab_helper.h
index 56b05e84..2fb29a9 100644
--- a/chrome/browser/ui/thumbnails/thumbnail_tab_helper.h
+++ b/chrome/browser/ui/thumbnails/thumbnail_tab_helper.h
@@ -24,6 +24,9 @@
class ThumbnailTabHelper
: public content::WebContentsUserData<ThumbnailTabHelper> {
public:
+ ThumbnailTabHelper(const ThumbnailTabHelper&) = delete;
+ ThumbnailTabHelper& operator=(const ThumbnailTabHelper&) = delete;
+
~ThumbnailTabHelper() override;
scoped_refptr<ThumbnailImage> thumbnail() const { return thumbnail_; }
@@ -94,8 +97,6 @@
base::WeakPtrFactory<ThumbnailTabHelper>
weak_factory_for_thumbnail_on_tab_hidden_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ThumbnailTabHelper);
};
#endif // CHROME_BROWSER_UI_THUMBNAILS_THUMBNAIL_TAB_HELPER_H_
diff --git a/chrome/browser/ui/toolbar/app_menu_model.h b/chrome/browser/ui/toolbar/app_menu_model.h
index f7492ce..29015c0 100644
--- a/chrome/browser/ui/toolbar/app_menu_model.h
+++ b/chrome/browser/ui/toolbar/app_menu_model.h
@@ -92,23 +92,27 @@
class ZoomMenuModel : public ui::SimpleMenuModel {
public:
explicit ZoomMenuModel(ui::SimpleMenuModel::Delegate* delegate);
+
+ ZoomMenuModel(const ZoomMenuModel&) = delete;
+ ZoomMenuModel& operator=(const ZoomMenuModel&) = delete;
+
~ZoomMenuModel() override;
private:
void Build();
-
- DISALLOW_COPY_AND_ASSIGN(ZoomMenuModel);
};
class ToolsMenuModel : public ui::SimpleMenuModel {
public:
ToolsMenuModel(ui::SimpleMenuModel::Delegate* delegate, Browser* browser);
+
+ ToolsMenuModel(const ToolsMenuModel&) = delete;
+ ToolsMenuModel& operator=(const ToolsMenuModel&) = delete;
+
~ToolsMenuModel() override;
private:
void Build(Browser* browser);
-
- DISALLOW_COPY_AND_ASSIGN(ToolsMenuModel);
};
// A menu model that builds the contents of the app menu.
@@ -137,6 +141,10 @@
AppMenuModel(ui::AcceleratorProvider* provider,
Browser* browser,
AppMenuIconController* app_menu_icon_controller = nullptr);
+
+ AppMenuModel(const AppMenuModel&) = delete;
+ AppMenuModel& operator=(const AppMenuModel&) = delete;
+
~AppMenuModel() override;
// Runs Build() and registers observers.
@@ -242,8 +250,6 @@
base::CallbackListSubscription browser_zoom_subscription_;
PrefChangeRegistrar local_state_pref_change_registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(AppMenuModel);
};
#endif // CHROME_BROWSER_UI_TOOLBAR_APP_MENU_MODEL_H_
diff --git a/chrome/browser/ui/toolbar/app_menu_model_unittest.cc b/chrome/browser/ui/toolbar/app_menu_model_unittest.cc
index ab4964b..ed8e57c 100644
--- a/chrome/browser/ui/toolbar/app_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model_unittest.cc
@@ -79,6 +79,10 @@
public ui::AcceleratorProvider {
public:
AppMenuModelTest() = default;
+
+ AppMenuModelTest(const AppMenuModelTest&) = delete;
+ AppMenuModelTest& operator=(const AppMenuModelTest&) = delete;
+
~AppMenuModelTest() override = default;
// Don't handle accelerators.
@@ -86,9 +90,6 @@
ui::Accelerator* accelerator) const override {
return false;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AppMenuModelTest);
};
// Copies parts of MenuModelTest::Delegate and combines them with the
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.h b/chrome/browser/ui/toolbar/back_forward_menu_model.h
index ba8b7fd..78a00e1 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model.h
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model.h
@@ -40,6 +40,10 @@
enum class ModelType { kForward = 1, kBackward = 2 };
BackForwardMenuModel(Browser* browser, ModelType model_type);
+
+ BackForwardMenuModel(const BackForwardMenuModel&) = delete;
+ BackForwardMenuModel& operator=(const BackForwardMenuModel&) = delete;
+
~BackForwardMenuModel() override;
// MenuModel implementation.
@@ -193,8 +197,6 @@
// Used for loading favicons.
base::CancelableTaskTracker cancelable_task_tracker_;
-
- DISALLOW_COPY_AND_ASSIGN(BackForwardMenuModel);
};
#endif // CHROME_BROWSER_UI_TOOLBAR_BACK_FORWARD_MENU_MODEL_H_
diff --git a/chrome/browser/ui/toolbar/bookmark_sub_menu_model.h b/chrome/browser/ui/toolbar/bookmark_sub_menu_model.h
index 7bf7885..9d1c90f5 100644
--- a/chrome/browser/ui/toolbar/bookmark_sub_menu_model.h
+++ b/chrome/browser/ui/toolbar/bookmark_sub_menu_model.h
@@ -18,12 +18,14 @@
public:
BookmarkSubMenuModel(ui::SimpleMenuModel::Delegate* delegate,
Browser* browser);
+
+ BookmarkSubMenuModel(const BookmarkSubMenuModel&) = delete;
+ BookmarkSubMenuModel& operator=(const BookmarkSubMenuModel&) = delete;
+
~BookmarkSubMenuModel() override;
private:
void Build(Browser* browser);
-
- DISALLOW_COPY_AND_ASSIGN(BookmarkSubMenuModel);
};
#endif // CHROME_BROWSER_UI_TOOLBAR_BOOKMARK_SUB_MENU_MODEL_H_
diff --git a/chrome/browser/ui/toolbar/location_bar_model_unittest.cc b/chrome/browser/ui/toolbar/location_bar_model_unittest.cc
index 62af792..c17ee36 100644
--- a/chrome/browser/ui/toolbar/location_bar_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/location_bar_model_unittest.cc
@@ -92,6 +92,10 @@
class LocationBarModelTest : public BrowserWithTestWindowTest {
public:
LocationBarModelTest();
+
+ LocationBarModelTest(const LocationBarModelTest&) = delete;
+ LocationBarModelTest& operator=(const LocationBarModelTest&) = delete;
+
~LocationBarModelTest() override;
// BrowserWithTestWindowTest:
@@ -103,9 +107,6 @@
const std::u16string& expected_formatted_full_url,
const std::u16string& expected_elided_url_for_display);
void NavigateAndCheckElided(const GURL& https_url);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LocationBarModelTest);
};
LocationBarModelTest::LocationBarModelTest() {}
diff --git a/chrome/browser/ui/toolbar/media_router_action_controller.h b/chrome/browser/ui/toolbar/media_router_action_controller.h
index 5dd4ddd..35c5f21 100644
--- a/chrome/browser/ui/toolbar/media_router_action_controller.h
+++ b/chrome/browser/ui/toolbar/media_router_action_controller.h
@@ -45,6 +45,11 @@
// Constructor for injecting dependencies in tests.
MediaRouterActionController(Profile* profile,
media_router::MediaRouter* router);
+
+ MediaRouterActionController(const MediaRouterActionController&) = delete;
+ MediaRouterActionController& operator=(const MediaRouterActionController&) =
+ delete;
+
~MediaRouterActionController() override;
// Whether the media router action is shown by an administrator policy.
@@ -127,8 +132,6 @@
base::ObserverList<Observer>::Unchecked observers_;
base::WeakPtrFactory<MediaRouterActionController> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MediaRouterActionController);
};
#endif // CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_CONTROLLER_H_
diff --git a/chrome/browser/ui/toolbar/media_router_contextual_menu.h b/chrome/browser/ui/toolbar/media_router_contextual_menu.h
index 92455ff..df43d6ab 100644
--- a/chrome/browser/ui/toolbar/media_router_contextual_menu.h
+++ b/chrome/browser/ui/toolbar/media_router_contextual_menu.h
@@ -31,6 +31,11 @@
MediaRouterContextualMenu(Browser* browser,
bool shown_by_policy,
Observer* observer);
+
+ MediaRouterContextualMenu(const MediaRouterContextualMenu&) = delete;
+ MediaRouterContextualMenu& operator=(const MediaRouterContextualMenu&) =
+ delete;
+
~MediaRouterContextualMenu() override;
// Creates a menu model with |this| as its delegate.
@@ -76,8 +81,6 @@
// Whether the Cast toolbar icon this context menu is shown for is shown by
// the administrator policy.
const bool shown_by_policy_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaRouterContextualMenu);
};
#endif // CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_CONTEXTUAL_MENU_H_
diff --git a/chrome/browser/ui/toolbar/mock_media_router_action_controller.h b/chrome/browser/ui/toolbar/mock_media_router_action_controller.h
index 8d83318..fddacf7 100644
--- a/chrome/browser/ui/toolbar/mock_media_router_action_controller.h
+++ b/chrome/browser/ui/toolbar/mock_media_router_action_controller.h
@@ -11,6 +11,12 @@
class MockMediaRouterActionController : public MediaRouterActionController {
public:
explicit MockMediaRouterActionController(Profile* profile);
+
+ MockMediaRouterActionController(const MockMediaRouterActionController&) =
+ delete;
+ MockMediaRouterActionController& operator=(
+ const MockMediaRouterActionController&) = delete;
+
~MockMediaRouterActionController() override;
MOCK_METHOD1(OnIssueUpdated, void(const media_router::Issue* issue));
@@ -23,9 +29,6 @@
MOCK_METHOD0(OnContextMenuShown, void());
MOCK_METHOD0(OnContextMenuHidden, void());
MOCK_METHOD0(MaybeAddOrRemoveAction, void());
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockMediaRouterActionController);
};
#endif // CHROME_BROWSER_UI_TOOLBAR_MOCK_MEDIA_ROUTER_ACTION_CONTROLLER_H_
diff --git a/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h b/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h
index 753ca904..cf5ce534 100644
--- a/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h
+++ b/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h
@@ -29,6 +29,11 @@
class RecentTabsBuilderTestHelper {
public:
RecentTabsBuilderTestHelper();
+
+ RecentTabsBuilderTestHelper(const RecentTabsBuilderTestHelper&) = delete;
+ RecentTabsBuilderTestHelper& operator=(const RecentTabsBuilderTestHelper&) =
+ delete;
+
~RecentTabsBuilderTestHelper();
void AddSession();
@@ -80,8 +85,6 @@
int max_tab_node_id_ = 0;
int next_response_version_ = 1;
-
- DISALLOW_COPY_AND_ASSIGN(RecentTabsBuilderTestHelper);
};
#endif // CHROME_BROWSER_UI_TOOLBAR_RECENT_TABS_BUILDER_TEST_HELPER_H_
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
index 24ae4d8..3f70d25 100644
--- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
+++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
@@ -67,6 +67,10 @@
RecentTabsSubMenuModel(ui::AcceleratorProvider* accelerator_provider,
Browser* browser);
+
+ RecentTabsSubMenuModel(const RecentTabsSubMenuModel&) = delete;
+ RecentTabsSubMenuModel& operator=(const RecentTabsSubMenuModel&) = delete;
+
~RecentTabsSubMenuModel() override;
// Overridden from ui::SimpleMenuModel::Delegate:
@@ -275,8 +279,6 @@
base::WeakPtrFactory<RecentTabsSubMenuModel> weak_ptr_factory_{this};
base::WeakPtrFactory<RecentTabsSubMenuModel>
weak_ptr_factory_for_other_devices_tab_{this};
-
- DISALLOW_COPY_AND_ASSIGN(RecentTabsSubMenuModel);
};
#endif // CHROME_BROWSER_UI_TOOLBAR_RECENT_TABS_SUB_MENU_MODEL_H_
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
index 8e1f0da..f86c986a 100644
--- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
@@ -90,6 +90,11 @@
model_->SetMenuModelDelegate(this);
}
+ TestRecentTabsMenuModelDelegate(const TestRecentTabsMenuModelDelegate&) =
+ delete;
+ TestRecentTabsMenuModelDelegate& operator=(
+ const TestRecentTabsMenuModelDelegate&) = delete;
+
~TestRecentTabsMenuModelDelegate() override {
model_->SetMenuModelDelegate(nullptr);
}
@@ -105,8 +110,6 @@
private:
ui::MenuModel* model_;
bool got_changes_;
-
- DISALLOW_COPY_AND_ASSIGN(TestRecentTabsMenuModelDelegate);
};
} // namespace
diff --git a/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h b/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h
index 08a94599..504ced0 100644
--- a/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h
+++ b/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h
@@ -13,6 +13,12 @@
class TestToolbarActionViewController : public ToolbarActionViewController {
public:
explicit TestToolbarActionViewController(const std::string& id);
+
+ TestToolbarActionViewController(const TestToolbarActionViewController&) =
+ delete;
+ TestToolbarActionViewController& operator=(
+ const TestToolbarActionViewController&) = delete;
+
~TestToolbarActionViewController() override;
// ToolbarActionViewController:
@@ -70,8 +76,6 @@
// True if a popup is (supposedly) currently showing.
bool popup_showing_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(TestToolbarActionViewController);
};
#endif // CHROME_BROWSER_UI_TOOLBAR_TEST_TOOLBAR_ACTION_VIEW_CONTROLLER_H_
diff --git a/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.cc b/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.cc
index 88e04a9..a634a28 100644
--- a/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.cc
+++ b/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.cc
@@ -15,6 +15,10 @@
public:
explicit DelegateImpl(TestToolbarActionsBarBubbleDelegate* parent)
: parent_(parent) {}
+
+ DelegateImpl(const DelegateImpl&) = delete;
+ DelegateImpl& operator=(const DelegateImpl&) = delete;
+
~DelegateImpl() override {}
private:
@@ -50,8 +54,6 @@
}
TestToolbarActionsBarBubbleDelegate* parent_;
-
- DISALLOW_COPY_AND_ASSIGN(DelegateImpl);
};
TestToolbarActionsBarBubbleDelegate::TestToolbarActionsBarBubbleDelegate(
diff --git a/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h b/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h
index 196a1ee..7d41dcd 100644
--- a/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h
+++ b/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h
@@ -17,6 +17,12 @@
TestToolbarActionsBarBubbleDelegate(const std::u16string& heading,
const std::u16string& body,
const std::u16string& action);
+
+ TestToolbarActionsBarBubbleDelegate(
+ const TestToolbarActionsBarBubbleDelegate&) = delete;
+ TestToolbarActionsBarBubbleDelegate& operator=(
+ const TestToolbarActionsBarBubbleDelegate&) = delete;
+
~TestToolbarActionsBarBubbleDelegate();
// Returns a delegate to pass to the bubble. Since the bubble typically owns
@@ -87,8 +93,6 @@
// Information about the extra view to show, if any.
std::unique_ptr<ToolbarActionsBarBubbleDelegate::ExtraViewInfo> info_;
-
- DISALLOW_COPY_AND_ASSIGN(TestToolbarActionsBarBubbleDelegate);
};
#endif // CHROME_BROWSER_UI_TOOLBAR_TEST_TOOLBAR_ACTIONS_BAR_BUBBLE_DELEGATE_H_
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model.h b/chrome/browser/ui/toolbar/toolbar_actions_model.h
index fe928818..9fe96598 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_model.h
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model.h
@@ -52,6 +52,10 @@
ToolbarActionsModel(Profile* profile,
extensions::ExtensionPrefs* extension_prefs);
+
+ ToolbarActionsModel(const ToolbarActionsModel&) = delete;
+ ToolbarActionsModel& operator=(const ToolbarActionsModel&) = delete;
+
~ToolbarActionsModel() override;
// A class which is informed of changes to the model; represents the view of
@@ -240,8 +244,6 @@
content::NotificationRegistrar notification_registrar_;
base::WeakPtrFactory<ToolbarActionsModel> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ToolbarActionsModel);
};
#endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_MODEL_H_
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
index e5eafa5..a0fac76 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
@@ -60,6 +60,12 @@
class ToolbarActionsModelTestObserver : public ToolbarActionsModel::Observer {
public:
explicit ToolbarActionsModelTestObserver(ToolbarActionsModel* model);
+
+ ToolbarActionsModelTestObserver(const ToolbarActionsModelTestObserver&) =
+ delete;
+ ToolbarActionsModelTestObserver& operator=(
+ const ToolbarActionsModelTestObserver&) = delete;
+
~ToolbarActionsModelTestObserver() override;
size_t inserted_count() const { return inserted_count_; }
@@ -99,8 +105,6 @@
size_t initialized_count_;
std::vector<ToolbarActionsModel::ActionId> last_pinned_action_ids_;
-
- DISALLOW_COPY_AND_ASSIGN(ToolbarActionsModelTestObserver);
};
ToolbarActionsModelTestObserver::ToolbarActionsModelTestObserver(
@@ -122,6 +126,11 @@
: public extensions::ExtensionServiceTestBase {
public:
ToolbarActionsModelUnitTest() {}
+
+ ToolbarActionsModelUnitTest(const ToolbarActionsModelUnitTest&) = delete;
+ ToolbarActionsModelUnitTest& operator=(const ToolbarActionsModelUnitTest&) =
+ delete;
+
~ToolbarActionsModelUnitTest() override {}
protected:
@@ -196,8 +205,6 @@
scoped_refptr<const extensions::Extension> browser_action_extension_;
scoped_refptr<const extensions::Extension> page_action_extension_;
scoped_refptr<const extensions::Extension> no_action_extension_;
-
- DISALLOW_COPY_AND_ASSIGN(ToolbarActionsModelUnitTest);
};
void ToolbarActionsModelUnitTest::Init() {
diff --git a/chrome/browser/ui/translate/source_language_combobox_model.h b/chrome/browser/ui/translate/source_language_combobox_model.h
index e70a7ce5..97e3b9b 100644
--- a/chrome/browser/ui/translate/source_language_combobox_model.h
+++ b/chrome/browser/ui/translate/source_language_combobox_model.h
@@ -20,6 +20,11 @@
class SourceLanguageComboboxModel : public ui::ComboboxModel {
public:
SourceLanguageComboboxModel(int default_index, TranslateBubbleModel* model);
+
+ SourceLanguageComboboxModel(const SourceLanguageComboboxModel&) = delete;
+ SourceLanguageComboboxModel& operator=(const SourceLanguageComboboxModel&) =
+ delete;
+
~SourceLanguageComboboxModel() override;
// Overridden from ui::ComboboxModel:
@@ -30,8 +35,6 @@
private:
const int default_index_;
TranslateBubbleModel* model_;
-
- DISALLOW_COPY_AND_ASSIGN(SourceLanguageComboboxModel);
};
#endif // CHROME_BROWSER_UI_TRANSLATE_SOURCE_LANGUAGE_COMBOBOX_MODEL_H_
diff --git a/chrome/browser/ui/translate/target_language_combobox_model.h b/chrome/browser/ui/translate/target_language_combobox_model.h
index dce7a94..cf09b4a1 100644
--- a/chrome/browser/ui/translate/target_language_combobox_model.h
+++ b/chrome/browser/ui/translate/target_language_combobox_model.h
@@ -19,6 +19,11 @@
class TargetLanguageComboboxModel : public ui::ComboboxModel {
public:
TargetLanguageComboboxModel(int default_index, TranslateBubbleModel* model);
+
+ TargetLanguageComboboxModel(const TargetLanguageComboboxModel&) = delete;
+ TargetLanguageComboboxModel& operator=(const TargetLanguageComboboxModel&) =
+ delete;
+
~TargetLanguageComboboxModel() override;
// Overridden from ui::ComboboxModel:
@@ -29,8 +34,6 @@
private:
const int default_index_;
TranslateBubbleModel* model_;
-
- DISALLOW_COPY_AND_ASSIGN(TargetLanguageComboboxModel);
};
#endif // CHROME_BROWSER_UI_TRANSLATE_TARGET_LANGUAGE_COMBOBOX_MODEL_H_
diff --git a/chrome/browser/ui/translate/translate_bubble_model_impl.h b/chrome/browser/ui/translate/translate_bubble_model_impl.h
index ff47dc42..bf2b64f 100644
--- a/chrome/browser/ui/translate/translate_bubble_model_impl.h
+++ b/chrome/browser/ui/translate/translate_bubble_model_impl.h
@@ -22,6 +22,10 @@
TranslateBubbleModelImpl(
translate::TranslateStep step,
std::unique_ptr<translate::TranslateUIDelegate> ui_delegate);
+
+ TranslateBubbleModelImpl(const TranslateBubbleModelImpl&) = delete;
+ TranslateBubbleModelImpl& operator=(const TranslateBubbleModelImpl&) = delete;
+
~TranslateBubbleModelImpl() override;
// Converts a TranslateStep to a ViewState.
@@ -65,8 +69,6 @@
bool translation_declined_;
bool translate_executed_;
-
- DISALLOW_COPY_AND_ASSIGN(TranslateBubbleModelImpl);
};
#endif // CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_BUBBLE_MODEL_IMPL_H_
diff --git a/chrome/browser/ui/unload_controller.h b/chrome/browser/ui/unload_controller.h
index 7fd097d..0bc8f74 100644
--- a/chrome/browser/ui/unload_controller.h
+++ b/chrome/browser/ui/unload_controller.h
@@ -25,6 +25,10 @@
public TabStripModelObserver {
public:
explicit UnloadController(Browser* browser);
+
+ UnloadController(const UnloadController&) = delete;
+ UnloadController& operator=(const UnloadController&) = delete;
+
~UnloadController() override;
// Returns true if |contents| can be cleanly closed. When |browser_| is being
@@ -153,8 +157,6 @@
base::RepeatingCallback<void(bool)> on_close_confirmed_;
base::WeakPtrFactory<UnloadController> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UnloadController);
};
#endif // CHROME_BROWSER_UI_UNLOAD_CONTROLLER_H_
diff --git a/chrome/browser/ui/user_education/active_tab_tracker.h b/chrome/browser/ui/user_education/active_tab_tracker.h
index 473b38d3..4908d84d 100644
--- a/chrome/browser/ui/user_education/active_tab_tracker.h
+++ b/chrome/browser/ui/user_education/active_tab_tracker.h
@@ -29,6 +29,10 @@
ActiveTabTracker(const base::TickClock* clock,
ActiveTabClosedCallback callback);
+
+ ActiveTabTracker(const ActiveTabTracker&) = delete;
+ ActiveTabTracker& operator=(const ActiveTabTracker&) = delete;
+
~ActiveTabTracker() override;
// Observes |tab_strip_model|. Its last activation time is set to the current
@@ -51,8 +55,6 @@
// Map containing the latest time the active tab changed for each tab strip
// model. Also serves as the list of all registered |TabStripModel|s.
std::unordered_map<TabStripModel*, base::TimeTicks> active_tab_changed_times_;
-
- DISALLOW_COPY_AND_ASSIGN(ActiveTabTracker);
};
#endif // CHROME_BROWSER_UI_USER_EDUCATION_ACTIVE_TAB_TRACKER_H_
diff --git a/chrome/browser/ui/user_education/reopen_tab_in_product_help.h b/chrome/browser/ui/user_education/reopen_tab_in_product_help.h
index 24aa216..6bde151 100644
--- a/chrome/browser/ui/user_education/reopen_tab_in_product_help.h
+++ b/chrome/browser/ui/user_education/reopen_tab_in_product_help.h
@@ -31,6 +31,10 @@
class ReopenTabInProductHelp : public BrowserListObserver, public KeyedService {
public:
ReopenTabInProductHelp(Profile* profile, const base::TickClock* clock);
+
+ ReopenTabInProductHelp(const ReopenTabInProductHelp&) = delete;
+ ReopenTabInProductHelp& operator=(const ReopenTabInProductHelp&) = delete;
+
~ReopenTabInProductHelp() override;
// Should be called when the user opens a blank new tab. Possibly triggers
@@ -63,8 +67,6 @@
// Manages the triggering logic for this IPH. This object calls into the IPH
// backend.
ReopenTabInProductHelpTrigger trigger_;
-
- DISALLOW_COPY_AND_ASSIGN(ReopenTabInProductHelp);
};
#endif // CHROME_BROWSER_UI_USER_EDUCATION_REOPEN_TAB_IN_PRODUCT_HELP_H_
diff --git a/chrome/browser/ui/user_education/reopen_tab_in_product_help_trigger.h b/chrome/browser/ui/user_education/reopen_tab_in_product_help_trigger.h
index e9bda29..4938cc3 100644
--- a/chrome/browser/ui/user_education/reopen_tab_in_product_help_trigger.h
+++ b/chrome/browser/ui/user_education/reopen_tab_in_product_help_trigger.h
@@ -27,6 +27,11 @@
public:
ReopenTabInProductHelpTrigger(feature_engagement::Tracker* tracker,
const base::TickClock* clock);
+
+ ReopenTabInProductHelpTrigger(const ReopenTabInProductHelpTrigger&) = delete;
+ ReopenTabInProductHelpTrigger& operator=(
+ const ReopenTabInProductHelpTrigger&) = delete;
+
~ReopenTabInProductHelpTrigger();
using ShowHelpCallback = base::RepeatingCallback<void()>;
@@ -68,8 +73,6 @@
TriggerState trigger_state_;
base::TimeTicks time_of_last_step_;
-
- DISALLOW_COPY_AND_ASSIGN(ReopenTabInProductHelpTrigger);
};
#endif // CHROME_BROWSER_UI_USER_EDUCATION_REOPEN_TAB_IN_PRODUCT_HELP_TRIGGER_H_
diff --git a/chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc b/chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc
index 83352881..cc570ea 100644
--- a/chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc
+++ b/chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc
@@ -35,6 +35,11 @@
class WinAccessibilityEventMonitor {
public:
WinAccessibilityEventMonitor(UINT event_min, UINT event_max);
+
+ WinAccessibilityEventMonitor(const WinAccessibilityEventMonitor&) = delete;
+ WinAccessibilityEventMonitor& operator=(const WinAccessibilityEventMonitor&) =
+ delete;
+
~WinAccessibilityEventMonitor();
// Blocks until the next event is received. When it's received, it
@@ -76,8 +81,6 @@
scoped_refptr<content::MessageLoopRunner> loop_runner_;
HWINEVENTHOOK win_event_hook_handle_;
static WinAccessibilityEventMonitor* instance_;
-
- DISALLOW_COPY_AND_ASSIGN(WinAccessibilityEventMonitor);
};
// static
diff --git a/chrome/browser/ui/views/accessibility/uia_accessibility_event_waiter.h b/chrome/browser/ui/views/accessibility/uia_accessibility_event_waiter.h
index d039222..f81b252c 100644
--- a/chrome/browser/ui/views/accessibility/uia_accessibility_event_waiter.h
+++ b/chrome/browser/ui/views/accessibility/uia_accessibility_event_waiter.h
@@ -78,6 +78,10 @@
public IUIAutomationEventHandler {
public:
EventHandler();
+
+ EventHandler(const EventHandler&) = delete;
+ EventHandler& operator=(const EventHandler&) = delete;
+
virtual ~EventHandler();
void Init(UiaAccessibilityEventWaiter::Thread* owner,
@@ -117,8 +121,6 @@
bool MatchesNameRole(IUIAutomationElement* sender);
Microsoft::WRL::ComPtr<IUIAutomationElement> root_;
-
- DISALLOW_COPY_AND_ASSIGN(EventHandler);
};
Microsoft::WRL::ComPtr<CComObject<EventHandler>> uia_event_handler_;
};
diff --git a/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.h b/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.h
index ff3922de..73c50d0a 100644
--- a/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.h
+++ b/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.h
@@ -37,6 +37,10 @@
const std::string& app_name,
gfx::ImageSkia image,
apps::UninstallDialog* uninstall_dialog);
+
+ AppUninstallDialogView(const AppUninstallDialogView&) = delete;
+ AppUninstallDialogView& operator=(const AppUninstallDialogView&) = delete;
+
~AppUninstallDialogView() override;
static AppUninstallDialogView* GetActiveViewForTesting();
@@ -63,8 +67,6 @@
views::Checkbox* report_abuse_checkbox_ = nullptr;
views::Checkbox* clear_site_data_checkbox_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(AppUninstallDialogView);
};
#endif // CHROME_BROWSER_UI_VIEWS_APPS_APP_DIALOG_APP_UNINSTALL_DIALOG_VIEW_H_
diff --git a/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.h b/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.h
index c3ece185..945e599 100644
--- a/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.h
+++ b/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.h
@@ -23,6 +23,12 @@
AppWindowDesktopWindowTreeHostWin(
ChromeNativeAppWindowViewsWin* app_window,
views::DesktopNativeWidgetAura* desktop_native_widget_aura);
+
+ AppWindowDesktopWindowTreeHostWin(const AppWindowDesktopWindowTreeHostWin&) =
+ delete;
+ AppWindowDesktopWindowTreeHostWin& operator=(
+ const AppWindowDesktopWindowTreeHostWin&) = delete;
+
~AppWindowDesktopWindowTreeHostWin() override;
private:
@@ -33,8 +39,6 @@
void HandleFrameChanged() override;
ChromeNativeAppWindowViewsWin* app_window_;
-
- DISALLOW_COPY_AND_ASSIGN(AppWindowDesktopWindowTreeHostWin);
};
#endif // CHROME_BROWSER_UI_VIEWS_APPS_APP_WINDOW_DESKTOP_WINDOW_TREE_HOST_WIN_H_
diff --git a/chrome/browser/ui/views/apps/app_window_easy_resize_window_targeter.h b/chrome/browser/ui/views/apps/app_window_easy_resize_window_targeter.h
index dd7f7d1..651be30b 100644
--- a/chrome/browser/ui/views/apps/app_window_easy_resize_window_targeter.h
+++ b/chrome/browser/ui/views/apps/app_window_easy_resize_window_targeter.h
@@ -19,6 +19,11 @@
AppWindowEasyResizeWindowTargeter(const gfx::Insets& insets,
ui::BaseWindow* native_app_window);
+ AppWindowEasyResizeWindowTargeter(const AppWindowEasyResizeWindowTargeter&) =
+ delete;
+ AppWindowEasyResizeWindowTargeter& operator=(
+ const AppWindowEasyResizeWindowTargeter&) = delete;
+
~AppWindowEasyResizeWindowTargeter() override;
protected:
@@ -29,8 +34,6 @@
private:
ui::BaseWindow* native_app_window_;
-
- DISALLOW_COPY_AND_ASSIGN(AppWindowEasyResizeWindowTargeter);
};
#endif // CHROME_BROWSER_UI_VIEWS_APPS_APP_WINDOW_EASY_RESIZE_WINDOW_TARGETER_H_
diff --git a/chrome/browser/ui/views/apps/app_window_native_widget_mac.h b/chrome/browser/ui/views/apps/app_window_native_widget_mac.h
index c38c5e8a..6bbded14 100644
--- a/chrome/browser/ui/views/apps/app_window_native_widget_mac.h
+++ b/chrome/browser/ui/views/apps/app_window_native_widget_mac.h
@@ -18,6 +18,10 @@
public:
AppWindowNativeWidgetMac(views::Widget* widget,
extensions::NativeAppWindow* native_app_window);
+
+ AppWindowNativeWidgetMac(const AppWindowNativeWidgetMac&) = delete;
+ AppWindowNativeWidgetMac& operator=(const AppWindowNativeWidgetMac&) = delete;
+
~AppWindowNativeWidgetMac() override;
protected:
@@ -32,8 +36,6 @@
// Weak. Owned by extensions::AppWindow (which manages our Widget via its
// WebContents).
extensions::NativeAppWindow* native_app_window_;
-
- DISALLOW_COPY_AND_ASSIGN(AppWindowNativeWidgetMac);
};
#endif // CHROME_BROWSER_UI_VIEWS_APPS_APP_WINDOW_NATIVE_WIDGET_MAC_H_
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views.h
index 782031f..28509337 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.h
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.h
@@ -18,6 +18,11 @@
public extensions::ChromeAppIconDelegate {
public:
ChromeNativeAppWindowViews();
+
+ ChromeNativeAppWindowViews(const ChromeNativeAppWindowViews&) = delete;
+ ChromeNativeAppWindowViews& operator=(const ChromeNativeAppWindowViews&) =
+ delete;
+
~ChromeNativeAppWindowViews() override;
SkRegion* shape() { return shape_.get(); }
@@ -94,8 +99,6 @@
// Contains the default Chrome app icon. It is used in case the custom icon
// for the extension app window is not set, or as a part of composite image.
std::unique_ptr<extensions::ChromeAppIcon> app_icon_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViews);
};
#endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h
index 559b87e..840c5ea 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h
@@ -18,6 +18,12 @@
class ChromeNativeAppWindowViewsAura : public ChromeNativeAppWindowViews {
public:
ChromeNativeAppWindowViewsAura();
+
+ ChromeNativeAppWindowViewsAura(const ChromeNativeAppWindowViewsAura&) =
+ delete;
+ ChromeNativeAppWindowViewsAura& operator=(
+ const ChromeNativeAppWindowViewsAura&) = delete;
+
~ChromeNativeAppWindowViewsAura() override;
protected:
@@ -42,8 +48,6 @@
private:
FRIEND_TEST_ALL_PREFIXES(ShapedAppWindowTargeterTest,
ResizeInsetsWithinBounds);
-
- DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsAura);
};
#endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_H_
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h
index b42711ee..885946f 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h
@@ -51,6 +51,12 @@
public aura::WindowObserver {
public:
ChromeNativeAppWindowViewsAuraAsh();
+
+ ChromeNativeAppWindowViewsAuraAsh(const ChromeNativeAppWindowViewsAuraAsh&) =
+ delete;
+ ChromeNativeAppWindowViewsAuraAsh& operator=(
+ const ChromeNativeAppWindowViewsAuraAsh&) = delete;
+
~ChromeNativeAppWindowViewsAuraAsh() override;
protected:
@@ -203,8 +209,6 @@
base::WeakPtrFactory<ChromeNativeAppWindowViewsAuraAsh> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsAuraAsh);
};
#endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_ASH_H_
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash_browsertest.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash_browsertest.cc
index 759b61f..11559d5 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash_browsertest.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash_browsertest.cc
@@ -63,6 +63,12 @@
: public AppWindowInteractiveTest {
public:
ChromeNativeAppWindowViewsAuraAshBrowserTest() = default;
+
+ ChromeNativeAppWindowViewsAuraAshBrowserTest(
+ const ChromeNativeAppWindowViewsAuraAshBrowserTest&) = delete;
+ ChromeNativeAppWindowViewsAuraAshBrowserTest& operator=(
+ const ChromeNativeAppWindowViewsAuraAshBrowserTest&) = delete;
+
~ChromeNativeAppWindowViewsAuraAshBrowserTest() override = default;
protected:
@@ -120,9 +126,6 @@
}
extensions::AppWindow* app_window_ = nullptr;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsAuraAshBrowserTest);
};
// Verify that immersive mode is enabled or disabled as expected.
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_mac.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views_mac.h
index 992c5c3..3c5f7b3 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_mac.h
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_mac.h
@@ -17,6 +17,11 @@
class ChromeNativeAppWindowViewsMac : public ChromeNativeAppWindowViews {
public:
ChromeNativeAppWindowViewsMac();
+
+ ChromeNativeAppWindowViewsMac(const ChromeNativeAppWindowViewsMac&) = delete;
+ ChromeNativeAppWindowViewsMac& operator=(
+ const ChromeNativeAppWindowViewsMac&) = delete;
+
~ChromeNativeAppWindowViewsMac() override;
// Called by |nswindow_observer_| for window resize events.
@@ -55,8 +60,6 @@
// Set true during an exit fullscreen transition, so that the live resize
// event AppKit sends can be distinguished from a zoom-triggered live resize.
bool in_fullscreen_transition_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsMac);
};
#endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_MAC_H_
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h
index 3dfab87..c281e08 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h
@@ -19,6 +19,11 @@
class ChromeNativeAppWindowViewsWin : public ChromeNativeAppWindowViewsAura {
public:
ChromeNativeAppWindowViewsWin();
+
+ ChromeNativeAppWindowViewsWin(const ChromeNativeAppWindowViewsWin&) = delete;
+ ChromeNativeAppWindowViewsWin& operator=(
+ const ChromeNativeAppWindowViewsWin&) = delete;
+
~ChromeNativeAppWindowViewsWin() override;
GlassAppWindowFrameViewWin* glass_frame_view() {
@@ -58,8 +63,6 @@
bool is_translucent_;
base::WeakPtrFactory<ChromeNativeAppWindowViewsWin> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsWin);
};
#endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_
diff --git a/chrome/browser/ui/views/apps/native_app_window_frame_view_mac.h b/chrome/browser/ui/views/apps/native_app_window_frame_view_mac.h
index 31cd708a..5baf72e3 100644
--- a/chrome/browser/ui/views/apps/native_app_window_frame_view_mac.h
+++ b/chrome/browser/ui/views/apps/native_app_window_frame_view_mac.h
@@ -20,6 +20,11 @@
public:
NativeAppWindowFrameViewMac(views::Widget* frame,
extensions::NativeAppWindow* window);
+
+ NativeAppWindowFrameViewMac(const NativeAppWindowFrameViewMac&) = delete;
+ NativeAppWindowFrameViewMac& operator=(const NativeAppWindowFrameViewMac&) =
+ delete;
+
~NativeAppWindowFrameViewMac() override;
// NonClientFrameView:
@@ -31,8 +36,6 @@
// Weak. Owned by extensions::AppWindow (which manages our Widget via its
// WebContents).
extensions::NativeAppWindow* native_app_window_;
-
- DISALLOW_COPY_AND_ASSIGN(NativeAppWindowFrameViewMac);
};
#endif // CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_FRAME_VIEW_MAC_H_
diff --git a/chrome/browser/ui/views/apps/shaped_app_window_targeter.h b/chrome/browser/ui/views/apps/shaped_app_window_targeter.h
index c57e51a..be504f3dc 100644
--- a/chrome/browser/ui/views/apps/shaped_app_window_targeter.h
+++ b/chrome/browser/ui/views/apps/shaped_app_window_targeter.h
@@ -13,6 +13,10 @@
class ShapedAppWindowTargeter : public aura::WindowTargeter {
public:
explicit ShapedAppWindowTargeter(ChromeNativeAppWindowViews* app_window);
+
+ ShapedAppWindowTargeter(const ShapedAppWindowTargeter&) = delete;
+ ShapedAppWindowTargeter& operator=(const ShapedAppWindowTargeter&) = delete;
+
~ShapedAppWindowTargeter() override;
private:
@@ -21,8 +25,6 @@
aura::Window* target) const override;
ChromeNativeAppWindowViews* app_window_;
-
- DISALLOW_COPY_AND_ASSIGN(ShapedAppWindowTargeter);
};
#endif // CHROME_BROWSER_UI_VIEWS_APPS_SHAPED_APP_WINDOW_TARGETER_H_
diff --git a/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc b/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
index a107e952..3d50a4a0 100644
--- a/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
+++ b/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
@@ -28,6 +28,10 @@
: web_view_(NULL) {
}
+ ShapedAppWindowTargeterTest(const ShapedAppWindowTargeterTest&) = delete;
+ ShapedAppWindowTargeterTest& operator=(const ShapedAppWindowTargeterTest&) =
+ delete;
+
~ShapedAppWindowTargeterTest() override {}
views::Widget* widget() { return widget_.get(); }
@@ -69,8 +73,6 @@
views::WebView web_view_;
std::unique_ptr<views::Widget> widget_;
ChromeNativeAppWindowViewsAura app_window_;
-
- DISALLOW_COPY_AND_ASSIGN(ShapedAppWindowTargeterTest);
};
TEST_F(ShapedAppWindowTargeterTest, HitTestBasic) {
diff --git a/chrome/browser/ui/views/arc_app_dialog_view_browsertest.cc b/chrome/browser/ui/views/arc_app_dialog_view_browsertest.cc
index 71e09613..a12d25a9 100644
--- a/chrome/browser/ui/views/arc_app_dialog_view_browsertest.cc
+++ b/chrome/browser/ui/views/arc_app_dialog_view_browsertest.cc
@@ -35,6 +35,11 @@
public:
ArcAppUninstallDialogViewBrowserTest() {}
+ ArcAppUninstallDialogViewBrowserTest(
+ const ArcAppUninstallDialogViewBrowserTest&) = delete;
+ ArcAppUninstallDialogViewBrowserTest& operator=(
+ const ArcAppUninstallDialogViewBrowserTest&) = delete;
+
~ArcAppUninstallDialogViewBrowserTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -106,14 +111,18 @@
Profile* profile_ = nullptr;
std::unique_ptr<arc::FakeAppInstance> app_instance_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppUninstallDialogViewBrowserTest);
};
class ArcAppPermissionDialogViewBrowserTest
: public ArcAppUninstallDialogViewBrowserTest {
public:
ArcAppPermissionDialogViewBrowserTest() {}
+
+ ArcAppPermissionDialogViewBrowserTest(
+ const ArcAppPermissionDialogViewBrowserTest&) = delete;
+ ArcAppPermissionDialogViewBrowserTest& operator=(
+ const ArcAppPermissionDialogViewBrowserTest&) = delete;
+
// InProcessBrowserTest:
~ArcAppPermissionDialogViewBrowserTest() override = default;
@@ -184,8 +193,6 @@
base::WeakPtrFactory<ArcAppPermissionDialogViewBrowserTest> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcAppPermissionDialogViewBrowserTest);
};
// Basic flow of requesting scan device list or access permission.
diff --git a/chrome/browser/ui/views/autofill/autofill_bubble_handler_impl.h b/chrome/browser/ui/views/autofill/autofill_bubble_handler_impl.h
index bfc9f19c..da17a69 100644
--- a/chrome/browser/ui/views/autofill/autofill_bubble_handler_impl.h
+++ b/chrome/browser/ui/views/autofill/autofill_bubble_handler_impl.h
@@ -31,6 +31,11 @@
public:
AutofillBubbleHandlerImpl(Browser* browser,
ToolbarButtonProvider* toolbar_button_provider);
+
+ AutofillBubbleHandlerImpl(const AutofillBubbleHandlerImpl&) = delete;
+ AutofillBubbleHandlerImpl& operator=(const AutofillBubbleHandlerImpl&) =
+ delete;
+
~AutofillBubbleHandlerImpl() override;
// AutofillBubbleHandler:
@@ -89,8 +94,6 @@
personal_data_manager_observation_{this};
base::ScopedObservation<AvatarToolbarButton, AvatarToolbarButton::Observer>
avatar_toolbar_button_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AutofillBubbleHandlerImpl);
};
} // namespace autofill
diff --git a/chrome/browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc b/chrome/browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc
index 7fb32b4..ab78ef65 100644
--- a/chrome/browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc
+++ b/chrome/browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc
@@ -49,6 +49,11 @@
class AutofillPopupBaseViewTest : public InProcessBrowserTest {
public:
AutofillPopupBaseViewTest() {}
+
+ AutofillPopupBaseViewTest(const AutofillPopupBaseViewTest&) = delete;
+ AutofillPopupBaseViewTest& operator=(const AutofillPopupBaseViewTest&) =
+ delete;
+
~AutofillPopupBaseViewTest() override {}
void SetUpOnMainThread() override {
@@ -80,8 +85,6 @@
protected:
testing::NiceMock<MockAutofillPopupViewDelegate> mock_delegate_;
AutofillPopupBaseView* view_;
-
- DISALLOW_COPY_AND_ASSIGN(AutofillPopupBaseViewTest);
};
// Regression test for crbug.com/391316
diff --git a/chrome/browser/ui/views/autofill/payments/card_unmask_prompt_view_tester_views.h b/chrome/browser/ui/views/autofill/payments/card_unmask_prompt_view_tester_views.h
index 6e2b5d1..cc28bb8 100644
--- a/chrome/browser/ui/views/autofill/payments/card_unmask_prompt_view_tester_views.h
+++ b/chrome/browser/ui/views/autofill/payments/card_unmask_prompt_view_tester_views.h
@@ -16,6 +16,12 @@
class CardUnmaskPromptViewTesterViews : public CardUnmaskPromptViewTester {
public:
explicit CardUnmaskPromptViewTesterViews(CardUnmaskPromptViews* view);
+
+ CardUnmaskPromptViewTesterViews(const CardUnmaskPromptViewTesterViews&) =
+ delete;
+ CardUnmaskPromptViewTesterViews& operator=(
+ const CardUnmaskPromptViewTesterViews&) = delete;
+
~CardUnmaskPromptViewTesterViews() override;
// CardUnmaskPromptViewTester:
@@ -24,8 +30,6 @@
private:
CardUnmaskPromptViews* view_;
-
- DISALLOW_COPY_AND_ASSIGN(CardUnmaskPromptViewTesterViews);
};
} // namespace autofill
diff --git a/chrome/browser/ui/views/autofill/payments/local_card_migration_icon_view.h b/chrome/browser/ui/views/autofill/payments/local_card_migration_icon_view.h
index a6ea242..38b38a7 100644
--- a/chrome/browser/ui/views/autofill/payments/local_card_migration_icon_view.h
+++ b/chrome/browser/ui/views/autofill/payments/local_card_migration_icon_view.h
@@ -22,6 +22,11 @@
CommandUpdater* command_updater,
IconLabelBubbleView::Delegate* icon_label_bubble_delegate,
PageActionIconView::Delegate* page_action_icon_delegate);
+
+ LocalCardMigrationIconView(const LocalCardMigrationIconView&) = delete;
+ LocalCardMigrationIconView& operator=(const LocalCardMigrationIconView&) =
+ delete;
+
~LocalCardMigrationIconView() override;
// PageActionIconView:
@@ -42,8 +47,6 @@
// IconLabelBubbleView:
void AnimationProgressed(const gfx::Animation* animation) override;
void AnimationEnded(const gfx::Animation* animation) override;
-
- DISALLOW_COPY_AND_ASSIGN(LocalCardMigrationIconView);
};
} // namespace autofill
diff --git a/chrome/browser/ui/views/autofill/payments/save_payment_icon_view.h b/chrome/browser/ui/views/autofill/payments/save_payment_icon_view.h
index 7656579..66c41e9 100644
--- a/chrome/browser/ui/views/autofill/payments/save_payment_icon_view.h
+++ b/chrome/browser/ui/views/autofill/payments/save_payment_icon_view.h
@@ -22,6 +22,10 @@
SavePaymentIconView(CommandUpdater* command_updater,
IconLabelBubbleView::Delegate* icon_label_bubble_delegate,
PageActionIconView::Delegate* page_action_icon_delegate);
+
+ SavePaymentIconView(const SavePaymentIconView&) = delete;
+ SavePaymentIconView& operator=(const SavePaymentIconView&) = delete;
+
~SavePaymentIconView() override;
// PageActionIconView:
@@ -41,8 +45,6 @@
// gfx::AnimationDelegate:
void AnimationEnded(const gfx::Animation* animation) override;
-
- DISALLOW_COPY_AND_ASSIGN(SavePaymentIconView);
};
} // namespace autofill
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index 8b699062..8e92cbf 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -92,6 +92,9 @@
public:
DialogWaiter() { aura::Env::GetInstance()->AddObserver(this); }
+ DialogWaiter(const DialogWaiter&) = delete;
+ DialogWaiter& operator=(const DialogWaiter&) = delete;
+
~DialogWaiter() override { aura::Env::GetInstance()->RemoveObserver(this); }
views::Widget* WaitForDialog() {
@@ -129,8 +132,6 @@
bool dialog_created_ = false;
views::Widget* dialog_ = nullptr;
base::RepeatingClosure quit_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(DialogWaiter);
};
// Waits for a dialog to terminate.
@@ -141,6 +142,9 @@
dialog->AddObserver(this);
}
+ DialogCloseWaiter(const DialogCloseWaiter&) = delete;
+ DialogCloseWaiter& operator=(const DialogCloseWaiter&) = delete;
+
~DialogCloseWaiter() override {
// It is not necessary to remove |this| from the dialog's observer, since
// the dialog is destroyed before this waiter.
@@ -164,8 +168,6 @@
bool dialog_closed_;
base::RepeatingClosure quit_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(DialogCloseWaiter);
};
// Waits for a views::Widget to receive a Tab key.
@@ -177,6 +179,9 @@
widget_->GetNativeWindow()->AddPreTargetHandler(this);
}
+ TabKeyWaiter(const TabKeyWaiter&) = delete;
+ TabKeyWaiter& operator=(const TabKeyWaiter&) = delete;
+
~TabKeyWaiter() override {
widget_->GetNativeWindow()->RemovePreTargetHandler(this);
}
@@ -203,8 +208,6 @@
views::Widget* widget_;
bool received_tab_;
base::RepeatingClosure quit_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(TabKeyWaiter);
};
void MoveMouseAndPress(const gfx::Point& screen_pos,
@@ -222,6 +225,10 @@
class TestingPageNavigator : public PageNavigator {
public:
TestingPageNavigator() {}
+
+ TestingPageNavigator(const TestingPageNavigator&) = delete;
+ TestingPageNavigator& operator=(const TestingPageNavigator&) = delete;
+
~TestingPageNavigator() override {}
WebContents* OpenURL(const OpenURLParams& params) override {
@@ -241,8 +248,6 @@
private:
std::vector<GURL> urls_;
std::vector<ui::PageTransition> transitions_;
-
- DISALLOW_COPY_AND_ASSIGN(TestingPageNavigator);
};
} // namespace
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h
index 7b2f93c..d006777 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h
@@ -12,6 +12,11 @@
class BookmarkBarViewTestHelper {
public:
explicit BookmarkBarViewTestHelper(BookmarkBarView* bbv) : bbv_(bbv) {}
+
+ BookmarkBarViewTestHelper(const BookmarkBarViewTestHelper&) = delete;
+ BookmarkBarViewTestHelper& operator=(const BookmarkBarViewTestHelper&) =
+ delete;
+
~BookmarkBarViewTestHelper() {}
size_t GetBookmarkButtonCount() { return bbv_->bookmark_buttons_.size(); }
@@ -34,8 +39,6 @@
private:
BookmarkBarView* bbv_;
-
- DISALLOW_COPY_AND_ASSIGN(BookmarkBarViewTestHelper);
};
#endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_TEST_HELPER_H_
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h
index 245702e..8fabf5a2 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h
@@ -51,6 +51,10 @@
const bookmarks::BookmarkNode* parent,
const std::vector<const bookmarks::BookmarkNode*>& selection,
bool close_on_remove);
+
+ BookmarkContextMenu(const BookmarkContextMenu&) = delete;
+ BookmarkContextMenu& operator=(const BookmarkContextMenu&) = delete;
+
~BookmarkContextMenu() override;
// Installs a callback to be run before the context menu is run. The callback
@@ -99,8 +103,6 @@
// Should the menu close when a node is removed.
bool close_on_remove_;
-
- DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenu);
};
#endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h
index 0f7f735..80c1082 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h
@@ -62,6 +62,10 @@
Browser* browser,
base::RepeatingCallback<content::PageNavigator*()> get_navigator,
views::Widget* parent);
+
+ BookmarkMenuDelegate(const BookmarkMenuDelegate&) = delete;
+ BookmarkMenuDelegate& operator=(const BookmarkMenuDelegate&) = delete;
+
~BookmarkMenuDelegate() override;
// Creates the menus from the model.
@@ -234,8 +238,6 @@
// Whether the involved menu uses mnemonics or not. If it does, ampersands
// inside bookmark titles need to be escaped.
bool menu_uses_mnemonics_;
-
- DISALLOW_COPY_AND_ASSIGN(BookmarkMenuDelegate);
};
#endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_
diff --git a/chrome/browser/ui/views/certificate_selector_browsertest.cc b/chrome/browser/ui/views/certificate_selector_browsertest.cc
index 9fbccdb..f5834dd 100644
--- a/chrome/browser/ui/views/certificate_selector_browsertest.cc
+++ b/chrome/browser/ui/views/certificate_selector_browsertest.cc
@@ -32,6 +32,9 @@
content::WebContents* web_contents)
: CertificateSelector(std::move(certificates), web_contents) {}
+ TestCertificateSelector(const TestCertificateSelector&) = delete;
+ TestCertificateSelector& operator=(const TestCertificateSelector&) = delete;
+
~TestCertificateSelector() override {
if (!on_destroy_.is_null())
std::move(on_destroy_).Run();
@@ -68,8 +71,6 @@
bool* accepted_ = nullptr;
bool* canceled_ = nullptr;
base::OnceClosure on_destroy_;
-
- DISALLOW_COPY_AND_ASSIGN(TestCertificateSelector);
};
class CertificateSelectorTest : public InProcessBrowserTest {
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h
index 490fd432..7ce1728 100644
--- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h
+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h
@@ -38,6 +38,12 @@
class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts {
public:
ChromeBrowserMainExtraPartsViews();
+
+ ChromeBrowserMainExtraPartsViews(const ChromeBrowserMainExtraPartsViews&) =
+ delete;
+ ChromeBrowserMainExtraPartsViews& operator=(
+ const ChromeBrowserMainExtraPartsViews&) = delete;
+
~ChromeBrowserMainExtraPartsViews() override;
// Returns global singleton.
@@ -73,8 +79,6 @@
// Manages the relaunch notification prompts.
std::unique_ptr<RelaunchNotificationController>
relaunch_notification_controller_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews);
};
#endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h
index ee36fad..17cbe5a2 100644
--- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h
+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h
@@ -20,6 +20,12 @@
public display::DisplayObserver {
public:
ChromeBrowserMainExtraPartsViewsLinux();
+
+ ChromeBrowserMainExtraPartsViewsLinux(
+ const ChromeBrowserMainExtraPartsViewsLinux&) = delete;
+ ChromeBrowserMainExtraPartsViewsLinux& operator=(
+ const ChromeBrowserMainExtraPartsViewsLinux&) = delete;
+
~ChromeBrowserMainExtraPartsViewsLinux() override;
// Overridden from ChromeBrowserMainExtraParts:
@@ -31,8 +37,6 @@
void OnCurrentWorkspaceChanged(const std::string& new_workspace) override;
absl::optional<display::ScopedDisplayObserver> display_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViewsLinux);
};
#endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_LINUX_H_
diff --git a/chrome/browser/ui/views/chrome_constrained_window_views_client.cc b/chrome/browser/ui/views/chrome_constrained_window_views_client.cc
index 6dfe9ce..85a3551 100644
--- a/chrome/browser/ui/views/chrome_constrained_window_views_client.cc
+++ b/chrome/browser/ui/views/chrome_constrained_window_views_client.cc
@@ -18,6 +18,12 @@
: public constrained_window::ConstrainedWindowViewsClient {
public:
ChromeConstrainedWindowViewsClient() {}
+
+ ChromeConstrainedWindowViewsClient(
+ const ChromeConstrainedWindowViewsClient&) = delete;
+ ChromeConstrainedWindowViewsClient& operator=(
+ const ChromeConstrainedWindowViewsClient&) = delete;
+
~ChromeConstrainedWindowViewsClient() override {}
private:
@@ -35,8 +41,6 @@
gfx::NativeView GetDialogHostView(gfx::NativeWindow parent) override {
return platform_util::GetViewForWindow(parent);
}
-
- DISALLOW_COPY_AND_ASSIGN(ChromeConstrainedWindowViewsClient);
};
} // namespace
diff --git a/chrome/browser/ui/views/chrome_layout_provider.h b/chrome/browser/ui/views/chrome_layout_provider.h
index 2b971d6..fadc00dc 100644
--- a/chrome/browser/ui/views/chrome_layout_provider.h
+++ b/chrome/browser/ui/views/chrome_layout_provider.h
@@ -82,6 +82,10 @@
class ChromeLayoutProvider : public views::LayoutProvider {
public:
ChromeLayoutProvider();
+
+ ChromeLayoutProvider(const ChromeLayoutProvider&) = delete;
+ ChromeLayoutProvider& operator=(const ChromeLayoutProvider&) = delete;
+
~ChromeLayoutProvider() override;
static ChromeLayoutProvider* Get();
@@ -107,8 +111,6 @@
private:
const ChromeTypographyProvider typography_provider_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeLayoutProvider);
};
#endif // CHROME_BROWSER_UI_VIEWS_CHROME_LAYOUT_PROVIDER_H_
diff --git a/chrome/browser/ui/views/chrome_views_delegate.h b/chrome/browser/ui/views/chrome_views_delegate.h
index 393070d..302c3103 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.h
+++ b/chrome/browser/ui/views/chrome_views_delegate.h
@@ -24,6 +24,10 @@
class ChromeViewsDelegate : public views::ViewsDelegate {
public:
ChromeViewsDelegate();
+
+ ChromeViewsDelegate(const ChromeViewsDelegate&) = delete;
+ ChromeViewsDelegate& operator=(const ChromeViewsDelegate&) = delete;
+
~ChromeViewsDelegate() override;
// views::ViewsDelegate:
@@ -109,8 +113,6 @@
base::WeakPtrFactory<ChromeViewsDelegate> weak_factory_{this};
#endif
-
- DISALLOW_COPY_AND_ASSIGN(ChromeViewsDelegate);
};
#endif // CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_
diff --git a/chrome/browser/ui/views/close_bubble_on_tab_activation_helper.h b/chrome/browser/ui/views/close_bubble_on_tab_activation_helper.h
index 7fd05ce..6e8bd6f 100644
--- a/chrome/browser/ui/views/close_bubble_on_tab_activation_helper.h
+++ b/chrome/browser/ui/views/close_bubble_on_tab_activation_helper.h
@@ -23,6 +23,12 @@
CloseBubbleOnTabActivationHelper(
views::BubbleDialogDelegateView* owner_bubble,
Browser* browser);
+
+ CloseBubbleOnTabActivationHelper(const CloseBubbleOnTabActivationHelper&) =
+ delete;
+ CloseBubbleOnTabActivationHelper& operator=(
+ const CloseBubbleOnTabActivationHelper&) = delete;
+
~CloseBubbleOnTabActivationHelper() override;
// TabStripModelObserver:
@@ -34,8 +40,6 @@
private:
views::BubbleDialogDelegateView* owner_bubble_; // weak, owns me.
Browser* browser_;
-
- DISALLOW_COPY_AND_ASSIGN(CloseBubbleOnTabActivationHelper);
};
#endif // CHROME_BROWSER_UI_VIEWS_CLOSE_BUBBLE_ON_TAB_ACTIVATION_HELPER_H_
diff --git a/chrome/browser/ui/views/collected_cookies_views_browsertest.cc b/chrome/browser/ui/views/collected_cookies_views_browsertest.cc
index 4a94b29..7a8918f9 100644
--- a/chrome/browser/ui/views/collected_cookies_views_browsertest.cc
+++ b/chrome/browser/ui/views/collected_cookies_views_browsertest.cc
@@ -18,6 +18,11 @@
class CollectedCookiesViewsTest : public InProcessBrowserTest {
public:
CollectedCookiesViewsTest() = default;
+
+ CollectedCookiesViewsTest(const CollectedCookiesViewsTest&) = delete;
+ CollectedCookiesViewsTest& operator=(const CollectedCookiesViewsTest&) =
+ delete;
+
~CollectedCookiesViewsTest() override = default;
// InProcessBrowserTest:
@@ -54,8 +59,6 @@
private:
CollectedCookiesViews* cookies_dialog_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(CollectedCookiesViewsTest);
};
IN_PROC_BROWSER_TEST_F(CollectedCookiesViewsTest, CloseDialog) {
diff --git a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
index 0a9060e..662dd67 100644
--- a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
+++ b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
@@ -127,6 +127,12 @@
std::make_unique<ChromeWebContentsHandler>()),
initiator_observer_(observer),
web_view_(web_view) {}
+
+ WebDialogWebContentsDelegateViews(const WebDialogWebContentsDelegateViews&) =
+ delete;
+ WebDialogWebContentsDelegateViews& operator=(
+ const WebDialogWebContentsDelegateViews&) = delete;
+
~WebDialogWebContentsDelegateViews() override = default;
// ui::WebDialogWebContentsDelegate:
@@ -175,8 +181,6 @@
private:
InitiatorWebContentsObserver* const initiator_observer_;
ConstrainedDialogWebView* web_view_;
-
- DISALLOW_COPY_AND_ASSIGN(WebDialogWebContentsDelegateViews);
};
// Views implementation of ConstrainedWebDialogDelegate.
@@ -195,6 +199,12 @@
content::BrowserContext* browser_context,
std::unique_ptr<ui::WebDialogDelegate> web_dialog_delegate,
std::unique_ptr<WebDialogWebContentsDelegate> tab_delegate);
+
+ ConstrainedWebDialogDelegateViews(const ConstrainedWebDialogDelegateViews&) =
+ delete;
+ ConstrainedWebDialogDelegateViews& operator=(
+ const ConstrainedWebDialogDelegateViews&) = delete;
+
~ConstrainedWebDialogDelegateViews() override;
bool closed_via_webui() const;
@@ -252,8 +262,6 @@
views::WebView* view_;
std::unique_ptr<WebDialogWebContentsDelegate> override_tab_delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateViews);
};
using content::NativeWebKeyboardEvent;
diff --git a/chrome/browser/ui/views/constrained_window_views_browsertest.cc b/chrome/browser/ui/views/constrained_window_views_browsertest.cc
index a6dfde0..8dbea1f 100644
--- a/chrome/browser/ui/views/constrained_window_views_browsertest.cc
+++ b/chrome/browser/ui/views/constrained_window_views_browsertest.cc
@@ -35,12 +35,13 @@
SetModalType(ui::MODAL_TYPE_CHILD);
GetViewAccessibility().OverrideName("Test dialog");
}
+
+ TestDialog(const TestDialog&) = delete;
+ TestDialog& operator=(const TestDialog&) = delete;
+
~TestDialog() override {}
views::View* GetInitiallyFocusedView() override { return this; }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestDialog);
};
// A helper function to create and show a web contents modal dialog.
@@ -54,10 +55,12 @@
class ConstrainedWindowViewTest : public InProcessBrowserTest {
public:
ConstrainedWindowViewTest() = default;
- ~ConstrainedWindowViewTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowViewTest);
+ ConstrainedWindowViewTest(const ConstrainedWindowViewTest&) = delete;
+ ConstrainedWindowViewTest& operator=(const ConstrainedWindowViewTest&) =
+ delete;
+
+ ~ConstrainedWindowViewTest() override = default;
};
} // namespace
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index fff69b1..648500d 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -72,6 +72,10 @@
class MediaComboboxModel : public ui::ComboboxModel {
public:
explicit MediaComboboxModel(blink::mojom::MediaStreamType type);
+
+ MediaComboboxModel(const MediaComboboxModel&) = delete;
+ MediaComboboxModel& operator=(const MediaComboboxModel&) = delete;
+
~MediaComboboxModel() override;
blink::mojom::MediaStreamType type() const { return type_; }
@@ -84,8 +88,6 @@
private:
blink::mojom::MediaStreamType type_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaComboboxModel);
};
// A view representing one or more rows, each containing a label and combobox
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h b/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h
index 161e591..d0951d1 100644
--- a/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h
+++ b/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h
@@ -26,6 +26,9 @@
DesktopMediaSourceViewStyle single_style,
const std::u16string& accessible_name);
+ DesktopMediaListView(const DesktopMediaListView&) = delete;
+ DesktopMediaListView& operator=(const DesktopMediaListView&) = delete;
+
~DesktopMediaListView() override;
// Called by DesktopMediaSourceView when selection has changed.
@@ -62,8 +65,6 @@
DesktopMediaSourceViewStyle* active_style_;
const std::u16string accessible_name_;
-
- DISALLOW_COPY_AND_ASSIGN(DesktopMediaListView);
};
#endif // CHROME_BROWSER_UI_VIEWS_DESKTOP_CAPTURE_DESKTOP_MEDIA_LIST_VIEW_H_
diff --git a/chrome/browser/ui/views/devtools_process_observer.h b/chrome/browser/ui/views/devtools_process_observer.h
index c85d7aa5..d534c3d5 100644
--- a/chrome/browser/ui/views/devtools_process_observer.h
+++ b/chrome/browser/ui/views/devtools_process_observer.h
@@ -17,6 +17,10 @@
class DevtoolsProcessObserver : public content::BrowserChildProcessObserver {
public:
explicit DevtoolsProcessObserver(ui_devtools::TracingAgent* agent);
+
+ DevtoolsProcessObserver(const DevtoolsProcessObserver&) = delete;
+ DevtoolsProcessObserver& operator=(const DevtoolsProcessObserver&) = delete;
+
~DevtoolsProcessObserver() override;
private:
@@ -33,8 +37,6 @@
const content::ChildProcessTerminationInfo& info) override;
ui_devtools::TracingAgent* tracing_agent_;
-
- DISALLOW_COPY_AND_ASSIGN(DevtoolsProcessObserver);
};
#endif // CHROME_BROWSER_UI_VIEWS_DEVTOOLS_PROCESS_OBSERVER_H_
diff --git a/chrome/browser/ui/views/dropdown_bar_host.h b/chrome/browser/ui/views/dropdown_bar_host.h
index 9317d020..6eaf4863 100644
--- a/chrome/browser/ui/views/dropdown_bar_host.h
+++ b/chrome/browser/ui/views/dropdown_bar_host.h
@@ -44,6 +44,10 @@
public views::WidgetDelegate {
public:
explicit DropdownBarHost(BrowserView* browser_view);
+
+ DropdownBarHost(const DropdownBarHost&) = delete;
+ DropdownBarHost& operator=(const DropdownBarHost&) = delete;
+
~DropdownBarHost() override;
// Initializes the DropdownBarHost. This creates the widget that |view| paints
@@ -183,8 +187,6 @@
// A flag to manually manage visibility. GTK/X11 is asynchronous and
// the state of the widget can be out of sync.
bool is_visible_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(DropdownBarHost);
};
#endif // CHROME_BROWSER_UI_VIEWS_DROPDOWN_BAR_HOST_H_
diff --git a/chrome/browser/ui/views/elevation_icon_setter.h b/chrome/browser/ui/views/elevation_icon_setter.h
index a2b9b7d..e0bf71e2 100644
--- a/chrome/browser/ui/views/elevation_icon_setter.h
+++ b/chrome/browser/ui/views/elevation_icon_setter.h
@@ -25,6 +25,10 @@
// should pass a function which does a relayout on the view containing the
// button, to ensure the button is correctly resized as necessary.
ElevationIconSetter(views::LabelButton* button, base::OnceClosure callback);
+
+ ElevationIconSetter(const ElevationIconSetter&) = delete;
+ ElevationIconSetter& operator=(const ElevationIconSetter&) = delete;
+
~ElevationIconSetter();
private:
@@ -32,8 +36,6 @@
views::LabelButton* button_;
base::WeakPtrFactory<ElevationIconSetter> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ElevationIconSetter);
};
#endif // CHROME_BROWSER_UI_VIEWS_ELEVATION_ICON_SETTER_H_
diff --git a/chrome/browser/ui/views/exclusive_access_bubble_views.h b/chrome/browser/ui/views/exclusive_access_bubble_views.h
index 64f60f0..3894af1 100644
--- a/chrome/browser/ui/views/exclusive_access_bubble_views.h
+++ b/chrome/browser/ui/views/exclusive_access_bubble_views.h
@@ -41,6 +41,11 @@
const GURL& url,
ExclusiveAccessBubbleType bubble_type,
ExclusiveAccessBubbleHideCallback bubble_first_hide_callback);
+
+ ExclusiveAccessBubbleViews(const ExclusiveAccessBubbleViews&) = delete;
+ ExclusiveAccessBubbleViews& operator=(const ExclusiveAccessBubbleViews&) =
+ delete;
+
~ExclusiveAccessBubbleViews() override;
// |force_update| indicates the caller wishes to show the bubble contents
@@ -117,8 +122,6 @@
base::ScopedObservation<FullscreenController, FullscreenObserver>
fullscreen_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessBubbleViews);
};
#endif // CHROME_BROWSER_UI_VIEWS_EXCLUSIVE_ACCESS_BUBBLE_VIEWS_H_
diff --git a/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.h b/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.h
index 136168f5..3cbc8f0a2 100644
--- a/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.h
+++ b/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.h
@@ -28,6 +28,12 @@
public:
ExtensionActionPlatformDelegateViews(
ExtensionActionViewController* controller);
+
+ ExtensionActionPlatformDelegateViews(
+ const ExtensionActionPlatformDelegateViews&) = delete;
+ ExtensionActionPlatformDelegateViews& operator=(
+ const ExtensionActionPlatformDelegateViews&) = delete;
+
~ExtensionActionPlatformDelegateViews() override;
private:
@@ -62,8 +68,6 @@
base::ScopedObservation<extensions::CommandService,
extensions::CommandService::Observer>
command_service_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionActionPlatformDelegateViews);
};
#endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_ACTION_PLATFORM_DELEGATE_VIEWS_H_
diff --git a/chrome/browser/ui/views/extensions/extension_context_menu_controller.h b/chrome/browser/ui/views/extensions/extension_context_menu_controller.h
index 70a36f3..76512d6 100644
--- a/chrome/browser/ui/views/extensions/extension_context_menu_controller.h
+++ b/chrome/browser/ui/views/extensions/extension_context_menu_controller.h
@@ -23,6 +23,12 @@
public:
explicit ExtensionContextMenuController(
ToolbarActionViewController* controller);
+
+ ExtensionContextMenuController(const ExtensionContextMenuController&) =
+ delete;
+ ExtensionContextMenuController& operator=(
+ const ExtensionContextMenuController&) = delete;
+
~ExtensionContextMenuController() override;
// views::ContextMenuController:
@@ -52,8 +58,6 @@
// This controller contains the data for the extension's context menu.
ToolbarActionViewController* const controller_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionContextMenuController);
};
#endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_CONTEXT_MENU_CONTROLLER_H_
diff --git a/chrome/browser/ui/views/extensions/extension_dialog_bounds_browsertest.cc b/chrome/browser/ui/views/extensions/extension_dialog_bounds_browsertest.cc
index 34d732b..87565ce 100644
--- a/chrome/browser/ui/views/extensions/extension_dialog_bounds_browsertest.cc
+++ b/chrome/browser/ui/views/extensions/extension_dialog_bounds_browsertest.cc
@@ -26,6 +26,11 @@
: public SupportsTestDialog<extensions::ExtensionBrowserTest> {
public:
ExtensionDialogBoundsTest() = default;
+
+ ExtensionDialogBoundsTest(const ExtensionDialogBoundsTest&) = delete;
+ ExtensionDialogBoundsTest& operator=(const ExtensionDialogBoundsTest&) =
+ delete;
+
~ExtensionDialogBoundsTest() override = default;
void SetUp() override {
@@ -72,8 +77,6 @@
ASSERT_TRUE(dialog);
ASSERT_TRUE(init_listener.WaitUntilSatisfied());
}
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionDialogBoundsTest);
};
// Note that the underscores in the test names below are important as whatever
diff --git a/chrome/browser/ui/views/extensions/extension_dialog_interactive_uitest.cc b/chrome/browser/ui/views/extensions/extension_dialog_interactive_uitest.cc
index 02c8d5c7..56f0a0b3 100644
--- a/chrome/browser/ui/views/extensions/extension_dialog_interactive_uitest.cc
+++ b/chrome/browser/ui/views/extensions/extension_dialog_interactive_uitest.cc
@@ -18,10 +18,11 @@
class ExtensionDialogUiTest : public extensions::ExtensionBrowserTest {
public:
ExtensionDialogUiTest() = default;
- ~ExtensionDialogUiTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(ExtensionDialogUiTest);
+ ExtensionDialogUiTest(const ExtensionDialogUiTest&) = delete;
+ ExtensionDialogUiTest& operator=(const ExtensionDialogUiTest&) = delete;
+
+ ~ExtensionDialogUiTest() override = default;
};
} // namespace
diff --git a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h
index 544eb10..88a8d52 100644
--- a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h
+++ b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h
@@ -36,6 +36,12 @@
views::FocusManager* focus_manager,
ExtensionFilter extension_filter,
Delegate* delegate);
+
+ ExtensionKeybindingRegistryViews(const ExtensionKeybindingRegistryViews&) =
+ delete;
+ ExtensionKeybindingRegistryViews& operator=(
+ const ExtensionKeybindingRegistryViews&) = delete;
+
~ExtensionKeybindingRegistryViews() override;
// Overridden from ui::AcceleratorTarget.
@@ -56,8 +62,6 @@
// Weak pointer back to the focus manager to use to register and unregister
// accelerators with. Not owned by us.
views::FocusManager* focus_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionKeybindingRegistryViews);
};
#endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_VIEWS_H_
diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc
index 5cab777..ca085ccf 100644
--- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc
+++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc
@@ -62,6 +62,11 @@
base::RepeatingClosure quit_closure)
: quit_closure_(quit_closure) {}
+ TestExtensionUninstallDialogDelegate(
+ const TestExtensionUninstallDialogDelegate&) = delete;
+ TestExtensionUninstallDialogDelegate& operator=(
+ const TestExtensionUninstallDialogDelegate&) = delete;
+
~TestExtensionUninstallDialogDelegate() override {}
bool canceled() const { return canceled_; }
@@ -82,8 +87,6 @@
bool did_close_ = false;
bool canceled_ = false;
std::u16string error_;
-
- DISALLOW_COPY_AND_ASSIGN(TestExtensionUninstallDialogDelegate);
};
} // namespace
diff --git a/chrome/browser/ui/views/extensions/extensions_menu_view_unittest.cc b/chrome/browser/ui/views/extensions/extensions_menu_view_unittest.cc
index 5197f52..9293ef0 100644
--- a/chrome/browser/ui/views/extensions/extensions_menu_view_unittest.cc
+++ b/chrome/browser/ui/views/extensions/extensions_menu_view_unittest.cc
@@ -79,6 +79,11 @@
ExtensionsMenuViewUnitTest()
: allow_extension_menu_instances_(
ExtensionsMenuView::AllowInstancesForTesting()) {}
+
+ ExtensionsMenuViewUnitTest(const ExtensionsMenuViewUnitTest&) = delete;
+ ExtensionsMenuViewUnitTest& operator=(const ExtensionsMenuViewUnitTest&) =
+ delete;
+
~ExtensionsMenuViewUnitTest() override = default;
// TestWithBrowserView:
@@ -129,8 +134,6 @@
base::AutoReset<bool> allow_extension_menu_instances_;
extensions::ExtensionService* extension_service_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionsMenuViewUnitTest);
};
void ExtensionsMenuViewUnitTest::SetUp() {
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h
index 2c61c07..ccec781 100644
--- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h
+++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h
@@ -31,6 +31,11 @@
public:
explicit MediaGalleriesDialogViews(
MediaGalleriesDialogController* controller);
+
+ MediaGalleriesDialogViews(const MediaGalleriesDialogViews&) = delete;
+ MediaGalleriesDialogViews& operator=(const MediaGalleriesDialogViews&) =
+ delete;
+
~MediaGalleriesDialogViews() override;
// MediaGalleriesDialog:
@@ -103,8 +108,6 @@
bool accepted_;
std::unique_ptr<views::MenuRunner> context_menu_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaGalleriesDialogViews);
};
#endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_MEDIA_GALLERIES_DIALOG_VIEWS_H_
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views_browsertest.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views_browsertest.cc
index 4b24ee7..c0a0bba 100644
--- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views_browsertest.cc
+++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views_browsertest.cc
@@ -43,6 +43,12 @@
class MediaGalleriesInteractiveDialogTest : public DialogBrowserTest {
public:
MediaGalleriesInteractiveDialogTest() {}
+
+ MediaGalleriesInteractiveDialogTest(
+ const MediaGalleriesInteractiveDialogTest&) = delete;
+ MediaGalleriesInteractiveDialogTest& operator=(
+ const MediaGalleriesInteractiveDialogTest&) = delete;
+
~MediaGalleriesInteractiveDialogTest() override {}
void PreRunTestOnMainThread() override {
@@ -75,8 +81,6 @@
private:
testing::NiceMock<MediaGalleriesDialogControllerMock> controller_;
std::unique_ptr<MediaGalleriesDialogViews> dialog_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaGalleriesInteractiveDialogTest);
};
IN_PROC_BROWSER_TEST_F(MediaGalleriesInteractiveDialogTest,
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
index 21ac27ce..609b4cc7 100644
--- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
+++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
@@ -40,6 +40,10 @@
class MediaGalleriesDialogTest : public ChromeViewsTestBase {
public:
MediaGalleriesDialogTest() {}
+
+ MediaGalleriesDialogTest(const MediaGalleriesDialogTest&) = delete;
+ MediaGalleriesDialogTest& operator=(const MediaGalleriesDialogTest&) = delete;
+
~MediaGalleriesDialogTest() override {}
void SetUp() override {
ChromeViewsTestBase::SetUp();
@@ -82,8 +86,6 @@
NiceMock<MediaGalleriesDialogControllerMock> controller_;
views::Checkbox* checkbox_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(MediaGalleriesDialogTest);
};
// Tests that checkboxes are initialized according to the contents of
diff --git a/chrome/browser/ui/views/external_protocol_dialog_browsertest.cc b/chrome/browser/ui/views/external_protocol_dialog_browsertest.cc
index 0848a5b..1437e8a3 100644
--- a/chrome/browser/ui/views/external_protocol_dialog_browsertest.cc
+++ b/chrome/browser/ui/views/external_protocol_dialog_browsertest.cc
@@ -83,6 +83,11 @@
ExternalProtocolHandler::SetDelegateForTesting(this);
}
+ ExternalProtocolDialogBrowserTest(const ExternalProtocolDialogBrowserTest&) =
+ delete;
+ ExternalProtocolDialogBrowserTest& operator=(
+ const ExternalProtocolDialogBrowserTest&) = delete;
+
~ExternalProtocolDialogBrowserTest() override {
ExternalProtocolHandler::SetDelegateForTesting(nullptr);
}
@@ -148,9 +153,6 @@
BlockState blocked_state_ = BlockState::UNKNOWN;
bool url_did_launch_ = false;
std::string launch_url_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ExternalProtocolDialogBrowserTest);
};
IN_PROC_BROWSER_TEST_F(ExternalProtocolDialogBrowserTest, TestAccept) {
diff --git a/chrome/browser/ui/views/find_bar_host.h b/chrome/browser/ui/views/find_bar_host.h
index ab1a168..82504563 100644
--- a/chrome/browser/ui/views/find_bar_host.h
+++ b/chrome/browser/ui/views/find_bar_host.h
@@ -41,6 +41,10 @@
public FindBarTesting {
public:
explicit FindBarHost(BrowserView* browser_view);
+
+ FindBarHost(const FindBarHost&) = delete;
+ FindBarHost& operator=(const FindBarHost&) = delete;
+
~FindBarHost() override;
// Forwards selected key events to the renderer. This is useful to make sure
@@ -161,8 +165,6 @@
// The number of audible alerts issued.
size_t audible_alerts_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(FindBarHost);
};
#endif // CHROME_BROWSER_UI_VIEWS_FIND_BAR_HOST_H_
diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc
index e10c5b9..49e6df89 100644
--- a/chrome/browser/ui/views/find_bar_view.cc
+++ b/chrome/browser/ui/views/find_bar_view.cc
@@ -65,6 +65,10 @@
METADATA_HEADER(FindBarMatchCountLabel);
FindBarMatchCountLabel() = default;
+
+ FindBarMatchCountLabel(const FindBarMatchCountLabel&) = delete;
+ FindBarMatchCountLabel& operator=(const FindBarMatchCountLabel&) = delete;
+
~FindBarMatchCountLabel() override = default;
gfx::Size CalculatePreferredSize() const override {
@@ -114,8 +118,6 @@
private:
absl::optional<find_in_page::FindNotificationDetails> last_result_;
-
- DISALLOW_COPY_AND_ASSIGN(FindBarMatchCountLabel);
};
BEGIN_VIEW_BUILDER(/* No Export */, FindBarMatchCountLabel, views::Label)
diff --git a/chrome/browser/ui/views/find_bar_view.h b/chrome/browser/ui/views/find_bar_view.h
index 68374f95..06bcb6b 100644
--- a/chrome/browser/ui/views/find_bar_view.h
+++ b/chrome/browser/ui/views/find_bar_view.h
@@ -49,6 +49,10 @@
METADATA_HEADER(FindBarView);
explicit FindBarView(FindBarHost* host = nullptr);
+
+ FindBarView(const FindBarView&) = delete;
+ FindBarView& operator=(const FindBarView&) = delete;
+
~FindBarView() override;
void SetHost(FindBarHost* host);
@@ -119,8 +123,6 @@
views::ImageButton* find_previous_button_;
views::ImageButton* find_next_button_;
views::ImageButton* close_button_;
-
- DISALLOW_COPY_AND_ASSIGN(FindBarView);
};
BEGIN_VIEW_BUILDER(/* no export */, FindBarView, views::BoxLayoutView)
diff --git a/chrome/browser/ui/views/frame/app_menu_button.h b/chrome/browser/ui/views/frame/app_menu_button.h
index 384d0f8..45f27ce 100644
--- a/chrome/browser/ui/views/frame/app_menu_button.h
+++ b/chrome/browser/ui/views/frame/app_menu_button.h
@@ -25,6 +25,10 @@
class AppMenuButton : public ToolbarButton {
public:
explicit AppMenuButton(PressedCallback callback);
+
+ AppMenuButton(const AppMenuButton&) = delete;
+ AppMenuButton& operator=(const AppMenuButton&) = delete;
+
~AppMenuButton() override;
views::MenuButtonController* menu_button_controller() const {
@@ -69,8 +73,6 @@
base::ObserverList<AppMenuButtonObserver>::Unchecked observer_list_;
views::MenuButtonController* menu_button_controller_;
-
- DISALLOW_COPY_AND_ASSIGN(AppMenuButton);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_APP_MENU_BUTTON_H_
diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h
index cb41f15..2b621275 100644
--- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h
+++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h
@@ -38,6 +38,12 @@
views::DesktopNativeWidgetAura* desktop_native_widget_aura,
BrowserView* browser_view,
BrowserFrame* browser_frame);
+
+ BrowserDesktopWindowTreeHostLinux(const BrowserDesktopWindowTreeHostLinux&) =
+ delete;
+ BrowserDesktopWindowTreeHostLinux& operator=(
+ const BrowserDesktopWindowTreeHostLinux&) = delete;
+
~BrowserDesktopWindowTreeHostLinux() override;
// Called when the tab drag status changes for this window.
@@ -111,8 +117,6 @@
&views::LinuxUI::AddDeviceScaleFactorObserver,
&views::LinuxUI::RemoveDeviceScaleFactorObserver>
scale_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BrowserDesktopWindowTreeHostLinux);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_LINUX_H_
diff --git a/chrome/browser/ui/views/frame/browser_frame.h b/chrome/browser/ui/views/frame/browser_frame.h
index e06cd6c3..8e81caaf 100644
--- a/chrome/browser/ui/views/frame/browser_frame.h
+++ b/chrome/browser/ui/views/frame/browser_frame.h
@@ -55,6 +55,10 @@
class BrowserFrame : public views::Widget, public views::ContextMenuController {
public:
explicit BrowserFrame(BrowserView* browser_view);
+
+ BrowserFrame(const BrowserFrame&) = delete;
+ BrowserFrame& operator=(const BrowserFrame&) = delete;
+
~BrowserFrame() override;
// Initialize the frame (creates the underlying native window).
@@ -200,8 +204,6 @@
// model yet.
int num_desks_ = -1;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(BrowserFrame);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
diff --git a/chrome/browser/ui/views/frame/browser_frame_ash.cc b/chrome/browser/ui/views/frame/browser_frame_ash.cc
index 14e4ddc..ae8892b 100644
--- a/chrome/browser/ui/views/frame/browser_frame_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_ash.cc
@@ -37,6 +37,11 @@
explicit BrowserWindowStateDelegate(Browser* browser) : browser_(browser) {
DCHECK(browser_);
}
+
+ BrowserWindowStateDelegate(const BrowserWindowStateDelegate&) = delete;
+ BrowserWindowStateDelegate& operator=(const BrowserWindowStateDelegate&) =
+ delete;
+
~BrowserWindowStateDelegate() override {}
// Overridden from ash::WindowStateDelegate.
@@ -51,8 +56,6 @@
private:
Browser* browser_; // not owned.
-
- DISALLOW_COPY_AND_ASSIGN(BrowserWindowStateDelegate);
};
} // namespace
diff --git a/chrome/browser/ui/views/frame/browser_frame_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_frame_ash_browsertest.cc
index 16fb476..979df0d 100644
--- a/chrome/browser/ui/views/frame/browser_frame_ash_browsertest.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_ash_browsertest.cc
@@ -23,12 +23,13 @@
public testing::WithParamInterface<bool> {
public:
BrowserTestParam() = default;
+
+ BrowserTestParam(const BrowserTestParam&) = delete;
+ BrowserTestParam& operator=(const BrowserTestParam&) = delete;
+
~BrowserTestParam() override = default;
bool CreateV1App() { return GetParam(); }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BrowserTestParam);
};
} // namespace
diff --git a/chrome/browser/ui/views/frame/browser_frame_header_chromeos.h b/chrome/browser/ui/views/frame/browser_frame_header_chromeos.h
index 40b7b68..751e199 100644
--- a/chrome/browser/ui/views/frame/browser_frame_header_chromeos.h
+++ b/chrome/browser/ui/views/frame/browser_frame_header_chromeos.h
@@ -32,6 +32,11 @@
views::View* view,
AppearanceProvider* appearance_provider,
chromeos::FrameCaptionButtonContainerView* caption_button_container);
+
+ BrowserFrameHeaderChromeOS(const BrowserFrameHeaderChromeOS&) = delete;
+ BrowserFrameHeaderChromeOS& operator=(const BrowserFrameHeaderChromeOS&) =
+ delete;
+
~BrowserFrameHeaderChromeOS() override;
// Returns the amount that the frame background is inset from the left edge of
@@ -54,8 +59,6 @@
void PaintFrameImages(gfx::Canvas* canvas);
AppearanceProvider* appearance_provider_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserFrameHeaderChromeOS);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_HEADER_CHROMEOS_H_
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_browsertest.cc
index b969d506..bb1fa8f 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_browsertest.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_browsertest.cc
@@ -36,6 +36,12 @@
: public extensions::ExtensionBrowserTest {
public:
BrowserNonClientFrameViewBrowserTest() = default;
+
+ BrowserNonClientFrameViewBrowserTest(
+ const BrowserNonClientFrameViewBrowserTest&) = delete;
+ BrowserNonClientFrameViewBrowserTest& operator=(
+ const BrowserNonClientFrameViewBrowserTest&) = delete;
+
~BrowserNonClientFrameViewBrowserTest() override = default;
void SetUp() override {
@@ -86,8 +92,6 @@
private:
GURL GetAppURL() { return embedded_test_server()->GetURL("/empty.html"); }
-
- DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewBrowserTest);
};
// Tests the frame color for a normal browser window.
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos_browsertest.cc
index ee2ec23..6b44d19e 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos_browsertest.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos_browsertest.cc
@@ -398,6 +398,11 @@
public:
WebAppNonClientFrameViewAshTest() = default;
+ WebAppNonClientFrameViewAshTest(const WebAppNonClientFrameViewAshTest&) =
+ delete;
+ WebAppNonClientFrameViewAshTest& operator=(
+ const WebAppNonClientFrameViewAshTest&) = delete;
+
~WebAppNonClientFrameViewAshTest() override = default;
GURL GetAppURL() const {
@@ -521,8 +526,6 @@
// For mocking a secure site.
net::EmbeddedTestServer https_server_{net::EmbeddedTestServer::TYPE_HTTPS};
content::ContentMockCertVerifier cert_verifier_;
-
- DISALLOW_COPY_AND_ASSIGN(WebAppNonClientFrameViewAshTest);
};
} // namespace
@@ -1008,6 +1011,12 @@
: public TopChromeMdParamTest<InProcessBrowserTest> {
public:
HomeLauncherBrowserNonClientFrameViewChromeOSTest() = default;
+
+ HomeLauncherBrowserNonClientFrameViewChromeOSTest(
+ const HomeLauncherBrowserNonClientFrameViewChromeOSTest&) = delete;
+ HomeLauncherBrowserNonClientFrameViewChromeOSTest& operator=(
+ const HomeLauncherBrowserNonClientFrameViewChromeOSTest&) = delete;
+
~HomeLauncherBrowserNonClientFrameViewChromeOSTest() override = default;
void SetUpDefaultCommandLine(base::CommandLine* command_line) override {
@@ -1016,9 +1025,6 @@
command_line->AppendSwitch(ash::switches::kAshEnableTabletMode);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(HomeLauncherBrowserNonClientFrameViewChromeOSTest);
};
} // namespace
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.h b/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.h
index 780762d..6390dea2 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.h
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.h
@@ -26,6 +26,11 @@
public:
// Mac implementation of BrowserNonClientFrameView.
BrowserNonClientFrameViewMac(BrowserFrame* frame, BrowserView* browser_view);
+
+ BrowserNonClientFrameViewMac(const BrowserNonClientFrameViewMac&) = delete;
+ BrowserNonClientFrameViewMac& operator=(const BrowserNonClientFrameViewMac&) =
+ delete;
+
~BrowserNonClientFrameViewMac() override;
// BrowserNonClientFrameView:
@@ -131,8 +136,6 @@
base::scoped_nsobject<FullscreenToolbarController>
fullscreen_toolbar_controller_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewMac);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_MAC_H_
diff --git a/chrome/browser/ui/views/frame/browser_view_browsertest.cc b/chrome/browser/ui/views/frame/browser_view_browsertest.cc
index 3f18817..d021952 100644
--- a/chrome/browser/ui/views/frame/browser_view_browsertest.cc
+++ b/chrome/browser/ui/views/frame/browser_view_browsertest.cc
@@ -88,6 +88,10 @@
content::WebContents* other)
: content::WebContentsObserver(source),
other_(other) {}
+
+ TestWebContentsObserver(const TestWebContentsObserver&) = delete;
+ TestWebContentsObserver& operator=(const TestWebContentsObserver&) = delete;
+
~TestWebContentsObserver() override {}
void WebContentsDestroyed() override {
@@ -97,8 +101,6 @@
private:
content::WebContents* other_;
-
- DISALLOW_COPY_AND_ASSIGN(TestWebContentsObserver);
};
class TestTabModalConfirmDialogDelegate : public TabModalConfirmDialogDelegate {
diff --git a/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc b/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc
index 84a1047..d5c161d 100644
--- a/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc
+++ b/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc
@@ -28,14 +28,15 @@
class BrowserViewFocusTest : public InProcessBrowserTest {
public:
BrowserViewFocusTest() = default;
+
+ BrowserViewFocusTest(const BrowserViewFocusTest&) = delete;
+ BrowserViewFocusTest& operator=(const BrowserViewFocusTest&) = delete;
+
~BrowserViewFocusTest() override = default;
bool IsViewFocused(ViewID vid) {
return ui_test_utils::IsViewFocused(browser(), vid);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BrowserViewFocusTest);
};
IN_PROC_BROWSER_TEST_F(BrowserViewFocusTest, BrowsersRememberFocus) {
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc
index 2bd298c..2ccfb80 100644
--- a/chrome/browser/ui/views/frame/browser_view_layout.cc
+++ b/chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -75,6 +75,11 @@
: browser_view_layout_(browser_view_layout) {
}
+ WebContentsModalDialogHostViews(const WebContentsModalDialogHostViews&) =
+ delete;
+ WebContentsModalDialogHostViews& operator=(
+ const WebContentsModalDialogHostViews&) = delete;
+
~WebContentsModalDialogHostViews() override {
for (ModalDialogHostObserver& observer : observer_list_)
observer.OnHostDestroying();
@@ -124,8 +129,6 @@
BrowserViewLayout* const browser_view_layout_;
base::ObserverList<ModalDialogHostObserver>::Unchecked observer_list_;
-
- DISALLOW_COPY_AND_ASSIGN(WebContentsModalDialogHostViews);
};
////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.h b/chrome/browser/ui/views/frame/browser_view_layout.h
index d2ce4bd4..398ca60 100644
--- a/chrome/browser/ui/views/frame/browser_view_layout.h
+++ b/chrome/browser/ui/views/frame/browser_view_layout.h
@@ -65,6 +65,10 @@
views::View* lens_side_panel,
ImmersiveModeController* immersive_mode_controller,
views::View* contents_separator);
+
+ BrowserViewLayout(const BrowserViewLayout&) = delete;
+ BrowserViewLayout& operator=(const BrowserViewLayout&) = delete;
+
~BrowserViewLayout() override;
// Sets or updates views that are not available when |this| is initialized.
@@ -193,8 +197,6 @@
// The distance the web contents modal dialog is from the top of the window,
// in pixels.
int web_contents_modal_dialog_top_y_ = -1;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserViewLayout);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_
diff --git a/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc b/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc
index 3a2854f..a8fd744 100644
--- a/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc
+++ b/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc
@@ -30,6 +30,11 @@
class MockBrowserViewLayoutDelegate : public BrowserViewLayoutDelegate {
public:
MockBrowserViewLayoutDelegate() = default;
+
+ MockBrowserViewLayoutDelegate(const MockBrowserViewLayoutDelegate&) = delete;
+ MockBrowserViewLayoutDelegate& operator=(
+ const MockBrowserViewLayoutDelegate&) = delete;
+
~MockBrowserViewLayoutDelegate() override = default;
void set_tab_strip_visible(bool visible) {
@@ -95,8 +100,6 @@
bool content_separator_enabled_ = true;
bool top_controls_slide_enabled_ = false;
float top_controls_shown_ratio_ = 1.f;
-
- DISALLOW_COPY_AND_ASSIGN(MockBrowserViewLayoutDelegate);
};
///////////////////////////////////////////////////////////////////////////////
@@ -147,6 +150,10 @@
contents_container_(nullptr),
contents_web_view_(nullptr),
devtools_web_view_(nullptr) {}
+
+ BrowserViewLayoutTest(const BrowserViewLayoutTest&) = delete;
+ BrowserViewLayoutTest& operator=(const BrowserViewLayoutTest&) = delete;
+
~BrowserViewLayoutTest() override {}
BrowserViewLayout* layout() { return layout_.get(); }
@@ -231,8 +238,6 @@
views::View* devtools_web_view_;
std::unique_ptr<MockImmersiveModeController> immersive_mode_controller_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserViewLayoutTest);
};
// Test basic construction and initialization.
diff --git a/chrome/browser/ui/views/frame/browser_view_unittest.cc b/chrome/browser/ui/views/frame/browser_view_unittest.cc
index c93ad4be..24b6254f 100644
--- a/chrome/browser/ui/views/frame/browser_view_unittest.cc
+++ b/chrome/browser/ui/views/frame/browser_view_unittest.cc
@@ -345,10 +345,11 @@
BrowserViewHostedAppTest()
: TestWithBrowserView(Browser::TYPE_POPUP,
BrowserWithTestWindowTest::HostedApp()) {}
- ~BrowserViewHostedAppTest() override {}
- private:
- DISALLOW_COPY_AND_ASSIGN(BrowserViewHostedAppTest);
+ BrowserViewHostedAppTest(const BrowserViewHostedAppTest&) = delete;
+ BrowserViewHostedAppTest& operator=(const BrowserViewHostedAppTest&) = delete;
+
+ ~BrowserViewHostedAppTest() override {}
};
// Test basic layout for hosted apps.
diff --git a/chrome/browser/ui/views/frame/contents_layout_manager.h b/chrome/browser/ui/views/frame/contents_layout_manager.h
index f383d72..6b76a9ff 100644
--- a/chrome/browser/ui/views/frame/contents_layout_manager.h
+++ b/chrome/browser/ui/views/frame/contents_layout_manager.h
@@ -14,6 +14,10 @@
class ContentsLayoutManager : public views::LayoutManager {
public:
ContentsLayoutManager(views::View* devtools_view, views::View* contents_view);
+
+ ContentsLayoutManager(const ContentsLayoutManager&) = delete;
+ ContentsLayoutManager& operator=(const ContentsLayoutManager&) = delete;
+
~ContentsLayoutManager() override;
// Sets the contents resizing strategy.
@@ -32,8 +36,6 @@
views::View* host_;
DevToolsContentsResizingStrategy strategy_;
-
- DISALLOW_COPY_AND_ASSIGN(ContentsLayoutManager);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_LAYOUT_MANAGER_H_
diff --git a/chrome/browser/ui/views/frame/dbus_appmenu.h b/chrome/browser/ui/views/frame/dbus_appmenu.h
index 52af158..a53e043 100644
--- a/chrome/browser/ui/views/frame/dbus_appmenu.h
+++ b/chrome/browser/ui/views/frame/dbus_appmenu.h
@@ -50,6 +50,10 @@
public ui::SimpleMenuModel::Delegate {
public:
DbusAppmenu(BrowserView* browser_view, uint32_t browser_frame_id);
+
+ DbusAppmenu(const DbusAppmenu&) = delete;
+ DbusAppmenu& operator=(const DbusAppmenu&) = delete;
+
~DbusAppmenu() override;
void Initialize(DbusMenu::InitializedCallback callback);
@@ -190,8 +194,6 @@
// For callbacks may be run after destruction.
base::WeakPtrFactory<DbusAppmenu> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DbusAppmenu);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_DBUS_APPMENU_H_
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.h b/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.h
index 78f7892..b8c1a644 100644
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.h
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.h
@@ -25,6 +25,12 @@
public aura::WindowObserver {
public:
ImmersiveModeControllerChromeos();
+
+ ImmersiveModeControllerChromeos(const ImmersiveModeControllerChromeos&) =
+ delete;
+ ImmersiveModeControllerChromeos& operator=(
+ const ImmersiveModeControllerChromeos&) = delete;
+
~ImmersiveModeControllerChromeos() override;
chromeos::ImmersiveFullscreenController* controller() { return &controller_; }
@@ -82,8 +88,6 @@
base::ScopedObservation<aura::Window, aura::WindowObserver>
window_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ImmersiveModeControllerChromeos);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_MODE_CONTROLLER_CHROMEOS_H_
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos_browsertest.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos_browsertest.cc
index b50df9e..b58e4ae9 100644
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos_browsertest.cc
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos_browsertest.cc
@@ -43,6 +43,11 @@
ImmersiveModeControllerChromeosWebAppBrowserTest()
: https_server_(net::EmbeddedTestServer::TYPE_HTTPS) {}
+ ImmersiveModeControllerChromeosWebAppBrowserTest(
+ const ImmersiveModeControllerChromeosWebAppBrowserTest&) = delete;
+ ImmersiveModeControllerChromeosWebAppBrowserTest& operator=(
+ const ImmersiveModeControllerChromeosWebAppBrowserTest&) = delete;
+
~ImmersiveModeControllerChromeosWebAppBrowserTest() override = default;
// WebAppControllerBrowserTest override:
@@ -134,8 +139,6 @@
std::unique_ptr<ImmersiveRevealedLock> revealed_lock_;
net::EmbeddedTestServer https_server_;
-
- DISALLOW_COPY_AND_ASSIGN(ImmersiveModeControllerChromeosWebAppBrowserTest);
};
// Test the layout and visibility of the TopContainerView and web contents when
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos_unittest.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos_unittest.cc
index 1094b6a1..2bf8e1f 100644
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos_unittest.cc
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos_unittest.cc
@@ -35,6 +35,12 @@
public:
ImmersiveModeControllerChromeosTest()
: TestWithBrowserView(Browser::TYPE_NORMAL) {}
+
+ ImmersiveModeControllerChromeosTest(
+ const ImmersiveModeControllerChromeosTest&) = delete;
+ ImmersiveModeControllerChromeosTest& operator=(
+ const ImmersiveModeControllerChromeosTest&) = delete;
+
~ImmersiveModeControllerChromeosTest() override {}
// TestWithBrowserView override:
@@ -97,8 +103,6 @@
ImmersiveModeController* controller_;
std::unique_ptr<ImmersiveRevealedLock> revealed_lock_;
-
- DISALLOW_COPY_AND_ASSIGN(ImmersiveModeControllerChromeosTest);
};
// Test the layout and visibility of the tabstrip, toolbar and TopContainerView
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_mac.mm b/chrome/browser/ui/views/frame/immersive_mode_controller_mac.mm
index fa66ae0..f89661a 100644
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_mac.mm
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_mac.mm
@@ -152,12 +152,15 @@
public:
RevealedLock(base::WeakPtr<ImmersiveModeControllerMac> controller,
AnimateReveal animate_reveal);
+
+ RevealedLock(const RevealedLock&) = delete;
+ RevealedLock& operator=(const RevealedLock&) = delete;
+
~RevealedLock() override;
private:
base::WeakPtr<ImmersiveModeControllerMac> controller_;
AnimateReveal animate_reveal_;
- DISALLOW_COPY_AND_ASSIGN(RevealedLock);
};
ImmersiveModeControllerMac();
diff --git a/chrome/browser/ui/views/frame/minimize_button_metrics_win.h b/chrome/browser/ui/views/frame/minimize_button_metrics_win.h
index cfc7823..1b392d0 100644
--- a/chrome/browser/ui/views/frame/minimize_button_metrics_win.h
+++ b/chrome/browser/ui/views/frame/minimize_button_metrics_win.h
@@ -16,6 +16,10 @@
class MinimizeButtonMetrics {
public:
MinimizeButtonMetrics();
+
+ MinimizeButtonMetrics(const MinimizeButtonMetrics&) = delete;
+ MinimizeButtonMetrics& operator=(const MinimizeButtonMetrics&) = delete;
+
~MinimizeButtonMetrics();
void Init(HWND hwnd);
@@ -57,8 +61,6 @@
// Has OnHWNDActivated() been invoked?
bool was_activated_;
-
- DISALLOW_COPY_AND_ASSIGN(MinimizeButtonMetrics);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_MINIMIZE_BUTTON_METRICS_WIN_H_
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index a1d34276..ad87b3f2 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -82,6 +82,11 @@
dest_height_(dest_height),
draw_mirrored_(draw_mirrored) {}
+ CaptionButtonBackgroundImageSource(
+ const CaptionButtonBackgroundImageSource&) = delete;
+ CaptionButtonBackgroundImageSource& operator=(
+ const CaptionButtonBackgroundImageSource&) = delete;
+
~CaptionButtonBackgroundImageSource() override = default;
void Draw(gfx::Canvas* canvas) override {
@@ -104,8 +109,6 @@
int source_x_, source_y_;
int dest_width_, dest_height_;
bool draw_mirrored_;
-
- DISALLOW_COPY_AND_ASSIGN(CaptionButtonBackgroundImageSource);
};
} // namespace
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc
index 5ffed94b..36aa846 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc
@@ -36,6 +36,12 @@
class WebAppOpaqueBrowserFrameViewTest : public InProcessBrowserTest {
public:
WebAppOpaqueBrowserFrameViewTest() = default;
+
+ WebAppOpaqueBrowserFrameViewTest(const WebAppOpaqueBrowserFrameViewTest&) =
+ delete;
+ WebAppOpaqueBrowserFrameViewTest& operator=(
+ const WebAppOpaqueBrowserFrameViewTest&) = delete;
+
~WebAppOpaqueBrowserFrameViewTest() override = default;
static GURL GetAppURL() { return GURL("https://test.org"); }
@@ -107,9 +113,6 @@
// Disable animations.
ui::ScopedAnimationDurationScaleMode scoped_animation_duration_scale_mode_{
ui::ScopedAnimationDurationScaleMode::ZERO_DURATION};
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WebAppOpaqueBrowserFrameViewTest);
};
IN_PROC_BROWSER_TEST_F(WebAppOpaqueBrowserFrameViewTest, NoThemeColor) {
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
index a06beb2..c15b4099 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
@@ -41,6 +41,11 @@
static const int kCaptionButtonBottomPadding;
OpaqueBrowserFrameViewLayout();
+
+ OpaqueBrowserFrameViewLayout(const OpaqueBrowserFrameViewLayout&) = delete;
+ OpaqueBrowserFrameViewLayout& operator=(const OpaqueBrowserFrameViewLayout&) =
+ delete;
+
~OpaqueBrowserFrameViewLayout() override;
void set_delegate(OpaqueBrowserFrameViewLayoutDelegate* delegate) {
@@ -239,8 +244,6 @@
bool is_window_controls_overlay_enabled_ = false;
CaptionButtonPlaceholderContainer* caption_button_placeholder_container_;
-
- DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameViewLayout);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
index 04dd5b9e..b34d976 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
@@ -40,6 +40,10 @@
class TestLayoutDelegate : public OpaqueBrowserFrameViewLayoutDelegate {
public:
TestLayoutDelegate() : show_caption_buttons_(true), maximized_(false) {}
+
+ TestLayoutDelegate(const TestLayoutDelegate&) = delete;
+ TestLayoutDelegate& operator=(const TestLayoutDelegate&) = delete;
+
~TestLayoutDelegate() override {}
void set_window_title(const std::u16string& title) { window_title_ = title; }
@@ -86,8 +90,6 @@
std::u16string window_title_;
bool show_caption_buttons_;
bool maximized_;
-
- DISALLOW_COPY_AND_ASSIGN(TestLayoutDelegate);
};
} // namespace
@@ -97,6 +99,12 @@
public testing::WithParamInterface<bool> {
public:
OpaqueBrowserFrameViewLayoutTest() {}
+
+ OpaqueBrowserFrameViewLayoutTest(const OpaqueBrowserFrameViewLayoutTest&) =
+ delete;
+ OpaqueBrowserFrameViewLayoutTest& operator=(
+ const OpaqueBrowserFrameViewLayoutTest&) = delete;
+
~OpaqueBrowserFrameViewLayoutTest() override {}
void SetUp() override {
@@ -355,8 +363,6 @@
TabIconView* tab_icon_view_ = nullptr;
views::Label* window_title_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameViewLayoutTest);
};
TEST_P(OpaqueBrowserFrameViewLayoutTest, BasicWindow) {
diff --git a/chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h b/chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h
index 0a8b5e3..e7ebebee 100644
--- a/chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h
+++ b/chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h
@@ -15,13 +15,16 @@
class SystemMenuInsertionDelegateWin : public views::MenuInsertionDelegateWin {
public:
SystemMenuInsertionDelegateWin() {}
+
+ SystemMenuInsertionDelegateWin(const SystemMenuInsertionDelegateWin&) =
+ delete;
+ SystemMenuInsertionDelegateWin& operator=(
+ const SystemMenuInsertionDelegateWin&) = delete;
+
~SystemMenuInsertionDelegateWin() override {}
// Overridden from views::MenuInsertionDelegateWin:
int GetInsertionIndex(HMENU native_menu) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SystemMenuInsertionDelegateWin);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_INSERTION_DELEGATE_WIN_H_
diff --git a/chrome/browser/ui/views/frame/system_menu_model_builder.h b/chrome/browser/ui/views/frame/system_menu_model_builder.h
index 71124f51..85ae532 100644
--- a/chrome/browser/ui/views/frame/system_menu_model_builder.h
+++ b/chrome/browser/ui/views/frame/system_menu_model_builder.h
@@ -30,6 +30,10 @@
class SystemMenuModelBuilder {
public:
SystemMenuModelBuilder(ui::AcceleratorProvider* provider, Browser* browser);
+
+ SystemMenuModelBuilder(const SystemMenuModelBuilder&) = delete;
+ SystemMenuModelBuilder& operator=(const SystemMenuModelBuilder&) = delete;
+
~SystemMenuModelBuilder();
// Populates the menu.
@@ -63,8 +67,6 @@
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
std::unique_ptr<chromeos::MoveToDesksMenuModel> move_to_desks_model_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(SystemMenuModelBuilder);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_MODEL_BUILDER_H_
diff --git a/chrome/browser/ui/views/frame/system_menu_model_delegate.h b/chrome/browser/ui/views/frame/system_menu_model_delegate.h
index c27ae7eb..ccdd51f 100644
--- a/chrome/browser/ui/views/frame/system_menu_model_delegate.h
+++ b/chrome/browser/ui/views/frame/system_menu_model_delegate.h
@@ -16,6 +16,10 @@
class SystemMenuModelDelegate : public ui::SimpleMenuModel::Delegate {
public:
SystemMenuModelDelegate(ui::AcceleratorProvider* provider, Browser* browser);
+
+ SystemMenuModelDelegate(const SystemMenuModelDelegate&) = delete;
+ SystemMenuModelDelegate& operator=(const SystemMenuModelDelegate&) = delete;
+
~SystemMenuModelDelegate() override;
Browser* browser() { return browser_; }
@@ -33,8 +37,6 @@
private:
ui::AcceleratorProvider* const provider_; // weak
Browser* const browser_; // weak
-
- DISALLOW_COPY_AND_ASSIGN(SystemMenuModelDelegate);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_MODEL_DELEGATE_H_
diff --git a/chrome/browser/ui/views/frame/test_with_browser_view.h b/chrome/browser/ui/views/frame/test_with_browser_view.h
index 23d64f3..cc5b0c6 100644
--- a/chrome/browser/ui/views/frame/test_with_browser_view.h
+++ b/chrome/browser/ui/views/frame/test_with_browser_view.h
@@ -26,6 +26,9 @@
feature_list_.InitAndDisableFeature(media_router::kMediaRouter);
}
+ TestWithBrowserView(const TestWithBrowserView&) = delete;
+ TestWithBrowserView& operator=(const TestWithBrowserView&) = delete;
+
~TestWithBrowserView() override;
// BrowserWithTestWindowTest overrides:
@@ -40,8 +43,6 @@
private:
BrowserView* browser_view_; // Not owned.
base::test::ScopedFeatureList feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(TestWithBrowserView);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_
diff --git a/chrome/browser/ui/views/frame/top_controls_slide_controller.h b/chrome/browser/ui/views/frame/top_controls_slide_controller.h
index e684717..db91fce 100644
--- a/chrome/browser/ui/views/frame/top_controls_slide_controller.h
+++ b/chrome/browser/ui/views/frame/top_controls_slide_controller.h
@@ -18,6 +18,11 @@
class TopControlsSlideController {
public:
TopControlsSlideController() = default;
+
+ TopControlsSlideController(const TopControlsSlideController&) = delete;
+ TopControlsSlideController& operator=(const TopControlsSlideController&) =
+ delete;
+
virtual ~TopControlsSlideController() = default;
// Returns true when the browser top controls slide behavior with page scrolls
@@ -54,9 +59,6 @@
// Returns true while the top controls are sliding up or down, and hasn't
// reached a final steady state.
virtual bool IsTopControlsSlidingInProgress() const = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TopControlsSlideController);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_TOP_CONTROLS_SLIDE_CONTROLLER_H_
diff --git a/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.cc b/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.cc
index 420e8052..2852b2a8 100644
--- a/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.cc
+++ b/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.cc
@@ -155,6 +155,10 @@
permission_manager->AddObserver(this);
}
+ TopControlsSlideTabObserver(const TopControlsSlideTabObserver&) = delete;
+ TopControlsSlideTabObserver& operator=(const TopControlsSlideTabObserver&) =
+ delete;
+
~TopControlsSlideTabObserver() override {
auto* permission_manager =
permissions::PermissionRequestManager::FromWebContents(web_contents());
@@ -268,8 +272,6 @@
// right before the final layout of the BrowserView.
// https://crbug.com/885223.
bool shrink_renderer_size_ = true;
-
- DISALLOW_COPY_AND_ASSIGN(TopControlsSlideTabObserver);
};
////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.h b/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.h
index 89534f8a..a97860d 100644
--- a/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.h
+++ b/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.h
@@ -45,6 +45,12 @@
public views::ViewObserver {
public:
explicit TopControlsSlideControllerChromeOS(BrowserView* browser_view);
+
+ TopControlsSlideControllerChromeOS(
+ const TopControlsSlideControllerChromeOS&) = delete;
+ TopControlsSlideControllerChromeOS& operator=(
+ const TopControlsSlideControllerChromeOS&) = delete;
+
~TopControlsSlideControllerChromeOS() override;
// TopControlsSlideController:
@@ -194,8 +200,6 @@
#endif
display::ScopedDisplayObserver display_observer_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TopControlsSlideControllerChromeOS);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_TOP_CONTROLS_SLIDE_CONTROLLER_CHROMEOS_H_
diff --git a/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos_browsertest.cc b/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos_browsertest.cc
index fc1d51a..393df95625 100644
--- a/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos_browsertest.cc
+++ b/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos_browsertest.cc
@@ -138,6 +138,10 @@
: real_controller_(std::move(real_controller)) {
DCHECK(real_controller_);
}
+
+ TestController(const TestController&) = delete;
+ TestController& operator=(const TestController&) = delete;
+
~TestController() override = default;
void AddObserver(TestControllerObserver* observer) {
@@ -188,8 +192,6 @@
std::unique_ptr<TopControlsSlideController> real_controller_;
base::ObserverList<TestControllerObserver>::Unchecked observers_;
-
- DISALLOW_COPY_AND_ASSIGN(TestController);
};
// Waits for a given terminal value (1.f or 0.f) of the browser top controls
@@ -201,6 +203,10 @@
controller_->AddObserver(this);
}
+ TopControlsShownRatioWaiter(const TopControlsShownRatioWaiter&) = delete;
+ TopControlsShownRatioWaiter& operator=(const TopControlsShownRatioWaiter&) =
+ delete;
+
~TopControlsShownRatioWaiter() override { controller_->RemoveObserver(this); }
// TestControllerObserver:
@@ -248,8 +254,6 @@
std::unique_ptr<base::RunLoop> run_loop_;
float waiting_for_shown_ratio_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(TopControlsShownRatioWaiter);
};
// Waits for a given |is_gesture_scrolling_in_progress_| value.
@@ -303,6 +307,12 @@
class TopControlsSlideControllerTest : public InProcessBrowserTest {
public:
TopControlsSlideControllerTest() = default;
+
+ TopControlsSlideControllerTest(const TopControlsSlideControllerTest&) =
+ delete;
+ TopControlsSlideControllerTest& operator=(
+ const TopControlsSlideControllerTest&) = delete;
+
~TopControlsSlideControllerTest() override = default;
BrowserView* browser_view() const {
@@ -545,8 +555,6 @@
}
TestController* test_controller_ = nullptr; // Not owned.
-
- DISALLOW_COPY_AND_ASSIGN(TopControlsSlideControllerTest);
};
namespace {
@@ -873,6 +881,10 @@
: browser_view_(browser_view) {
browser_view->AddObserver(this);
}
+
+ BrowserViewLayoutWaiter(const BrowserViewLayoutWaiter&) = delete;
+ BrowserViewLayoutWaiter& operator=(const BrowserViewLayoutWaiter&) = delete;
+
~BrowserViewLayoutWaiter() override { browser_view_->RemoveObserver(this); }
void Wait() {
@@ -898,8 +910,6 @@
bool view_bounds_changed_ = false;
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserViewLayoutWaiter);
};
IN_PROC_BROWSER_TEST_F(TopControlsSlideControllerTest, DisplayRotation) {
@@ -1001,6 +1011,10 @@
public:
explicit PageStateUpdateWaiter(content::WebContents* contents)
: WebContentsObserver(contents) {}
+
+ PageStateUpdateWaiter(const PageStateUpdateWaiter&) = delete;
+ PageStateUpdateWaiter& operator=(const PageStateUpdateWaiter&) = delete;
+
~PageStateUpdateWaiter() override = default;
void Wait() {
@@ -1020,8 +1034,6 @@
private:
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(PageStateUpdateWaiter);
};
// Verifies that we ignore the shown ratios sent from widgets other than that of
@@ -1132,6 +1144,10 @@
controller_->AddObserver(this);
}
+ IntermediateShownRatioWaiter(const IntermediateShownRatioWaiter&) = delete;
+ IntermediateShownRatioWaiter& operator=(const IntermediateShownRatioWaiter&) =
+ delete;
+
~IntermediateShownRatioWaiter() override {
controller_->RemoveObserver(this);
}
@@ -1170,8 +1186,6 @@
base::OnceClosure on_intermediate_ratio_callback_;
bool seen_intermediate_ratios_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(IntermediateShownRatioWaiter);
};
// TODO(crbug.com/1055958): Test is flaky.
diff --git a/chrome/browser/ui/views/frame/web_contents_close_handler.h b/chrome/browser/ui/views/frame/web_contents_close_handler.h
index 2e8a7e2..717ce7b 100644
--- a/chrome/browser/ui/views/frame/web_contents_close_handler.h
+++ b/chrome/browser/ui/views/frame/web_contents_close_handler.h
@@ -18,6 +18,10 @@
class WebContentsCloseHandler {
public:
explicit WebContentsCloseHandler(WebContentsCloseHandlerDelegate* delegate);
+
+ WebContentsCloseHandler(const WebContentsCloseHandler&) = delete;
+ WebContentsCloseHandler& operator=(const WebContentsCloseHandler&) = delete;
+
~WebContentsCloseHandler();
// Invoked when a tab is inserted.
@@ -49,8 +53,6 @@
bool tab_changed_after_clone_;
base::OneShotTimer timer_;
-
- DISALLOW_COPY_AND_ASSIGN(WebContentsCloseHandler);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_WEB_CONTENTS_CLOSE_HANDLER_H_
diff --git a/chrome/browser/ui/views/frame/web_contents_close_handler_unittest.cc b/chrome/browser/ui/views/frame/web_contents_close_handler_unittest.cc
index 812bddf5..ba5c851 100644
--- a/chrome/browser/ui/views/frame/web_contents_close_handler_unittest.cc
+++ b/chrome/browser/ui/views/frame/web_contents_close_handler_unittest.cc
@@ -17,6 +17,12 @@
base::test::SingleThreadTaskEnvironment::MainThreadType::UI),
got_clone_(false),
got_destroy_(false) {}
+
+ MockWebContentsCloseHandlerDelegate(
+ const MockWebContentsCloseHandlerDelegate&) = delete;
+ MockWebContentsCloseHandlerDelegate& operator=(
+ const MockWebContentsCloseHandlerDelegate&) = delete;
+
~MockWebContentsCloseHandlerDelegate() override {}
void Clear() {
@@ -37,8 +43,6 @@
base::test::SingleThreadTaskEnvironment task_environment_;
bool got_clone_;
bool got_destroy_;
-
- DISALLOW_COPY_AND_ASSIGN(MockWebContentsCloseHandlerDelegate);
};
// -----------------------------------------------------------------------------
@@ -46,6 +50,11 @@
class WebContentsCloseHandlerTest : public testing::Test {
public:
WebContentsCloseHandlerTest() : close_handler_(&close_handler_delegate_) {}
+
+ WebContentsCloseHandlerTest(const WebContentsCloseHandlerTest&) = delete;
+ WebContentsCloseHandlerTest& operator=(const WebContentsCloseHandlerTest&) =
+ delete;
+
~WebContentsCloseHandlerTest() override {}
protected:
@@ -55,9 +64,6 @@
MockWebContentsCloseHandlerDelegate close_handler_delegate_;
WebContentsCloseHandler close_handler_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WebContentsCloseHandlerTest);
};
// Verifies ActiveTabChanged() sends the right functions to the delegate.
diff --git a/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.h b/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.h
index abefdd9f..6afbd09c 100644
--- a/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.h
+++ b/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.h
@@ -33,6 +33,10 @@
class FullscreenControlHost : public ui::EventObserver {
public:
explicit FullscreenControlHost(BrowserView* browser_view);
+
+ FullscreenControlHost(const FullscreenControlHost&) = delete;
+ FullscreenControlHost& operator=(const FullscreenControlHost&) = delete;
+
~FullscreenControlHost() override;
static bool IsFullscreenExitUIEnabled();
@@ -87,8 +91,6 @@
// Used to allow tests to wait for popup visibility changes.
base::OnceClosure on_popup_visibility_changed_;
-
- DISALLOW_COPY_AND_ASSIGN(FullscreenControlHost);
};
#endif // CHROME_BROWSER_UI_VIEWS_FULLSCREEN_CONTROL_FULLSCREEN_CONTROL_HOST_H_
diff --git a/chrome/browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc b/chrome/browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc
index 7dd2809..df33b494 100644
--- a/chrome/browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc
+++ b/chrome/browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc
@@ -54,6 +54,10 @@
button_->AddObserver(this);
}
+ MediaToolbarButtonWatcher(const MediaToolbarButtonWatcher&) = delete;
+ MediaToolbarButtonWatcher& operator=(const MediaToolbarButtonWatcher&) =
+ delete;
+
~MediaToolbarButtonWatcher() override {
button_->RemoveObserver(this);
if (observed_dialog_ &&
@@ -236,8 +240,6 @@
std::u16string expected_text_;
int expected_notification_count_ = 0;
bool expected_pip_visibility_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(MediaToolbarButtonWatcher);
};
class TestWebContentsPresentationManager
@@ -316,6 +318,11 @@
class MediaDialogViewBrowserTest : public InProcessBrowserTest {
public:
MediaDialogViewBrowserTest() = default;
+
+ MediaDialogViewBrowserTest(const MediaDialogViewBrowserTest&) = delete;
+ MediaDialogViewBrowserTest& operator=(const MediaDialogViewBrowserTest&) =
+ delete;
+
~MediaDialogViewBrowserTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -618,8 +625,6 @@
base::test::ScopedFeatureList feature_list_;
base::CallbackListSubscription subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaDialogViewBrowserTest);
};
// This test was first disabled on defined(OS_MAC) && defined(ARCH_CPU_ARM64)
diff --git a/chrome/browser/ui/views/hover_button_controller.h b/chrome/browser/ui/views/hover_button_controller.h
index 8178dc6..5b3a488 100644
--- a/chrome/browser/ui/views/hover_button_controller.h
+++ b/chrome/browser/ui/views/hover_button_controller.h
@@ -23,6 +23,10 @@
views::Button* button,
views::Button::PressedCallback callback,
std::unique_ptr<views::ButtonControllerDelegate> delegate);
+
+ HoverButtonController(const HoverButtonController&) = delete;
+ HoverButtonController& operator=(const HoverButtonController&) = delete;
+
~HoverButtonController() override;
// views::ButtonController:
@@ -34,8 +38,6 @@
private:
// Callback to be called when button is clicked.
views::Button::PressedCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(HoverButtonController);
};
#endif // CHROME_BROWSER_UI_VIEWS_HOVER_BUTTON_CONTROLLER_H_
diff --git a/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.h b/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.h
index ac11357..27886f4 100644
--- a/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.h
+++ b/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.h
@@ -17,6 +17,10 @@
public:
explicit AlternateNavInfoBarView(
std::unique_ptr<AlternateNavInfoBarDelegate> delegate);
+
+ AlternateNavInfoBarView(const AlternateNavInfoBarView&) = delete;
+ AlternateNavInfoBarView& operator=(const AlternateNavInfoBarView&) = delete;
+
~AlternateNavInfoBarView() override;
private:
@@ -42,8 +46,6 @@
views::Label* label_1_ = nullptr;
views::Link* link_ = nullptr;
views::Label* label_2_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(AlternateNavInfoBarView);
};
#endif // CHROME_BROWSER_UI_VIEWS_INFOBARS_ALTERNATE_NAV_INFOBAR_VIEW_H_
diff --git a/chrome/browser/ui/views/infobars/confirm_infobar.h b/chrome/browser/ui/views/infobars/confirm_infobar.h
index f6ea7052..8e3efd81 100644
--- a/chrome/browser/ui/views/infobars/confirm_infobar.h
+++ b/chrome/browser/ui/views/infobars/confirm_infobar.h
@@ -23,6 +23,10 @@
class ConfirmInfoBar : public InfoBarView {
public:
explicit ConfirmInfoBar(std::unique_ptr<ConfirmInfoBarDelegate> delegate);
+
+ ConfirmInfoBar(const ConfirmInfoBar&) = delete;
+ ConfirmInfoBar& operator=(const ConfirmInfoBar&) = delete;
+
~ConfirmInfoBar() override;
// InfoBarView:
@@ -49,8 +53,6 @@
views::MdTextButton* cancel_button_ = nullptr;
views::Link* link_ = nullptr;
std::unique_ptr<ElevationIconSetter> elevation_icon_setter_;
-
- DISALLOW_COPY_AND_ASSIGN(ConfirmInfoBar);
};
#endif // CHROME_BROWSER_UI_VIEWS_INFOBARS_CONFIRM_INFOBAR_H_
diff --git a/chrome/browser/ui/views/infobars/infobar_view_unittest.cc b/chrome/browser/ui/views/infobars/infobar_view_unittest.cc
index 224fd0e..8736a87 100644
--- a/chrome/browser/ui/views/infobars/infobar_view_unittest.cc
+++ b/chrome/browser/ui/views/infobars/infobar_view_unittest.cc
@@ -24,6 +24,10 @@
class InfoBarViewTest : public BrowserWithTestWindowTest {
public:
InfoBarViewTest() : infobar_container_view_(nullptr) {}
+
+ InfoBarViewTest(const InfoBarViewTest&) = delete;
+ InfoBarViewTest& operator=(const InfoBarViewTest&) = delete;
+
~InfoBarViewTest() override = default;
// ChromeViewsTestBase:
@@ -53,8 +57,6 @@
private:
InfoBarContainerView infobar_container_view_;
-
- DISALLOW_COPY_AND_ASSIGN(InfoBarViewTest);
};
// Regression test for crbug.com/834728 .
diff --git a/chrome/browser/ui/views/intent_picker_bubble_view.h b/chrome/browser/ui/views/intent_picker_bubble_view.h
index a427653c..33fb430 100644
--- a/chrome/browser/ui/views/intent_picker_bubble_view.h
+++ b/chrome/browser/ui/views/intent_picker_bubble_view.h
@@ -75,6 +75,10 @@
bool show_stay_in_chrome,
bool show_remember_selection,
const absl::optional<url::Origin>& initiating_origin);
+
+ IntentPickerBubbleView(const IntentPickerBubbleView&) = delete;
+ IntentPickerBubbleView& operator=(const IntentPickerBubbleView&) = delete;
+
~IntentPickerBubbleView() override;
static views::Widget* ShowBubble(
@@ -246,8 +250,6 @@
// The origin initiating this picker.
const absl::optional<url::Origin> initiating_origin_;
-
- DISALLOW_COPY_AND_ASSIGN(IntentPickerBubbleView);
};
#endif // CHROME_BROWSER_UI_VIEWS_INTENT_PICKER_BUBBLE_VIEW_H_
diff --git a/chrome/browser/ui/views/keyboard_access_browsertest.cc b/chrome/browser/ui/views/keyboard_access_browsertest.cc
index 6214db91..7a13497 100644
--- a/chrome/browser/ui/views/keyboard_access_browsertest.cc
+++ b/chrome/browser/ui/views/keyboard_access_browsertest.cc
@@ -54,6 +54,9 @@
OnWillChangeFocus(NULL, focus_manager_->GetFocusedView());
}
+ ViewFocusChangeWaiter(const ViewFocusChangeWaiter&) = delete;
+ ViewFocusChangeWaiter& operator=(const ViewFocusChangeWaiter&) = delete;
+
~ViewFocusChangeWaiter() override {
focus_manager_->RemoveFocusChangeListener(this);
}
@@ -78,8 +81,6 @@
views::FocusManager* focus_manager_;
int previous_view_id_;
base::WeakPtrFactory<ViewFocusChangeWaiter> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ViewFocusChangeWaiter);
};
class SendKeysMenuListener : public AppMenuButtonObserver {
@@ -93,6 +94,9 @@
observation_.Observe(app_menu_button);
}
+ SendKeysMenuListener(const SendKeysMenuListener&) = delete;
+ SendKeysMenuListener& operator=(const SendKeysMenuListener&) = delete;
+
~SendKeysMenuListener() override = default;
// AppMenuButtonObserver:
@@ -124,8 +128,6 @@
base::ScopedObservation<AppMenuButton, AppMenuButtonObserver> observation_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(SendKeysMenuListener);
};
class KeyboardAccessTest : public InProcessBrowserTest {
diff --git a/chrome/browser/ui/views/layout/interpolating_layout_manager.h b/chrome/browser/ui/views/layout/interpolating_layout_manager.h
index 23cfa964..0d5f871 100644
--- a/chrome/browser/ui/views/layout/interpolating_layout_manager.h
+++ b/chrome/browser/ui/views/layout/interpolating_layout_manager.h
@@ -48,6 +48,11 @@
class InterpolatingLayoutManager : public views::LayoutManagerBase {
public:
InterpolatingLayoutManager();
+
+ InterpolatingLayoutManager(const InterpolatingLayoutManager&) = delete;
+ InterpolatingLayoutManager& operator=(const InterpolatingLayoutManager&) =
+ delete;
+
~InterpolatingLayoutManager() override;
InterpolatingLayoutManager& SetOrientation(
@@ -116,8 +121,6 @@
// Maps from interpolation range to embedded layout.
std::map<views::Span, LayoutManagerBase*> embedded_layouts_;
LayoutManagerBase* default_layout_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(InterpolatingLayoutManager);
};
#endif // CHROME_BROWSER_UI_VIEWS_LAYOUT_INTERPOLATING_LAYOUT_MANAGER_H_
diff --git a/chrome/browser/ui/views/location_bar/content_setting_bubble_dialog_browsertest.cc b/chrome/browser/ui/views/location_bar/content_setting_bubble_dialog_browsertest.cc
index 5459480..8d0f895 100644
--- a/chrome/browser/ui/views/location_bar/content_setting_bubble_dialog_browsertest.cc
+++ b/chrome/browser/ui/views/location_bar/content_setting_bubble_dialog_browsertest.cc
@@ -51,6 +51,12 @@
explicit TestQuietNotificationPermissionUiSelector(
QuietUiReason simulated_reason_for_quiet_ui)
: simulated_reason_for_quiet_ui_(simulated_reason_for_quiet_ui) {}
+
+ TestQuietNotificationPermissionUiSelector(
+ const TestQuietNotificationPermissionUiSelector&) = delete;
+ TestQuietNotificationPermissionUiSelector& operator=(
+ const TestQuietNotificationPermissionUiSelector&) = delete;
+
~TestQuietNotificationPermissionUiSelector() override = default;
protected:
@@ -68,8 +74,6 @@
private:
QuietUiReason simulated_reason_for_quiet_ui_;
-
- DISALLOW_COPY_AND_ASSIGN(TestQuietNotificationPermissionUiSelector);
};
} // namespace
diff --git a/chrome/browser/ui/views/location_bar/custom_tab_bar_view_browsertest.cc b/chrome/browser/ui/views/location_bar/custom_tab_bar_view_browsertest.cc
index b9a461d1..f8ce9c9 100644
--- a/chrome/browser/ui/views/location_bar/custom_tab_bar_view_browsertest.cc
+++ b/chrome/browser/ui/views/location_bar/custom_tab_bar_view_browsertest.cc
@@ -176,6 +176,11 @@
: public web_app::WebAppControllerBrowserTest {
public:
CustomTabBarViewBrowserTest() = default;
+
+ CustomTabBarViewBrowserTest(const CustomTabBarViewBrowserTest&) = delete;
+ CustomTabBarViewBrowserTest& operator=(const CustomTabBarViewBrowserTest&) =
+ delete;
+
~CustomTabBarViewBrowserTest() override = default;
protected:
@@ -241,8 +246,6 @@
}
base::test::ScopedFeatureList feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(CustomTabBarViewBrowserTest);
};
// Check the custom tab bar is not instantiated for a tabbed browser window.
diff --git a/chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h b/chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h
index 0c623a7c..218cca4 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h
@@ -87,6 +87,10 @@
public:
WebContentMouseHandler(LocationBarBubbleDelegateView* bubble,
content::WebContents* web_contents);
+
+ WebContentMouseHandler(const WebContentMouseHandler&) = delete;
+ WebContentMouseHandler& operator=(const WebContentMouseHandler&) = delete;
+
~WebContentMouseHandler() override;
// ui::EventObserver:
@@ -96,8 +100,6 @@
LocationBarBubbleDelegateView* bubble_;
content::WebContents* web_contents_;
std::unique_ptr<views::EventMonitor> event_monitor_;
-
- DISALLOW_COPY_AND_ASSIGN(WebContentMouseHandler);
};
// Closes the bubble.
diff --git a/chrome/browser/ui/views/location_bar/location_bar_layout.h b/chrome/browser/ui/views/location_bar/location_bar_layout.h
index 8292956..a458627 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_layout.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_layout.h
@@ -29,6 +29,10 @@
};
LocationBarLayout(Position position, int item_edit_padding);
+
+ LocationBarLayout(const LocationBarLayout&) = delete;
+ LocationBarLayout& operator=(const LocationBarLayout&) = delete;
+
virtual ~LocationBarLayout();
// Add a decoration, specifying:
@@ -76,8 +80,6 @@
// The list of decorations to layout.
std::vector<std::unique_ptr<DecorationInfo>> decorations_;
-
- DISALLOW_COPY_AND_ASSIGN(LocationBarLayout);
};
#endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_LAYOUT_H_
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view_browsertest.cc b/chrome/browser/ui/views/location_bar/location_icon_view_browsertest.cc
index f71b9131..54e83e60 100644
--- a/chrome/browser/ui/views/location_bar/location_icon_view_browsertest.cc
+++ b/chrome/browser/ui/views/location_bar/location_icon_view_browsertest.cc
@@ -16,6 +16,11 @@
class LocationIconViewBrowserTest : public InProcessBrowserTest {
public:
LocationIconViewBrowserTest() {}
+
+ LocationIconViewBrowserTest(const LocationIconViewBrowserTest&) = delete;
+ LocationIconViewBrowserTest& operator=(const LocationIconViewBrowserTest&) =
+ delete;
+
~LocationIconViewBrowserTest() override {}
protected:
@@ -36,8 +41,6 @@
LocationBarView* location_bar_;
std::unique_ptr<LocationIconView> icon_view_;
-
- DISALLOW_COPY_AND_ASSIGN(LocationIconViewBrowserTest);
};
// Check to see if the InkDropMode is off when the omnibox is editing.
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc b/chrome/browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc
index cccb698..a8bd982 100644
--- a/chrome/browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc
@@ -20,10 +20,11 @@
class LocationIconViewTest : public InProcessBrowserTest {
public:
LocationIconViewTest() = default;
- ~LocationIconViewTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(LocationIconViewTest);
+ LocationIconViewTest(const LocationIconViewTest&) = delete;
+ LocationIconViewTest& operator=(const LocationIconViewTest&) = delete;
+
+ ~LocationIconViewTest() override = default;
};
// Verify that clicking the location icon a second time hides the bubble.
diff --git a/chrome/browser/ui/views/location_bar/selected_keyword_view_interactive_uitest.cc b/chrome/browser/ui/views/location_bar/selected_keyword_view_interactive_uitest.cc
index ae66093e..404e0ee 100644
--- a/chrome/browser/ui/views/location_bar/selected_keyword_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/location_bar/selected_keyword_view_interactive_uitest.cc
@@ -25,10 +25,11 @@
class SelectedKeywordViewTest : public extensions::ExtensionBrowserTest {
public:
SelectedKeywordViewTest() = default;
- ~SelectedKeywordViewTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(SelectedKeywordViewTest);
+ SelectedKeywordViewTest(const SelectedKeywordViewTest&) = delete;
+ SelectedKeywordViewTest& operator=(const SelectedKeywordViewTest&) = delete;
+
+ ~SelectedKeywordViewTest() override = default;
};
// Tests that an extension's short name is registered as the value of the
diff --git a/chrome/browser/ui/views/location_bar/star_view_interactive_uitest.cc b/chrome/browser/ui/views/location_bar/star_view_interactive_uitest.cc
index 98cda8d..0fa67f2 100644
--- a/chrome/browser/ui/views/location_bar/star_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/location_bar/star_view_interactive_uitest.cc
@@ -45,6 +45,10 @@
class StarViewTest : public InProcessBrowserTest {
public:
StarViewTest() = default;
+
+ StarViewTest(const StarViewTest&) = delete;
+ StarViewTest& operator=(const StarViewTest&) = delete;
+
~StarViewTest() override = default;
PageActionIconView* GetStarIcon() {
@@ -52,9 +56,6 @@
->toolbar_button_provider()
->GetPageActionIconView(PageActionIconType::kBookmarkStar);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(StarViewTest);
};
// Verifies clicking the star bookmarks the page.
diff --git a/chrome/browser/ui/views/login_handler_views.cc b/chrome/browser/ui/views/login_handler_views.cc
index 3dc6e203..2c00543 100644
--- a/chrome/browser/ui/views/login_handler_views.cc
+++ b/chrome/browser/ui/views/login_handler_views.cc
@@ -40,6 +40,9 @@
RecordDialogCreation(DialogIdentifier::LOGIN_HANDLER);
}
+ LoginHandlerViews(const LoginHandlerViews&) = delete;
+ LoginHandlerViews& operator=(const LoginHandlerViews&) = delete;
+
~LoginHandlerViews() override {
// LoginHandler cannot call CloseDialog because the subclass will already
// have been destructed.
@@ -166,8 +169,6 @@
Dialog* dialog_ = nullptr;
std::unique_ptr<PopunderPreventer> popunder_preventer_;
-
- DISALLOW_COPY_AND_ASSIGN(LoginHandlerViews);
};
} // namespace
diff --git a/chrome/browser/ui/views/media_router/app_menu_test_api_views.cc b/chrome/browser/ui/views/media_router/app_menu_test_api_views.cc
index 5bcf712..5d1fe843 100644
--- a/chrome/browser/ui/views/media_router/app_menu_test_api_views.cc
+++ b/chrome/browser/ui/views/media_router/app_menu_test_api_views.cc
@@ -17,6 +17,10 @@
class AppMenuTestApiViews : public test::AppMenuTestApi {
public:
explicit AppMenuTestApiViews(Browser* browser);
+
+ AppMenuTestApiViews(const AppMenuTestApiViews&) = delete;
+ AppMenuTestApiViews& operator=(const AppMenuTestApiViews&) = delete;
+
~AppMenuTestApiViews() override;
// AppMenuTestApi:
@@ -29,8 +33,6 @@
AppMenu* GetAppMenu();
Browser* browser_;
-
- DISALLOW_COPY_AND_ASSIGN(AppMenuTestApiViews);
};
AppMenuTestApiViews::AppMenuTestApiViews(Browser* browser)
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_metrics.h b/chrome/browser/ui/views/media_router/cast_dialog_metrics.h
index 96aa8dc..b7a94a0eb 100644
--- a/chrome/browser/ui/views/media_router/cast_dialog_metrics.h
+++ b/chrome/browser/ui/views/media_router/cast_dialog_metrics.h
@@ -30,6 +30,10 @@
CastDialogMetrics(const base::Time& initialization_time,
MediaRouterDialogOpenOrigin activation_location,
Profile* profile);
+
+ CastDialogMetrics(const CastDialogMetrics&) = delete;
+ CastDialogMetrics& operator=(const CastDialogMetrics&) = delete;
+
virtual ~CastDialogMetrics();
// Records the time it took to load sinks when called for the first time. This
@@ -85,8 +89,6 @@
bool first_action_recorded_ = false;
bool activation_location_and_cast_mode_recorded_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(CastDialogMetrics);
};
} // namespace media_router
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_no_sinks_view_unittest.cc b/chrome/browser/ui/views/media_router/cast_dialog_no_sinks_view_unittest.cc
index 44a1a7f1..8d4f2c00 100644
--- a/chrome/browser/ui/views/media_router/cast_dialog_no_sinks_view_unittest.cc
+++ b/chrome/browser/ui/views/media_router/cast_dialog_no_sinks_view_unittest.cc
@@ -17,6 +17,11 @@
class CastDialogNoSinksViewTest : public ChromeViewsTestBase {
public:
CastDialogNoSinksViewTest() = default;
+
+ CastDialogNoSinksViewTest(const CastDialogNoSinksViewTest&) = delete;
+ CastDialogNoSinksViewTest& operator=(const CastDialogNoSinksViewTest&) =
+ delete;
+
~CastDialogNoSinksViewTest() override = default;
void SetUp() override {
@@ -37,8 +42,6 @@
private:
std::unique_ptr<CastDialogNoSinksView> no_sinks_view_;
-
- DISALLOW_COPY_AND_ASSIGN(CastDialogNoSinksViewTest);
};
TEST_F(CastDialogNoSinksViewTest, SwitchViews) {
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_sink_button_unittest.cc b/chrome/browser/ui/views/media_router/cast_dialog_sink_button_unittest.cc
index 3e0a59e46..b460282 100644
--- a/chrome/browser/ui/views/media_router/cast_dialog_sink_button_unittest.cc
+++ b/chrome/browser/ui/views/media_router/cast_dialog_sink_button_unittest.cc
@@ -22,10 +22,11 @@
class CastDialogSinkButtonTest : public ChromeViewsTestBase {
public:
CastDialogSinkButtonTest() = default;
- ~CastDialogSinkButtonTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(CastDialogSinkButtonTest);
+ CastDialogSinkButtonTest(const CastDialogSinkButtonTest&) = delete;
+ CastDialogSinkButtonTest& operator=(const CastDialogSinkButtonTest&) = delete;
+
+ ~CastDialogSinkButtonTest() override = default;
};
TEST_F(CastDialogSinkButtonTest, SetTitleLabel) {
diff --git a/chrome/browser/ui/views/media_router/cast_toolbar_button_unittest.cc b/chrome/browser/ui/views/media_router/cast_toolbar_button_unittest.cc
index a8a9aa5..b0c5d222f 100644
--- a/chrome/browser/ui/views/media_router/cast_toolbar_button_unittest.cc
+++ b/chrome/browser/ui/views/media_router/cast_toolbar_button_unittest.cc
@@ -69,6 +69,10 @@
class CastToolbarButtonTest : public ChromeViewsTestBase {
public:
CastToolbarButtonTest() = default;
+
+ CastToolbarButtonTest(const CastToolbarButtonTest&) = delete;
+ CastToolbarButtonTest& operator=(const CastToolbarButtonTest&) = delete;
+
~CastToolbarButtonTest() override = default;
void SetUp() override {
@@ -146,9 +150,6 @@
CreateLocalDisplayRoute()};
const std::vector<MediaRoute> non_local_display_route_list_ = {
CreateNonLocalDisplayRoute(), CreateLocalNonDisplayRoute()};
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CastToolbarButtonTest);
};
TEST_F(CastToolbarButtonTest, ShowAndHideButton) {
diff --git a/chrome/browser/ui/views/media_router/media_router_dialog_controller_views.h b/chrome/browser/ui/views/media_router/media_router_dialog_controller_views.h
index f620c19..681d984 100644
--- a/chrome/browser/ui/views/media_router/media_router_dialog_controller_views.h
+++ b/chrome/browser/ui/views/media_router/media_router_dialog_controller_views.h
@@ -27,6 +27,11 @@
public views::WidgetObserver,
public MediaRouterUIService::Observer {
public:
+ MediaRouterDialogControllerViews(const MediaRouterDialogControllerViews&) =
+ delete;
+ MediaRouterDialogControllerViews& operator=(
+ const MediaRouterDialogControllerViews&) = delete;
+
~MediaRouterDialogControllerViews() override;
// MediaRouterDialogController:
@@ -79,8 +84,6 @@
MediaRouterUIService* const media_router_ui_service_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(MediaRouterDialogControllerViews);
};
} // namespace media_router
diff --git a/chrome/browser/ui/views/media_router/media_router_dialog_controller_views_browsertest.cc b/chrome/browser/ui/views/media_router/media_router_dialog_controller_views_browsertest.cc
index 503523f6..1167adc1 100644
--- a/chrome/browser/ui/views/media_router/media_router_dialog_controller_views_browsertest.cc
+++ b/chrome/browser/ui/views/media_router/media_router_dialog_controller_views_browsertest.cc
@@ -39,6 +39,12 @@
class MediaRouterDialogControllerViewsTest : public InProcessBrowserTest {
public:
MediaRouterDialogControllerViewsTest() = default;
+
+ MediaRouterDialogControllerViewsTest(
+ const MediaRouterDialogControllerViewsTest&) = delete;
+ MediaRouterDialogControllerViewsTest& operator=(
+ const MediaRouterDialogControllerViewsTest&) = delete;
+
~MediaRouterDialogControllerViewsTest() override = default;
void OpenMediaRouterDialog();
@@ -47,9 +53,6 @@
protected:
WebContents* initiator_;
MediaRouterDialogControllerViews* dialog_controller_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MediaRouterDialogControllerViewsTest);
};
void MediaRouterDialogControllerViewsTest::CreateDialogController() {
diff --git a/chrome/browser/ui/views/media_router/presentation_receiver_window_frame.h b/chrome/browser/ui/views/media_router/presentation_receiver_window_frame.h
index 34453af6..9ead59e8 100644
--- a/chrome/browser/ui/views/media_router/presentation_receiver_window_frame.h
+++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_frame.h
@@ -30,6 +30,12 @@
class PresentationReceiverWindowFrame final : public views::Widget {
public:
explicit PresentationReceiverWindowFrame(Profile* profile);
+
+ PresentationReceiverWindowFrame(const PresentationReceiverWindowFrame&) =
+ delete;
+ PresentationReceiverWindowFrame& operator=(
+ const PresentationReceiverWindowFrame&) = delete;
+
~PresentationReceiverWindowFrame() final;
void InitReceiverFrame(std::unique_ptr<views::WidgetDelegateView> delegate,
@@ -40,8 +46,6 @@
// The profile from which we get the theme.
Profile* const profile_;
-
- DISALLOW_COPY_AND_ASSIGN(PresentationReceiverWindowFrame);
};
#endif // CHROME_BROWSER_UI_VIEWS_MEDIA_ROUTER_PRESENTATION_RECEIVER_WINDOW_FRAME_H_
diff --git a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
index 89c2144..8f48722 100644
--- a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
+++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
@@ -72,6 +72,9 @@
window_observation_.Observe(observed_window);
}
+ FullscreenWindowObserver(const FullscreenWindowObserver&) = delete;
+ FullscreenWindowObserver& operator=(const FullscreenWindowObserver&) = delete;
+
~FullscreenWindowObserver() override = default;
private:
@@ -99,8 +102,6 @@
base::ScopedObservation<aura::Window, aura::WindowObserver>
window_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FullscreenWindowObserver);
};
#endif
diff --git a/chrome/browser/ui/views/media_router/presentation_receiver_window_view_browsertest.cc b/chrome/browser/ui/views/media_router/presentation_receiver_window_view_browsertest.cc
index 281def1c..4da7077 100644
--- a/chrome/browser/ui/views/media_router/presentation_receiver_window_view_browsertest.cc
+++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_view_browsertest.cc
@@ -138,6 +138,10 @@
&FullscreenWaiter::OnViewVisibilityChanged,
base::Unretained(this), base::Unretained(location_bar_view)));
}
+
+ FullscreenWaiter(const FullscreenWaiter&) = delete;
+ FullscreenWaiter& operator=(const FullscreenWaiter&) = delete;
+
~FullscreenWaiter() = default;
private:
@@ -152,8 +156,6 @@
base::CallbackListSubscription subscription_;
const AwaitType await_type_;
base::OnceClosure fullscreen_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(FullscreenWaiter);
};
{
diff --git a/chrome/browser/ui/views/menu_controller_interactive_uitest.cc b/chrome/browser/ui/views/menu_controller_interactive_uitest.cc
index 3a7c2b3..4650829 100644
--- a/chrome/browser/ui/views/menu_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/menu_controller_interactive_uitest.cc
@@ -15,6 +15,10 @@
MenuControllerMnemonicTest() {
}
+ MenuControllerMnemonicTest(const MenuControllerMnemonicTest&) = delete;
+ MenuControllerMnemonicTest& operator=(const MenuControllerMnemonicTest&) =
+ delete;
+
~MenuControllerMnemonicTest() override {
}
@@ -46,9 +50,6 @@
ASSERT_FALSE(menu()->GetSubmenu()->IsShowing());
Done();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MenuControllerMnemonicTest);
};
// Pressing the mnemonic for a menu item should execute the command for that
diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc
index 864fc27..1b78f64 100644
--- a/chrome/browser/ui/views/menu_model_adapter_test.cc
+++ b/chrome/browser/ui/views/menu_model_adapter_test.cc
@@ -41,6 +41,9 @@
CommonMenuModel() {
}
+ CommonMenuModel(const CommonMenuModel&) = delete;
+ CommonMenuModel& operator=(const CommonMenuModel&) = delete;
+
~CommonMenuModel() override {}
protected:
@@ -75,9 +78,6 @@
ui::MenuModel* GetSubmenuModelAt(int index) const override { return nullptr; }
void ActivatedAt(int index) override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CommonMenuModel);
};
class SubMenuModel : public CommonMenuModel {
@@ -86,6 +86,9 @@
: showing_(false) {
}
+ SubMenuModel(const SubMenuModel&) = delete;
+ SubMenuModel& operator=(const SubMenuModel&) = delete;
+
~SubMenuModel() override {}
bool showing() const {
@@ -110,8 +113,6 @@
void MenuWillClose() override { showing_ = false; }
bool showing_;
-
- DISALLOW_COPY_AND_ASSIGN(SubMenuModel);
};
class TopMenuModel : public CommonMenuModel {
@@ -119,6 +120,9 @@
TopMenuModel() {
}
+ TopMenuModel(const TopMenuModel&) = delete;
+ TopMenuModel& operator=(const TopMenuModel&) = delete;
+
~TopMenuModel() override {}
bool IsSubmenuShowing() {
@@ -142,8 +146,6 @@
}
mutable SubMenuModel sub_menu_model_;
-
- DISALLOW_COPY_AND_ASSIGN(TopMenuModel);
};
} // namespace
diff --git a/chrome/browser/ui/views/menu_test_base.h b/chrome/browser/ui/views/menu_test_base.h
index e0a4a7f..89a4a20 100644
--- a/chrome/browser/ui/views/menu_test_base.h
+++ b/chrome/browser/ui/views/menu_test_base.h
@@ -39,6 +39,10 @@
public views::MenuDelegate {
public:
MenuTestBase();
+
+ MenuTestBase(const MenuTestBase&) = delete;
+ MenuTestBase& operator=(const MenuTestBase&) = delete;
+
~MenuTestBase() override;
// AXEventObserver overrides.
@@ -97,8 +101,6 @@
static constexpr int kNumEvents =
static_cast<size_t>(ax::mojom::Event::kMaxValue) + 1;
std::array<int, kNumEvents> ax_event_counts_;
-
- DISALLOW_COPY_AND_ASSIGN(MenuTestBase);
};
#endif // CHROME_BROWSER_UI_VIEWS_MENU_TEST_BASE_H_
diff --git a/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc b/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc
index 2b95610..827e37a 100644
--- a/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc
+++ b/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc
@@ -30,6 +30,10 @@
class TestDragView : public views::View {
public:
TestDragView();
+
+ TestDragView(const TestDragView&) = delete;
+ TestDragView& operator=(const TestDragView&) = delete;
+
~TestDragView() override;
private:
@@ -37,8 +41,6 @@
int GetDragOperations(const gfx::Point& point) override;
void WriteDragData(const gfx::Point& point,
ui::OSExchangeData* data) override;
-
- DISALLOW_COPY_AND_ASSIGN(TestDragView);
};
TestDragView::TestDragView() {
@@ -60,6 +62,10 @@
class TestTargetView : public views::View {
public:
TestTargetView() = default;
+
+ TestTargetView(const TestTargetView&) = delete;
+ TestTargetView& operator=(const TestTargetView&) = delete;
+
~TestTargetView() override = default;
// Initializes this view to have the same bounds as its parent, and to have
@@ -90,8 +96,6 @@
// Whether or not a drop has been performed on the view.
bool dropped_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(TestTargetView);
};
void TestTargetView::Init() {
@@ -161,6 +165,10 @@
public views::WidgetObserver {
public:
MenuViewDragAndDropTest() = default;
+
+ MenuViewDragAndDropTest(const MenuViewDragAndDropTest&) = delete;
+ MenuViewDragAndDropTest& operator=(const MenuViewDragAndDropTest&) = delete;
+
~MenuViewDragAndDropTest() override = default;
protected:
@@ -221,7 +229,6 @@
base::ScopedObservation<views::Widget, views::WidgetObserver>
widget_observation_{this};
- DISALLOW_COPY_AND_ASSIGN(MenuViewDragAndDropTest);
};
void MenuViewDragAndDropTest::BuildMenu(views::MenuItemView* menu) {
diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
index 68df1e1f..6152888 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
@@ -43,6 +43,10 @@
// from NativeTheme.
explicit AutocompletePopupWidget(views::Widget* role_model)
: ThemeCopyingWidget(role_model) {}
+
+ AutocompletePopupWidget(const AutocompletePopupWidget&) = delete;
+ AutocompletePopupWidget& operator=(const AutocompletePopupWidget&) = delete;
+
~AutocompletePopupWidget() override {}
void InitOmniboxPopup(views::Widget* parent_widget) {
@@ -146,8 +150,6 @@
// True if the popup's bounds are currently being set.
bool is_setting_popup_bounds_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(AutocompletePopupWidget);
};
OmniboxPopupContentsView::OmniboxPopupContentsView(
diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view_browsertest.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view_browsertest.cc
index 1c39221b..3da655a 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view_browsertest.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view_browsertest.cc
@@ -77,6 +77,9 @@
explicit ThemeChangeWaiter(ThemeService* theme_service)
: waiter_(theme_service) {}
+ ThemeChangeWaiter(const ThemeChangeWaiter&) = delete;
+ ThemeChangeWaiter& operator=(const ThemeChangeWaiter&) = delete;
+
~ThemeChangeWaiter() {
waiter_.WaitForThemeChanged();
// Theme changes propagate asynchronously in DesktopWindowTreeHostX11::
@@ -86,14 +89,15 @@
private:
test::ThemeServiceChangedWaiter waiter_;
-
- DISALLOW_COPY_AND_ASSIGN(ThemeChangeWaiter);
};
class TestAXEventObserver : public views::AXEventObserver {
public:
TestAXEventObserver() { views::AXEventManager::Get()->AddObserver(this); }
+ TestAXEventObserver(const TestAXEventObserver&) = delete;
+ TestAXEventObserver& operator=(const TestAXEventObserver&) = delete;
+
~TestAXEventObserver() override {
views::AXEventManager::Get()->RemoveObserver(this);
}
@@ -150,8 +154,6 @@
int active_descendant_changed_count_ = 0;
std::string omnibox_value_;
std::string selected_option_name_;
-
- DISALLOW_COPY_AND_ASSIGN(TestAXEventObserver);
};
} // namespace
diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc
index bb0a179..3db862e 100644
--- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
@@ -135,6 +135,10 @@
class OverlayWindowFrameView : public views::NonClientFrameView {
public:
explicit OverlayWindowFrameView(views::Widget* widget) : widget_(widget) {}
+
+ OverlayWindowFrameView(const OverlayWindowFrameView&) = delete;
+ OverlayWindowFrameView& operator=(const OverlayWindowFrameView&) = delete;
+
~OverlayWindowFrameView() override = default;
// views::NonClientFrameView:
@@ -194,8 +198,6 @@
private:
views::Widget* widget_;
-
- DISALLOW_COPY_AND_ASSIGN(OverlayWindowFrameView);
};
// OverlayWindow implementation of WidgetDelegate.
@@ -210,6 +212,11 @@
SetTitle(IDS_PICTURE_IN_PICTURE_TITLE_TEXT);
SetOwnedByWidget(true);
}
+
+ OverlayWindowWidgetDelegate(const OverlayWindowWidgetDelegate&) = delete;
+ OverlayWindowWidgetDelegate& operator=(const OverlayWindowWidgetDelegate&) =
+ delete;
+
~OverlayWindowWidgetDelegate() override = default;
// views::WidgetDelegate:
@@ -217,9 +224,6 @@
views::Widget* widget) override {
return std::make_unique<OverlayWindowFrameView>(widget);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(OverlayWindowWidgetDelegate);
};
// static
diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.h b/chrome/browser/ui/views/overlay/overlay_window_views.h
index d2f65e3..7160ae1 100644
--- a/chrome/browser/ui/views/overlay/overlay_window_views.h
+++ b/chrome/browser/ui/views/overlay/overlay_window_views.h
@@ -39,6 +39,9 @@
static std::unique_ptr<OverlayWindowViews> Create(
content::PictureInPictureWindowController* controller);
+ OverlayWindowViews(const OverlayWindowViews&) = delete;
+ OverlayWindowViews& operator=(const OverlayWindowViews&) = delete;
+
~OverlayWindowViews() override;
enum class WindowQuadrant { kBottomLeft, kBottomRight, kTopLeft, kTopRight };
@@ -282,8 +285,6 @@
// and hiding automatically. Only used for testing via
// ForceControlsVisibleForTesting().
absl::optional<bool> force_controls_visible_;
-
- DISALLOW_COPY_AND_ASSIGN(OverlayWindowViews);
};
#endif // CHROME_BROWSER_UI_VIEWS_OVERLAY_OVERLAY_WINDOW_VIEWS_H_
diff --git a/chrome/browser/ui/views/page_action/pwa_install_view_browsertest.cc b/chrome/browser/ui/views/page_action/pwa_install_view_browsertest.cc
index d99003e3..6dcb52d 100644
--- a/chrome/browser/ui/views/page_action/pwa_install_view_browsertest.cc
+++ b/chrome/browser/ui/views/page_action/pwa_install_view_browsertest.cc
@@ -113,6 +113,11 @@
{feature_engagement::kIPHDesktopPwaInstallFeature, {}}},
{});
}
+
+ PwaInstallViewBrowserTest(const PwaInstallViewBrowserTest&) = delete;
+ PwaInstallViewBrowserTest& operator=(const PwaInstallViewBrowserTest&) =
+ delete;
+
~PwaInstallViewBrowserTest() override = default;
void SetUp() override {
@@ -282,8 +287,6 @@
content::WebContents* web_contents_ = nullptr;
webapps::TestAppBannerManagerDesktop* app_banner_manager_ = nullptr;
- DISALLOW_COPY_AND_ASSIGN(PwaInstallViewBrowserTest);
-
private:
web_app::ScopedOsHooksSuppress os_hooks_suppress_;
base::test::ScopedFeatureList features_;
diff --git a/chrome/browser/ui/views/page_info/page_info_hover_button.h b/chrome/browser/ui/views/page_info/page_info_hover_button.h
index 324e8af..9052c4f7 100644
--- a/chrome/browser/ui/views/page_info/page_info_hover_button.h
+++ b/chrome/browser/ui/views/page_info/page_info_hover_button.h
@@ -61,6 +61,10 @@
const std::u16string& tooltip_text,
const std::u16string& subtitle_text,
absl::optional<ui::ImageModel> action_image_icon = absl::nullopt);
+
+ PageInfoHoverButton(const PageInfoHoverButton&) = delete;
+ PageInfoHoverButton& operator=(const PageInfoHoverButton&) = delete;
+
~PageInfoHoverButton() override = default;
// Updates the title text, and applies the secondary style to the secondary
@@ -89,8 +93,6 @@
// Shows secondary text on right side. Used for page info v2 only.
views::Label* secondary_label_ = nullptr;
views::Label* subtitle_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(PageInfoHoverButton);
};
#endif // CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PAGE_INFO_HOVER_BUTTON_H_
diff --git a/chrome/browser/ui/views/page_info/permission_selector_row.cc b/chrome/browser/ui/views/page_info/permission_selector_row.cc
index 26fd12b..d713db3 100644
--- a/chrome/browser/ui/views/page_info/permission_selector_row.cc
+++ b/chrome/browser/ui/views/page_info/permission_selector_row.cc
@@ -99,6 +99,10 @@
PermissionCombobox(ComboboxModelAdapter* model,
bool enabled,
bool use_default);
+
+ PermissionCombobox(const PermissionCombobox&) = delete;
+ PermissionCombobox& operator=(const PermissionCombobox&) = delete;
+
~PermissionCombobox() override;
void UpdateSelectedIndex(bool use_default);
@@ -115,8 +119,6 @@
// Minimum width for |PermissionCombobox|.
int min_width_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(PermissionCombobox);
};
PermissionCombobox::PermissionCombobox(ComboboxModelAdapter* model,
diff --git a/chrome/browser/ui/views/page_info/permission_selector_row.h b/chrome/browser/ui/views/page_info/permission_selector_row.h
index d318b8b..701585a5 100644
--- a/chrome/browser/ui/views/page_info/permission_selector_row.h
+++ b/chrome/browser/ui/views/page_info/permission_selector_row.h
@@ -44,6 +44,10 @@
PermissionSelectorRow(ChromePageInfoUiDelegate* delegate,
const PageInfo::PermissionInfo& permission,
views::GridLayout* layout);
+
+ PermissionSelectorRow(const PermissionSelectorRow&) = delete;
+ PermissionSelectorRow& operator=(const PermissionSelectorRow&) = delete;
+
virtual ~PermissionSelectorRow();
// Retrieve the minimum height a |PermissionSelectorRow| can be.
@@ -85,8 +89,6 @@
base::ObserverList<PermissionSelectorRowObserver, false>::Unchecked
observer_list_;
-
- DISALLOW_COPY_AND_ASSIGN(PermissionSelectorRow);
};
#endif // CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PERMISSION_SELECTOR_ROW_H_
diff --git a/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view.h b/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view.h
index c9f3238..3f31378 100644
--- a/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view.h
+++ b/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view.h
@@ -44,6 +44,11 @@
security_state::SafetyTipStatus safety_tip_status,
const GURL& suggested_url,
base::OnceCallback<void(SafetyTipInteraction)> close_callback);
+
+ SafetyTipPageInfoBubbleView(const SafetyTipPageInfoBubbleView&) = delete;
+ SafetyTipPageInfoBubbleView& operator=(const SafetyTipPageInfoBubbleView&) =
+ delete;
+
~SafetyTipPageInfoBubbleView() override;
// views::WidgetObserver:
@@ -80,8 +85,6 @@
views::Button* leave_button_ = nullptr;
base::OnceCallback<void(SafetyTipInteraction)> close_callback_;
SafetyTipInteraction action_taken_ = SafetyTipInteraction::kNoAction;
-
- DISALLOW_COPY_AND_ASSIGN(SafetyTipPageInfoBubbleView);
};
// Creates and returns a safety tip bubble. Used in unit tests.
diff --git a/chrome/browser/ui/views/passwords/manage_passwords_icon_view_interactive_uitest.cc b/chrome/browser/ui/views/passwords/manage_passwords_icon_view_interactive_uitest.cc
index 75cfc2d..6ff938611 100644
--- a/chrome/browser/ui/views/passwords/manage_passwords_icon_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/passwords/manage_passwords_icon_view_interactive_uitest.cc
@@ -29,6 +29,11 @@
public ::testing::WithParamInterface<bool> {
public:
ManagePasswordsIconViewTest() {}
+
+ ManagePasswordsIconViewTest(const ManagePasswordsIconViewTest&) = delete;
+ ManagePasswordsIconViewTest& operator=(const ManagePasswordsIconViewTest&) =
+ delete;
+
~ManagePasswordsIconViewTest() override {}
password_manager::ui::State ViewState() { return GetView()->state_; }
@@ -89,8 +94,6 @@
}
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(ManagePasswordsIconViewTest);
};
IN_PROC_BROWSER_TEST_P(ManagePasswordsIconViewTest, DefaultStateIsInactive) {
diff --git a/chrome/browser/ui/views/passwords/password_bubble_interactive_uitest.cc b/chrome/browser/ui/views/passwords/password_bubble_interactive_uitest.cc
index c7908cf..ebb98dd 100644
--- a/chrome/browser/ui/views/passwords/password_bubble_interactive_uitest.cc
+++ b/chrome/browser/ui/views/passwords/password_bubble_interactive_uitest.cc
@@ -66,6 +66,12 @@
class PasswordBubbleInteractiveUiTest : public ManagePasswordsTest {
public:
PasswordBubbleInteractiveUiTest() {}
+
+ PasswordBubbleInteractiveUiTest(const PasswordBubbleInteractiveUiTest&) =
+ delete;
+ PasswordBubbleInteractiveUiTest& operator=(
+ const PasswordBubbleInteractiveUiTest&) = delete;
+
~PasswordBubbleInteractiveUiTest() override {}
MOCK_METHOD0(OnIconRequestDone, void());
@@ -78,9 +84,6 @@
}
return std::move(response);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PasswordBubbleInteractiveUiTest);
};
IN_PROC_BROWSER_TEST_F(PasswordBubbleInteractiveUiTest, BasicOpenAndClose) {
diff --git a/chrome/browser/ui/views/passwords/password_generation_confirmation_view.h b/chrome/browser/ui/views/passwords/password_generation_confirmation_view.h
index 36d548e..c0baefdf 100644
--- a/chrome/browser/ui/views/passwords/password_generation_confirmation_view.h
+++ b/chrome/browser/ui/views/passwords/password_generation_confirmation_view.h
@@ -17,6 +17,12 @@
content::WebContents* web_contents,
views::View* anchor_view,
DisplayReason reason);
+
+ PasswordGenerationConfirmationView(
+ const PasswordGenerationConfirmationView&) = delete;
+ PasswordGenerationConfirmationView& operator=(
+ const PasswordGenerationConfirmationView&) = delete;
+
~PasswordGenerationConfirmationView() override;
private:
@@ -27,8 +33,6 @@
void StyledLabelLinkClicked();
GenerationConfirmationBubbleController controller_;
-
- DISALLOW_COPY_AND_ASSIGN(PasswordGenerationConfirmationView);
};
#endif // CHROME_BROWSER_UI_VIEWS_PASSWORDS_PASSWORD_GENERATION_CONFIRMATION_VIEW_H_
diff --git a/chrome/browser/ui/views/passwords/password_generation_popup_view_tester_views.h b/chrome/browser/ui/views/passwords/password_generation_popup_view_tester_views.h
index 486054c..82212fee 100644
--- a/chrome/browser/ui/views/passwords/password_generation_popup_view_tester_views.h
+++ b/chrome/browser/ui/views/passwords/password_generation_popup_view_tester_views.h
@@ -15,6 +15,12 @@
public:
explicit PasswordGenerationPopupViewTesterViews(
PasswordGenerationPopupViewViews* view);
+
+ PasswordGenerationPopupViewTesterViews(
+ const PasswordGenerationPopupViewTesterViews&) = delete;
+ PasswordGenerationPopupViewTesterViews& operator=(
+ const PasswordGenerationPopupViewTesterViews&) = delete;
+
~PasswordGenerationPopupViewTesterViews() override;
void SimulateMouseMovementAt(const gfx::Point& point) override;
@@ -22,8 +28,6 @@
private:
// Weak reference
PasswordGenerationPopupViewViews* view_;
-
- DISALLOW_COPY_AND_ASSIGN(PasswordGenerationPopupViewTesterViews);
};
#endif // CHROME_BROWSER_UI_VIEWS_PASSWORDS_PASSWORD_GENERATION_POPUP_VIEW_TESTER_VIEWS_H_
diff --git a/chrome/browser/ui/views/passwords/password_items_view.h b/chrome/browser/ui/views/passwords/password_items_view.h
index 1e227af..fcb13c97 100644
--- a/chrome/browser/ui/views/passwords/password_items_view.h
+++ b/chrome/browser/ui/views/passwords/password_items_view.h
@@ -21,6 +21,10 @@
public:
PasswordItemsView(content::WebContents* web_contents,
views::View* anchor_view);
+
+ PasswordItemsView(const PasswordItemsView&) = delete;
+ PasswordItemsView& operator=(const PasswordItemsView&) = delete;
+
~PasswordItemsView() override;
private:
@@ -45,8 +49,6 @@
gfx::Image favicon_;
ItemsBubbleController controller_;
-
- DISALLOW_COPY_AND_ASSIGN(PasswordItemsView);
};
#endif // CHROME_BROWSER_UI_VIEWS_PASSWORDS_PASSWORD_ITEMS_VIEW_H_
diff --git a/chrome/browser/ui/views/payments/credit_card_editor_view_controller.h b/chrome/browser/ui/views/payments/credit_card_editor_view_controller.h
index cea5553d..8ff72d4 100644
--- a/chrome/browser/ui/views/payments/credit_card_editor_view_controller.h
+++ b/chrome/browser/ui/views/payments/credit_card_editor_view_controller.h
@@ -45,6 +45,12 @@
base::OnceCallback<void(const autofill::CreditCard&)> on_added,
autofill::CreditCard* credit_card,
bool is_incognito);
+
+ CreditCardEditorViewController(const CreditCardEditorViewController&) =
+ delete;
+ CreditCardEditorViewController& operator=(
+ const CreditCardEditorViewController&) = delete;
+
~CreditCardEditorViewController() override;
// EditorViewController:
@@ -86,6 +92,11 @@
// outlive this delegate.
CreditCardValidationDelegate(const EditorField& field,
CreditCardEditorViewController* controller);
+
+ CreditCardValidationDelegate(const CreditCardValidationDelegate&) = delete;
+ CreditCardValidationDelegate& operator=(
+ const CreditCardValidationDelegate&) = delete;
+
~CreditCardValidationDelegate() override;
// ValidationDelegate:
@@ -110,8 +121,6 @@
EditorField field_;
// Outlives this class.
CreditCardEditorViewController* controller_;
-
- DISALLOW_COPY_AND_ASSIGN(CreditCardValidationDelegate);
};
bool GetSheetId(DialogViewID* sheet_id) override;
@@ -142,8 +151,6 @@
std::set<std::string> supported_card_networks_;
base::WeakPtrFactory<CreditCardEditorViewController> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CreditCardEditorViewController);
};
} // namespace payments
diff --git a/chrome/browser/ui/views/payments/cvc_unmask_view_controller.h b/chrome/browser/ui/views/payments/cvc_unmask_view_controller.h
index 439787b..0a4fed3 100644
--- a/chrome/browser/ui/views/payments/cvc_unmask_view_controller.h
+++ b/chrome/browser/ui/views/payments/cvc_unmask_view_controller.h
@@ -48,6 +48,10 @@
base::WeakPtr<autofill::payments::FullCardRequest::ResultDelegate>
result_delegate,
content::WebContents* web_contents);
+
+ CvcUnmaskViewController(const CvcUnmaskViewController&) = delete;
+ CvcUnmaskViewController& operator=(const CvcUnmaskViewController&) = delete;
+
~CvcUnmaskViewController() override;
// autofill::RiskDataLoader:
@@ -105,8 +109,6 @@
base::WeakPtr<autofill::CardUnmaskDelegate> unmask_delegate_;
base::WeakPtrFactory<CvcUnmaskViewController> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CvcUnmaskViewController);
};
} // namespace payments
diff --git a/chrome/browser/ui/views/payments/editor_view_controller.h b/chrome/browser/ui/views/payments/editor_view_controller.h
index efa1f68..f37eebf 100644
--- a/chrome/browser/ui/views/payments/editor_view_controller.h
+++ b/chrome/browser/ui/views/payments/editor_view_controller.h
@@ -93,6 +93,10 @@
base::WeakPtr<PaymentRequestDialogView> dialog,
BackNavigationType back_navigation_type,
bool is_incognito);
+
+ EditorViewController(const EditorViewController&) = delete;
+ EditorViewController& operator=(const EditorViewController&) = delete;
+
~EditorViewController() override;
// Will display |error_message| alongside the input field represented by
@@ -219,8 +223,6 @@
BackNavigationType back_navigation_type_;
bool is_incognito_;
-
- DISALLOW_COPY_AND_ASSIGN(EditorViewController);
};
} // namespace payments
diff --git a/chrome/browser/ui/views/payments/error_message_view_controller.h b/chrome/browser/ui/views/payments/error_message_view_controller.h
index 4acffa0..701de7b 100644
--- a/chrome/browser/ui/views/payments/error_message_view_controller.h
+++ b/chrome/browser/ui/views/payments/error_message_view_controller.h
@@ -28,6 +28,11 @@
ErrorMessageViewController(base::WeakPtr<PaymentRequestSpec> spec,
base::WeakPtr<PaymentRequestState> state,
base::WeakPtr<PaymentRequestDialogView> dialog);
+
+ ErrorMessageViewController(const ErrorMessageViewController&) = delete;
+ ErrorMessageViewController& operator=(const ErrorMessageViewController&) =
+ delete;
+
~ErrorMessageViewController() override;
private:
@@ -40,8 +45,6 @@
bool ShouldShowSecondaryButton() override;
std::u16string GetSheetTitle() override;
void FillContentView(views::View* content_view) override;
-
- DISALLOW_COPY_AND_ASSIGN(ErrorMessageViewController);
};
} // namespace payments
diff --git a/chrome/browser/ui/views/payments/order_summary_view_controller.h b/chrome/browser/ui/views/payments/order_summary_view_controller.h
index 047835f..1aed2d3 100644
--- a/chrome/browser/ui/views/payments/order_summary_view_controller.h
+++ b/chrome/browser/ui/views/payments/order_summary_view_controller.h
@@ -26,6 +26,11 @@
OrderSummaryViewController(base::WeakPtr<PaymentRequestSpec> spec,
base::WeakPtr<PaymentRequestState> state,
base::WeakPtr<PaymentRequestDialogView> dialog);
+
+ OrderSummaryViewController(const OrderSummaryViewController&) = delete;
+ OrderSummaryViewController& operator=(const OrderSummaryViewController&) =
+ delete;
+
~OrderSummaryViewController() override;
// PaymentRequestSpec::Observer:
@@ -42,8 +47,6 @@
void FillContentView(views::View* content_view) override;
base::WeakPtrFactory<OrderSummaryViewController> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(OrderSummaryViewController);
};
} // namespace payments
diff --git a/chrome/browser/ui/views/payments/payment_handler_modal_dialog_manager_delegate.h b/chrome/browser/ui/views/payments/payment_handler_modal_dialog_manager_delegate.h
index efaa2f9..f1859f4 100644
--- a/chrome/browser/ui/views/payments/payment_handler_modal_dialog_manager_delegate.h
+++ b/chrome/browser/ui/views/payments/payment_handler_modal_dialog_manager_delegate.h
@@ -30,6 +30,12 @@
// |host| must not be null.
explicit PaymentHandlerModalDialogManagerDelegate(
content::WebContents* host_web_contents);
+
+ PaymentHandlerModalDialogManagerDelegate(
+ const PaymentHandlerModalDialogManagerDelegate&) = delete;
+ PaymentHandlerModalDialogManagerDelegate& operator=(
+ const PaymentHandlerModalDialogManagerDelegate&) = delete;
+
~PaymentHandlerModalDialogManagerDelegate() override;
// Sets the |web_contents| that is behind the modal dialogs managed by this
@@ -51,8 +57,6 @@
// A not-owned pointer to the WebContents behind the modal dialogs.
content::WebContents* web_contents_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(PaymentHandlerModalDialogManagerDelegate);
};
} // namespace payments
diff --git a/chrome/browser/ui/views/payments/payment_method_view_controller.cc b/chrome/browser/ui/views/payments/payment_method_view_controller.cc
index 2c0c9a2..40add151 100644
--- a/chrome/browser/ui/views/payments/payment_method_view_controller.cc
+++ b/chrome/browser/ui/views/payments/payment_method_view_controller.cc
@@ -63,6 +63,10 @@
dialog_(dialog) {
Init();
}
+
+ PaymentMethodListItem(const PaymentMethodListItem&) = delete;
+ PaymentMethodListItem& operator=(const PaymentMethodListItem&) = delete;
+
~PaymentMethodListItem() override {}
private:
@@ -165,8 +169,6 @@
base::WeakPtr<PaymentApp> app_;
base::WeakPtr<PaymentRequestDialogView> dialog_;
-
- DISALLOW_COPY_AND_ASSIGN(PaymentMethodListItem);
};
} // namespace
diff --git a/chrome/browser/ui/views/payments/payment_method_view_controller.h b/chrome/browser/ui/views/payments/payment_method_view_controller.h
index 5032363..7c3d8fa 100644
--- a/chrome/browser/ui/views/payments/payment_method_view_controller.h
+++ b/chrome/browser/ui/views/payments/payment_method_view_controller.h
@@ -23,6 +23,11 @@
PaymentMethodViewController(base::WeakPtr<PaymentRequestSpec> spec,
base::WeakPtr<PaymentRequestState> state,
base::WeakPtr<PaymentRequestDialogView> dialog);
+
+ PaymentMethodViewController(const PaymentMethodViewController&) = delete;
+ PaymentMethodViewController& operator=(const PaymentMethodViewController&) =
+ delete;
+
~PaymentMethodViewController() override;
private:
@@ -39,8 +44,6 @@
// Whether or not adding a new card is allowed.
bool enable_add_card_;
-
- DISALLOW_COPY_AND_ASSIGN(PaymentMethodViewController);
};
} // namespace payments
diff --git a/chrome/browser/ui/views/payments/payment_request_item_list.h b/chrome/browser/ui/views/payments/payment_request_item_list.h
index 52e9ccf..22e77fe 100644
--- a/chrome/browser/ui/views/payments/payment_request_item_list.h
+++ b/chrome/browser/ui/views/payments/payment_request_item_list.h
@@ -41,6 +41,10 @@
bool selected,
bool clickable,
bool show_edit_button);
+
+ Item(const Item&) = delete;
+ Item& operator=(const Item&) = delete;
+
~Item() override;
bool selected() const { return selected_; }
@@ -114,8 +118,6 @@
std::u16string accessible_item_description_;
bool selected_;
bool show_edit_button_;
-
- DISALLOW_COPY_AND_ASSIGN(Item);
};
explicit PaymentRequestItemList(
diff --git a/chrome/browser/ui/views/payments/payment_request_sheet_controller.h b/chrome/browser/ui/views/payments/payment_request_sheet_controller.h
index 740151f..29d3c56 100644
--- a/chrome/browser/ui/views/payments/payment_request_sheet_controller.h
+++ b/chrome/browser/ui/views/payments/payment_request_sheet_controller.h
@@ -36,6 +36,11 @@
PaymentRequestSheetController(base::WeakPtr<PaymentRequestSpec> spec,
base::WeakPtr<PaymentRequestState> state,
base::WeakPtr<PaymentRequestDialogView> dialog);
+
+ PaymentRequestSheetController(const PaymentRequestSheetController&) = delete;
+ PaymentRequestSheetController& operator=(
+ const PaymentRequestSheetController&) = delete;
+
virtual ~PaymentRequestSheetController();
// Creates a view to be displayed in the PaymentRequestDialog. The header view
@@ -201,8 +206,6 @@
bool is_active_ = true;
base::WeakPtrFactory<PaymentRequestSheetController> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PaymentRequestSheetController);
};
} // namespace payments
diff --git a/chrome/browser/ui/views/payments/payment_request_views_util.cc b/chrome/browser/ui/views/payments/payment_request_views_util.cc
index 7bdc5a9..731236f 100644
--- a/chrome/browser/ui/views/payments/payment_request_views_util.cc
+++ b/chrome/browser/ui/views/payments/payment_request_views_util.cc
@@ -199,6 +199,12 @@
class PaymentRequestRowBorderPainter : public views::Painter {
public:
explicit PaymentRequestRowBorderPainter(SkColor color) : color_(color) {}
+
+ PaymentRequestRowBorderPainter(const PaymentRequestRowBorderPainter&) =
+ delete;
+ PaymentRequestRowBorderPainter& operator=(
+ const PaymentRequestRowBorderPainter&) = delete;
+
~PaymentRequestRowBorderPainter() override {}
// views::Painter:
@@ -217,7 +223,6 @@
private:
SkColor color_;
- DISALLOW_COPY_AND_ASSIGN(PaymentRequestRowBorderPainter);
};
} // namespace
diff --git a/chrome/browser/ui/views/payments/payment_sheet_view_controller.h b/chrome/browser/ui/views/payments/payment_sheet_view_controller.h
index 76541d6..1185b00bb 100644
--- a/chrome/browser/ui/views/payments/payment_sheet_view_controller.h
+++ b/chrome/browser/ui/views/payments/payment_sheet_view_controller.h
@@ -29,6 +29,11 @@
PaymentSheetViewController(base::WeakPtr<PaymentRequestSpec> spec,
base::WeakPtr<PaymentRequestState> state,
base::WeakPtr<PaymentRequestDialogView> dialog);
+
+ PaymentSheetViewController(const PaymentSheetViewController&) = delete;
+ PaymentSheetViewController& operator=(const PaymentSheetViewController&) =
+ delete;
+
~PaymentSheetViewController() override;
// PaymentRequestSpec::Observer:
@@ -65,8 +70,6 @@
void AddShippingButtonPressed();
void AddPaymentMethodButtonPressed();
void AddContactInfoButtonPressed();
-
- DISALLOW_COPY_AND_ASSIGN(PaymentSheetViewController);
};
} // namespace payments
diff --git a/chrome/browser/ui/views/payments/profile_list_view_controller.cc b/chrome/browser/ui/views/payments/profile_list_view_controller.cc
index aabb246..8c129e9 100644
--- a/chrome/browser/ui/views/payments/profile_list_view_controller.cc
+++ b/chrome/browser/ui/views/payments/profile_list_view_controller.cc
@@ -59,6 +59,10 @@
profile_(profile) {
Init();
}
+
+ ProfileItem(const ProfileItem&) = delete;
+ ProfileItem& operator=(const ProfileItem&) = delete;
+
~ProfileItem() override {}
private:
@@ -98,8 +102,6 @@
base::WeakPtr<ProfileListViewController> controller_;
autofill::AutofillProfile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ProfileItem);
};
// The ProfileListViewController subtype for the Shipping address list
@@ -117,6 +119,10 @@
PopulateList();
}
+ ShippingProfileViewController(const ShippingProfileViewController&) = delete;
+ ShippingProfileViewController& operator=(
+ const ShippingProfileViewController&) = delete;
+
~ShippingProfileViewController() override {
if (spec())
spec()->RemoveObserver(this);
@@ -225,8 +231,6 @@
}
base::WeakPtrFactory<ShippingProfileViewController> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ShippingProfileViewController);
};
class ContactProfileViewController : public ProfileListViewController {
@@ -239,6 +243,11 @@
DCHECK(spec);
PopulateList();
}
+
+ ContactProfileViewController(const ContactProfileViewController&) = delete;
+ ContactProfileViewController& operator=(const ContactProfileViewController&) =
+ delete;
+
~ContactProfileViewController() override {}
protected:
@@ -300,9 +309,6 @@
int GetSecondaryButtonId() override {
return static_cast<int>(DialogViewID::PAYMENT_METHOD_ADD_CONTACT_BUTTON);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ContactProfileViewController);
};
} // namespace
diff --git a/chrome/browser/ui/views/payments/profile_list_view_controller.h b/chrome/browser/ui/views/payments/profile_list_view_controller.h
index 85aa1542..090f883 100644
--- a/chrome/browser/ui/views/payments/profile_list_view_controller.h
+++ b/chrome/browser/ui/views/payments/profile_list_view_controller.h
@@ -33,6 +33,10 @@
// a list of profiles and allow exactly one of them to be selected.
class ProfileListViewController : public PaymentRequestSheetController {
public:
+ ProfileListViewController(const ProfileListViewController&) = delete;
+ ProfileListViewController& operator=(const ProfileListViewController&) =
+ delete;
+
~ProfileListViewController() override;
// Creates a controller which lists and allows selection of profiles
@@ -99,7 +103,6 @@
PaymentRequestItemList list_;
base::WeakPtrFactory<ProfileListViewController> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(ProfileListViewController);
};
} // namespace payments
diff --git a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.h b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.h
index 7e30a008..63a58b7 100644
--- a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.h
+++ b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.h
@@ -44,6 +44,12 @@
base::OnceCallback<void(const autofill::AutofillProfile&)> on_added,
autofill::AutofillProfile* profile,
bool is_incognito);
+
+ ShippingAddressEditorViewController(
+ const ShippingAddressEditorViewController&) = delete;
+ ShippingAddressEditorViewController& operator=(
+ const ShippingAddressEditorViewController&) = delete;
+
~ShippingAddressEditorViewController() override;
// EditorViewController:
@@ -72,6 +78,12 @@
ShippingAddressValidationDelegate(
ShippingAddressEditorViewController* parent,
const EditorField& field);
+
+ ShippingAddressValidationDelegate(
+ const ShippingAddressValidationDelegate&) = delete;
+ ShippingAddressValidationDelegate& operator=(
+ const ShippingAddressValidationDelegate&) = delete;
+
~ShippingAddressValidationDelegate() override;
// ValidationDelegate:
@@ -94,8 +106,6 @@
// Raw pointer back to the owner of this class, therefore will not be null.
ShippingAddressEditorViewController* controller_;
-
- DISALLOW_COPY_AND_ASSIGN(ShippingAddressValidationDelegate);
};
std::u16string GetValueForType(const autofill::AutofillProfile& profile,
@@ -165,8 +175,6 @@
base::WeakPtrFactory<ShippingAddressEditorViewController> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(ShippingAddressEditorViewController);
};
} // namespace payments
diff --git a/chrome/browser/ui/views/payments/shipping_option_view_controller.cc b/chrome/browser/ui/views/payments/shipping_option_view_controller.cc
index 5600f151..32256f9 100644
--- a/chrome/browser/ui/views/payments/shipping_option_view_controller.cc
+++ b/chrome/browser/ui/views/payments/shipping_option_view_controller.cc
@@ -37,6 +37,10 @@
shipping_option_(shipping_option) {
Init();
}
+
+ ShippingOptionItem(const ShippingOptionItem&) = delete;
+ ShippingOptionItem& operator=(const ShippingOptionItem&) = delete;
+
~ShippingOptionItem() override {}
private:
@@ -77,8 +81,6 @@
}
mojom::PaymentShippingOption* shipping_option_;
-
- DISALLOW_COPY_AND_ASSIGN(ShippingOptionItem);
};
} // namespace
diff --git a/chrome/browser/ui/views/payments/shipping_option_view_controller.h b/chrome/browser/ui/views/payments/shipping_option_view_controller.h
index 8bcf906e..e03a3ee 100644
--- a/chrome/browser/ui/views/payments/shipping_option_view_controller.h
+++ b/chrome/browser/ui/views/payments/shipping_option_view_controller.h
@@ -21,6 +21,11 @@
ShippingOptionViewController(base::WeakPtr<PaymentRequestSpec> spec,
base::WeakPtr<PaymentRequestState> state,
base::WeakPtr<PaymentRequestDialogView> dialog);
+
+ ShippingOptionViewController(const ShippingOptionViewController&) = delete;
+ ShippingOptionViewController& operator=(const ShippingOptionViewController&) =
+ delete;
+
~ShippingOptionViewController() override;
// PaymentRequestSpec::Observer:
@@ -37,8 +42,6 @@
PaymentRequestItemList shipping_option_list_;
base::WeakPtrFactory<ShippingOptionViewController> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ShippingOptionViewController);
};
} // namespace payments
diff --git a/chrome/browser/ui/views/payments/test_chrome_payment_request_delegate.h b/chrome/browser/ui/views/payments/test_chrome_payment_request_delegate.h
index 5032821..b9a5ac63 100644
--- a/chrome/browser/ui/views/payments/test_chrome_payment_request_delegate.h
+++ b/chrome/browser/ui/views/payments/test_chrome_payment_request_delegate.h
@@ -33,6 +33,12 @@
bool is_valid_ssl,
bool is_browser_window_active,
bool skip_ui_for_basic_card);
+
+ TestChromePaymentRequestDelegate(const TestChromePaymentRequestDelegate&) =
+ delete;
+ TestChromePaymentRequestDelegate& operator=(
+ const TestChromePaymentRequestDelegate&) = delete;
+
~TestChromePaymentRequestDelegate() override;
void SetRegionDataLoader(autofill::RegionDataLoader* region_data_loader) {
@@ -62,8 +68,6 @@
const bool is_valid_ssl_;
const bool is_browser_window_active_;
const bool skip_ui_for_basic_card_;
-
- DISALLOW_COPY_AND_ASSIGN(TestChromePaymentRequestDelegate);
};
} // namespace payments
diff --git a/chrome/browser/ui/views/payments/validating_combobox.h b/chrome/browser/ui/views/payments/validating_combobox.h
index fcc2660f..5222d19 100644
--- a/chrome/browser/ui/views/payments/validating_combobox.h
+++ b/chrome/browser/ui/views/payments/validating_combobox.h
@@ -18,6 +18,10 @@
public:
ValidatingCombobox(std::unique_ptr<ui::ComboboxModel> model,
std::unique_ptr<ValidationDelegate> delegate);
+
+ ValidatingCombobox(const ValidatingCombobox&) = delete;
+ ValidatingCombobox& operator=(const ValidatingCombobox&) = delete;
+
~ValidatingCombobox() override;
// Combobox:
@@ -43,8 +47,6 @@
std::unique_ptr<ValidationDelegate> delegate_;
bool being_removed_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ValidatingCombobox);
};
} // namespace payments
diff --git a/chrome/browser/ui/views/payments/validating_textfield_unittest.cc b/chrome/browser/ui/views/payments/validating_textfield_unittest.cc
index f8a00c3..037f724 100644
--- a/chrome/browser/ui/views/payments/validating_textfield_unittest.cc
+++ b/chrome/browser/ui/views/payments/validating_textfield_unittest.cc
@@ -20,12 +20,20 @@
class ValidatingTextfieldTest : public ChromeViewsTestBase {
public:
ValidatingTextfieldTest() {}
+
+ ValidatingTextfieldTest(const ValidatingTextfieldTest&) = delete;
+ ValidatingTextfieldTest& operator=(const ValidatingTextfieldTest&) = delete;
+
~ValidatingTextfieldTest() override {}
protected:
class TestValidationDelegate : public ValidationDelegate {
public:
TestValidationDelegate() {}
+
+ TestValidationDelegate(const TestValidationDelegate&) = delete;
+ TestValidationDelegate& operator=(const TestValidationDelegate&) = delete;
+
~TestValidationDelegate() override {}
// ValidationDelegate:
@@ -48,13 +56,7 @@
return true;
}
void ComboboxModelChanged(ValidatingCombobox* combobox) override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestValidationDelegate);
};
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ValidatingTextfieldTest);
};
TEST_F(ValidatingTextfieldTest, Validation) {
diff --git a/chrome/browser/ui/views/permission_bubble/chooser_bubble_ui.cc b/chrome/browser/ui/views/permission_bubble/chooser_bubble_ui.cc
index 3305b2e5..d83f612b 100644
--- a/chrome/browser/ui/views/permission_bubble/chooser_bubble_ui.cc
+++ b/chrome/browser/ui/views/permission_bubble/chooser_bubble_ui.cc
@@ -48,6 +48,11 @@
Browser* browser,
content::WebContents* web_contents,
std::unique_ptr<permissions::ChooserController> chooser_controller);
+
+ ChooserBubbleUiViewDelegate(const ChooserBubbleUiViewDelegate&) = delete;
+ ChooserBubbleUiViewDelegate& operator=(const ChooserBubbleUiViewDelegate&) =
+ delete;
+
~ChooserBubbleUiViewDelegate() override;
// views::View:
@@ -76,8 +81,6 @@
DeviceChooserContentView* device_chooser_content_view_ = nullptr;
base::WeakPtrFactory<ChooserBubbleUiViewDelegate> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChooserBubbleUiViewDelegate);
};
ChooserBubbleUiViewDelegate::ChooserBubbleUiViewDelegate(
diff --git a/chrome/browser/ui/views/permission_bubble/permission_prompt_impl.h b/chrome/browser/ui/views/permission_bubble/permission_prompt_impl.h
index edfda7d..c46176b 100644
--- a/chrome/browser/ui/views/permission_bubble/permission_prompt_impl.h
+++ b/chrome/browser/ui/views/permission_bubble/permission_prompt_impl.h
@@ -31,6 +31,10 @@
PermissionPromptImpl(Browser* browser,
content::WebContents* web_contents,
Delegate* delegate);
+
+ PermissionPromptImpl(const PermissionPromptImpl&) = delete;
+ PermissionPromptImpl& operator=(const PermissionPromptImpl&) = delete;
+
~PermissionPromptImpl() override;
// permissions::PermissionPrompt:
@@ -76,8 +80,6 @@
// PermissionRequestManager owns `this` and outlives `PermissionPromptImpl`.
permissions::PermissionRequestManager* manager_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(PermissionPromptImpl);
};
#endif // CHROME_BROWSER_UI_VIEWS_PERMISSION_BUBBLE_PERMISSION_PROMPT_IMPL_H_
diff --git a/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.h b/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.h
index 9e02ca2..7ddd5b19 100644
--- a/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.h
+++ b/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.h
@@ -31,6 +31,12 @@
const std::string& extension_name,
CertificateSelectedCallback callback,
content::WebContents* web_contents);
+
+ PlatformKeysCertificateSelector(const PlatformKeysCertificateSelector&) =
+ delete;
+ PlatformKeysCertificateSelector& operator=(
+ const PlatformKeysCertificateSelector&) = delete;
+
~PlatformKeysCertificateSelector() override;
void Init();
@@ -44,8 +50,6 @@
// Will be reset to null after it was run.
CertificateSelectedCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(PlatformKeysCertificateSelector);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/views/policy/enterprise_startup_dialog_view_browsertest.cc b/chrome/browser/ui/views/policy/enterprise_startup_dialog_view_browsertest.cc
index fce77c0..38a4ab1 100644
--- a/chrome/browser/ui/views/policy/enterprise_startup_dialog_view_browsertest.cc
+++ b/chrome/browser/ui/views/policy/enterprise_startup_dialog_view_browsertest.cc
@@ -21,6 +21,12 @@
class EnterpriseStartupDialogViewBrowserTest : public DialogBrowserTest {
public:
EnterpriseStartupDialogViewBrowserTest() = default;
+
+ EnterpriseStartupDialogViewBrowserTest(
+ const EnterpriseStartupDialogViewBrowserTest&) = delete;
+ EnterpriseStartupDialogViewBrowserTest& operator=(
+ const EnterpriseStartupDialogViewBrowserTest&) = delete;
+
~EnterpriseStartupDialogViewBrowserTest() override = default;
// override DialogBrowserTest
@@ -49,8 +55,6 @@
private:
EnterpriseStartupDialogView* dialog;
-
- DISALLOW_COPY_AND_ASSIGN(EnterpriseStartupDialogViewBrowserTest);
};
IN_PROC_BROWSER_TEST_F(EnterpriseStartupDialogViewBrowserTest,
diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button_delegate.h b/chrome/browser/ui/views/profiles/avatar_toolbar_button_delegate.h
index 4475590..55b643a 100644
--- a/chrome/browser/ui/views/profiles/avatar_toolbar_button_delegate.h
+++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button_delegate.h
@@ -31,6 +31,11 @@
public syncer::SyncServiceObserver {
public:
AvatarToolbarButtonDelegate(AvatarToolbarButton* button, Profile* profile);
+
+ AvatarToolbarButtonDelegate(const AvatarToolbarButtonDelegate&) = delete;
+ AvatarToolbarButtonDelegate& operator=(const AvatarToolbarButtonDelegate&) =
+ delete;
+
~AvatarToolbarButtonDelegate() override;
// Methods called by the AvatarToolbarButton to get profile information.
@@ -143,8 +148,6 @@
absl::optional<AvatarSyncErrorType> last_avatar_error_;
base::WeakPtrFactory<AvatarToolbarButtonDelegate> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AvatarToolbarButtonDelegate);
};
#endif // CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_TOOLBAR_BUTTON_DELEGATE_H_
diff --git a/chrome/browser/ui/views/profiles/incognito_menu_view.h b/chrome/browser/ui/views/profiles/incognito_menu_view.h
index 8252c18a..3a3f35c 100644
--- a/chrome/browser/ui/views/profiles/incognito_menu_view.h
+++ b/chrome/browser/ui/views/profiles/incognito_menu_view.h
@@ -25,6 +25,10 @@
public:
IncognitoMenuView(views::Button* anchor_button,
Browser* browser);
+
+ IncognitoMenuView(const IncognitoMenuView&) = delete;
+ IncognitoMenuView& operator=(const IncognitoMenuView&) = delete;
+
~IncognitoMenuView() override;
// ProfileMenuViewBase:
@@ -39,8 +43,6 @@
void OnCreateShortcutButtonClicked();
#endif
void OnExitButtonClicked();
-
- DISALLOW_COPY_AND_ASSIGN(IncognitoMenuView);
};
#endif // CHROME_BROWSER_UI_VIEWS_PROFILES_INCOGNITO_MENU_VIEW_H_
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.cc b/chrome/browser/ui/views/profiles/profile_menu_view_base.cc
index 4cb87e72..ac2127ba 100644
--- a/chrome/browser/ui/views/profiles/profile_menu_view_base.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.cc
@@ -105,14 +105,16 @@
public:
CircleImageSource(int size, SkColor color)
: gfx::CanvasImageSource(gfx::Size(size, size)), color_(color) {}
+
+ CircleImageSource(const CircleImageSource&) = delete;
+ CircleImageSource& operator=(const CircleImageSource&) = delete;
+
~CircleImageSource() override = default;
void Draw(gfx::Canvas* canvas) override;
private:
SkColor color_;
-
- DISALLOW_COPY_AND_ASSIGN(CircleImageSource);
};
void CircleImageSource::Draw(gfx::Canvas* canvas) {
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
index f0917d49..a7c27ab6 100644
--- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
@@ -529,6 +529,10 @@
public ProfileMenuViewTestBase {
public:
ProfileMenuClickTestBase() : SyncTest(SINGLE_CLIENT) {}
+
+ ProfileMenuClickTestBase(const ProfileMenuClickTestBase&) = delete;
+ ProfileMenuClickTestBase& operator=(const ProfileMenuClickTestBase&) = delete;
+
~ProfileMenuClickTestBase() override = default;
void SetUpInProcessBrowserTestFixture() override {
@@ -573,14 +577,16 @@
base::HistogramTester histogram_tester_;
std::unique_ptr<SyncServiceImplHarness> sync_harness_;
-
- DISALLOW_COPY_AND_ASSIGN(ProfileMenuClickTestBase);
};
class ProfileMenuClickTest : public ProfileMenuClickTestBase,
public testing::WithParamInterface<size_t> {
public:
ProfileMenuClickTest() = default;
+
+ ProfileMenuClickTest(const ProfileMenuClickTest&) = delete;
+ ProfileMenuClickTest& operator=(const ProfileMenuClickTest&) = delete;
+
~ProfileMenuClickTest() override = default;
virtual ProfileMenuViewBase::ActionableItem GetExpectedActionableItemAtIndex(
@@ -603,9 +609,6 @@
"Profile.Menu.ClickedActionableItem",
GetExpectedActionableItemAtIndex(GetParam()), /*count=*/1);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ProfileMenuClickTest);
};
#define PROFILE_MENU_CLICK_TEST(actionable_item_list, test_case_name) \
diff --git a/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc
index b34cca4..e52c9ea18 100644
--- a/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc
@@ -106,6 +106,10 @@
explicit BrowserAddedWaiter(size_t total_count) : total_count_(total_count) {
BrowserList::AddObserver(this);
}
+
+ BrowserAddedWaiter(const BrowserAddedWaiter&) = delete;
+ BrowserAddedWaiter& operator=(const BrowserAddedWaiter&) = delete;
+
~BrowserAddedWaiter() override { BrowserList::RemoveObserver(this); }
Browser* Wait() {
@@ -128,8 +132,6 @@
const size_t total_count_;
Browser* browser_ = nullptr;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserAddedWaiter);
};
// Fake user policy signin service immediately invoking the callbacks.
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.h b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.h
index 85df58c..ccaed397 100644
--- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.h
+++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.h
@@ -54,6 +54,12 @@
// |upgrade_detector| is expected to be the process-wide detector, and must
// outlive the controller.
explicit RelaunchNotificationController(UpgradeDetector* upgrade_detector);
+
+ RelaunchNotificationController(const RelaunchNotificationController&) =
+ delete;
+ RelaunchNotificationController& operator=(
+ const RelaunchNotificationController&) = delete;
+
~RelaunchNotificationController() override;
protected:
@@ -200,8 +206,6 @@
// overridden to required. Changes to the policy value will not affect the
// notification type.
bool notification_type_required_overridden_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(RelaunchNotificationController);
};
#endif // CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_NOTIFICATION_CONTROLLER_H_
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.h b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.h
index ff98c33..7caae60 100644
--- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.h
+++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.h
@@ -22,6 +22,11 @@
public:
RelaunchNotificationControllerPlatformImpl();
+ RelaunchNotificationControllerPlatformImpl(
+ const RelaunchNotificationControllerPlatformImpl&) = delete;
+ RelaunchNotificationControllerPlatformImpl& operator=(
+ const RelaunchNotificationControllerPlatformImpl&) = delete;
+
~RelaunchNotificationControllerPlatformImpl() override;
// Shows the relaunch recommended notification if it is not already open.
@@ -77,8 +82,6 @@
base::ScopedObservation<session_manager::SessionManager,
session_manager::SessionManagerObserver>
session_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(RelaunchNotificationControllerPlatformImpl);
};
#endif // CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_NOTIFICATION_CONTROLLER_PLATFORM_IMPL_CHROMEOS_H_
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.h b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.h
index 327f9fb1..26fce14 100644
--- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.h
+++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.h
@@ -18,6 +18,12 @@
public BrowserListObserver {
public:
RelaunchNotificationControllerPlatformImpl();
+
+ RelaunchNotificationControllerPlatformImpl(
+ const RelaunchNotificationControllerPlatformImpl&) = delete;
+ RelaunchNotificationControllerPlatformImpl& operator=(
+ const RelaunchNotificationControllerPlatformImpl&) = delete;
+
~RelaunchNotificationControllerPlatformImpl() override;
// Shows the relaunch recommended notification if it is not already open.
@@ -67,8 +73,6 @@
// The last relaunch deadline if the relaunch notification has_shown_.
base::Time last_relaunch_deadline_;
-
- DISALLOW_COPY_AND_ASSIGN(RelaunchNotificationControllerPlatformImpl);
};
#endif // CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_NOTIFICATION_CONTROLLER_PLATFORM_IMPL_DESKTOP_H_
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.h b/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.h
index bf2f4a0..7a8e62e 100644
--- a/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.h
+++ b/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.h
@@ -29,6 +29,11 @@
static views::Widget* ShowBubble(Browser* browser,
base::Time detection_time,
base::RepeatingClosure on_accept);
+
+ RelaunchRecommendedBubbleView(const RelaunchRecommendedBubbleView&) = delete;
+ RelaunchRecommendedBubbleView& operator=(
+ const RelaunchRecommendedBubbleView&) = delete;
+
~RelaunchRecommendedBubbleView() override;
// LocationBarBubbleDelegateView:
@@ -55,8 +60,6 @@
// Timer that schedules title refreshes.
RelaunchRecommendedTimer relaunch_recommended_timer_;
-
- DISALLOW_COPY_AND_ASSIGN(RelaunchRecommendedBubbleView);
};
#endif // CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_RECOMMENDED_BUBBLE_VIEW_H_
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_timer.h b/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_timer.h
index 3f4c8dc..50ee9e3 100644
--- a/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_timer.h
+++ b/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_timer.h
@@ -21,6 +21,9 @@
RelaunchRecommendedTimer(base::Time upgrade_detected_time,
base::RepeatingClosure callback);
+ RelaunchRecommendedTimer(const RelaunchRecommendedTimer&) = delete;
+ RelaunchRecommendedTimer& operator=(const RelaunchRecommendedTimer&) = delete;
+
~RelaunchRecommendedTimer();
// Returns current notification's title, composed depending on how much time
@@ -45,8 +48,6 @@
// Callback which triggers the actual title update on Chrome desktop.
base::RepeatingClosure callback_;
-
- DISALLOW_COPY_AND_ASSIGN(RelaunchRecommendedTimer);
};
#endif // CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_RECOMMENDED_TIMER_H_
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view.h b/chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view.h
index ee53925..b6ba2bbe 100644
--- a/chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view.h
+++ b/chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view.h
@@ -27,6 +27,10 @@
base::Time deadline,
base::RepeatingClosure on_accept);
+ RelaunchRequiredDialogView(const RelaunchRequiredDialogView&) = delete;
+ RelaunchRequiredDialogView& operator=(const RelaunchRequiredDialogView&) =
+ delete;
+
~RelaunchRequiredDialogView() override;
// Returns the instance hosted by |widget|. |widget| must be an instance
@@ -50,8 +54,6 @@
// Timer that schedules title refreshes.
RelaunchRequiredTimer relaunch_required_timer_;
-
- DISALLOW_COPY_AND_ASSIGN(RelaunchRequiredDialogView);
};
#endif // CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_REQUIRED_DIALOG_VIEW_H_
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.h b/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.h
index 6837dda6..dea428c 100644
--- a/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.h
+++ b/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.h
@@ -22,6 +22,9 @@
// |callback| is called every time the notification title has to be updated.
RelaunchRequiredTimer(base::Time deadline, base::RepeatingClosure callback);
+ RelaunchRequiredTimer(const RelaunchRequiredTimer&) = delete;
+ RelaunchRequiredTimer& operator=(const RelaunchRequiredTimer&) = delete;
+
~RelaunchRequiredTimer();
// Sets the relaunch deadline to |deadline| and refreshes the notifications's
@@ -48,8 +51,6 @@
// Callback which triggers the actual title update, which differs on Chrome
// for desktop vs for Chrome OS.
base::RepeatingClosure callback_;
-
- DISALLOW_COPY_AND_ASSIGN(RelaunchRequiredTimer);
};
#endif // CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_REQUIRED_TIMER_H_
diff --git a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.h b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.h
index bdaea16..56558c6 100644
--- a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.h
+++ b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.h
@@ -27,6 +27,10 @@
class RenderViewContextMenuViews : public RenderViewContextMenu {
public:
+ RenderViewContextMenuViews(const RenderViewContextMenuViews&) = delete;
+ RenderViewContextMenuViews& operator=(const RenderViewContextMenuViews&) =
+ delete;
+
~RenderViewContextMenuViews() override;
// Factory function to create an instance.
@@ -73,8 +77,6 @@
// View observer of the submenu view and widget. SubmenuViewObserver is used
// to observe bounds changes.
std::unique_ptr<SubmenuViewObserver> submenu_view_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenuViews);
};
#endif // CHROME_BROWSER_UI_VIEWS_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_VIEWS_H_
diff --git a/chrome/browser/ui/views/sad_tab_view.h b/chrome/browser/ui/views/sad_tab_view.h
index 4a93ea9..2ef3c57 100644
--- a/chrome/browser/ui/views/sad_tab_view.h
+++ b/chrome/browser/ui/views/sad_tab_view.h
@@ -35,6 +35,10 @@
METADATA_HEADER(SadTabView);
SadTabView(content::WebContents* web_contents, SadTabKind kind);
+
+ SadTabView(const SadTabView&) = delete;
+ SadTabView& operator=(const SadTabView&) = delete;
+
~SadTabView() override;
// Overridden from SadTab:
@@ -61,8 +65,6 @@
views::LabelButton* action_button_;
views::Label* title_;
views::WebView* owner_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(SadTabView);
};
#endif // CHROME_BROWSER_UI_VIEWS_SAD_TAB_VIEW_H__
diff --git a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog_browsertest.cc b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog_browsertest.cc
index ff65642..225e336 100644
--- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog_browsertest.cc
+++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog_browsertest.cc
@@ -24,6 +24,10 @@
PasswordReuseModalWarningTest()
: dialog_(nullptr), latest_user_action_(WarningAction::SHOWN) {}
+ PasswordReuseModalWarningTest(const PasswordReuseModalWarningTest&) = delete;
+ PasswordReuseModalWarningTest& operator=(
+ const PasswordReuseModalWarningTest&) = delete;
+
~PasswordReuseModalWarningTest() override {}
// DialogBrowserTest:
@@ -54,9 +58,6 @@
protected:
PasswordReuseModalWarningDialog* dialog_;
WarningAction latest_user_action_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PasswordReuseModalWarningTest);
};
IN_PROC_BROWSER_TEST_F(PasswordReuseModalWarningTest, InvokeUi_default) {
diff --git a/chrome/browser/ui/views/select_file_dialog_extension_factory.h b/chrome/browser/ui/views/select_file_dialog_extension_factory.h
index 4bb25b13..a68823c7 100644
--- a/chrome/browser/ui/views/select_file_dialog_extension_factory.h
+++ b/chrome/browser/ui/views/select_file_dialog_extension_factory.h
@@ -12,6 +12,12 @@
class SelectFileDialogExtensionFactory : public ui::SelectFileDialogFactory {
public:
SelectFileDialogExtensionFactory();
+
+ SelectFileDialogExtensionFactory(const SelectFileDialogExtensionFactory&) =
+ delete;
+ SelectFileDialogExtensionFactory& operator=(
+ const SelectFileDialogExtensionFactory&) = delete;
+
~SelectFileDialogExtensionFactory() override;
private:
@@ -19,8 +25,6 @@
ui::SelectFileDialog* Create(
ui::SelectFileDialog::Listener* listener,
std::unique_ptr<ui::SelectFilePolicy> policy) override;
-
- DISALLOW_COPY_AND_ASSIGN(SelectFileDialogExtensionFactory);
};
#endif // CHROME_BROWSER_UI_VIEWS_SELECT_FILE_DIALOG_EXTENSION_FACTORY_H_
diff --git a/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc b/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc
index c0757afd..629bfe0 100644
--- a/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc
+++ b/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc
@@ -60,6 +60,10 @@
class TestListener : public ui::SelectFileDialog::Listener {
public:
TestListener() : selected_(false), file_index_(-1) {}
+
+ TestListener(const TestListener&) = delete;
+ TestListener& operator=(const TestListener&) = delete;
+
~TestListener() override {}
bool selected() const { return selected_; }
@@ -76,8 +80,6 @@
private:
bool selected_;
int file_index_;
-
- DISALLOW_COPY_AND_ASSIGN(TestListener);
};
// Client of a SelectFileDialog that deletes itself whenever the dialog
diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.h b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.h
index 897de823..f2a4d5a 100644
--- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.h
+++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.h
@@ -41,6 +41,10 @@
content::WebContents* web_contents,
SendTabToSelfBubbleController* controller);
+ SendTabToSelfBubbleViewImpl(const SendTabToSelfBubbleViewImpl&) = delete;
+ SendTabToSelfBubbleViewImpl& operator=(const SendTabToSelfBubbleViewImpl&) =
+ delete;
+
~SendTabToSelfBubbleViewImpl() override;
// SendTabToSelfBubbleView:
@@ -76,8 +80,6 @@
// ScrollView containing the list of device buttons.
// Only kept for GetButtonContainerForTesting().
views::ScrollView* scroll_view_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(SendTabToSelfBubbleViewImpl);
};
} // namespace send_tab_to_self
diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/browser/ui/views/session_crashed_bubble_view.cc
index f5355fd..82cdd724 100644
--- a/chrome/browser/ui/views/session_crashed_bubble_view.cc
+++ b/chrome/browser/ui/views/session_crashed_bubble_view.cc
@@ -163,6 +163,9 @@
BrowserList::AddObserver(this);
}
+ BrowserRemovalObserver(const BrowserRemovalObserver&) = delete;
+ BrowserRemovalObserver& operator=(const BrowserRemovalObserver&) = delete;
+
~BrowserRemovalObserver() override { BrowserList::RemoveObserver(this); }
// Overridden from BrowserListObserver.
@@ -175,8 +178,6 @@
private:
Browser* browser_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserRemovalObserver);
};
// static
diff --git a/chrome/browser/ui/views/session_crashed_bubble_view_browsertest.cc b/chrome/browser/ui/views/session_crashed_bubble_view_browsertest.cc
index cb07cf8..735fa4e 100644
--- a/chrome/browser/ui/views/session_crashed_bubble_view_browsertest.cc
+++ b/chrome/browser/ui/views/session_crashed_bubble_view_browsertest.cc
@@ -22,6 +22,11 @@
class SessionCrashedBubbleViewTest : public DialogBrowserTest {
public:
SessionCrashedBubbleViewTest() = default;
+
+ SessionCrashedBubbleViewTest(const SessionCrashedBubbleViewTest&) = delete;
+ SessionCrashedBubbleViewTest& operator=(const SessionCrashedBubbleViewTest&) =
+ delete;
+
~SessionCrashedBubbleViewTest() override = default;
void ShowUi(const std::string& name) override {
@@ -32,9 +37,6 @@
protected:
views::BubbleDialogDelegate* crash_bubble_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SessionCrashedBubbleViewTest);
};
IN_PROC_BROWSER_TEST_F(SessionCrashedBubbleViewTest,
diff --git a/chrome/browser/ui/views/settings_reset_prompt_dialog_browsertest.cc b/chrome/browser/ui/views/settings_reset_prompt_dialog_browsertest.cc
index 6c68befc..b35399a3 100644
--- a/chrome/browser/ui/views/settings_reset_prompt_dialog_browsertest.cc
+++ b/chrome/browser/ui/views/settings_reset_prompt_dialog_browsertest.cc
@@ -109,6 +109,11 @@
? RESET_REQUIRED
: NO_RESET_REQUIRED_DUE_TO_DOMAIN_NOT_MATCHED));
}
+
+ MockSettingsResetPromptModel(const MockSettingsResetPromptModel&) = delete;
+ MockSettingsResetPromptModel& operator=(const MockSettingsResetPromptModel&) =
+ delete;
+
~MockSettingsResetPromptModel() override {}
void PerformReset(std::unique_ptr<BrandcodedDefaultSettings> default_settings,
@@ -130,8 +135,6 @@
private:
std::vector<GURL> startup_urls_;
std::vector<GURL> startup_urls_to_reset_;
-
- DISALLOW_COPY_AND_ASSIGN(MockSettingsResetPromptModel);
};
class SettingsResetPromptDialogTest : public DialogBrowserTest {
diff --git a/chrome/browser/ui/views/sharing/shared_clipboard_browsertest.cc b/chrome/browser/ui/views/sharing/shared_clipboard_browsertest.cc
index b81b9f6..0312194 100644
--- a/chrome/browser/ui/views/sharing/shared_clipboard_browsertest.cc
+++ b/chrome/browser/ui/views/sharing/shared_clipboard_browsertest.cc
@@ -33,6 +33,11 @@
public:
SharedClipboardBrowserTestBase() {}
+ SharedClipboardBrowserTestBase(const SharedClipboardBrowserTestBase&) =
+ delete;
+ SharedClipboardBrowserTestBase& operator=(
+ const SharedClipboardBrowserTestBase&) = delete;
+
~SharedClipboardBrowserTestBase() override = default;
std::string GetTestPageURL() const override {
@@ -48,9 +53,6 @@
protected:
base::test::ScopedFeatureList feature_list_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SharedClipboardBrowserTestBase);
};
class SharedClipboardBrowserTest : public SharedClipboardBrowserTestBase {
diff --git a/chrome/browser/ui/views/sharing/sharing_browsertest.h b/chrome/browser/ui/views/sharing/sharing_browsertest.h
index 8b5bbadb..dcd2792 100644
--- a/chrome/browser/ui/views/sharing/sharing_browsertest.h
+++ b/chrome/browser/ui/views/sharing/sharing_browsertest.h
@@ -30,6 +30,10 @@
class FakeWebPushSender : public WebPushSender {
public:
FakeWebPushSender() : WebPushSender(/*url_loader_factory=*/nullptr) {}
+
+ FakeWebPushSender(const FakeWebPushSender&) = delete;
+ FakeWebPushSender& operator=(const FakeWebPushSender&) = delete;
+
~FakeWebPushSender() override = default;
void SendMessage(const std::string& fcm_token,
@@ -43,13 +47,15 @@
private:
std::string fcm_token_;
WebPushMessage message_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeWebPushSender);
};
class FakeSharingMessageBridge : public SharingMessageBridge {
public:
FakeSharingMessageBridge() = default;
+
+ FakeSharingMessageBridge(const FakeSharingMessageBridge&) = delete;
+ FakeSharingMessageBridge& operator=(const FakeSharingMessageBridge&) = delete;
+
~FakeSharingMessageBridge() override = default;
// SharingMessageBridge:
@@ -67,8 +73,6 @@
private:
sync_pb::SharingMessageSpecifics specifics_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeSharingMessageBridge);
};
// Base test class for testing sharing features.
@@ -76,6 +80,9 @@
public:
SharingBrowserTest();
+ SharingBrowserTest(const SharingBrowserTest&) = delete;
+ SharingBrowserTest& operator=(const SharingBrowserTest&) = delete;
+
~SharingBrowserTest() override;
void SetUpOnMainThread() override;
@@ -119,8 +126,6 @@
SharingService* sharing_service_;
FakeWebPushSender* fake_web_push_sender_;
FakeSharingMessageBridge fake_sharing_message_bridge_;
-
- DISALLOW_COPY_AND_ASSIGN(SharingBrowserTest);
};
#endif // CHROME_BROWSER_UI_VIEWS_SHARING_SHARING_BROWSERTEST_H_
diff --git a/chrome/browser/ui/views/sharing/sharing_dialog_view.h b/chrome/browser/ui/views/sharing/sharing_dialog_view.h
index 232512fd..b77be233 100644
--- a/chrome/browser/ui/views/sharing/sharing_dialog_view.h
+++ b/chrome/browser/ui/views/sharing/sharing_dialog_view.h
@@ -27,6 +27,9 @@
content::WebContents* web_contents,
SharingDialogData data);
+ SharingDialogView(const SharingDialogView&) = delete;
+ SharingDialogView& operator=(const SharingDialogView&) = delete;
+
~SharingDialogView() override;
// SharingDialog:
@@ -67,8 +70,6 @@
// References to device and app buttons views.
View* button_list_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(SharingDialogView);
};
#endif // CHROME_BROWSER_UI_VIEWS_SHARING_SHARING_DIALOG_VIEW_H_
diff --git a/chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_view_impl.h b/chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_view_impl.h
index 1e177e25..d327709 100644
--- a/chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_view_impl.h
+++ b/chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_view_impl.h
@@ -33,6 +33,9 @@
content::WebContents* web_contents,
SharingHubBubbleController* controller);
+ SharingHubBubbleViewImpl(const SharingHubBubbleViewImpl&) = delete;
+ SharingHubBubbleViewImpl& operator=(const SharingHubBubbleViewImpl&) = delete;
+
~SharingHubBubbleViewImpl() override;
// SharingHubBubbleView:
@@ -78,8 +81,6 @@
views::ScrollView* scroll_view_ = nullptr;
base::WeakPtrFactory<SharingHubBubbleViewImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SharingHubBubbleViewImpl);
};
} // namespace sharing_hub
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.h b/chrome/browser/ui/views/ssl_client_certificate_selector.h
index b82923a..91d8892 100644
--- a/chrome/browser/ui/views/ssl_client_certificate_selector.h
+++ b/chrome/browser/ui/views/ssl_client_certificate_selector.h
@@ -31,6 +31,11 @@
const scoped_refptr<net::SSLCertRequestInfo>& cert_request_info,
net::ClientCertIdentityList client_certs,
std::unique_ptr<content::ClientCertificateDelegate> delegate);
+
+ SSLClientCertificateSelector(const SSLClientCertificateSelector&) = delete;
+ SSLClientCertificateSelector& operator=(const SSLClientCertificateSelector&) =
+ delete;
+
~SSLClientCertificateSelector() override;
void Init();
@@ -52,8 +57,6 @@
std::unique_ptr<SSLClientAuthObserverImpl> auth_observer_impl_;
base::WeakPtrFactory<SSLClientCertificateSelector> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SSLClientCertificateSelector);
};
#endif // CHROME_BROWSER_UI_VIEWS_SSL_CLIENT_CERTIFICATE_SELECTOR_H_
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
index 2bf05db1..06eef09 100644
--- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
+++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
@@ -170,6 +170,12 @@
: public SSLClientCertificateSelectorTest {
public:
SSLClientCertificateSelectorMultiProfileTest() = default;
+
+ SSLClientCertificateSelectorMultiProfileTest(
+ const SSLClientCertificateSelectorMultiProfileTest&) = delete;
+ SSLClientCertificateSelectorMultiProfileTest& operator=(
+ const SSLClientCertificateSelectorMultiProfileTest&) = delete;
+
~SSLClientCertificateSelectorMultiProfileTest() override = default;
void SetUpInProcessBrowserTestFixture() override {
@@ -218,9 +224,6 @@
scoped_refptr<net::SSLCertRequestInfo> cert_request_info_1_;
scoped_refptr<StrictMock<SSLClientAuthRequestorMock> > auth_requestor_1_;
SSLClientCertificateSelector* selector_1_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SSLClientCertificateSelectorMultiProfileTest);
};
IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, SelectNone) {
diff --git a/chrome/browser/ui/views/status_bubble_views.h b/chrome/browser/ui/views/status_bubble_views.h
index a8ad40b..c39d923e 100644
--- a/chrome/browser/ui/views/status_bubble_views.h
+++ b/chrome/browser/ui/views/status_bubble_views.h
@@ -42,6 +42,10 @@
// |base_view| is the view that this bubble is positioned relative to.
explicit StatusBubbleViews(views::View* base_view);
+
+ StatusBubbleViews(const StatusBubbleViews&) = delete;
+ StatusBubbleViews& operator=(const StatusBubbleViews&) = delete;
+
~StatusBubbleViews() override;
views::View* base_view() { return base_view_; }
@@ -170,8 +174,6 @@
// Times expansion of status bubble when URL is too long for standard width.
base::WeakPtrFactory<StatusBubbleViews> expand_timer_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(StatusBubbleViews);
};
#endif // CHROME_BROWSER_UI_VIEWS_STATUS_BUBBLE_VIEWS_H_
diff --git a/chrome/browser/ui/views/status_icons/concat_menu_model.h b/chrome/browser/ui/views/status_icons/concat_menu_model.h
index 46226ab..620ec4d 100644
--- a/chrome/browser/ui/views/status_icons/concat_menu_model.h
+++ b/chrome/browser/ui/views/status_icons/concat_menu_model.h
@@ -15,6 +15,10 @@
class ConcatMenuModel : public ui::MenuModel {
public:
ConcatMenuModel(ui::MenuModel* m1, ui::MenuModel* m2);
+
+ ConcatMenuModel(const ConcatMenuModel&) = delete;
+ ConcatMenuModel& operator=(const ConcatMenuModel&) = delete;
+
~ConcatMenuModel() override;
// MenuModel:
@@ -52,8 +56,6 @@
ui::MenuModel* const m1_;
ui::MenuModel* const m2_;
-
- DISALLOW_COPY_AND_ASSIGN(ConcatMenuModel);
};
#endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_CONCAT_MENU_MODEL_H_
diff --git a/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h b/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h
index d4ba50cb..e60bb7e 100644
--- a/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h
+++ b/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h
@@ -22,6 +22,9 @@
public views::StatusIconLinux::Delegate,
public StatusIconMenuModel::Observer {
public:
+ StatusIconLinuxWrapper(const StatusIconLinuxWrapper&) = delete;
+ StatusIconLinuxWrapper& operator=(const StatusIconLinuxWrapper&) = delete;
+
~StatusIconLinuxWrapper() override;
// StatusIcon overrides:
@@ -93,8 +96,6 @@
gfx::ImageSkia image_;
std::u16string tool_tip_;
StatusIconMenuModel* menu_model_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(StatusIconLinuxWrapper);
};
#endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_LINUX_WRAPPER_H_
diff --git a/chrome/browser/ui/views/status_icons/status_icon_win.h b/chrome/browser/ui/views/status_icons/status_icon_win.h
index 8d6a57ee..38c1c12 100644
--- a/chrome/browser/ui/views/status_icons/status_icon_win.h
+++ b/chrome/browser/ui/views/status_icons/status_icon_win.h
@@ -29,6 +29,10 @@
public:
// Constructor which provides this icon's unique ID and messaging window.
StatusIconWin(StatusTrayWin* tray, UINT id, HWND window, UINT message);
+
+ StatusIconWin(const StatusIconWin&) = delete;
+ StatusIconWin& operator=(const StatusIconWin&) = delete;
+
~StatusIconWin() override;
// Handles a click event from the user - if |left_button_click| is true and
@@ -85,8 +89,6 @@
// Context menu associated with this icon (if any).
std::unique_ptr<views::MenuRunner> menu_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(StatusIconWin);
};
#endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_
diff --git a/chrome/browser/ui/views/status_icons/status_tray_linux.h b/chrome/browser/ui/views/status_icons/status_tray_linux.h
index c323737..34f2a186 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_linux.h
+++ b/chrome/browser/ui/views/status_icons/status_tray_linux.h
@@ -12,6 +12,10 @@
class StatusTrayLinux : public StatusTray {
public:
StatusTrayLinux();
+
+ StatusTrayLinux(const StatusTrayLinux&) = delete;
+ StatusTrayLinux& operator=(const StatusTrayLinux&) = delete;
+
~StatusTrayLinux() override;
protected:
@@ -20,9 +24,6 @@
StatusIconType type,
const gfx::ImageSkia& image,
const std::u16string& tool_tip) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(StatusTrayLinux);
};
#endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_TRAY_LINUX_H_
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win.cc b/chrome/browser/ui/views/status_icons/status_tray_win.cc
index eeced64..4b4ddbb 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_win.cc
+++ b/chrome/browser/ui/views/status_icons/status_tray_win.cc
@@ -48,6 +48,11 @@
worker_thread_.init_com_with_mta(false);
}
+ StatusTrayStateChangerProxyImpl(const StatusTrayStateChangerProxyImpl&) =
+ delete;
+ StatusTrayStateChangerProxyImpl& operator=(
+ const StatusTrayStateChangerProxyImpl&) = delete;
+
~StatusTrayStateChangerProxyImpl() override {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
}
@@ -93,8 +98,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<StatusTrayStateChangerProxyImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(StatusTrayStateChangerProxyImpl);
};
StatusTrayWin::StatusTrayWin()
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win.h b/chrome/browser/ui/views/status_icons/status_tray_win.h
index 1008da0..4e13978 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_win.h
+++ b/chrome/browser/ui/views/status_icons/status_tray_win.h
@@ -31,6 +31,10 @@
class StatusTrayWin : public StatusTray {
public:
StatusTrayWin();
+
+ StatusTrayWin(const StatusTrayWin&) = delete;
+ StatusTrayWin& operator=(const StatusTrayWin&) = delete;
+
~StatusTrayWin() override;
void UpdateIconVisibilityInBackground(StatusIconWin* status_icon);
@@ -77,9 +81,6 @@
// Manages changes performed on a background thread to manipulate visibility
// of notification icons.
std::unique_ptr<StatusTrayStateChangerProxy> state_changer_proxy_;
-
- DISALLOW_COPY_AND_ASSIGN(StatusTrayWin);
};
#endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_TRAY_WIN_H_
-
diff --git a/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc b/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
index 4a265d6..1114968 100644
--- a/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
+++ b/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
@@ -403,6 +403,10 @@
public:
InlineLoginHelperBrowserTest() : forced_signin_setter_(true) {}
+ InlineLoginHelperBrowserTest(const InlineLoginHelperBrowserTest&) = delete;
+ InlineLoginHelperBrowserTest& operator=(const InlineLoginHelperBrowserTest&) =
+ delete;
+
~InlineLoginHelperBrowserTest() override = default;
void SetUpInProcessBrowserTestFixture() override {
@@ -499,8 +503,6 @@
base::CallbackListSubscription create_services_subscription_;
Profile* profile_ = nullptr;
signin_util::ScopedForceSigninSetterForTesting forced_signin_setter_;
-
- DISALLOW_COPY_AND_ASSIGN(InlineLoginHelperBrowserTest);
};
// Test signin helper calls correct fetcher methods when called with an
diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h
index 7624f61..612f0d4 100644
--- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h
+++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h
@@ -29,6 +29,12 @@
public:
explicit ChromeWebContentsViewDelegateViews(
content::WebContents* web_contents);
+
+ ChromeWebContentsViewDelegateViews(
+ const ChromeWebContentsViewDelegateViews&) = delete;
+ ChromeWebContentsViewDelegateViews& operator=(
+ const ChromeWebContentsViewDelegateViews&) = delete;
+
~ChromeWebContentsViewDelegateViews() override;
// Overridden from WebContentsViewDelegate:
@@ -61,8 +67,6 @@
content::WebContents* web_contents_;
ChromeWebContentsViewFocusHelper* GetFocusHelper() const;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeWebContentsViewDelegateViews);
};
#endif // CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_CHROME_WEB_CONTENTS_VIEW_DELEGATE_VIEWS_H_
diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_mac.h b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_mac.h
index a9c9d5cf..38dc28b 100644
--- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_mac.h
+++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_mac.h
@@ -15,6 +15,12 @@
public:
explicit ChromeWebContentsViewDelegateViewsMac(
content::WebContents* web_contents);
+
+ ChromeWebContentsViewDelegateViewsMac(
+ const ChromeWebContentsViewDelegateViewsMac&) = delete;
+ ChromeWebContentsViewDelegateViewsMac& operator=(
+ const ChromeWebContentsViewDelegateViewsMac&) = delete;
+
~ChromeWebContentsViewDelegateViewsMac() override;
// ChromeWebContentsViewDelegateMac:
@@ -30,8 +36,6 @@
content::WebContents* web_contents_;
ChromeWebContentsViewFocusHelper* GetFocusHelper() const;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeWebContentsViewDelegateViewsMac);
};
#endif // CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_CHROME_WEB_CONTENTS_VIEW_DELEGATE_VIEWS_MAC_H_
diff --git a/chrome/browser/ui/views/tab_dialogs_views.h b/chrome/browser/ui/views/tab_dialogs_views.h
index 2131322b..358d077 100644
--- a/chrome/browser/ui/views/tab_dialogs_views.h
+++ b/chrome/browser/ui/views/tab_dialogs_views.h
@@ -12,6 +12,10 @@
class TabDialogsViews : public TabDialogs {
public:
explicit TabDialogsViews(content::WebContents* contents);
+
+ TabDialogsViews(const TabDialogsViews&) = delete;
+ TabDialogsViews& operator=(const TabDialogsViews&) = delete;
+
~TabDialogsViews() override;
// TabDialogs:
@@ -33,8 +37,6 @@
private:
content::WebContents* web_contents_; // Weak. Owns this.
-
- DISALLOW_COPY_AND_ASSIGN(TabDialogsViews);
};
#endif // CHROME_BROWSER_UI_VIEWS_TAB_DIALOGS_VIEWS_H_
diff --git a/chrome/browser/ui/views/task_manager_view_browsertest.cc b/chrome/browser/ui/views/task_manager_view_browsertest.cc
index fe206ac..b17d1c4 100644
--- a/chrome/browser/ui/views/task_manager_view_browsertest.cc
+++ b/chrome/browser/ui/views/task_manager_view_browsertest.cc
@@ -54,6 +54,10 @@
feature_list_.InitAndEnableFeature(features::kViewsTaskManager);
#endif
}
+
+ TaskManagerViewTest(const TaskManagerViewTest&) = delete;
+ TaskManagerViewTest& operator=(const TaskManagerViewTest&) = delete;
+
~TaskManagerViewTest() override {}
void SetUpOnMainThread() override {
@@ -125,8 +129,6 @@
private:
base::test::ScopedFeatureList feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(TaskManagerViewTest);
};
// Tests that all defined columns have a corresponding string IDs for keying
diff --git a/chrome/browser/ui/views/touch_events_interactive_uitest_win.cc b/chrome/browser/ui/views/touch_events_interactive_uitest_win.cc
index 6c5725d..22c187b 100644
--- a/chrome/browser/ui/views/touch_events_interactive_uitest_win.cc
+++ b/chrome/browser/ui/views/touch_events_interactive_uitest_win.cc
@@ -27,6 +27,9 @@
num_pointers_down_(0),
recursion_enabled_(false) {}
+ TouchEventHandler(const TouchEventHandler&) = delete;
+ TouchEventHandler& operator=(const TouchEventHandler&) = delete;
+
~TouchEventHandler() override {}
// OnTouchEvent will simulate a second touch event (at |touch_point|) to force
@@ -90,12 +93,15 @@
base::RepeatingClosure quit_closure_;
bool recursion_enabled_;
gfx::Point touch_point_;
- DISALLOW_COPY_AND_ASSIGN(TouchEventHandler);
};
class TestingGestureRecognizer : public ui::GestureRecognizerImpl {
public:
TestingGestureRecognizer() = default;
+
+ TestingGestureRecognizer(const TestingGestureRecognizer&) = delete;
+ TestingGestureRecognizer& operator=(const TestingGestureRecognizer&) = delete;
+
~TestingGestureRecognizer() override = default;
int num_touch_press_events() const { return num_touch_press_events_; }
@@ -123,7 +129,6 @@
private:
int num_touch_press_events_ = 0;
int num_touch_release_events_ = 0;
- DISALLOW_COPY_AND_ASSIGN(TestingGestureRecognizer);
};
} // namespace
diff --git a/chrome/browser/ui/views/touch_selection_menu_runner_chromeos.h b/chrome/browser/ui/views/touch_selection_menu_runner_chromeos.h
index 6d9cf0d..ef72add 100644
--- a/chrome/browser/ui/views/touch_selection_menu_runner_chromeos.h
+++ b/chrome/browser/ui/views/touch_selection_menu_runner_chromeos.h
@@ -24,6 +24,12 @@
: public views::TouchSelectionMenuRunnerViews {
public:
TouchSelectionMenuRunnerChromeOS();
+
+ TouchSelectionMenuRunnerChromeOS(const TouchSelectionMenuRunnerChromeOS&) =
+ delete;
+ TouchSelectionMenuRunnerChromeOS& operator=(
+ const TouchSelectionMenuRunnerChromeOS&) = delete;
+
~TouchSelectionMenuRunnerChromeOS() override;
private:
@@ -50,8 +56,6 @@
base::WeakPtrFactory<TouchSelectionMenuRunnerChromeOS> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(TouchSelectionMenuRunnerChromeOS);
};
#endif // CHROME_BROWSER_UI_VIEWS_TOUCH_SELECTION_MENU_RUNNER_CHROMEOS_H_
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.h b/chrome/browser/ui/views/translate/translate_bubble_view.h
index 250d5f6..a68a249 100644
--- a/chrome/browser/ui/views/translate/translate_bubble_view.h
+++ b/chrome/browser/ui/views/translate/translate_bubble_view.h
@@ -76,6 +76,9 @@
kSourceLanguageDoneButton);
DECLARE_CLASS_ELEMENT_IDENTIFIER_VALUE(TranslateBubbleView, kErrorMessage);
+ TranslateBubbleView(const TranslateBubbleView&) = delete;
+ TranslateBubbleView& operator=(const TranslateBubbleView&) = delete;
+
~TranslateBubbleView() override;
// Shows the Translate bubble. Returns the newly created bubble's Widget or
@@ -324,8 +327,6 @@
bool should_never_translate_site_ = false;
std::unique_ptr<WebContentMouseHandler> mouse_handler_;
-
- DISALLOW_COPY_AND_ASSIGN(TranslateBubbleView);
};
#endif // CHROME_BROWSER_UI_VIEWS_TRANSLATE_TRANSLATE_BUBBLE_VIEW_H_
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc b/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc
index 68f6b36..e6169aa 100644
--- a/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc
+++ b/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc
@@ -36,6 +36,12 @@
class TranslateBubbleViewBrowserTest : public InProcessBrowserTest {
public:
TranslateBubbleViewBrowserTest() {}
+
+ TranslateBubbleViewBrowserTest(const TranslateBubbleViewBrowserTest&) =
+ delete;
+ TranslateBubbleViewBrowserTest& operator=(
+ const TranslateBubbleViewBrowserTest&) = delete;
+
~TranslateBubbleViewBrowserTest() override {}
void SetUp() override {
@@ -76,9 +82,6 @@
->Wait();
}
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TranslateBubbleViewBrowserTest);
};
IN_PROC_BROWSER_TEST_F(TranslateBubbleViewBrowserTest,
diff --git a/chrome/browser/ui/views/try_chrome_dialog_win/button_layout.h b/chrome/browser/ui/views/try_chrome_dialog_win/button_layout.h
index 6a56209..e13c6ee6 100644
--- a/chrome/browser/ui/views/try_chrome_dialog_win/button_layout.h
+++ b/chrome/browser/ui/views/try_chrome_dialog_win/button_layout.h
@@ -35,6 +35,10 @@
// parent must respect this width (by, for example, using ColumnSize::kUsePref
// for the hosting column's size_type if it uses GridLayout).
explicit ButtonLayout(int view_width);
+
+ ButtonLayout(const ButtonLayout&) = delete;
+ ButtonLayout& operator=(const ButtonLayout&) = delete;
+
~ButtonLayout() override;
protected:
@@ -56,8 +60,6 @@
// The desired width of the view.
const int view_width_;
-
- DISALLOW_COPY_AND_ASSIGN(ButtonLayout);
};
#endif // CHROME_BROWSER_UI_VIEWS_TRY_CHROME_DIALOG_WIN_BUTTON_LAYOUT_H_
diff --git a/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.h b/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.h
index 0f1c5e5..ebafb9a 100644
--- a/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.h
+++ b/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.h
@@ -65,6 +65,9 @@
// The dialog does not steal focus and does not have an entry in the taskbar.
static Result Show(size_t group, ActiveModalDialogListener listener);
+ TryChromeDialog(const TryChromeDialog&) = delete;
+ TryChromeDialog& operator=(const TryChromeDialog&) = delete;
+
~TryChromeDialog() override;
private:
@@ -167,8 +170,6 @@
bool has_hover_ = false;
SEQUENCE_CHECKER(my_sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(TryChromeDialog);
};
#endif // CHROME_BROWSER_UI_VIEWS_TRY_CHROME_DIALOG_WIN_TRY_CHROME_DIALOG_H_
diff --git a/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.h b/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.h
index 900925a..78e44b6 100644
--- a/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.h
+++ b/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.h
@@ -35,6 +35,11 @@
chrome::PwaInProductHelpState iph_state,
PrefService* prefs,
feature_engagement::Tracker* tracker);
+
+ PWAConfirmationBubbleView(const PWAConfirmationBubbleView&) = delete;
+ PWAConfirmationBubbleView& operator=(const PWAConfirmationBubbleView&) =
+ delete;
+
~PWAConfirmationBubbleView() override;
// LocationBarBubbleDelegateView:
@@ -53,8 +58,6 @@
chrome::PwaInProductHelpState iph_state_;
PrefService* prefs_;
feature_engagement::Tracker* tracker_;
-
- DISALLOW_COPY_AND_ASSIGN(PWAConfirmationBubbleView);
};
#endif // CHROME_BROWSER_UI_VIEWS_WEB_APPS_PWA_CONFIRMATION_BUBBLE_VIEW_H_
diff --git a/chrome/browser/ui/views/web_apps/web_app_ash_interactive_ui_test.cc b/chrome/browser/ui/views/web_apps/web_app_ash_interactive_ui_test.cc
index aae50bc4..45770c3 100644
--- a/chrome/browser/ui/views/web_apps/web_app_ash_interactive_ui_test.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_ash_interactive_ui_test.cc
@@ -20,6 +20,11 @@
class WebAppAshInteractiveUITest : public web_app::WebAppControllerBrowserTest {
public:
WebAppAshInteractiveUITest() = default;
+
+ WebAppAshInteractiveUITest(const WebAppAshInteractiveUITest&) = delete;
+ WebAppAshInteractiveUITest& operator=(const WebAppAshInteractiveUITest&) =
+ delete;
+
~WebAppAshInteractiveUITest() override = default;
// InProcessBrowserTest override:
@@ -62,9 +67,6 @@
BrowserView* browser_view_ = nullptr;
ImmersiveModeController* controller_ = nullptr;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WebAppAshInteractiveUITest);
};
// Test that the web app menu button opens a menu on click.
diff --git a/chrome/browser/ui/views/web_apps/web_app_info_image_source.h b/chrome/browser/ui/views/web_apps/web_app_info_image_source.h
index b482318a..736f8a3 100644
--- a/chrome/browser/ui/views/web_apps/web_app_info_image_source.h
+++ b/chrome/browser/ui/views/web_apps/web_app_info_image_source.h
@@ -16,6 +16,10 @@
public:
WebAppInfoImageSource(int dip_size,
const std::map<SquareSizePx, SkBitmap>& icons);
+
+ WebAppInfoImageSource(const WebAppInfoImageSource&) = delete;
+ WebAppInfoImageSource& operator=(const WebAppInfoImageSource&) = delete;
+
~WebAppInfoImageSource() override;
private:
@@ -24,8 +28,6 @@
int dip_size_;
std::map<SquareSizePx, SkBitmap> icons_;
-
- DISALLOW_COPY_AND_ASSIGN(WebAppInfoImageSource);
};
#endif // CHROME_BROWSER_UI_VIEWS_WEB_APPS_WEB_APP_INFO_IMAGE_SOURCE_H_
diff --git a/chrome/browser/ui/views/webauthn/authenticator_bio_enrollment_sheet_view.h b/chrome/browser/ui/views/webauthn/authenticator_bio_enrollment_sheet_view.h
index 01f6dc41..20553023 100644
--- a/chrome/browser/ui/views/webauthn/authenticator_bio_enrollment_sheet_view.h
+++ b/chrome/browser/ui/views/webauthn/authenticator_bio_enrollment_sheet_view.h
@@ -17,6 +17,12 @@
public:
explicit AuthenticatorBioEnrollmentSheetView(
std::unique_ptr<AuthenticatorBioEnrollmentSheetModel> sheet_model);
+
+ AuthenticatorBioEnrollmentSheetView(
+ const AuthenticatorBioEnrollmentSheetView&) = delete;
+ AuthenticatorBioEnrollmentSheetView& operator=(
+ const AuthenticatorBioEnrollmentSheetView&) = delete;
+
~AuthenticatorBioEnrollmentSheetView() override;
private:
@@ -28,8 +34,6 @@
bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
RingProgressBar* ring_progress_bar_;
-
- DISALLOW_COPY_AND_ASSIGN(AuthenticatorBioEnrollmentSheetView);
};
#endif // CHROME_BROWSER_UI_VIEWS_WEBAUTHN_AUTHENTICATOR_BIO_ENROLLMENT_SHEET_VIEW_H_
diff --git a/chrome/browser/ui/views/webauthn/authenticator_client_pin_entry_sheet_view.h b/chrome/browser/ui/views/webauthn/authenticator_client_pin_entry_sheet_view.h
index 1d84ec55..6304b24 100644
--- a/chrome/browser/ui/views/webauthn/authenticator_client_pin_entry_sheet_view.h
+++ b/chrome/browser/ui/views/webauthn/authenticator_client_pin_entry_sheet_view.h
@@ -20,6 +20,12 @@
public:
explicit AuthenticatorClientPinEntrySheetView(
std::unique_ptr<AuthenticatorClientPinEntrySheetModel> model);
+
+ AuthenticatorClientPinEntrySheetView(
+ const AuthenticatorClientPinEntrySheetView&) = delete;
+ AuthenticatorClientPinEntrySheetView& operator=(
+ const AuthenticatorClientPinEntrySheetView&) = delete;
+
~AuthenticatorClientPinEntrySheetView() override;
private:
@@ -32,8 +38,6 @@
// AuthenticatorClientPinEntryView::Delegate:
void OnPincodeChanged(std::u16string pincode) override;
void OnConfirmationChanged(std::u16string pincode) override;
-
- DISALLOW_COPY_AND_ASSIGN(AuthenticatorClientPinEntrySheetView);
};
#endif // CHROME_BROWSER_UI_VIEWS_WEBAUTHN_AUTHENTICATOR_CLIENT_PIN_ENTRY_SHEET_VIEW_H_
diff --git a/chrome/browser/ui/views/webauthn/authenticator_dialog_view_browsertest.cc b/chrome/browser/ui/views/webauthn/authenticator_dialog_view_browsertest.cc
index 6b27b84f..6d5030ec 100644
--- a/chrome/browser/ui/views/webauthn/authenticator_dialog_view_browsertest.cc
+++ b/chrome/browser/ui/views/webauthn/authenticator_dialog_view_browsertest.cc
@@ -26,6 +26,10 @@
class TestSheetModel : public AuthenticatorRequestSheetModel {
public:
TestSheetModel() = default;
+
+ TestSheetModel(const TestSheetModel&) = delete;
+ TestSheetModel& operator=(const TestSheetModel&) = delete;
+
~TestSheetModel() override = default;
// Getters for data on step specific content:
@@ -70,8 +74,6 @@
void OnBack() override {}
void OnAccept() override {}
void OnCancel() override {}
-
- DISALLOW_COPY_AND_ASSIGN(TestSheetModel);
};
class TestSheetView : public AuthenticatorRequestSheetView {
@@ -81,6 +83,9 @@
ReInitChildViews();
}
+ TestSheetView(const TestSheetView&) = delete;
+ TestSheetView& operator=(const TestSheetView&) = delete;
+
~TestSheetView() override = default;
private:
@@ -95,8 +100,6 @@
test_sheet_model()->GetStepSpecificLabelText()),
AutoFocus::kNo);
}
-
- DISALLOW_COPY_AND_ASSIGN(TestSheetView);
};
} // namespace
diff --git a/chrome/browser/ui/views/webauthn/authenticator_qr_sheet_view.h b/chrome/browser/ui/views/webauthn/authenticator_qr_sheet_view.h
index 06099be..8fb22e0 100644
--- a/chrome/browser/ui/views/webauthn/authenticator_qr_sheet_view.h
+++ b/chrome/browser/ui/views/webauthn/authenticator_qr_sheet_view.h
@@ -20,6 +20,9 @@
explicit AuthenticatorQRSheetView(
std::unique_ptr<AuthenticatorQRSheetModel> model);
+ AuthenticatorQRSheetView(const AuthenticatorQRSheetView&) = delete;
+ AuthenticatorQRSheetView& operator=(const AuthenticatorQRSheetView&) = delete;
+
~AuthenticatorQRSheetView() override;
// RefreshQRCode causes a fresh QR code to be painted.
@@ -34,8 +37,6 @@
AuthenticatorQRViewCentered* qr_view_ = nullptr;
const std::string qr_string_;
base::RepeatingTimer timer_;
-
- DISALLOW_COPY_AND_ASSIGN(AuthenticatorQRSheetView);
};
#endif // CHROME_BROWSER_UI_VIEWS_WEBAUTHN_AUTHENTICATOR_QR_SHEET_VIEW_H_
diff --git a/chrome/browser/ui/views/webauthn/authenticator_select_account_sheet_view.h b/chrome/browser/ui/views/webauthn/authenticator_select_account_sheet_view.h
index 0b2bcc9..91b86413 100644
--- a/chrome/browser/ui/views/webauthn/authenticator_select_account_sheet_view.h
+++ b/chrome/browser/ui/views/webauthn/authenticator_select_account_sheet_view.h
@@ -20,6 +20,12 @@
public:
explicit AuthenticatorSelectAccountSheetView(
std::unique_ptr<AuthenticatorSelectAccountSheetModel> model);
+
+ AuthenticatorSelectAccountSheetView(
+ const AuthenticatorSelectAccountSheetView&) = delete;
+ AuthenticatorSelectAccountSheetView& operator=(
+ const AuthenticatorSelectAccountSheetView&) = delete;
+
~AuthenticatorSelectAccountSheetView() override;
private:
@@ -34,8 +40,6 @@
// AccountHoverListModel::Delegate:
void OnItemSelected(int index) override;
-
- DISALLOW_COPY_AND_ASSIGN(AuthenticatorSelectAccountSheetView);
};
#endif // CHROME_BROWSER_UI_VIEWS_WEBAUTHN_AUTHENTICATOR_SELECT_ACCOUNT_SHEET_VIEW_H_
diff --git a/chrome/browser/ui/webauthn/account_hover_list_model.h b/chrome/browser/ui/webauthn/account_hover_list_model.h
index bc99d2f..dc949c6 100644
--- a/chrome/browser/ui/webauthn/account_hover_list_model.h
+++ b/chrome/browser/ui/webauthn/account_hover_list_model.h
@@ -27,6 +27,10 @@
AccountHoverListModel(
const std::vector<device::PublicKeyCredentialUserEntity>* users_list,
Delegate* delegate);
+
+ AccountHoverListModel(const AccountHoverListModel&) = delete;
+ AccountHoverListModel& operator=(const AccountHoverListModel&) = delete;
+
~AccountHoverListModel() override;
// HoverListModel:
@@ -45,8 +49,6 @@
private:
const std::vector<device::PublicKeyCredentialUserEntity>* users_list_;
Delegate* const delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(AccountHoverListModel);
};
#endif // CHROME_BROWSER_UI_WEBAUTHN_ACCOUNT_HOVER_LIST_MODEL_H_
diff --git a/chrome/browser/ui/webauthn/hover_list_model.h b/chrome/browser/ui/webauthn/hover_list_model.h
index ab07af59..4facbca3 100644
--- a/chrome/browser/ui/webauthn/hover_list_model.h
+++ b/chrome/browser/ui/webauthn/hover_list_model.h
@@ -33,6 +33,10 @@
};
HoverListModel() = default;
+
+ HoverListModel(const HoverListModel&) = delete;
+ HoverListModel& operator=(const HoverListModel&) = delete;
+
virtual ~HoverListModel() = default;
virtual bool ShouldShowPlaceholderForEmptyList() const = 0;
@@ -70,8 +74,6 @@
private:
Observer* observer_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(HoverListModel);
};
#endif // CHROME_BROWSER_UI_WEBAUTHN_HOVER_LIST_MODEL_H_
diff --git a/chrome/browser/ui/webauthn/other_mechanisms_menu_model.h b/chrome/browser/ui/webauthn/other_mechanisms_menu_model.h
index 491a279..d3ea4f32 100644
--- a/chrome/browser/ui/webauthn/other_mechanisms_menu_model.h
+++ b/chrome/browser/ui/webauthn/other_mechanisms_menu_model.h
@@ -19,6 +19,10 @@
public:
explicit OtherMechanismsMenuModel(
AuthenticatorRequestDialogModel* dialog_model);
+
+ OtherMechanismsMenuModel(const OtherMechanismsMenuModel&) = delete;
+ OtherMechanismsMenuModel& operator=(const OtherMechanismsMenuModel&) = delete;
+
~OtherMechanismsMenuModel() override;
protected:
@@ -28,8 +32,6 @@
void ExecuteCommand(int command_id, int event_flags) override;
AuthenticatorRequestDialogModel* const dialog_model_;
-
- DISALLOW_COPY_AND_ASSIGN(OtherMechanismsMenuModel);
};
#endif // CHROME_BROWSER_UI_WEBAUTHN_OTHER_MECHANISMS_MENU_MODEL_H_
diff --git a/chrome/browser/ui/webauthn/sheet_models.h b/chrome/browser/ui/webauthn/sheet_models.h
index 74fc1ac4..63c98406 100644
--- a/chrome/browser/ui/webauthn/sheet_models.h
+++ b/chrome/browser/ui/webauthn/sheet_models.h
@@ -32,6 +32,11 @@
public:
explicit AuthenticatorSheetModelBase(
AuthenticatorRequestDialogModel* dialog_model);
+
+ AuthenticatorSheetModelBase(const AuthenticatorSheetModelBase&) = delete;
+ AuthenticatorSheetModelBase& operator=(const AuthenticatorSheetModelBase&) =
+ delete;
+
~AuthenticatorSheetModelBase() override;
AuthenticatorRequestDialogModel* dialog_model() const {
@@ -61,8 +66,6 @@
private:
AuthenticatorRequestDialogModel* dialog_model_;
-
- DISALLOW_COPY_AND_ASSIGN(AuthenticatorSheetModelBase);
};
// The sheet shown for selecting the transport over which the security key
diff --git a/chrome/browser/ui/webauthn/transport_hover_list_model.h b/chrome/browser/ui/webauthn/transport_hover_list_model.h
index babdfaf..c4999f4 100644
--- a/chrome/browser/ui/webauthn/transport_hover_list_model.h
+++ b/chrome/browser/ui/webauthn/transport_hover_list_model.h
@@ -21,6 +21,10 @@
public:
explicit TransportHoverListModel(
base::span<const AuthenticatorRequestDialogModel::Mechanism> mechanisms);
+
+ TransportHoverListModel(const TransportHoverListModel&) = delete;
+ TransportHoverListModel& operator=(const TransportHoverListModel&) = delete;
+
~TransportHoverListModel() override;
// HoverListModel:
@@ -39,8 +43,6 @@
private:
const base::span<const AuthenticatorRequestDialogModel::Mechanism>
mechanisms_;
-
- DISALLOW_COPY_AND_ASSIGN(TransportHoverListModel);
};
#endif // CHROME_BROWSER_UI_WEBAUTHN_TRANSPORT_HOVER_LIST_MODEL_H_
diff --git a/chrome/browser/ui/webui/about_ui.h b/chrome/browser/ui/webui/about_ui.h
index 8a77e03b..703c359 100644
--- a/chrome/browser/ui/webui/about_ui.h
+++ b/chrome/browser/ui/webui/about_ui.h
@@ -20,6 +20,10 @@
public:
// Construct a data source for the specified |source_name|.
AboutUIHTMLSource(const std::string& source_name, Profile* profile);
+
+ AboutUIHTMLSource(const AboutUIHTMLSource&) = delete;
+ AboutUIHTMLSource& operator=(const AboutUIHTMLSource&) = delete;
+
~AboutUIHTMLSource() override;
// content::URLDataSource implementation.
@@ -42,17 +46,16 @@
private:
std::string source_name_;
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(AboutUIHTMLSource);
};
class AboutUI : public content::WebUIController {
public:
explicit AboutUI(content::WebUI* web_ui, const std::string& host);
- ~AboutUI() override {}
- private:
- DISALLOW_COPY_AND_ASSIGN(AboutUI);
+ AboutUI(const AboutUI&) = delete;
+ AboutUI& operator=(const AboutUI&) = delete;
+
+ ~AboutUI() override {}
};
namespace about_ui {
diff --git a/chrome/browser/ui/webui/about_ui_unittest.cc b/chrome/browser/ui/webui/about_ui_unittest.cc
index b082ad8..8d63b3a 100644
--- a/chrome/browser/ui/webui/about_ui_unittest.cc
+++ b/chrome/browser/ui/webui/about_ui_unittest.cc
@@ -39,6 +39,10 @@
class TestDataReceiver {
public:
TestDataReceiver() = default;
+
+ TestDataReceiver(const TestDataReceiver&) = delete;
+ TestDataReceiver& operator=(const TestDataReceiver&) = delete;
+
virtual ~TestDataReceiver() = default;
bool data_received() const { return data_received_; }
@@ -60,8 +64,6 @@
private:
bool data_received_ = false;
std::string data_;
-
- DISALLOW_COPY_AND_ASSIGN(TestDataReceiver);
};
} // namespace
diff --git a/chrome/browser/ui/webui/app_launcher_page_ui.h b/chrome/browser/ui/webui/app_launcher_page_ui.h
index a549600..7a252d1c 100644
--- a/chrome/browser/ui/webui/app_launcher_page_ui.h
+++ b/chrome/browser/ui/webui/app_launcher_page_ui.h
@@ -20,6 +20,10 @@
class AppLauncherPageUI : public content::WebUIController {
public:
explicit AppLauncherPageUI(content::WebUI* web_ui);
+
+ AppLauncherPageUI(const AppLauncherPageUI&) = delete;
+ AppLauncherPageUI& operator=(const AppLauncherPageUI&) = delete;
+
~AppLauncherPageUI() override;
static base::RefCountedMemory* GetFaviconResourceBytes(
@@ -30,8 +34,6 @@
Profile* GetProfile() const;
PrefChangeRegistrar pref_change_registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(AppLauncherPageUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_APP_LAUNCHER_PAGE_UI_H_
diff --git a/chrome/browser/ui/webui/app_management/app_management_page_handler.h b/chrome/browser/ui/webui/app_management/app_management_page_handler.h
index 05fa6ae..835f4b9 100644
--- a/chrome/browser/ui/webui/app_management/app_management_page_handler.h
+++ b/chrome/browser/ui/webui/app_management/app_management_page_handler.h
@@ -27,6 +27,10 @@
mojo::PendingReceiver<app_management::mojom::PageHandler> receiver,
mojo::PendingRemote<app_management::mojom::Page> page,
Profile* profile);
+
+ AppManagementPageHandler(const AppManagementPageHandler&) = delete;
+ AppManagementPageHandler& operator=(const AppManagementPageHandler&) = delete;
+
~AppManagementPageHandler() override;
void OnPinnedChanged(const std::string& app_id, bool pinned);
@@ -79,8 +83,6 @@
base::ScopedObservation<apps::PreferredAppsList,
apps::PreferredAppsList::Observer>
preferred_apps_list_observer_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AppManagementPageHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_APP_MANAGEMENT_APP_MANAGEMENT_PAGE_HANDLER_H_
diff --git a/chrome/browser/ui/webui/app_management/app_management_shelf_delegate_chromeos.h b/chrome/browser/ui/webui/app_management/app_management_shelf_delegate_chromeos.h
index 7e47bbf..cc5295c 100644
--- a/chrome/browser/ui/webui/app_management/app_management_shelf_delegate_chromeos.h
+++ b/chrome/browser/ui/webui/app_management/app_management_shelf_delegate_chromeos.h
@@ -23,6 +23,11 @@
public:
explicit AppManagementShelfDelegate(AppManagementPageHandler* page_handler,
Profile* profile);
+
+ AppManagementShelfDelegate(const AppManagementShelfDelegate&) = delete;
+ AppManagementShelfDelegate& operator=(const AppManagementShelfDelegate&) =
+ delete;
+
~AppManagementShelfDelegate() override;
bool IsPinned(const std::string& app_id);
@@ -38,8 +43,6 @@
AppManagementPageHandler* page_handler_;
std::unique_ptr<ShelfControllerHelper> shelf_controller_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(AppManagementShelfDelegate);
};
#endif // CHROME_BROWSER_UI_WEBUI_APP_MANAGEMENT_APP_MANAGEMENT_SHELF_DELEGATE_CHROMEOS_H_
diff --git a/chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui.h b/chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui.h
index 4869bd69..8584fa2 100644
--- a/chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui.h
+++ b/chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui.h
@@ -15,10 +15,11 @@
class AutofillInternalsUI : public content::WebUIController {
public:
explicit AutofillInternalsUI(content::WebUI* web_ui);
- ~AutofillInternalsUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(AutofillInternalsUI);
+ AutofillInternalsUI(const AutofillInternalsUI&) = delete;
+ AutofillInternalsUI& operator=(const AutofillInternalsUI&) = delete;
+
+ ~AutofillInternalsUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_AUTOFILL_AND_PASSWORD_MANAGER_INTERNALS_AUTOFILL_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.h b/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.h
index a62ad8b..f1c69ddc 100644
--- a/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.h
+++ b/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.h
@@ -64,6 +64,10 @@
InternalsUIHandler(std::string call_on_load,
GetLogRouterFunction get_log_router_function);
+
+ InternalsUIHandler(const InternalsUIHandler&) = delete;
+ InternalsUIHandler& operator=(const InternalsUIHandler&) = delete;
+
~InternalsUIHandler() override;
private:
@@ -94,8 +98,6 @@
bool registered_with_log_router_ = false;
absl::optional<AutofillCacheResetter> autofill_cache_resetter_;
-
- DISALLOW_COPY_AND_ASSIGN(InternalsUIHandler);
};
} // namespace autofill
diff --git a/chrome/browser/ui/webui/autofill_and_password_manager_internals/password_manager_internals_ui.h b/chrome/browser/ui/webui/autofill_and_password_manager_internals/password_manager_internals_ui.h
index 3e557dd..ecba6f0 100644
--- a/chrome/browser/ui/webui/autofill_and_password_manager_internals/password_manager_internals_ui.h
+++ b/chrome/browser/ui/webui/autofill_and_password_manager_internals/password_manager_internals_ui.h
@@ -15,10 +15,12 @@
class PasswordManagerInternalsUI : public content::WebUIController {
public:
explicit PasswordManagerInternalsUI(content::WebUI* web_ui);
- ~PasswordManagerInternalsUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(PasswordManagerInternalsUI);
+ PasswordManagerInternalsUI(const PasswordManagerInternalsUI&) = delete;
+ PasswordManagerInternalsUI& operator=(const PasswordManagerInternalsUI&) =
+ delete;
+
+ ~PasswordManagerInternalsUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_AUTOFILL_AND_PASSWORD_MANAGER_INTERNALS_PASSWORD_MANAGER_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.h b/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.h
index 8f51f963..94cbaa9 100644
--- a/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.h
+++ b/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.h
@@ -26,6 +26,11 @@
public:
explicit BluetoothInternalsHandler(
mojo::PendingReceiver<mojom::BluetoothInternalsHandler> receiver);
+
+ BluetoothInternalsHandler(const BluetoothInternalsHandler&) = delete;
+ BluetoothInternalsHandler& operator=(const BluetoothInternalsHandler&) =
+ delete;
+
~BluetoothInternalsHandler() override;
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -51,8 +56,6 @@
#endif
base::WeakPtrFactory<BluetoothInternalsHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BluetoothInternalsHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_BLUETOOTH_INTERNALS_BLUETOOTH_INTERNALS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.h b/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.h
index 8f22cb5..7343333 100644
--- a/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.h
+++ b/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.h
@@ -16,6 +16,10 @@
class BluetoothInternalsUI : public ui::MojoWebUIController {
public:
explicit BluetoothInternalsUI(content::WebUI* web_ui);
+
+ BluetoothInternalsUI(const BluetoothInternalsUI&) = delete;
+ BluetoothInternalsUI& operator=(const BluetoothInternalsUI&) = delete;
+
~BluetoothInternalsUI() override;
// Instantiates the implementor of the mojom::BluetoothInternalsHandler mojo
@@ -27,8 +31,6 @@
std::unique_ptr<BluetoothInternalsHandler> page_handler_;
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(BluetoothInternalsUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_BLUETOOTH_INTERNALS_BLUETOOTH_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/bookmarks/bookmarks_browsertest.h b/chrome/browser/ui/webui/bookmarks/bookmarks_browsertest.h
index 7eee4f0..3007a80 100644
--- a/chrome/browser/ui/webui/bookmarks/bookmarks_browsertest.h
+++ b/chrome/browser/ui/webui/bookmarks/bookmarks_browsertest.h
@@ -10,13 +10,14 @@
class BookmarksBrowserTest : public WebUIBrowserTest {
public:
BookmarksBrowserTest();
+
+ BookmarksBrowserTest(const BookmarksBrowserTest&) = delete;
+ BookmarksBrowserTest& operator=(const BookmarksBrowserTest&) = delete;
+
~BookmarksBrowserTest() override;
void SetupExtensionAPITest();
void SetupExtensionAPIEditDisabledTest();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BookmarksBrowserTest);
};
#endif // CHROME_BROWSER_UI_WEBUI_BOOKMARKS_BOOKMARKS_BROWSERTEST_H_
diff --git a/chrome/browser/ui/webui/bookmarks/bookmarks_message_handler.h b/chrome/browser/ui/webui/bookmarks/bookmarks_message_handler.h
index c0bfa634..5819ecea 100644
--- a/chrome/browser/ui/webui/bookmarks/bookmarks_message_handler.h
+++ b/chrome/browser/ui/webui/bookmarks/bookmarks_message_handler.h
@@ -15,6 +15,10 @@
class BookmarksMessageHandler : public content::WebUIMessageHandler {
public:
BookmarksMessageHandler();
+
+ BookmarksMessageHandler(const BookmarksMessageHandler&) = delete;
+ BookmarksMessageHandler& operator=(const BookmarksMessageHandler&) = delete;
+
~BookmarksMessageHandler() override;
private:
@@ -32,8 +36,6 @@
void OnJavascriptDisallowed() override;
PrefChangeRegistrar pref_change_registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(BookmarksMessageHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_BOOKMARKS_BOOKMARKS_MESSAGE_HANDLER_H_
diff --git a/chrome/browser/ui/webui/browser_switch/browser_switch_ui.cc b/chrome/browser/ui/webui/browser_switch/browser_switch_ui.cc
index 75cb668..93542fa 100644
--- a/chrome/browser/ui/webui/browser_switch/browser_switch_ui.cc
+++ b/chrome/browser/ui/webui/browser_switch/browser_switch_ui.cc
@@ -156,6 +156,10 @@
class BrowserSwitchHandler : public content::WebUIMessageHandler {
public:
BrowserSwitchHandler();
+
+ BrowserSwitchHandler(const BrowserSwitchHandler&) = delete;
+ BrowserSwitchHandler& operator=(const BrowserSwitchHandler&) = delete;
+
~BrowserSwitchHandler() override;
// WebUIMessageHandler
@@ -240,8 +244,6 @@
base::CallbackListSubscription service_subscription_;
base::WeakPtrFactory<BrowserSwitchHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BrowserSwitchHandler);
};
BrowserSwitchHandler::BrowserSwitchHandler() {}
diff --git a/chrome/browser/ui/webui/certificate_viewer_ui.h b/chrome/browser/ui/webui/certificate_viewer_ui.h
index b998cd4..52105655 100644
--- a/chrome/browser/ui/webui/certificate_viewer_ui.h
+++ b/chrome/browser/ui/webui/certificate_viewer_ui.h
@@ -12,10 +12,11 @@
class CertificateViewerUI : public ConstrainedWebDialogUI {
public:
explicit CertificateViewerUI(content::WebUI* web_ui);
- ~CertificateViewerUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(CertificateViewerUI);
+ CertificateViewerUI(const CertificateViewerUI&) = delete;
+ CertificateViewerUI& operator=(const CertificateViewerUI&) = delete;
+
+ ~CertificateViewerUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_CERTIFICATE_VIEWER_UI_H_
diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.h b/chrome/browser/ui/webui/certificate_viewer_webui.h
index d5cdb430..b7034a8 100644
--- a/chrome/browser/ui/webui/certificate_viewer_webui.h
+++ b/chrome/browser/ui/webui/certificate_viewer_webui.h
@@ -34,6 +34,9 @@
content::WebContents* web_contents,
gfx::NativeWindow parent);
+ CertificateViewerDialog(const CertificateViewerDialog&) = delete;
+ CertificateViewerDialog& operator=(const CertificateViewerDialog&) = delete;
+
~CertificateViewerDialog() override;
gfx::NativeWindow GetNativeWebContentsModalDialog();
@@ -68,8 +71,6 @@
content::WebUI* webui_ = nullptr;
ConstrainedWebDialogDelegate* delegate_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(CertificateViewerDialog);
};
// Dialog handler which handles calls from the JS WebUI code to view certificate
@@ -78,6 +79,12 @@
public:
CertificateViewerDialogHandler(CertificateViewerDialog* dialog,
net::ScopedCERTCertificateList cert_chain);
+
+ CertificateViewerDialogHandler(const CertificateViewerDialogHandler&) =
+ delete;
+ CertificateViewerDialogHandler& operator=(
+ const CertificateViewerDialogHandler&) = delete;
+
~CertificateViewerDialogHandler() override;
// Overridden from WebUIMessageHandler
@@ -106,8 +113,6 @@
// The certificate chain.
net::ScopedCERTCertificateList cert_chain_;
-
- DISALLOW_COPY_AND_ASSIGN(CertificateViewerDialogHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_CERTIFICATE_VIEWER_WEBUI_H_
diff --git a/chrome/browser/ui/webui/certificates_handler.h b/chrome/browser/ui/webui/certificates_handler.h
index cabd07f34..8d32de9b 100644
--- a/chrome/browser/ui/webui/certificates_handler.h
+++ b/chrome/browser/ui/webui/certificates_handler.h
@@ -62,6 +62,10 @@
public ui::SelectFileDialog::Listener {
public:
CertificatesHandler();
+
+ CertificatesHandler(const CertificatesHandler&) = delete;
+ CertificatesHandler& operator=(const CertificatesHandler&) = delete;
+
~CertificatesHandler() override;
// content::WebUIMessageHandler.
@@ -244,8 +248,6 @@
cert_info_id_map_;
base::WeakPtrFactory<CertificatesHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CertificatesHandler);
friend class ::CertificateHandlerTest;
};
diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc b/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc
index bbab223e..31eef8e 100644
--- a/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc
+++ b/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc
@@ -42,6 +42,10 @@
explicit NavigationObserver(content::WebContents* web_contents)
: WebContentsObserver(web_contents), navigation_result_(NOT_FINISHED) {}
+
+ NavigationObserver(const NavigationObserver&) = delete;
+ NavigationObserver& operator=(const NavigationObserver&) = delete;
+
~NavigationObserver() override = default;
void DidFinishNavigation(
@@ -76,8 +80,6 @@
net::Error net_error_ = net::OK;
bool got_navigation_ = false;
int http_status_code_ = -1;
-
- DISALLOW_COPY_AND_ASSIGN(NavigationObserver);
};
} // namespace
diff --git a/chrome/browser/ui/webui/chrome_web_contents_handler.h b/chrome/browser/ui/webui/chrome_web_contents_handler.h
index 1aa083ab..a5719c3c 100644
--- a/chrome/browser/ui/webui/chrome_web_contents_handler.h
+++ b/chrome/browser/ui/webui/chrome_web_contents_handler.h
@@ -13,6 +13,10 @@
: public ui::WebDialogWebContentsDelegate::WebContentsHandler {
public:
ChromeWebContentsHandler();
+
+ ChromeWebContentsHandler(const ChromeWebContentsHandler&) = delete;
+ ChromeWebContentsHandler& operator=(const ChromeWebContentsHandler&) = delete;
+
~ChromeWebContentsHandler() override;
// Overridden from WebDialogWebContentsDelegate::WebContentsHandler:
@@ -30,9 +34,6 @@
void RunFileChooser(content::RenderFrameHost* render_frame_host,
scoped_refptr<content::FileSelectListener> listener,
const blink::mojom::FileChooserParams& params) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeWebContentsHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_CHROME_WEB_CONTENTS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/chromeos/account_manager/account_manager_welcome_ui.h b/chrome/browser/ui/webui/chromeos/account_manager/account_manager_welcome_ui.h
index 9a68ddc..497b175 100644
--- a/chrome/browser/ui/webui/chromeos/account_manager/account_manager_welcome_ui.h
+++ b/chrome/browser/ui/webui/chromeos/account_manager/account_manager_welcome_ui.h
@@ -15,11 +15,14 @@
class AccountManagerWelcomeUI : public ui::WebDialogUI {
public:
explicit AccountManagerWelcomeUI(content::WebUI* web_ui);
+
+ AccountManagerWelcomeUI(const AccountManagerWelcomeUI&) = delete;
+ AccountManagerWelcomeUI& operator=(const AccountManagerWelcomeUI&) = delete;
+
~AccountManagerWelcomeUI() override;
private:
base::WeakPtrFactory<AccountManagerWelcomeUI> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(AccountManagerWelcomeUI);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui.cc b/chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui.cc
index c05b0737..97219cf 100644
--- a/chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui.cc
@@ -37,6 +37,10 @@
public:
explicit MigrationMessageHandler(base::RepeatingClosure close_dialog_closure)
: close_dialog_closure_(close_dialog_closure) {}
+
+ MigrationMessageHandler(const MigrationMessageHandler&) = delete;
+ MigrationMessageHandler& operator=(const MigrationMessageHandler&) = delete;
+
~MigrationMessageHandler() override = default;
private:
@@ -75,8 +79,6 @@
}
base::RepeatingClosure close_dialog_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(MigrationMessageHandler);
};
} // namespace
diff --git a/chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui.h b/chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui.h
index 3c7ec92..6e71ea0 100644
--- a/chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui.h
+++ b/chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui.h
@@ -16,12 +16,15 @@
class AccountMigrationWelcomeUI : public ui::WebDialogUI {
public:
explicit AccountMigrationWelcomeUI(content::WebUI* web_ui);
+
+ AccountMigrationWelcomeUI(const AccountMigrationWelcomeUI&) = delete;
+ AccountMigrationWelcomeUI& operator=(const AccountMigrationWelcomeUI&) =
+ delete;
+
~AccountMigrationWelcomeUI() override;
private:
base::WeakPtrFactory<AccountMigrationWelcomeUI> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AccountMigrationWelcomeUI);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_handler.h b/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_handler.h
index 1ea2c89..35fc9545 100644
--- a/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_handler.h
+++ b/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_handler.h
@@ -51,6 +51,10 @@
content::WebUI* web_ui,
signin::IdentityManager* identity_manager,
Delegate* delegate);
+
+ AddSupervisionHandler(const AddSupervisionHandler&) = delete;
+ AddSupervisionHandler& operator=(const AddSupervisionHandler&) = delete;
+
~AddSupervisionHandler() override;
// add_supervision::mojom::AddSupervisionHandler overrides:
@@ -78,8 +82,6 @@
Delegate* delegate_;
base::WeakPtrFactory<AddSupervisionHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AddSupervisionHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_metrics_recorder_browsertest.cc b/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_metrics_recorder_browsertest.cc
index b6b05e91..5002f04 100644
--- a/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_metrics_recorder_browsertest.cc
+++ b/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_metrics_recorder_browsertest.cc
@@ -23,6 +23,12 @@
class AddSupervisionMetricsRecorderTest : public InProcessBrowserTest {
public:
AddSupervisionMetricsRecorderTest() = default;
+
+ AddSupervisionMetricsRecorderTest(const AddSupervisionMetricsRecorderTest&) =
+ delete;
+ AddSupervisionMetricsRecorderTest& operator=(
+ const AddSupervisionMetricsRecorderTest&) = delete;
+
~AddSupervisionMetricsRecorderTest() override = default;
void SetUpOnMainThread() override {
@@ -63,9 +69,6 @@
CloseNowForTesting();
}
- private:
- DISALLOW_COPY_AND_ASSIGN(AddSupervisionMetricsRecorderTest);
-
std::unique_ptr<signin::IdentityTestEnvironment> identity_test_env_;
content::TestWebUI test_web_ui_;
};
diff --git a/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui.h b/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui.h
index 9238359..c7d977f 100644
--- a/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui.h
+++ b/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui.h
@@ -67,6 +67,10 @@
public AddSupervisionHandler::Delegate {
public:
explicit AddSupervisionUI(content::WebUI* web_ui);
+
+ AddSupervisionUI(const AddSupervisionUI&) = delete;
+ AddSupervisionUI& operator=(const AddSupervisionUI&) = delete;
+
~AddSupervisionUI() override;
// AddSupervisionHandler::Delegate:
@@ -94,8 +98,6 @@
bool allow_non_google_url_for_tests_ = false;
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(AddSupervisionUI);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui_browsertest.cc b/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui_browsertest.cc
index e0d3399..3abcb4e 100644
--- a/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui_browsertest.cc
@@ -33,6 +33,11 @@
class AddSupervisionBrowserTest : public InProcessBrowserTest {
public:
AddSupervisionBrowserTest() = default;
+
+ AddSupervisionBrowserTest(const AddSupervisionBrowserTest&) = delete;
+ AddSupervisionBrowserTest& operator=(const AddSupervisionBrowserTest&) =
+ delete;
+
~AddSupervisionBrowserTest() override = default;
void SetUpOnMainThread() override {
@@ -80,8 +85,6 @@
private:
std::unique_ptr<signin::IdentityTestEnvironment> identity_test_env_;
-
- DISALLOW_COPY_AND_ASSIGN(AddSupervisionBrowserTest);
};
IN_PROC_BROWSER_TEST_F(AddSupervisionBrowserTest, URLParameters) {
diff --git a/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc b/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc
index a519d0d13..e0cb1ea 100644
--- a/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc
@@ -105,15 +105,16 @@
class ProcessFilterPassAll : public base::ProcessFilter {
public:
ProcessFilterPassAll() = default;
+
+ ProcessFilterPassAll(const ProcessFilterPassAll&) = delete;
+ ProcessFilterPassAll& operator=(const ProcessFilterPassAll&) = delete;
+
~ProcessFilterPassAll() override = default;
// base::ProcessFilter:
bool Includes(const base::ProcessEntry& process) const override {
return true;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ProcessFilterPassAll);
};
// Reads name of thread from /proc/pid/task/tid/status.
diff --git a/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.h b/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.h
index c3aa5c4..2ebdcafe 100644
--- a/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.h
+++ b/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.h
@@ -49,6 +49,11 @@
const std::string& title);
explicit ArcGraphicsTracingHandler(ArcGraphicsTracingMode mode);
+
+ ArcGraphicsTracingHandler(const ArcGraphicsTracingHandler&) = delete;
+ ArcGraphicsTracingHandler& operator=(const ArcGraphicsTracingHandler&) =
+ delete;
+
~ArcGraphicsTracingHandler() override;
// content::WebUIMessageHandler:
@@ -144,8 +149,6 @@
base::Time timestamp_;
base::WeakPtrFactory<ArcGraphicsTracingHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ArcGraphicsTracingHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_ui.h b/chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_ui.h
index 245debaf..de30f6c 100644
--- a/chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_ui.h
+++ b/chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_ui.h
@@ -24,6 +24,10 @@
class AssistantOptInUI : public ui::WebDialogUI {
public:
explicit AssistantOptInUI(content::WebUI* web_ui);
+
+ AssistantOptInUI(const AssistantOptInUI&) = delete;
+ AssistantOptInUI& operator=(const AssistantOptInUI&) = delete;
+
~AssistantOptInUI() override;
// Called when the dialog is closed.
@@ -36,8 +40,6 @@
JSCallsContainer js_calls_container_;
AssistantOptInFlowScreenHandler* assistant_handler_ptr_;
base::WeakPtrFactory<AssistantOptInUI> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AssistantOptInUI);
};
// Dialog delegate for the assistant optin page.
diff --git a/chrome/browser/ui/webui/chromeos/bluetooth_pairing_dialog.h b/chrome/browser/ui/webui/chromeos/bluetooth_pairing_dialog.h
index 0ae8f2f..1c76fc8 100644
--- a/chrome/browser/ui/webui/chromeos/bluetooth_pairing_dialog.h
+++ b/chrome/browser/ui/webui/chromeos/bluetooth_pairing_dialog.h
@@ -50,6 +50,10 @@
class BluetoothPairingDialogUI : public ui::MojoWebDialogUI {
public:
explicit BluetoothPairingDialogUI(content::WebUI* web_ui);
+
+ BluetoothPairingDialogUI(const BluetoothPairingDialogUI&) = delete;
+ BluetoothPairingDialogUI& operator=(const BluetoothPairingDialogUI&) = delete;
+
~BluetoothPairingDialogUI() override;
// Instantiates implementor of the mojom::CrosBluetoothConfig mojo interface
@@ -60,8 +64,6 @@
private:
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(BluetoothPairingDialogUI);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_ui.cc
index 5f8cc68..e8de2253 100644
--- a/chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_ui.cc
@@ -175,6 +175,10 @@
class MobileSetupUIHTMLSource : public content::URLDataSource {
public:
MobileSetupUIHTMLSource();
+
+ MobileSetupUIHTMLSource(const MobileSetupUIHTMLSource&) = delete;
+ MobileSetupUIHTMLSource& operator=(const MobileSetupUIHTMLSource&) = delete;
+
~MobileSetupUIHTMLSource() override {}
// content::URLDataSource implementation.
@@ -193,8 +197,6 @@
private:
base::WeakPtrFactory<MobileSetupUIHTMLSource> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MobileSetupUIHTMLSource);
};
// The handler for Javascript messages related to the "register" view.
@@ -203,6 +205,10 @@
public NetworkStateHandlerObserver {
public:
MobileSetupHandler();
+
+ MobileSetupHandler(const MobileSetupHandler&) = delete;
+ MobileSetupHandler& operator=(const MobileSetupHandler&) = delete;
+
~MobileSetupHandler() override;
// WebUIMessageHandler implementation.
@@ -255,8 +261,6 @@
// Initial value is true.
bool lte_portal_reachable_;
base::WeakPtrFactory<MobileSetupHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MobileSetupHandler);
};
////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_ui.h b/chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_ui.h
index cfcc1ae5..df72243 100644
--- a/chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_ui.h
+++ b/chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_ui.h
@@ -16,10 +16,11 @@
class MobileSetupUI : public ui::WebDialogUI {
public:
explicit MobileSetupUI(content::WebUI* web_ui);
- ~MobileSetupUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(MobileSetupUI);
+ MobileSetupUI(const MobileSetupUI&) = delete;
+ MobileSetupUI& operator=(const MobileSetupUI&) = delete;
+
+ ~MobileSetupUI() override;
};
} // namespace cellular_setup
diff --git a/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h b/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h
index 01f4a44e..949c241 100644
--- a/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h
+++ b/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h
@@ -14,11 +14,12 @@
class CertificateManagerDialogUI : public ui::WebDialogUI {
public:
explicit CertificateManagerDialogUI(content::WebUI* web_ui);
+
+ CertificateManagerDialogUI(const CertificateManagerDialogUI&) = delete;
+ CertificateManagerDialogUI& operator=(const CertificateManagerDialogUI&) =
+ delete;
+
~CertificateManagerDialogUI() override;
-
- private:
-
- DISALLOW_COPY_AND_ASSIGN(CertificateManagerDialogUI);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_page_handler.h b/chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_page_handler.h
index 4e8b10c2..583094f 100644
--- a/chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_page_handler.h
+++ b/chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_page_handler.h
@@ -31,6 +31,11 @@
mojo::PendingRemote<chromeos::crostini_installer::mojom::Page>
pending_page,
base::OnceClosure on_page_closed);
+
+ CrostiniInstallerPageHandler(const CrostiniInstallerPageHandler&) = delete;
+ CrostiniInstallerPageHandler& operator=(const CrostiniInstallerPageHandler&) =
+ delete;
+
~CrostiniInstallerPageHandler() override;
// chromeos::crostini_installer::mojom::PageHandler:
@@ -56,8 +61,6 @@
base::OnceClosure on_page_closed_;
base::WeakPtrFactory<CrostiniInstallerPageHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniInstallerPageHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_ui.h b/chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_ui.h
index de78f42..00ca2e2 100644
--- a/chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_ui.h
+++ b/chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_ui.h
@@ -22,6 +22,10 @@
public chromeos::crostini_installer::mojom::PageHandlerFactory {
public:
explicit CrostiniInstallerUI(content::WebUI* web_ui);
+
+ CrostiniInstallerUI(const CrostiniInstallerUI&) = delete;
+ CrostiniInstallerUI& operator=(const CrostiniInstallerUI&) = delete;
+
~CrostiniInstallerUI() override;
// Send a close request to the web page. Return true if the page is already
@@ -52,8 +56,6 @@
bool page_closed_ = false;
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniInstallerUI);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader_page_handler.h b/chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader_page_handler.h
index 1ec4f2f..0759ccd 100644
--- a/chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader_page_handler.h
+++ b/chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader_page_handler.h
@@ -34,6 +34,11 @@
pending_page,
base::OnceClosure on_page_closed,
base::OnceCallback<void(bool)> launch_callback);
+
+ CrostiniUpgraderPageHandler(const CrostiniUpgraderPageHandler&) = delete;
+ CrostiniUpgraderPageHandler& operator=(const CrostiniUpgraderPageHandler&) =
+ delete;
+
~CrostiniUpgraderPageHandler() override;
// Send a close request to the web page.
@@ -79,8 +84,6 @@
bool restart_required_ = true;
base::WeakPtrFactory<CrostiniUpgraderPageHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniUpgraderPageHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader_ui.h b/chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader_ui.h
index db89c45..a5c9643 100644
--- a/chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader_ui.h
+++ b/chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader_ui.h
@@ -23,6 +23,10 @@
public chromeos::crostini_upgrader::mojom::PageHandlerFactory {
public:
explicit CrostiniUpgraderUI(content::WebUI* web_ui);
+
+ CrostiniUpgraderUI(const CrostiniUpgraderUI&) = delete;
+ CrostiniUpgraderUI& operator=(const CrostiniUpgraderUI&) = delete;
+
~CrostiniUpgraderUI() override;
// Send a close request to the web page. Return true if the page is already
@@ -60,8 +64,6 @@
bool page_closed_ = false;
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniUpgraderUI);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/cryptohome_ui.h b/chrome/browser/ui/webui/chromeos/cryptohome_ui.h
index f616d288..3c2659b 100644
--- a/chrome/browser/ui/webui/chromeos/cryptohome_ui.h
+++ b/chrome/browser/ui/webui/chromeos/cryptohome_ui.h
@@ -14,10 +14,11 @@
class CryptohomeUI : public content::WebUIController {
public:
explicit CryptohomeUI(content::WebUI* web_ui);
- ~CryptohomeUI() override {}
- private:
- DISALLOW_COPY_AND_ASSIGN(CryptohomeUI);
+ CryptohomeUI(const CryptohomeUI&) = delete;
+ CryptohomeUI& operator=(const CryptohomeUI&) = delete;
+
+ ~CryptohomeUI() override {}
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.h b/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.h
index 72a3f99b..b17e3f3 100644
--- a/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.h
+++ b/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.h
@@ -28,6 +28,9 @@
public:
CryptohomeWebUIHandler();
+ CryptohomeWebUIHandler(const CryptohomeWebUIHandler&) = delete;
+ CryptohomeWebUIHandler& operator=(const CryptohomeWebUIHandler&) = delete;
+
~CryptohomeWebUIHandler() override;
// WebUIMessageHandler override.
@@ -53,7 +56,6 @@
const base::Value& value);
base::WeakPtrFactory<CryptohomeWebUIHandler> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(CryptohomeWebUIHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
index d0647ca..63d4f01 100644
--- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
@@ -233,6 +233,10 @@
public:
DriveInternalsWebUIHandler() : last_sent_event_id_(-1) {}
+ DriveInternalsWebUIHandler(const DriveInternalsWebUIHandler&) = delete;
+ DriveInternalsWebUIHandler& operator=(const DriveInternalsWebUIHandler&) =
+ delete;
+
~DriveInternalsWebUIHandler() override {}
void DownloadLogsZip(const base::FilePath& path) {
@@ -813,7 +817,6 @@
bool developer_mode_ = false;
base::WeakPtrFactory<DriveInternalsWebUIHandler> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(DriveInternalsWebUIHandler);
};
class LogsZipper : public download::AllDownloadItemNotifier::Observer {
diff --git a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc
index 02a7985..21fdf71 100644
--- a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc
@@ -69,6 +69,9 @@
owner_->fake_bluetooth_device_client_->AddObserver(this);
}
+ BluetoothObserver(const BluetoothObserver&) = delete;
+ BluetoothObserver& operator=(const BluetoothObserver&) = delete;
+
~BluetoothObserver() override {
owner_->fake_bluetooth_device_client_->RemoveObserver(this);
}
@@ -85,8 +88,6 @@
private:
DeviceEmulatorMessageHandler* owner_;
-
- DISALLOW_COPY_AND_ASSIGN(BluetoothObserver);
};
void DeviceEmulatorMessageHandler::BluetoothObserver::DeviceAdded(
@@ -120,6 +121,9 @@
chromeos::FakeCrasAudioClient::Get()->AddObserver(this);
}
+ CrasAudioObserver(const CrasAudioObserver&) = delete;
+ CrasAudioObserver& operator=(const CrasAudioObserver&) = delete;
+
~CrasAudioObserver() override {
chromeos::FakeCrasAudioClient::Get()->RemoveObserver(this);
}
@@ -129,8 +133,6 @@
private:
DeviceEmulatorMessageHandler* owner_;
-
- DISALLOW_COPY_AND_ASSIGN(CrasAudioObserver);
};
class DeviceEmulatorMessageHandler::PowerObserver
@@ -140,6 +142,9 @@
owner_->fake_power_manager_client_->AddObserver(this);
}
+ PowerObserver(const PowerObserver&) = delete;
+ PowerObserver& operator=(const PowerObserver&) = delete;
+
~PowerObserver() override {
owner_->fake_power_manager_client_->RemoveObserver(this);
}
@@ -148,8 +153,6 @@
private:
DeviceEmulatorMessageHandler* owner_;
-
- DISALLOW_COPY_AND_ASSIGN(PowerObserver);
};
void DeviceEmulatorMessageHandler::PowerObserver::PowerChanged(
diff --git a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.h b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.h
index e30f5b61..774a4a4 100644
--- a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.h
+++ b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.h
@@ -37,6 +37,11 @@
public content::WebUIMessageHandler {
public:
DeviceEmulatorMessageHandler();
+
+ DeviceEmulatorMessageHandler(const DeviceEmulatorMessageHandler&) = delete;
+ DeviceEmulatorMessageHandler& operator=(const DeviceEmulatorMessageHandler&) =
+ delete;
+
~DeviceEmulatorMessageHandler() override;
// Adds |this| as an observer to all necessary objects.
@@ -137,8 +142,6 @@
scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
base::WeakPtrFactory<DeviceEmulatorMessageHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceEmulatorMessageHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h
index 5cb8ad62..ba44ffa 100644
--- a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h
+++ b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h
@@ -12,10 +12,11 @@
class DeviceEmulatorUI : public content::WebUIController {
public:
explicit DeviceEmulatorUI(content::WebUI* web_ui);
- ~DeviceEmulatorUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(DeviceEmulatorUI);
+ DeviceEmulatorUI(const DeviceEmulatorUI&) = delete;
+ DeviceEmulatorUI& operator=(const DeviceEmulatorUI&) = delete;
+
+ ~DeviceEmulatorUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_EMULATOR_DEVICE_EMULATOR_UI_H_
diff --git a/chrome/browser/ui/webui/chromeos/image_source.h b/chrome/browser/ui/webui/chromeos/image_source.h
index 4d93aec4..7d762df 100644
--- a/chrome/browser/ui/webui/chromeos/image_source.h
+++ b/chrome/browser/ui/webui/chromeos/image_source.h
@@ -23,6 +23,10 @@
class ImageSource : public content::URLDataSource {
public:
ImageSource();
+
+ ImageSource(const ImageSource&) = delete;
+ ImageSource& operator=(const ImageSource&) = delete;
+
~ImageSource() override;
// content::URLDataSource implementation.
@@ -48,8 +52,6 @@
scoped_refptr<base::SequencedTaskRunner> task_runner_;
base::WeakPtrFactory<ImageSource> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ImageSource);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/in_session_password_change/confirm_password_change_handler.h b/chrome/browser/ui/webui/chromeos/in_session_password_change/confirm_password_change_handler.h
index 1382ef7..c0cbb31 100644
--- a/chrome/browser/ui/webui/chromeos/in_session_password_change/confirm_password_change_handler.h
+++ b/chrome/browser/ui/webui/chromeos/in_session_password_change/confirm_password_change_handler.h
@@ -19,6 +19,11 @@
ConfirmPasswordChangeHandler(const std::string& scraped_old_password,
const std::string& scraped_new_password,
const bool show_spinner_initially);
+
+ ConfirmPasswordChangeHandler(const ConfirmPasswordChangeHandler&) = delete;
+ ConfirmPasswordChangeHandler& operator=(const ConfirmPasswordChangeHandler&) =
+ delete;
+
~ConfirmPasswordChangeHandler() override;
// Called by the JS UI to find out what to show and what size to be.
@@ -40,7 +45,6 @@
bool show_spinner_initially_ = false;
base::WeakPtrFactory<ConfirmPasswordChangeHandler> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(ConfirmPasswordChangeHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_handler.h b/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_handler.h
index a7d2f3d..2702af9 100644
--- a/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_handler.h
+++ b/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_handler.h
@@ -14,6 +14,10 @@
class PasswordChangeHandler : public content::WebUIMessageHandler {
public:
explicit PasswordChangeHandler(const std::string& password_change_url);
+
+ PasswordChangeHandler(const PasswordChangeHandler&) = delete;
+ PasswordChangeHandler& operator=(const PasswordChangeHandler&) = delete;
+
~PasswordChangeHandler() override;
// content::WebUIMessageHandler:
@@ -26,7 +30,6 @@
const std::string password_change_url_;
base::WeakPtrFactory<PasswordChangeHandler> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(PasswordChangeHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_ui.h b/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_ui.h
index 9f2ec72..d04e17c 100644
--- a/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_ui.h
+++ b/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_ui.h
@@ -15,30 +15,35 @@
class PasswordChangeUI : public ui::WebDialogUI {
public:
explicit PasswordChangeUI(content::WebUI* web_ui);
- ~PasswordChangeUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(PasswordChangeUI);
+ PasswordChangeUI(const PasswordChangeUI&) = delete;
+ PasswordChangeUI& operator=(const PasswordChangeUI&) = delete;
+
+ ~PasswordChangeUI() override;
};
// For chrome:://confirm-password-change
class ConfirmPasswordChangeUI : public ui::WebDialogUI {
public:
explicit ConfirmPasswordChangeUI(content::WebUI* web_ui);
- ~ConfirmPasswordChangeUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(ConfirmPasswordChangeUI);
+ ConfirmPasswordChangeUI(const ConfirmPasswordChangeUI&) = delete;
+ ConfirmPasswordChangeUI& operator=(const ConfirmPasswordChangeUI&) = delete;
+
+ ~ConfirmPasswordChangeUI() override;
};
// For chrome:://urgent-password-expiry-notification
class UrgentPasswordExpiryNotificationUI : public ui::WebDialogUI {
public:
explicit UrgentPasswordExpiryNotificationUI(content::WebUI* web_ui);
- ~UrgentPasswordExpiryNotificationUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(UrgentPasswordExpiryNotificationUI);
+ UrgentPasswordExpiryNotificationUI(
+ const UrgentPasswordExpiryNotificationUI&) = delete;
+ UrgentPasswordExpiryNotificationUI& operator=(
+ const UrgentPasswordExpiryNotificationUI&) = delete;
+
+ ~UrgentPasswordExpiryNotificationUI() override;
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/in_session_password_change/urgent_password_expiry_notification_handler.h b/chrome/browser/ui/webui/chromeos/in_session_password_change/urgent_password_expiry_notification_handler.h
index 06c83b1..fc597842 100644
--- a/chrome/browser/ui/webui/chromeos/in_session_password_change/urgent_password_expiry_notification_handler.h
+++ b/chrome/browser/ui/webui/chromeos/in_session_password_change/urgent_password_expiry_notification_handler.h
@@ -15,6 +15,12 @@
: public content::WebUIMessageHandler {
public:
UrgentPasswordExpiryNotificationHandler();
+
+ UrgentPasswordExpiryNotificationHandler(
+ const UrgentPasswordExpiryNotificationHandler&) = delete;
+ UrgentPasswordExpiryNotificationHandler& operator=(
+ const UrgentPasswordExpiryNotificationHandler&) = delete;
+
~UrgentPasswordExpiryNotificationHandler() override;
// content::WebUIMessageHandler:
@@ -29,7 +35,6 @@
private:
base::WeakPtrFactory<UrgentPasswordExpiryNotificationHandler> weak_factory_{
this};
- DISALLOW_COPY_AND_ASSIGN(UrgentPasswordExpiryNotificationHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/internet_config_dialog.h b/chrome/browser/ui/webui/chromeos/internet_config_dialog.h
index 86254d1..f89f8b2b 100644
--- a/chrome/browser/ui/webui/chromeos/internet_config_dialog.h
+++ b/chrome/browser/ui/webui/chromeos/internet_config_dialog.h
@@ -58,6 +58,10 @@
class InternetConfigDialogUI : public ui::MojoWebDialogUI {
public:
explicit InternetConfigDialogUI(content::WebUI* web_ui);
+
+ InternetConfigDialogUI(const InternetConfigDialogUI&) = delete;
+ InternetConfigDialogUI& operator=(const InternetConfigDialogUI&) = delete;
+
~InternetConfigDialogUI() override;
// Instantiates implementor of the mojom::CrosNetworkConfig mojo interface
// passing the pending receiver that will be internally bound.
@@ -67,8 +71,6 @@
private:
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(InternetConfigDialogUI);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/internet_detail_dialog.h b/chrome/browser/ui/webui/chromeos/internet_detail_dialog.h
index 1e58485..c3c37c3 100644
--- a/chrome/browser/ui/webui/chromeos/internet_detail_dialog.h
+++ b/chrome/browser/ui/webui/chromeos/internet_detail_dialog.h
@@ -50,6 +50,10 @@
class InternetDetailDialogUI : public ui::MojoWebDialogUI {
public:
explicit InternetDetailDialogUI(content::WebUI* web_ui);
+
+ InternetDetailDialogUI(const InternetDetailDialogUI&) = delete;
+ InternetDetailDialogUI& operator=(const InternetDetailDialogUI&) = delete;
+
~InternetDetailDialogUI() override;
// Instantiates implementor of the mojom::CrosNetworkConfig mojo interface
@@ -60,8 +64,6 @@
private:
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(InternetDetailDialogUI);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/active_directory_password_change_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/active_directory_password_change_screen_handler.h
index 6865b01..10754f26 100644
--- a/chrome/browser/ui/webui/chromeos/login/active_directory_password_change_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/active_directory_password_change_screen_handler.h
@@ -46,6 +46,12 @@
explicit ActiveDirectoryPasswordChangeScreenHandler(
JSCallsContainer* js_calls_container);
+
+ ActiveDirectoryPasswordChangeScreenHandler(
+ const ActiveDirectoryPasswordChangeScreenHandler&) = delete;
+ ActiveDirectoryPasswordChangeScreenHandler& operator=(
+ const ActiveDirectoryPasswordChangeScreenHandler&) = delete;
+
~ActiveDirectoryPasswordChangeScreenHandler() override;
// BaseScreenHandler implementation:
@@ -68,8 +74,6 @@
const std::string& new_password);
ash::ActiveDirectoryPasswordChangeScreen* screen_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(ActiveDirectoryPasswordChangeScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/app_downloading_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/app_downloading_screen_handler.h
index 330e033..7bfc509 100644
--- a/chrome/browser/ui/webui/chromeos/login/app_downloading_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/app_downloading_screen_handler.h
@@ -37,6 +37,11 @@
using TView = AppDownloadingScreenView;
explicit AppDownloadingScreenHandler(JSCallsContainer* js_calls_container);
+
+ AppDownloadingScreenHandler(const AppDownloadingScreenHandler&) = delete;
+ AppDownloadingScreenHandler& operator=(const AppDownloadingScreenHandler&) =
+ delete;
+
~AppDownloadingScreenHandler() override;
// BaseScreenHandler:
@@ -54,8 +59,6 @@
void Initialize() override;
ash::AppDownloadingScreen* screen_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(AppDownloadingScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h
index 1845667..4be8dffd 100644
--- a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h
@@ -101,6 +101,11 @@
JSCallsContainer* js_calls_container,
const scoped_refptr<NetworkStateInformer>& network_state_informer,
ErrorScreen* error_screen);
+
+ AppLaunchSplashScreenHandler(const AppLaunchSplashScreenHandler&) = delete;
+ AppLaunchSplashScreenHandler& operator=(const AppLaunchSplashScreenHandler&) =
+ delete;
+
~AppLaunchSplashScreenHandler() override;
// BaseScreenHandler implementation:
@@ -149,8 +154,6 @@
// If this has value it will be populated through ToggleNetworkConfig(value)
// after screen is shown. Cleared after screen was shown.
absl::optional<bool> toggle_network_config_on_show_;
-
- DISALLOW_COPY_AND_ASSIGN(AppLaunchSplashScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h
index 1bf351e5..63d2ddf 100644
--- a/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h
@@ -30,6 +30,11 @@
class ArcTermsOfServiceScreenViewObserver {
public:
+ ArcTermsOfServiceScreenViewObserver(
+ const ArcTermsOfServiceScreenViewObserver&) = delete;
+ ArcTermsOfServiceScreenViewObserver& operator=(
+ const ArcTermsOfServiceScreenViewObserver&) = delete;
+
virtual ~ArcTermsOfServiceScreenViewObserver() = default;
// Called when the user accepts the PlayStore Terms of Service.
@@ -40,15 +45,16 @@
protected:
ArcTermsOfServiceScreenViewObserver() = default;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceScreenViewObserver);
};
class ArcTermsOfServiceScreenView {
public:
constexpr static StaticOobeScreenId kScreenId{"arc-tos"};
+ ArcTermsOfServiceScreenView(const ArcTermsOfServiceScreenView&) = delete;
+ ArcTermsOfServiceScreenView& operator=(const ArcTermsOfServiceScreenView&) =
+ delete;
+
virtual ~ArcTermsOfServiceScreenView() = default;
// Adds/Removes observer for view.
@@ -67,9 +73,6 @@
protected:
ArcTermsOfServiceScreenView() = default;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceScreenView);
};
// The sole implementation of the ArcTermsOfServiceScreenView, using WebUI.
@@ -84,6 +87,12 @@
using TView = ArcTermsOfServiceScreenView;
explicit ArcTermsOfServiceScreenHandler(JSCallsContainer* js_calls_container);
+
+ ArcTermsOfServiceScreenHandler(const ArcTermsOfServiceScreenHandler&) =
+ delete;
+ ArcTermsOfServiceScreenHandler& operator=(
+ const ArcTermsOfServiceScreenHandler&) = delete;
+
~ArcTermsOfServiceScreenHandler() override;
// content::WebUIMessageHandler:
@@ -173,8 +182,6 @@
bool is_child_account_;
std::unique_ptr<arc::ArcOptInPreferenceHandler> pref_handler_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/assistant_optin_flow_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/assistant_optin_flow_screen_handler.h
index b98e62e..8f9911e 100644
--- a/chrome/browser/ui/webui/chromeos/login/assistant_optin_flow_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/assistant_optin_flow_screen_handler.h
@@ -31,6 +31,10 @@
public:
constexpr static StaticOobeScreenId kScreenId{"assistant-optin-flow"};
+ AssistantOptInFlowScreenView(const AssistantOptInFlowScreenView&) = delete;
+ AssistantOptInFlowScreenView& operator=(const AssistantOptInFlowScreenView&) =
+ delete;
+
virtual ~AssistantOptInFlowScreenView() = default;
virtual void Bind(ash::AssistantOptInFlowScreen* screen) = 0;
@@ -40,9 +44,6 @@
protected:
AssistantOptInFlowScreenView() = default;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AssistantOptInFlowScreenView);
};
class AssistantOptInFlowScreenHandler
@@ -67,6 +68,12 @@
explicit AssistantOptInFlowScreenHandler(
JSCallsContainer* js_calls_container);
+
+ AssistantOptInFlowScreenHandler(const AssistantOptInFlowScreenHandler&) =
+ delete;
+ AssistantOptInFlowScreenHandler& operator=(
+ const AssistantOptInFlowScreenHandler&) = delete;
+
~AssistantOptInFlowScreenHandler() override;
// Set an optional callback that will run when the screen has been
@@ -187,8 +194,6 @@
base::circular_deque<ConsentData> pending_consent_data_;
base::WeakPtrFactory<AssistantOptInFlowScreenHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AssistantOptInFlowScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h
index f16b830..ac4a41a 100644
--- a/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h
@@ -20,6 +20,12 @@
explicit AutoEnrollmentCheckScreenHandler(
JSCallsContainer* js_calls_container);
+
+ AutoEnrollmentCheckScreenHandler(const AutoEnrollmentCheckScreenHandler&) =
+ delete;
+ AutoEnrollmentCheckScreenHandler& operator=(
+ const AutoEnrollmentCheckScreenHandler&) = delete;
+
~AutoEnrollmentCheckScreenHandler() override;
// AutoEnrollmentCheckScreenActor implementation:
@@ -39,8 +45,6 @@
// Keeps whether screen should be shown right after initialization.
bool show_on_init_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(AutoEnrollmentCheckScreenHandler);
};
} // namespace chromeos
@@ -52,4 +56,3 @@
}
#endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_AUTO_ENROLLMENT_CHECK_SCREEN_HANDLER_H_
-
diff --git a/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h
index e8afe300..7ec27cc 100644
--- a/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h
@@ -19,6 +19,10 @@
public:
BaseScreenHandler(OobeScreenId oobe_screen,
JSCallsContainer* js_calls_container);
+
+ BaseScreenHandler(const BaseScreenHandler&) = delete;
+ BaseScreenHandler& operator=(const BaseScreenHandler&) = delete;
+
~BaseScreenHandler() override;
OobeScreenId oobe_screen() const { return oobe_screen_; }
@@ -51,8 +55,6 @@
OobeScreenId oobe_screen_ = OobeScreen::SCREEN_UNKNOWN;
BaseScreen* base_screen_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(BaseScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/base_webui_handler.h b/chrome/browser/ui/webui/chromeos/login/base_webui_handler.h
index 072dff24..8662254 100644
--- a/chrome/browser/ui/webui/chromeos/login/base_webui_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/base_webui_handler.h
@@ -39,6 +39,10 @@
class BaseWebUIHandler : public content::WebUIMessageHandler {
public:
explicit BaseWebUIHandler(JSCallsContainer* js_calls_container);
+
+ BaseWebUIHandler(const BaseWebUIHandler&) = delete;
+ BaseWebUIHandler& operator=(const BaseWebUIHandler&) = delete;
+
~BaseWebUIHandler() override;
// Gets localized strings to be used on the page.
@@ -192,8 +196,6 @@
bool javascript_disallowed_ = false;
JSCallsContainer* js_calls_container_ = nullptr; // non-owning pointers.
-
- DISALLOW_COPY_AND_ASSIGN(BaseWebUIHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h
index 0fbb80d..888683ad 100644
--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h
@@ -72,6 +72,10 @@
public OobeConfiguration::Observer {
public:
explicit CoreOobeHandler(JSCallsContainer* js_calls_container);
+
+ CoreOobeHandler(const CoreOobeHandler&) = delete;
+ CoreOobeHandler& operator=(const CoreOobeHandler&) = delete;
+
~CoreOobeHandler() override;
// BaseScreenHandler implementation:
@@ -182,8 +186,6 @@
mojo::Remote<ash::mojom::CrosDisplayConfigController> cros_display_config_;
base::WeakPtrFactory<CoreOobeHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CoreOobeHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/demo_preferences_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/demo_preferences_screen_handler.h
index 858af65..1564870c 100644
--- a/chrome/browser/ui/webui/chromeos/login/demo_preferences_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/demo_preferences_screen_handler.h
@@ -42,6 +42,11 @@
using TView = DemoPreferencesScreenView;
explicit DemoPreferencesScreenHandler(JSCallsContainer* js_calls_container);
+
+ DemoPreferencesScreenHandler(const DemoPreferencesScreenHandler&) = delete;
+ DemoPreferencesScreenHandler& operator=(const DemoPreferencesScreenHandler&) =
+ delete;
+
~DemoPreferencesScreenHandler() override;
// DemoPreferencesScreenView:
@@ -64,8 +69,6 @@
void HandleSetDemoModeCountry(const std::string& country_id);
ash::DemoPreferencesScreen* screen_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(DemoPreferencesScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h
index 01346c1..b3d1e04f 100644
--- a/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h
@@ -50,6 +50,10 @@
using TView = DemoSetupScreenView;
explicit DemoSetupScreenHandler(JSCallsContainer* js_calls_container);
+
+ DemoSetupScreenHandler(const DemoSetupScreenHandler&) = delete;
+ DemoSetupScreenHandler& operator=(const DemoSetupScreenHandler&) = delete;
+
~DemoSetupScreenHandler() override;
// DemoSetupScreenView:
@@ -71,8 +75,6 @@
private:
ash::DemoSetupScreen* screen_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(DemoSetupScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.h
index 0b19f8e2..76a1a49 100644
--- a/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.h
@@ -36,6 +36,11 @@
using TView = DeviceDisabledScreenView;
explicit DeviceDisabledScreenHandler(JSCallsContainer* js_calls_container);
+
+ DeviceDisabledScreenHandler(const DeviceDisabledScreenHandler&) = delete;
+ DeviceDisabledScreenHandler& operator=(const DeviceDisabledScreenHandler&) =
+ delete;
+
~DeviceDisabledScreenHandler() override;
// DeviceDisabledScreenActor:
@@ -56,8 +61,6 @@
void RegisterMessages() override;
ash::DeviceDisabledScreen* screen_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceDisabledScreenHandler);
};
} // namespace chromeos
@@ -69,4 +72,3 @@
}
#endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_DEVICE_DISABLED_SCREEN_HANDLER_H_
-
diff --git a/chrome/browser/ui/webui/chromeos/login/enable_adb_sideloading_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/enable_adb_sideloading_screen_handler.h
index ef23789e..0ebc3b2 100644
--- a/chrome/browser/ui/webui/chromeos/login/enable_adb_sideloading_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/enable_adb_sideloading_screen_handler.h
@@ -43,6 +43,12 @@
explicit EnableAdbSideloadingScreenHandler(
JSCallsContainer* js_calls_container);
+
+ EnableAdbSideloadingScreenHandler(const EnableAdbSideloadingScreenHandler&) =
+ delete;
+ EnableAdbSideloadingScreenHandler& operator=(
+ const EnableAdbSideloadingScreenHandler&) = delete;
+
~EnableAdbSideloadingScreenHandler() override;
// EnableAdbSideloadingScreenView implementation:
@@ -62,8 +68,6 @@
// Keeps whether screen should be shown right after initialization.
bool show_on_init_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(EnableAdbSideloadingScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h
index 010932d..75e9352 100644
--- a/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h
@@ -47,6 +47,11 @@
using TView = EnableDebuggingScreenView;
explicit EnableDebuggingScreenHandler(JSCallsContainer* js_calls_container);
+
+ EnableDebuggingScreenHandler(const EnableDebuggingScreenHandler&) = delete;
+ EnableDebuggingScreenHandler& operator=(const EnableDebuggingScreenHandler&) =
+ delete;
+
~EnableDebuggingScreenHandler() override;
// EnableDebuggingScreenView implementation:
@@ -74,8 +79,6 @@
// Keeps whether screen should be shown right after initialization.
bool show_on_init_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(EnableDebuggingScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.h
index 464a6648..92302f9 100644
--- a/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.h
@@ -54,6 +54,12 @@
explicit EncryptionMigrationScreenHandler(
JSCallsContainer* js_calls_container);
+
+ EncryptionMigrationScreenHandler(const EncryptionMigrationScreenHandler&) =
+ delete;
+ EncryptionMigrationScreenHandler& operator=(
+ const EncryptionMigrationScreenHandler&) = delete;
+
~EncryptionMigrationScreenHandler() override;
// EncryptionMigrationScreenView implementation:
@@ -78,8 +84,6 @@
private:
ash::EncryptionMigrationScreen* delegate_ = nullptr;
bool show_on_init_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(EncryptionMigrationScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h
index e1535e3..cc4f744 100644
--- a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h
@@ -63,6 +63,10 @@
JSCallsContainer* js_calls_container,
const scoped_refptr<NetworkStateInformer>& network_state_informer,
ErrorScreen* error_screen);
+
+ EnrollmentScreenHandler(const EnrollmentScreenHandler&) = delete;
+ EnrollmentScreenHandler& operator=(const EnrollmentScreenHandler&) = delete;
+
~EnrollmentScreenHandler() override;
// Implements WebUIMessageHandler:
@@ -211,8 +215,6 @@
bool use_fake_login_for_testing_ = false;
base::WeakPtrFactory<EnrollmentScreenHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EnrollmentScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
index bd51af7..07bbe1a 100644
--- a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
@@ -72,6 +72,10 @@
using TView = ErrorScreenView;
explicit ErrorScreenHandler(JSCallsContainer* js_calls_container);
+
+ ErrorScreenHandler(const ErrorScreenHandler&) = delete;
+ ErrorScreenHandler& operator=(const ErrorScreenHandler&) = delete;
+
~ErrorScreenHandler() override;
private:
@@ -109,8 +113,6 @@
bool showing_ = false;
base::WeakPtrFactory<ErrorScreenHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ErrorScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h
index 5ba86a2..8916e346 100644
--- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h
@@ -48,6 +48,10 @@
using TView = EulaView;
explicit EulaScreenHandler(JSCallsContainer* js_calls_container);
+
+ EulaScreenHandler(const EulaScreenHandler&) = delete;
+ EulaScreenHandler& operator=(const EulaScreenHandler&) = delete;
+
~EulaScreenHandler() override;
// EulaView implementation:
@@ -81,8 +85,6 @@
scoped_refptr<HelpAppLauncher> help_app_;
base::WeakPtrFactory<EulaScreenHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(EulaScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/fake_update_required_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/fake_update_required_screen_handler.h
index 974e098..41b69192 100644
--- a/chrome/browser/ui/webui/chromeos/login/fake_update_required_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/fake_update_required_screen_handler.h
@@ -17,6 +17,12 @@
class FakeUpdateRequiredScreenHandler : public UpdateRequiredView {
public:
FakeUpdateRequiredScreenHandler() = default;
+
+ FakeUpdateRequiredScreenHandler(const FakeUpdateRequiredScreenHandler&) =
+ delete;
+ FakeUpdateRequiredScreenHandler& operator=(
+ const FakeUpdateRequiredScreenHandler&) = delete;
+
~FakeUpdateRequiredScreenHandler() override {}
UpdateRequiredView::UIState ui_state() { return ui_state_; }
@@ -40,8 +46,6 @@
void SetIsUserDataPresent(bool data_present) override {}
UpdateRequiredView::UIState ui_state_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeUpdateRequiredScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/fingerprint_setup_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/fingerprint_setup_screen_handler.h
index bf63fb1..fe45e3f 100644
--- a/chrome/browser/ui/webui/chromeos/login/fingerprint_setup_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/fingerprint_setup_screen_handler.h
@@ -48,6 +48,11 @@
using TView = FingerprintSetupScreenView;
explicit FingerprintSetupScreenHandler(JSCallsContainer* js_calls_container);
+
+ FingerprintSetupScreenHandler(const FingerprintSetupScreenHandler&) = delete;
+ FingerprintSetupScreenHandler& operator=(
+ const FingerprintSetupScreenHandler&) = delete;
+
~FingerprintSetupScreenHandler() override;
// BaseScreenHandler:
@@ -69,8 +74,6 @@
private:
ash::FingerprintSetupScreen* screen_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(FingerprintSetupScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
index 2a95172..36a26fa 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
@@ -66,6 +66,10 @@
constexpr static StaticOobeScreenId kScreenId{"gaia-signin"};
GaiaView() = default;
+
+ GaiaView(const GaiaView&) = delete;
+ GaiaView& operator=(const GaiaView&) = delete;
+
virtual ~GaiaView() = default;
virtual void DisableRestrictiveProxyCheckForTest() = 0;
@@ -92,9 +96,6 @@
virtual void ShowSigninScreenForTest(const std::string& username,
const std::string& password,
const std::string& services) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(GaiaView);
};
// A class that handles WebUI hooks in Gaia screen.
@@ -125,6 +126,10 @@
JSCallsContainer* js_calls_container,
CoreOobeView* core_oobe_view,
const scoped_refptr<NetworkStateInformer>& network_state_informer);
+
+ GaiaScreenHandler(const GaiaScreenHandler&) = delete;
+ GaiaScreenHandler& operator=(const GaiaScreenHandler&) = delete;
+
~GaiaScreenHandler() override;
// GaiaView:
@@ -432,8 +437,6 @@
std::unique_ptr<UserContext> pending_user_context_;
base::WeakPtrFactory<GaiaScreenHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h
index 394f70bd..83324ab 100644
--- a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h
@@ -50,6 +50,11 @@
using TView = HIDDetectionView;
explicit HIDDetectionScreenHandler(JSCallsContainer* js_calls_container);
+
+ HIDDetectionScreenHandler(const HIDDetectionScreenHandler&) = delete;
+ HIDDetectionScreenHandler& operator=(const HIDDetectionScreenHandler&) =
+ delete;
+
~HIDDetectionScreenHandler() override;
// HIDDetectionView implementation:
@@ -116,8 +121,6 @@
// If true, Initialize() will call Show().
bool show_on_init_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(HIDDetectionScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/js_calls_container_test_api.h b/chrome/browser/ui/webui/chromeos/login/js_calls_container_test_api.h
index 6c2af03f4..16e20a6 100644
--- a/chrome/browser/ui/webui/chromeos/login/js_calls_container_test_api.h
+++ b/chrome/browser/ui/webui/chromeos/login/js_calls_container_test_api.h
@@ -20,6 +20,10 @@
class JSCallsContainerTestApi {
public:
explicit JSCallsContainerTestApi(JSCallsContainer* js_calls_container);
+
+ JSCallsContainerTestApi(const JSCallsContainerTestApi&) = delete;
+ JSCallsContainerTestApi& operator=(const JSCallsContainerTestApi&) = delete;
+
~JSCallsContainerTestApi();
// `function` has arguments serialized to make matching easier. For example, a
@@ -35,7 +39,6 @@
private:
JSCallsContainer* const js_calls_container_;
- DISALLOW_COPY_AND_ASSIGN(JSCallsContainerTestApi);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h
index b8d6d56..e17b9182 100644
--- a/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h
@@ -36,6 +36,11 @@
using TView = KioskAutolaunchScreenView;
explicit KioskAutolaunchScreenHandler(JSCallsContainer* js_calls_container);
+
+ KioskAutolaunchScreenHandler(const KioskAutolaunchScreenHandler&) = delete;
+ KioskAutolaunchScreenHandler& operator=(const KioskAutolaunchScreenHandler&) =
+ delete;
+
~KioskAutolaunchScreenHandler() override;
// KioskAutolaunchScreenView:
@@ -68,8 +73,6 @@
// Keeps whether screen should be shown right after initialization.
bool show_on_init_ = false;
bool is_visible_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(KioskAutolaunchScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h
index 98429520..e5db923 100644
--- a/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h
@@ -37,6 +37,10 @@
using TView = KioskEnableScreenView;
explicit KioskEnableScreenHandler(JSCallsContainer* js_calls_container);
+
+ KioskEnableScreenHandler(const KioskEnableScreenHandler&) = delete;
+ KioskEnableScreenHandler& operator=(const KioskEnableScreenHandler&) = delete;
+
~KioskEnableScreenHandler() override;
// KioskEnableScreenView:
@@ -54,8 +58,6 @@
// Keeps whether screen should be shown right after initialization.
bool show_on_init_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(KioskEnableScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util_test_util.h b/chrome/browser/ui/webui/chromeos/login/l10n_util_test_util.h
index dbd3e09..40aabc6 100644
--- a/chrome/browser/ui/webui/chromeos/login/l10n_util_test_util.h
+++ b/chrome/browser/ui/webui/chromeos/login/l10n_util_test_util.h
@@ -19,6 +19,12 @@
: public input_method::MockInputMethodManagerImpl {
public:
MockInputMethodManagerWithInputMethods();
+
+ MockInputMethodManagerWithInputMethods(
+ const MockInputMethodManagerWithInputMethods&) = delete;
+ MockInputMethodManagerWithInputMethods& operator=(
+ const MockInputMethodManagerWithInputMethods&) = delete;
+
~MockInputMethodManagerWithInputMethods() override;
void AddInputMethod(const std::string& id,
@@ -27,8 +33,6 @@
private:
input_method::InputMethodDescriptors descriptors_;
-
- DISALLOW_COPY_AND_ASSIGN(MockInputMethodManagerWithInputMethods);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc b/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc
index e7ee2fce..136a6f1 100644
--- a/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc
+++ b/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc
@@ -53,6 +53,10 @@
class L10nUtilTest : public testing::Test {
public:
L10nUtilTest();
+
+ L10nUtilTest(const L10nUtilTest&) = delete;
+ L10nUtilTest& operator=(const L10nUtilTest&) = delete;
+
~L10nUtilTest() override;
void SetInputMethods1();
@@ -62,8 +66,6 @@
base::test::TaskEnvironment task_environment_;
system::ScopedFakeStatisticsProvider scoped_fake_statistics_provider_;
MockInputMethodManagerWithInputMethods* input_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(L10nUtilTest);
};
L10nUtilTest::L10nUtilTest()
diff --git a/chrome/browser/ui/webui/chromeos/login/management_transition_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/management_transition_screen_handler.h
index d649e42..c4f5ce2 100644
--- a/chrome/browser/ui/webui/chromeos/login/management_transition_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/management_transition_screen_handler.h
@@ -25,6 +25,11 @@
// Renamed from "supervision-transition".
constexpr static StaticOobeScreenId kScreenId{"management-transition"};
+ ManagementTransitionScreenView(const ManagementTransitionScreenView&) =
+ delete;
+ ManagementTransitionScreenView& operator=(
+ const ManagementTransitionScreenView&) = delete;
+
virtual ~ManagementTransitionScreenView() {}
virtual void Bind(ash::ManagementTransitionScreen* screen) = 0;
@@ -34,9 +39,6 @@
protected:
ManagementTransitionScreenView() = default;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ManagementTransitionScreenView);
};
class ManagementTransitionScreenHandler
@@ -47,6 +49,12 @@
explicit ManagementTransitionScreenHandler(
JSCallsContainer* js_calls_container);
+
+ ManagementTransitionScreenHandler(const ManagementTransitionScreenHandler&) =
+ delete;
+ ManagementTransitionScreenHandler& operator=(
+ const ManagementTransitionScreenHandler&) = delete;
+
~ManagementTransitionScreenHandler() override;
// BaseScreenHandler:
@@ -89,8 +97,6 @@
PrefChangeRegistrar registrar_;
base::WeakPtrFactory<ManagementTransitionScreenHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ManagementTransitionScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/marketing_opt_in_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/marketing_opt_in_screen_handler.h
index 75d3ae52..51793456 100644
--- a/chrome/browser/ui/webui/chromeos/login/marketing_opt_in_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/marketing_opt_in_screen_handler.h
@@ -50,6 +50,11 @@
using TView = MarketingOptInScreenView;
explicit MarketingOptInScreenHandler(JSCallsContainer* js_calls_container);
+
+ MarketingOptInScreenHandler(const MarketingOptInScreenHandler&) = delete;
+ MarketingOptInScreenHandler& operator=(const MarketingOptInScreenHandler&) =
+ delete;
+
~MarketingOptInScreenHandler() override;
// BaseScreenHandler:
@@ -82,8 +87,6 @@
// second delay to avoid overreporting when the user keeps toggling the
// setting value in the screen UI.
base::OneShotTimer a11y_nav_buttons_toggle_metrics_reporter_timer_;
-
- DISALLOW_COPY_AND_ASSIGN(MarketingOptInScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/multidevice_setup_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/multidevice_setup_screen_handler.h
index 7a55143..cad2139 100644
--- a/chrome/browser/ui/webui/chromeos/login/multidevice_setup_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/multidevice_setup_screen_handler.h
@@ -34,6 +34,11 @@
using TView = MultiDeviceSetupScreenView;
explicit MultiDeviceSetupScreenHandler(JSCallsContainer* js_calls_container);
+
+ MultiDeviceSetupScreenHandler(const MultiDeviceSetupScreenHandler&) = delete;
+ MultiDeviceSetupScreenHandler& operator=(
+ const MultiDeviceSetupScreenHandler&) = delete;
+
~MultiDeviceSetupScreenHandler() override;
// BaseScreenHandler:
@@ -49,8 +54,6 @@
private:
// BaseScreenHandler:
void Initialize() override;
-
- DISALLOW_COPY_AND_ASSIGN(MultiDeviceSetupScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h
index d91ed8a..51c611b 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h
@@ -14,6 +14,10 @@
class NetworkDropdownHandler : public BaseWebUIHandler {
public:
explicit NetworkDropdownHandler(JSCallsContainer* js_calls_container);
+
+ NetworkDropdownHandler(const NetworkDropdownHandler&) = delete;
+ NetworkDropdownHandler& operator=(const NetworkDropdownHandler&) = delete;
+
~NetworkDropdownHandler() override;
// BaseScreenHandler implementation:
@@ -29,8 +33,6 @@
void HandleLaunchAddWiFiNetworkDialog();
void HandleShowNetworkDetails(const base::ListValue* args);
void HandleShowNetworkConfig(const base::ListValue* args);
-
- DISALLOW_COPY_AND_ASSIGN(NetworkDropdownHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h
index 885700c..5ab8e13 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h
@@ -53,6 +53,10 @@
using TView = NetworkScreenView;
explicit NetworkScreenHandler(JSCallsContainer* js_calls_container);
+
+ NetworkScreenHandler(const NetworkScreenHandler&) = delete;
+ NetworkScreenHandler& operator=(const NetworkScreenHandler&) = delete;
+
~NetworkScreenHandler() override;
private:
@@ -75,8 +79,6 @@
// Keeps whether screen should be shown right after initialization.
bool show_on_init_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser.h b/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser.h
index e79cc51..e0b19374 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser.h
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser.h
@@ -23,6 +23,10 @@
class OobeDisplayChooser : public ui::InputDeviceEventObserver {
public:
OobeDisplayChooser();
+
+ OobeDisplayChooser(const OobeDisplayChooser&) = delete;
+ OobeDisplayChooser& operator=(const OobeDisplayChooser&) = delete;
+
~OobeDisplayChooser() override;
// Tries to put the OOBE UI on a connected touch display (if available).
@@ -53,8 +57,6 @@
mojo::Remote<ash::mojom::CrosDisplayConfigController> cros_display_config_;
base::WeakPtrFactory<OobeDisplayChooser> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(OobeDisplayChooser);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_browsertest.cc b/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_browsertest.cc
index 09c39f1f..e9e4c5b0 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_browsertest.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_browsertest.cc
@@ -23,6 +23,10 @@
class OobeDisplayChooserTest : public OobeBaseTest {
public:
OobeDisplayChooserTest() {}
+
+ OobeDisplayChooserTest(const OobeDisplayChooserTest&) = delete;
+ OobeDisplayChooserTest& operator=(const OobeDisplayChooserTest&) = delete;
+
~OobeDisplayChooserTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -30,9 +34,6 @@
OobeBaseTest::SetUpCommandLine(command_line);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(OobeDisplayChooserTest);
};
display::DisplayManager* display_manager() {
diff --git a/chrome/browser/ui/webui/chromeos/login/pin_setup_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/pin_setup_screen_handler.h
index fdeec12..78dfd0d 100644
--- a/chrome/browser/ui/webui/chromeos/login/pin_setup_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/pin_setup_screen_handler.h
@@ -41,6 +41,10 @@
using TView = PinSetupScreenView;
explicit PinSetupScreenHandler(JSCallsContainer* js_calls_container);
+
+ PinSetupScreenHandler(const PinSetupScreenHandler&) = delete;
+ PinSetupScreenHandler& operator=(const PinSetupScreenHandler&) = delete;
+
~PinSetupScreenHandler() override;
// BaseScreenHandler:
@@ -58,8 +62,6 @@
private:
ash::PinSetupScreen* screen_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(PinSetupScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/recommend_apps_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/recommend_apps_screen_handler.h
index 1c14b36..fa3ac9e 100644
--- a/chrome/browser/ui/webui/chromeos/login/recommend_apps_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/recommend_apps_screen_handler.h
@@ -49,6 +49,11 @@
using TView = RecommendAppsScreenView;
explicit RecommendAppsScreenHandler(JSCallsContainer* js_calls_container);
+
+ RecommendAppsScreenHandler(const RecommendAppsScreenHandler&) = delete;
+ RecommendAppsScreenHandler& operator=(const RecommendAppsScreenHandler&) =
+ delete;
+
~RecommendAppsScreenHandler() override;
// BaseScreenHandler:
@@ -84,8 +89,6 @@
// If true, Initialize() will call Show().
bool show_on_init_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(RecommendAppsScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h
index a188bfa5..319d0df 100644
--- a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h
@@ -60,6 +60,10 @@
using TView = ResetView;
explicit ResetScreenHandler(JSCallsContainer* js_calls_container);
+
+ ResetScreenHandler(const ResetScreenHandler&) = delete;
+ ResetScreenHandler& operator=(const ResetScreenHandler&) = delete;
+
~ResetScreenHandler() override;
// ResetView implementation:
@@ -102,8 +106,6 @@
bool is_rollback_requested_ = false;
bool is_tpm_firmware_update_checked_ = false;
bool is_showing_confirmation_dialog_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ResetScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index dc156b5..8111f57 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -124,6 +124,9 @@
explicit CallOnReturn(base::OnceClosure callback)
: callback_(std::move(callback)), call_scheduled_(false) {}
+ CallOnReturn(const CallOnReturn&) = delete;
+ CallOnReturn& operator=(const CallOnReturn&) = delete;
+
~CallOnReturn() {
if (call_scheduled_ && !callback_.is_null())
std::move(callback_).Run();
@@ -135,8 +138,6 @@
private:
base::OnceClosure callback_;
bool call_scheduled_;
-
- DISALLOW_COPY_AND_ASSIGN(CallOnReturn);
};
} // namespace
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
index 05561c4..16d77f11 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
@@ -114,6 +114,10 @@
ErrorScreen* error_screen,
CoreOobeView* core_oobe_view,
GaiaScreenHandler* gaia_screen_handler);
+
+ SigninScreenHandler(const SigninScreenHandler&) = delete;
+ SigninScreenHandler& operator=(const SigninScreenHandler&) = delete;
+
~SigninScreenHandler() override;
static std::string GetUserLastInputMethod(const std::string& username);
@@ -293,8 +297,6 @@
std::unique_ptr<AccountId> focused_pod_account_id_;
base::WeakPtrFactory<SigninScreenHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc
index 64f52c07..c3ec589 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc
@@ -48,6 +48,10 @@
: fake_user_manager_(new FakeChromeUserManager()),
user_manager_enabler_(base::WrapUnique(fake_user_manager_)) {}
+ SigninPrepareUserListTest(const SigninPrepareUserListTest&) = delete;
+ SigninPrepareUserListTest& operator=(const SigninPrepareUserListTest&) =
+ delete;
+
~SigninPrepareUserListTest() override {}
// testing::Test:
@@ -94,8 +98,6 @@
std::unique_ptr<TestingProfileManager> profile_manager_;
std::map<std::string, proximity_auth::mojom::AuthType> user_auth_type_map;
std::unique_ptr<MultiProfileUserController> controller_;
-
- DISALLOW_COPY_AND_ASSIGN(SigninPrepareUserListTest);
};
TEST_F(SigninPrepareUserListTest, AlwaysKeepOwnerInList) {
diff --git a/chrome/browser/ui/webui/chromeos/login/sync_consent_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/sync_consent_screen_handler.h
index b6d6a9b..9ea56c8 100644
--- a/chrome/browser/ui/webui/chromeos/login/sync_consent_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/sync_consent_screen_handler.h
@@ -53,6 +53,10 @@
enum class UserChoice { kDeclined = 0, kAccepted = 1, kMaxValue = kAccepted };
explicit SyncConsentScreenHandler(JSCallsContainer* js_calls_container);
+
+ SyncConsentScreenHandler(const SyncConsentScreenHandler&) = delete;
+ SyncConsentScreenHandler& operator=(const SyncConsentScreenHandler&) = delete;
+
~SyncConsentScreenHandler() override;
// BaseScreenHandler:
@@ -102,8 +106,6 @@
std::unordered_set<int> known_string_ids_;
ash::SyncConsentScreen* screen_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(SyncConsentScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h
index a64d9662..c2fbe27 100644
--- a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h
@@ -54,6 +54,11 @@
using TView = TermsOfServiceScreenView;
explicit TermsOfServiceScreenHandler(JSCallsContainer* js_calls_container);
+
+ TermsOfServiceScreenHandler(const TermsOfServiceScreenHandler&) = delete;
+ TermsOfServiceScreenHandler& operator=(const TermsOfServiceScreenHandler&) =
+ delete;
+
~TermsOfServiceScreenHandler() override;
// BaseScreenHandler:
@@ -90,8 +95,6 @@
// Set to the Terms of Service when the download is successful.
std::string terms_of_service_;
-
- DISALLOW_COPY_AND_ASSIGN(TermsOfServiceScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/update_required_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/update_required_screen_handler.h
index 886723f..35eadf5 100644
--- a/chrome/browser/ui/webui/chromeos/login/update_required_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/update_required_screen_handler.h
@@ -76,6 +76,11 @@
using TView = UpdateRequiredView;
explicit UpdateRequiredScreenHandler(JSCallsContainer* js_calls_container);
+
+ UpdateRequiredScreenHandler(const UpdateRequiredScreenHandler&) = delete;
+ UpdateRequiredScreenHandler& operator=(const UpdateRequiredScreenHandler&) =
+ delete;
+
~UpdateRequiredScreenHandler() override;
private:
@@ -108,8 +113,6 @@
// The domain name for which update required screen is being shown.
std::string domain_;
-
- DISALLOW_COPY_AND_ASSIGN(UpdateRequiredScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h
index 156d03b19..20fb6ce 100644
--- a/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h
@@ -64,6 +64,10 @@
using TView = UpdateView;
explicit UpdateScreenHandler(JSCallsContainer* js_calls_container);
+
+ UpdateScreenHandler(const UpdateScreenHandler&) = delete;
+ UpdateScreenHandler& operator=(const UpdateScreenHandler&) = delete;
+
~UpdateScreenHandler() override;
private:
@@ -93,8 +97,6 @@
// If true, Initialize() will call Show().
bool show_on_init_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(UpdateScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/welcome_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/welcome_screen_handler.h
index 97127ec3..5dff2d8 100644
--- a/chrome/browser/ui/webui/chromeos/login/welcome_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/welcome_screen_handler.h
@@ -66,6 +66,10 @@
WelcomeScreenHandler(JSCallsContainer* js_calls_container,
CoreOobeView* core_oobe_view);
+
+ WelcomeScreenHandler(const WelcomeScreenHandler&) = delete;
+ WelcomeScreenHandler& operator=(const WelcomeScreenHandler&) = delete;
+
~WelcomeScreenHandler() override;
// WelcomeView:
@@ -120,8 +124,6 @@
bool show_on_init_ = false;
base::CallbackListSubscription accessibility_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(WelcomeScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h
index 40aff6b..de33d9a 100644
--- a/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h
@@ -40,6 +40,10 @@
using TView = WrongHWIDScreenView;
explicit WrongHWIDScreenHandler(JSCallsContainer* js_calls_container);
+
+ WrongHWIDScreenHandler(const WrongHWIDScreenHandler&) = delete;
+ WrongHWIDScreenHandler& operator=(const WrongHWIDScreenHandler&) = delete;
+
~WrongHWIDScreenHandler() override;
private:
@@ -58,8 +62,6 @@
// Keeps whether screen should be shown right after initialization.
bool show_on_init_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(WrongHWIDScreenHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_dialog.h b/chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_dialog.h
index 50763f16..3341a75 100644
--- a/chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_dialog.h
+++ b/chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_dialog.h
@@ -59,6 +59,10 @@
class MultiDeviceSetupDialogUI : public ui::MojoWebDialogUI {
public:
explicit MultiDeviceSetupDialogUI(content::WebUI* web_ui);
+
+ MultiDeviceSetupDialogUI(const MultiDeviceSetupDialogUI&) = delete;
+ MultiDeviceSetupDialogUI& operator=(const MultiDeviceSetupDialogUI&) = delete;
+
~MultiDeviceSetupDialogUI() override;
// Instantiates implementor of the mojom::MultiDeviceSetup mojo interface
@@ -69,8 +73,6 @@
private:
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(MultiDeviceSetupDialogUI);
};
} // namespace multidevice_setup
diff --git a/chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_handler.h b/chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_handler.h
index 093d0fb0..161c4c3 100644
--- a/chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_handler.h
+++ b/chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_handler.h
@@ -16,6 +16,10 @@
class MultideviceSetupHandler : public content::WebUIMessageHandler {
public:
MultideviceSetupHandler();
+
+ MultideviceSetupHandler(const MultideviceSetupHandler&) = delete;
+ MultideviceSetupHandler& operator=(const MultideviceSetupHandler&) = delete;
+
~MultideviceSetupHandler() override;
private:
@@ -24,8 +28,6 @@
void HandleGetProfileInfo(const base::ListValue* args);
void HandleOpenMultiDeviceSettings(const base::ListValue* args);
-
- DISALLOW_COPY_AND_ASSIGN(MultideviceSetupHandler);
};
} // namespace multidevice_setup
diff --git a/chrome/browser/ui/webui/chromeos/network_ui.cc b/chrome/browser/ui/webui/chromeos/network_ui.cc
index f0f5322..b4c0990 100644
--- a/chrome/browser/ui/webui/chromeos/network_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/network_ui.cc
@@ -131,6 +131,11 @@
class NetworkConfigMessageHandler : public content::WebUIMessageHandler {
public:
NetworkConfigMessageHandler() {}
+
+ NetworkConfigMessageHandler(const NetworkConfigMessageHandler&) = delete;
+ NetworkConfigMessageHandler& operator=(const NetworkConfigMessageHandler&) =
+ delete;
+
~NetworkConfigMessageHandler() override {}
// WebUIMessageHandler implementation.
@@ -385,8 +390,6 @@
}
base::WeakPtrFactory<NetworkConfigMessageHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NetworkConfigMessageHandler);
};
// static
diff --git a/chrome/browser/ui/webui/chromeos/network_ui.h b/chrome/browser/ui/webui/chromeos/network_ui.h
index b650d21a..2388556 100644
--- a/chrome/browser/ui/webui/chromeos/network_ui.h
+++ b/chrome/browser/ui/webui/chromeos/network_ui.h
@@ -23,6 +23,10 @@
class NetworkUI : public ui::MojoWebUIController {
public:
explicit NetworkUI(content::WebUI* web_ui);
+
+ NetworkUI(const NetworkUI&) = delete;
+ NetworkUI& operator=(const NetworkUI&) = delete;
+
~NetworkUI() override;
static void GetLocalizedStrings(base::DictionaryValue* localized_strings);
@@ -51,8 +55,6 @@
private:
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(NetworkUI);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/power_ui.h b/chrome/browser/ui/webui/chromeos/power_ui.h
index 19e21c9..4823aa0 100644
--- a/chrome/browser/ui/webui/chromeos/power_ui.h
+++ b/chrome/browser/ui/webui/chromeos/power_ui.h
@@ -13,10 +13,11 @@
class PowerUI : public content::WebUIController {
public:
explicit PowerUI(content::WebUI* web_ui);
- ~PowerUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(PowerUI);
+ PowerUI(const PowerUI&) = delete;
+ PowerUI& operator=(const PowerUI&) = delete;
+
+ ~PowerUI() override;
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/set_time_ui.cc b/chrome/browser/ui/webui/chromeos/set_time_ui.cc
index 92e4a10..37aedb2a 100644
--- a/chrome/browser/ui/webui/chromeos/set_time_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/set_time_ui.cc
@@ -47,6 +47,10 @@
public system::TimezoneSettings::Observer {
public:
SetTimeMessageHandler() : weak_factory_(this) {}
+
+ SetTimeMessageHandler(const SetTimeMessageHandler&) = delete;
+ SetTimeMessageHandler& operator=(const SetTimeMessageHandler&) = delete;
+
~SetTimeMessageHandler() override = default;
// WebUIMessageHandler:
@@ -153,8 +157,6 @@
system::TimezoneSettings::Observer>
timezone_observation_{this};
base::WeakPtrFactory<SetTimeMessageHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SetTimeMessageHandler);
};
} // namespace
diff --git a/chrome/browser/ui/webui/chromeos/set_time_ui.h b/chrome/browser/ui/webui/chromeos/set_time_ui.h
index a63a0ed..2eefeaa 100644
--- a/chrome/browser/ui/webui/chromeos/set_time_ui.h
+++ b/chrome/browser/ui/webui/chromeos/set_time_ui.h
@@ -14,10 +14,11 @@
class SetTimeUI : public ui::WebDialogUI {
public:
explicit SetTimeUI(content::WebUI* web_ui);
- ~SetTimeUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(SetTimeUI);
+ SetTimeUI(const SetTimeUI&) = delete;
+ SetTimeUI& operator=(const SetTimeUI&) = delete;
+
+ ~SetTimeUI() override;
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/slow_trace_ui.h b/chrome/browser/ui/webui/chromeos/slow_trace_ui.h
index aa719c2f..b05b483 100644
--- a/chrome/browser/ui/webui/chromeos/slow_trace_ui.h
+++ b/chrome/browser/ui/webui/chromeos/slow_trace_ui.h
@@ -26,6 +26,10 @@
class SlowTraceSource : public content::URLDataSource {
public:
SlowTraceSource();
+
+ SlowTraceSource(const SlowTraceSource&) = delete;
+ SlowTraceSource& operator=(const SlowTraceSource&) = delete;
+
~SlowTraceSource() override;
// content::URLDataSource implementation.
@@ -40,8 +44,6 @@
private:
void OnGetTraceData(content::URLDataSource::GotDataCallback callback,
scoped_refptr<base::RefCountedString> trace_data);
-
- DISALLOW_COPY_AND_ASSIGN(SlowTraceSource);
};
class SlowTraceController : public content::WebUIController {
diff --git a/chrome/browser/ui/webui/chromeos/slow_ui.cc b/chrome/browser/ui/webui/chromeos/slow_ui.cc
index 0baefb4a..5d7bfc3 100644
--- a/chrome/browser/ui/webui/chromeos/slow_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/slow_ui.cc
@@ -63,6 +63,10 @@
class SlowHandler : public WebUIMessageHandler {
public:
explicit SlowHandler(Profile* profile);
+
+ SlowHandler(const SlowHandler&) = delete;
+ SlowHandler& operator=(const SlowHandler&) = delete;
+
~SlowHandler() override;
// WebUIMessageHandler implementation.
@@ -78,8 +82,6 @@
Profile* profile_;
std::unique_ptr<PrefChangeRegistrar> user_pref_registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(SlowHandler);
};
// SlowHandler ------------------------------------------------------------
@@ -141,4 +143,3 @@
}
} // namespace chromeos
-
diff --git a/chrome/browser/ui/webui/chromeos/smb_shares/smb_credentials_dialog.h b/chrome/browser/ui/webui/chromeos/smb_shares/smb_credentials_dialog.h
index a55736a..01ef285 100644
--- a/chrome/browser/ui/webui/chromeos/smb_shares/smb_credentials_dialog.h
+++ b/chrome/browser/ui/webui/chromeos/smb_shares/smb_credentials_dialog.h
@@ -54,13 +54,15 @@
class SmbCredentialsDialogUI : public ui::WebDialogUI {
public:
explicit SmbCredentialsDialogUI(content::WebUI* web_ui);
+
+ SmbCredentialsDialogUI(const SmbCredentialsDialogUI&) = delete;
+ SmbCredentialsDialogUI& operator=(const SmbCredentialsDialogUI&) = delete;
+
~SmbCredentialsDialogUI() override;
private:
void OnUpdateCredentials(const std::string& username,
const std::string& password);
-
- DISALLOW_COPY_AND_ASSIGN(SmbCredentialsDialogUI);
};
} // namespace smb_dialog
diff --git a/chrome/browser/ui/webui/chromeos/smb_shares/smb_handler.h b/chrome/browser/ui/webui/chromeos/smb_shares/smb_handler.h
index 8123cd4..7c327bf 100644
--- a/chrome/browser/ui/webui/chromeos/smb_shares/smb_handler.h
+++ b/chrome/browser/ui/webui/chromeos/smb_shares/smb_handler.h
@@ -25,6 +25,10 @@
const std::string& password)>;
SmbHandler(Profile* profile, UpdateCredentialsCallback update_cred_callback);
+
+ SmbHandler(const SmbHandler&) = delete;
+ SmbHandler& operator=(const SmbHandler&) = delete;
+
~SmbHandler() override;
private:
@@ -57,8 +61,6 @@
Profile* const profile_;
UpdateCredentialsCallback update_cred_callback_;
base::WeakPtrFactory<SmbHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SmbHandler);
};
} // namespace smb_dialog
diff --git a/chrome/browser/ui/webui/chromeos/smb_shares/smb_share_dialog.h b/chrome/browser/ui/webui/chromeos/smb_shares/smb_share_dialog.h
index c59fc21..b1c40ec 100644
--- a/chrome/browser/ui/webui/chromeos/smb_shares/smb_share_dialog.h
+++ b/chrome/browser/ui/webui/chromeos/smb_shares/smb_share_dialog.h
@@ -31,9 +31,11 @@
class SmbShareDialogUI : public ui::WebDialogUI {
public:
explicit SmbShareDialogUI(content::WebUI* web_ui);
- ~SmbShareDialogUI() override;
- DISALLOW_COPY_AND_ASSIGN(SmbShareDialogUI);
+ SmbShareDialogUI(const SmbShareDialogUI&) = delete;
+ SmbShareDialogUI& operator=(const SmbShareDialogUI&) = delete;
+
+ ~SmbShareDialogUI() override;
};
} // namespace smb_dialog
diff --git a/chrome/browser/ui/webui/chromeos/sync/os_sync_handler.h b/chrome/browser/ui/webui/chromeos/sync/os_sync_handler.h
index fc1037d..9beb3bcb 100644
--- a/chrome/browser/ui/webui/chromeos/sync/os_sync_handler.h
+++ b/chrome/browser/ui/webui/chromeos/sync/os_sync_handler.h
@@ -25,6 +25,10 @@
public syncer::SyncServiceObserver {
public:
explicit OSSyncHandler(Profile* profile);
+
+ OSSyncHandler(const OSSyncHandler&) = delete;
+ OSSyncHandler& operator=(const OSSyncHandler&) = delete;
+
~OSSyncHandler() override;
// content::WebUIMessageHandler:
@@ -68,8 +72,6 @@
// Prevents messages to JS layer while data type prefs are being set.
bool is_setting_prefs_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(OSSyncHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_SYNC_OS_SYNC_HANDLER_H_
diff --git a/chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_message_handler.h b/chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_message_handler.h
index 6e84b36f..f8f551f 100644
--- a/chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_message_handler.h
+++ b/chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_message_handler.h
@@ -17,6 +17,11 @@
class SysInternalsMessageHandler : public content::WebUIMessageHandler {
public:
SysInternalsMessageHandler();
+
+ SysInternalsMessageHandler(const SysInternalsMessageHandler&) = delete;
+ SysInternalsMessageHandler& operator=(const SysInternalsMessageHandler&) =
+ delete;
+
~SysInternalsMessageHandler() override;
// content::WebUIMessageHandler methods:
@@ -60,8 +65,6 @@
void ReplySysInfo(base::Value callback_id, base::Value result);
base::WeakPtrFactory<SysInternalsMessageHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SysInternalsMessageHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_SYS_INTERNALS_SYS_INTERNALS_MESSAGE_HANDLER_H_
diff --git a/chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_ui.h b/chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_ui.h
index c842e39..79cbff8 100644
--- a/chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_ui.h
+++ b/chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_ui.h
@@ -12,10 +12,11 @@
class SysInternalsUI : public content::WebUIController {
public:
explicit SysInternalsUI(content::WebUI* web_ui);
- ~SysInternalsUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(SysInternalsUI);
+ SysInternalsUI(const SysInternalsUI&) = delete;
+ SysInternalsUI& operator=(const SysInternalsUI&) = delete;
+
+ ~SysInternalsUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_SYS_INTERNALS_SYS_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/chromeos/system_web_dialog_browsertest.cc b/chrome/browser/ui/webui/chromeos/system_web_dialog_browsertest.cc
index 89cce2de..5f58a1e 100644
--- a/chrome/browser/ui/webui/chromeos/system_web_dialog_browsertest.cc
+++ b/chrome/browser/ui/webui/chromeos/system_web_dialog_browsertest.cc
@@ -36,6 +36,10 @@
if (id)
id_ = std::string(id);
}
+
+ MockSystemWebDialog(const MockSystemWebDialog&) = delete;
+ MockSystemWebDialog& operator=(const MockSystemWebDialog&) = delete;
+
~MockSystemWebDialog() override = default;
const std::string& Id() override { return id_; }
@@ -43,7 +47,6 @@
private:
std::string id_;
- DISALLOW_COPY_AND_ASSIGN(MockSystemWebDialog);
};
} // namespace
@@ -53,13 +56,14 @@
SystemWebDialogLoginTest() : LoginManagerTest() {
login_mixin_.AppendRegularUsers(1);
}
+
+ SystemWebDialogLoginTest(const SystemWebDialogLoginTest&) = delete;
+ SystemWebDialogLoginTest& operator=(const SystemWebDialogLoginTest&) = delete;
+
~SystemWebDialogLoginTest() override = default;
protected:
LoginManagerMixin login_mixin_{&mixin_host_};
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SystemWebDialogLoginTest);
};
using SystemWebDialogOobeTest = OobeBaseTest;
diff --git a/chrome/browser/ui/webui/chromeos/system_web_dialog_delegate.h b/chrome/browser/ui/webui/chromeos/system_web_dialog_delegate.h
index 3e2db153..480da50 100644
--- a/chrome/browser/ui/webui/chromeos/system_web_dialog_delegate.h
+++ b/chrome/browser/ui/webui/chromeos/system_web_dialog_delegate.h
@@ -48,6 +48,10 @@
// |gurl| is the HTML file path for the dialog content and must be set.
// |title| may be empty in which case ShouldShowDialogTitle() returns false.
SystemWebDialogDelegate(const GURL& gurl, const std::u16string& title);
+
+ SystemWebDialogDelegate(const SystemWebDialogDelegate&) = delete;
+ SystemWebDialogDelegate& operator=(const SystemWebDialogDelegate&) = delete;
+
~SystemWebDialogDelegate() override;
// Returns an identifier used for matching an instance in FindInstance.
@@ -115,8 +119,6 @@
content::WebUI* webui_ = nullptr;
ui::ModalType modal_type_;
gfx::NativeWindow dialog_window_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(SystemWebDialogDelegate);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/user_image_source.h b/chrome/browser/ui/webui/chromeos/user_image_source.h
index 4e6374d..adb83220 100644
--- a/chrome/browser/ui/webui/chromeos/user_image_source.h
+++ b/chrome/browser/ui/webui/chromeos/user_image_source.h
@@ -27,6 +27,10 @@
class UserImageSource : public content::URLDataSource {
public:
UserImageSource();
+
+ UserImageSource(const UserImageSource&) = delete;
+ UserImageSource& operator=(const UserImageSource&) = delete;
+
~UserImageSource() override;
// content::URLDataSource implementation.
@@ -42,9 +46,6 @@
// the 100%-scale asset.
static scoped_refptr<base::RefCountedMemory> GetUserImage(
const AccountId& account_id);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(UserImageSource);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/video_source.h b/chrome/browser/ui/webui/chromeos/video_source.h
index 48ac2d4..cb0394c 100644
--- a/chrome/browser/ui/webui/chromeos/video_source.h
+++ b/chrome/browser/ui/webui/chromeos/video_source.h
@@ -25,6 +25,10 @@
class VideoSource : public content::URLDataSource {
public:
VideoSource();
+
+ VideoSource(const VideoSource&) = delete;
+ VideoSource& operator=(const VideoSource&) = delete;
+
~VideoSource() override;
// content::URLDataSource:
@@ -46,8 +50,6 @@
scoped_refptr<base::SequencedTaskRunner> task_runner_;
base::WeakPtrFactory<VideoSource> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(VideoSource);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/components/components_ui.h b/chrome/browser/ui/webui/components/components_ui.h
index 747c676..9e3c295 100644
--- a/chrome/browser/ui/webui/components/components_ui.h
+++ b/chrome/browser/ui/webui/components/components_ui.h
@@ -16,13 +16,14 @@
class ComponentsUI : public content::WebUIController {
public:
explicit ComponentsUI(content::WebUI* web_ui);
+
+ ComponentsUI(const ComponentsUI&) = delete;
+ ComponentsUI& operator=(const ComponentsUI&) = delete;
+
~ComponentsUI() override;
static base::RefCountedMemory* GetFaviconResourceBytes(
ui::ResourceScaleFactor scale_factor);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ComponentsUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_COMPONENTS_COMPONENTS_UI_H_
diff --git a/chrome/browser/ui/webui/conflicts/conflicts_data_fetcher.h b/chrome/browser/ui/webui/conflicts/conflicts_data_fetcher.h
index e9b21a0..3b0fbea 100644
--- a/chrome/browser/ui/webui/conflicts/conflicts_data_fetcher.h
+++ b/chrome/browser/ui/webui/conflicts/conflicts_data_fetcher.h
@@ -35,6 +35,9 @@
using OnConflictsDataFetchedCallback =
base::OnceCallback<void(base::DictionaryValue results)>;
+ ConflictsDataFetcher(const ConflictsDataFetcher&) = delete;
+ ConflictsDataFetcher& operator=(const ConflictsDataFetcher&) = delete;
+
~ConflictsDataFetcher() override;
// Creates the instance and initializes it on the ModuleDatabase task runner.
@@ -78,8 +81,6 @@
base::WeakPtrFactory<ConflictsDataFetcher> weak_ptr_factory_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(ConflictsDataFetcher);
};
#endif // CHROME_BROWSER_UI_WEBUI_CONFLICTS_CONFLICTS_DATA_FETCHER_H_
diff --git a/chrome/browser/ui/webui/conflicts/conflicts_handler.h b/chrome/browser/ui/webui/conflicts/conflicts_handler.h
index e10db79..e2af5ab 100644
--- a/chrome/browser/ui/webui/conflicts/conflicts_handler.h
+++ b/chrome/browser/ui/webui/conflicts/conflicts_handler.h
@@ -22,6 +22,10 @@
class ConflictsHandler : public content::WebUIMessageHandler {
public:
ConflictsHandler();
+
+ ConflictsHandler(const ConflictsHandler&) = delete;
+ ConflictsHandler& operator=(const ConflictsHandler&) = delete;
+
~ConflictsHandler() override;
private:
@@ -41,8 +45,6 @@
ConflictsDataFetcher::UniquePtr conflicts_data_fetcher_;
base::WeakPtrFactory<ConflictsHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ConflictsHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_CONFLICTS_CONFLICTS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.h b/chrome/browser/ui/webui/cookies_tree_model_util.h
index c8605f6..06e4914 100644
--- a/chrome/browser/ui/webui/cookies_tree_model_util.h
+++ b/chrome/browser/ui/webui/cookies_tree_model_util.h
@@ -23,6 +23,10 @@
class CookiesTreeModelUtil {
public:
CookiesTreeModelUtil();
+
+ CookiesTreeModelUtil(const CookiesTreeModelUtil&) = delete;
+ CookiesTreeModelUtil& operator=(const CookiesTreeModelUtil&) = delete;
+
~CookiesTreeModelUtil();
// Finds or creates an ID for given |node| and returns it as string.
@@ -67,8 +71,6 @@
// Reverse look up map to find the ID for a node.
CookieTreeNodeMap node_map_;
-
- DISALLOW_COPY_AND_ASSIGN(CookiesTreeModelUtil);
};
#endif // CHROME_BROWSER_UI_WEBUI_COOKIES_TREE_MODEL_UTIL_H_
diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc
index 27ae04e1..c9b2efa 100644
--- a/chrome/browser/ui/webui/crashes_ui.cc
+++ b/chrome/browser/ui/webui/crashes_ui.cc
@@ -85,6 +85,10 @@
class CrashesDOMHandler : public WebUIMessageHandler {
public:
CrashesDOMHandler();
+
+ CrashesDOMHandler(const CrashesDOMHandler&) = delete;
+ CrashesDOMHandler& operator=(const CrashesDOMHandler&) = delete;
+
~CrashesDOMHandler() override;
// WebUIMessageHandler implementation.
@@ -110,8 +114,6 @@
scoped_refptr<UploadList> upload_list_;
bool list_available_;
bool first_load_;
-
- DISALLOW_COPY_AND_ASSIGN(CrashesDOMHandler);
};
CrashesDOMHandler::CrashesDOMHandler()
diff --git a/chrome/browser/ui/webui/device_log_ui.cc b/chrome/browser/ui/webui/device_log_ui.cc
index ac4f3366..65d36978 100644
--- a/chrome/browser/ui/webui/device_log_ui.cc
+++ b/chrome/browser/ui/webui/device_log_ui.cc
@@ -29,6 +29,10 @@
class DeviceLogMessageHandler : public content::WebUIMessageHandler {
public:
DeviceLogMessageHandler() {}
+
+ DeviceLogMessageHandler(const DeviceLogMessageHandler&) = delete;
+ DeviceLogMessageHandler& operator=(const DeviceLogMessageHandler&) = delete;
+
~DeviceLogMessageHandler() override {}
// WebUIMessageHandler implementation.
@@ -54,8 +58,6 @@
void ClearLog(const base::ListValue* value) const {
device_event_log::ClearAll();
}
-
- DISALLOW_COPY_AND_ASSIGN(DeviceLogMessageHandler);
};
} // namespace
diff --git a/chrome/browser/ui/webui/device_log_ui.h b/chrome/browser/ui/webui/device_log_ui.h
index cee91ebb..65a92fb 100644
--- a/chrome/browser/ui/webui/device_log_ui.h
+++ b/chrome/browser/ui/webui/device_log_ui.h
@@ -13,10 +13,11 @@
class DeviceLogUI : public content::WebUIController {
public:
explicit DeviceLogUI(content::WebUI* web_ui);
- ~DeviceLogUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(DeviceLogUI);
+ DeviceLogUI(const DeviceLogUI&) = delete;
+ DeviceLogUI& operator=(const DeviceLogUI&) = delete;
+
+ ~DeviceLogUI() override;
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/devtools_ui.h b/chrome/browser/ui/webui/devtools_ui.h
index 88c7913..32809a6 100644
--- a/chrome/browser/ui/webui/devtools_ui.h
+++ b/chrome/browser/ui/webui/devtools_ui.h
@@ -16,11 +16,14 @@
static bool IsFrontendResourceURL(const GURL& url);
explicit DevToolsUI(content::WebUI* web_ui);
+
+ DevToolsUI(const DevToolsUI&) = delete;
+ DevToolsUI& operator=(const DevToolsUI&) = delete;
+
~DevToolsUI() override;
private:
DevToolsUIBindings bindings_;
- DISALLOW_COPY_AND_ASSIGN(DevToolsUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_DEVTOOLS_UI_H_
diff --git a/chrome/browser/ui/webui/devtools_ui_data_source.h b/chrome/browser/ui/webui/devtools_ui_data_source.h
index a713ac1..c43a6f7 100644
--- a/chrome/browser/ui/webui/devtools_ui_data_source.h
+++ b/chrome/browser/ui/webui/devtools_ui_data_source.h
@@ -34,6 +34,10 @@
explicit DevToolsDataSource(
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory);
+
+ DevToolsDataSource(const DevToolsDataSource&) = delete;
+ DevToolsDataSource& operator=(const DevToolsDataSource&) = delete;
+
~DevToolsDataSource() override;
// content::URLDataSource implementation.
@@ -91,8 +95,6 @@
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
std::list<PendingRequest> pending_requests_;
-
- DISALLOW_COPY_AND_ASSIGN(DevToolsDataSource);
};
#endif // CHROME_BROWSER_UI_WEBUI_DEVTOOLS_UI_DATA_SOURCE_H_
diff --git a/chrome/browser/ui/webui/discards/discards_ui.cc b/chrome/browser/ui/webui/discards/discards_ui.cc
index 169d114..c2a7f33 100644
--- a/chrome/browser/ui/webui/discards/discards_ui.cc
+++ b/chrome/browser/ui/webui/discards/discards_ui.cc
@@ -98,6 +98,10 @@
mojo::PendingReceiver<discards::mojom::DetailsProvider> receiver)
: receiver_(this, std::move(receiver)) {}
+ DiscardsDetailsProviderImpl(const DiscardsDetailsProviderImpl&) = delete;
+ DiscardsDetailsProviderImpl& operator=(const DiscardsDetailsProviderImpl&) =
+ delete;
+
~DiscardsDetailsProviderImpl() override {}
// discards::mojom::DetailsProvider overrides:
@@ -202,8 +206,6 @@
private:
mojo::Receiver<discards::mojom::DetailsProvider> receiver_;
-
- DISALLOW_COPY_AND_ASSIGN(DiscardsDetailsProviderImpl);
};
} // namespace
diff --git a/chrome/browser/ui/webui/discards/discards_ui.h b/chrome/browser/ui/webui/discards/discards_ui.h
index 187dc957..4f87ba9 100644
--- a/chrome/browser/ui/webui/discards/discards_ui.h
+++ b/chrome/browser/ui/webui/discards/discards_ui.h
@@ -18,6 +18,10 @@
class DiscardsUI : public ui::MojoWebUIController {
public:
explicit DiscardsUI(content::WebUI* web_ui);
+
+ DiscardsUI(const DiscardsUI&) = delete;
+ DiscardsUI& operator=(const DiscardsUI&) = delete;
+
~DiscardsUI() override;
// Instantiates the implementor of the mojom::DetailsProvider mojo
@@ -40,8 +44,6 @@
std::string profile_id_;
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(DiscardsUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_DISCARDS_DISCARDS_UI_H_
diff --git a/chrome/browser/ui/webui/discards/graph_dump_impl.h b/chrome/browser/ui/webui/discards/graph_dump_impl.h
index e480224..32751f57 100644
--- a/chrome/browser/ui/webui/discards/graph_dump_impl.h
+++ b/chrome/browser/ui/webui/discards/graph_dump_impl.h
@@ -31,6 +31,10 @@
public performance_manager::WorkerNodeObserver {
public:
DiscardsGraphDumpImpl();
+
+ DiscardsGraphDumpImpl(const DiscardsGraphDumpImpl&) = delete;
+ DiscardsGraphDumpImpl& operator=(const DiscardsGraphDumpImpl&) = delete;
+
~DiscardsGraphDumpImpl() override;
// Creates a new DiscardsGraphDumpImpl to service |receiver| and passes its
@@ -254,8 +258,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<DiscardsGraphDumpImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DiscardsGraphDumpImpl);
};
#endif // CHROME_BROWSER_UI_WEBUI_DISCARDS_GRAPH_DUMP_IMPL_H_
diff --git a/chrome/browser/ui/webui/domain_reliability_internals_ui.h b/chrome/browser/ui/webui/domain_reliability_internals_ui.h
index 1c08e86..b80e63e 100644
--- a/chrome/browser/ui/webui/domain_reliability_internals_ui.h
+++ b/chrome/browser/ui/webui/domain_reliability_internals_ui.h
@@ -22,14 +22,23 @@
class DomainReliabilityInternalsUI : public content::WebUIController {
public:
explicit DomainReliabilityInternalsUI(content::WebUI* web_ui);
- ~DomainReliabilityInternalsUI() override;
- DISALLOW_COPY_AND_ASSIGN(DomainReliabilityInternalsUI);
+ DomainReliabilityInternalsUI(const DomainReliabilityInternalsUI&) = delete;
+ DomainReliabilityInternalsUI& operator=(const DomainReliabilityInternalsUI&) =
+ delete;
+
+ ~DomainReliabilityInternalsUI() override;
};
class DomainReliabilityInternalsHandler : public content::WebUIMessageHandler {
public:
DomainReliabilityInternalsHandler();
+
+ DomainReliabilityInternalsHandler(const DomainReliabilityInternalsHandler&) =
+ delete;
+ DomainReliabilityInternalsHandler& operator=(
+ const DomainReliabilityInternalsHandler&) = delete;
+
~DomainReliabilityInternalsHandler() override;
// content::WebUIMessageHandler:
@@ -41,8 +50,6 @@
std::string callback_id_;
base::WeakPtrFactory<DomainReliabilityInternalsHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DomainReliabilityInternalsHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_DOMAIN_RELIABILITY_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/download_internals/download_internals_ui.h b/chrome/browser/ui/webui/download_internals/download_internals_ui.h
index 1785e63..444e0b33 100644
--- a/chrome/browser/ui/webui/download_internals/download_internals_ui.h
+++ b/chrome/browser/ui/webui/download_internals/download_internals_ui.h
@@ -12,10 +12,11 @@
class DownloadInternalsUI : public content::WebUIController {
public:
explicit DownloadInternalsUI(content::WebUI* web_ui);
- ~DownloadInternalsUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(DownloadInternalsUI);
+ DownloadInternalsUI(const DownloadInternalsUI&) = delete;
+ DownloadInternalsUI& operator=(const DownloadInternalsUI&) = delete;
+
+ ~DownloadInternalsUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_DOWNLOAD_INTERNALS_DOWNLOAD_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/download_internals/download_internals_ui_message_handler.h b/chrome/browser/ui/webui/download_internals/download_internals_ui_message_handler.h
index 187a30e..dff7d8ae 100644
--- a/chrome/browser/ui/webui/download_internals/download_internals_ui_message_handler.h
+++ b/chrome/browser/ui/webui/download_internals/download_internals_ui_message_handler.h
@@ -21,6 +21,12 @@
public download::Logger::Observer {
public:
DownloadInternalsUIMessageHandler();
+
+ DownloadInternalsUIMessageHandler(const DownloadInternalsUIMessageHandler&) =
+ delete;
+ DownloadInternalsUIMessageHandler& operator=(
+ const DownloadInternalsUIMessageHandler&) = delete;
+
~DownloadInternalsUIMessageHandler() override;
// content::WebUIMessageHandler implementation.
@@ -46,8 +52,6 @@
base::WeakPtrFactory<DownloadInternalsUIMessageHandler> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(DownloadInternalsUIMessageHandler);
};
} // namespace download_internals
diff --git a/chrome/browser/ui/webui/downloads/downloads_dom_handler.h b/chrome/browser/ui/webui/downloads/downloads_dom_handler.h
index b91eca1..2bedafd 100644
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.h
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.h
@@ -41,6 +41,10 @@
mojo::PendingRemote<downloads::mojom::Page> page,
content::DownloadManager* download_manager,
content::WebUI* web_ui);
+
+ DownloadsDOMHandler(const DownloadsDOMHandler&) = delete;
+ DownloadsDOMHandler& operator=(const DownloadsDOMHandler&) = delete;
+
~DownloadsDOMHandler() override;
// WebContentsObserver implementation.
@@ -130,8 +134,6 @@
mojo::Receiver<downloads::mojom::PageHandler> receiver_;
base::WeakPtrFactory<DownloadsDOMHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DownloadsDOMHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_DOWNLOADS_DOWNLOADS_DOM_HANDLER_H_
diff --git a/chrome/browser/ui/webui/downloads/downloads_list_tracker.h b/chrome/browser/ui/webui/downloads/downloads_list_tracker.h
index 2f254355..ef91b2b 100644
--- a/chrome/browser/ui/webui/downloads/downloads_list_tracker.h
+++ b/chrome/browser/ui/webui/downloads/downloads_list_tracker.h
@@ -30,6 +30,10 @@
public:
DownloadsListTracker(content::DownloadManager* download_manager,
mojo::PendingRemote<downloads::mojom::Page> page);
+
+ DownloadsListTracker(const DownloadsListTracker&) = delete;
+ DownloadsListTracker& operator=(const DownloadsListTracker&) = delete;
+
~DownloadsListTracker() override;
// Clears all downloads on the page if currently sending updates and resets
@@ -129,8 +133,6 @@
// Current search terms.
std::vector<std::u16string> search_terms_;
-
- DISALLOW_COPY_AND_ASSIGN(DownloadsListTracker);
};
#endif // CHROME_BROWSER_UI_WEBUI_DOWNLOADS_DOWNLOADS_LIST_TRACKER_H_
diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.h b/chrome/browser/ui/webui/downloads/downloads_ui.h
index 74665d7..73840de 100644
--- a/chrome/browser/ui/webui/downloads/downloads_ui.h
+++ b/chrome/browser/ui/webui/downloads/downloads_ui.h
@@ -25,6 +25,10 @@
public downloads::mojom::PageHandlerFactory {
public:
explicit DownloadsUI(content::WebUI* web_ui);
+
+ DownloadsUI(const DownloadsUI&) = delete;
+ DownloadsUI& operator=(const DownloadsUI&) = delete;
+
~DownloadsUI() override;
static base::RefCountedMemory* GetFaviconResourceBytes(
@@ -47,8 +51,6 @@
this};
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(DownloadsUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_DOWNLOADS_DOWNLOADS_UI_H_
diff --git a/chrome/browser/ui/webui/engagement/site_engagement_ui.cc b/chrome/browser/ui/webui/engagement/site_engagement_ui.cc
index 7781c93a..c69fa9d 100644
--- a/chrome/browser/ui/webui/engagement/site_engagement_ui.cc
+++ b/chrome/browser/ui/webui/engagement/site_engagement_ui.cc
@@ -41,6 +41,11 @@
DCHECK(profile_);
}
+ SiteEngagementDetailsProviderImpl(const SiteEngagementDetailsProviderImpl&) =
+ delete;
+ SiteEngagementDetailsProviderImpl& operator=(
+ const SiteEngagementDetailsProviderImpl&) = delete;
+
~SiteEngagementDetailsProviderImpl() override {}
// site_engagement::mojom::SiteEngagementDetailsProvider overrides:
@@ -83,8 +88,6 @@
mojo::Receiver<site_engagement::mojom::SiteEngagementDetailsProvider>
receiver_;
-
- DISALLOW_COPY_AND_ASSIGN(SiteEngagementDetailsProviderImpl);
};
} // namespace
diff --git a/chrome/browser/ui/webui/engagement/site_engagement_ui.h b/chrome/browser/ui/webui/engagement/site_engagement_ui.h
index fb679644..513bbeb 100644
--- a/chrome/browser/ui/webui/engagement/site_engagement_ui.h
+++ b/chrome/browser/ui/webui/engagement/site_engagement_ui.h
@@ -14,6 +14,10 @@
class SiteEngagementUI : public ui::MojoWebUIController {
public:
explicit SiteEngagementUI(content::WebUI* web_ui);
+
+ SiteEngagementUI(const SiteEngagementUI&) = delete;
+ SiteEngagementUI& operator=(const SiteEngagementUI&) = delete;
+
~SiteEngagementUI() override;
// Instantiates the implementor of the mojom::SiteEngagementDetailsProvider
@@ -27,8 +31,6 @@
ui_handler_;
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(SiteEngagementUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_ENGAGEMENT_SITE_ENGAGEMENT_UI_H_
diff --git a/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_page_handler.h b/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_page_handler.h
index 8b1218bc..4b199c7 100644
--- a/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_page_handler.h
+++ b/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_page_handler.h
@@ -24,6 +24,12 @@
receiver,
ExploreSitesService* explore_sites_service,
Profile* profile);
+
+ ExploreSitesInternalsPageHandler(const ExploreSitesInternalsPageHandler&) =
+ delete;
+ ExploreSitesInternalsPageHandler& operator=(
+ const ExploreSitesInternalsPageHandler&) = delete;
+
~ExploreSitesInternalsPageHandler() override;
private:
@@ -38,8 +44,6 @@
mojo::Receiver<explore_sites_internals::mojom::PageHandler> receiver_;
ExploreSitesService* explore_sites_service_;
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ExploreSitesInternalsPageHandler);
};
} // namespace explore_sites
diff --git a/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.h b/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.h
index 4aa64b4..85826d2 100644
--- a/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.h
+++ b/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.h
@@ -21,6 +21,10 @@
class ExploreSitesInternalsUI : public ui::MojoWebUIController {
public:
explicit ExploreSitesInternalsUI(content::WebUI* web_ui);
+
+ ExploreSitesInternalsUI(const ExploreSitesInternalsUI&) = delete;
+ ExploreSitesInternalsUI& operator=(const ExploreSitesInternalsUI&) = delete;
+
~ExploreSitesInternalsUI() override;
// Instantiates the implementor of the mojom::PageHandler mojo
@@ -34,8 +38,6 @@
ExploreSitesService* explore_sites_service_;
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(ExploreSitesInternalsUI);
};
} // namespace explore_sites
diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h
index 3cced8e..33ea9aa 100644
--- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h
+++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h
@@ -27,6 +27,10 @@
public KioskAppManagerObserver {
public:
explicit KioskAppsHandler(OwnerSettingsServiceAsh* service);
+
+ KioskAppsHandler(const KioskAppsHandler&) = delete;
+ KioskAppsHandler& operator=(const KioskAppsHandler&) = delete;
+
~KioskAppsHandler() override;
// content::WebUIMessageHandler overrides:
@@ -69,8 +73,6 @@
bool is_auto_launch_enabled_;
OwnerSettingsServiceAsh* const owner_settings_service_; // not owned
base::WeakPtrFactory<KioskAppsHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(KioskAppsHandler);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.h b/chrome/browser/ui/webui/extensions/extension_icon_source.h
index 4cf142d..415524f 100644
--- a/chrome/browser/ui/webui/extensions/extension_icon_source.h
+++ b/chrome/browser/ui/webui/extensions/extension_icon_source.h
@@ -53,6 +53,10 @@
public base::SupportsWeakPtr<ExtensionIconSource> {
public:
explicit ExtensionIconSource(Profile* profile);
+
+ ExtensionIconSource(const ExtensionIconSource&) = delete;
+ ExtensionIconSource& operator=(const ExtensionIconSource&) = delete;
+
~ExtensionIconSource() override;
// Gets the URL of the |extension| icon in the given |icon_size|, falling back
@@ -157,8 +161,6 @@
std::unique_ptr<SkBitmap> default_extension_data_;
base::CancelableTaskTracker cancelable_task_tracker_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionIconSource);
};
} // namespace extensions
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h
index 12aba4c40..85df533 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h
+++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h
@@ -23,6 +23,12 @@
class ExtensionSettingsUIBrowserTest : public WebUIBrowserTest {
public:
ExtensionSettingsUIBrowserTest();
+
+ ExtensionSettingsUIBrowserTest(const ExtensionSettingsUIBrowserTest&) =
+ delete;
+ ExtensionSettingsUIBrowserTest& operator=(
+ const ExtensionSettingsUIBrowserTest&) = delete;
+
~ExtensionSettingsUIBrowserTest() override;
protected:
@@ -73,8 +79,6 @@
std::unique_ptr<extensions::ScopedTestDialogAutoConfirm>
uninstall_auto_confirm_;
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsUIBrowserTest);
};
#endif // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_
diff --git a/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_message_handler.h b/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_message_handler.h
index 2d41735..c833b46 100644
--- a/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_message_handler.h
+++ b/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_message_handler.h
@@ -26,6 +26,12 @@
public SupervisedUserURLFilter::Observer {
public:
FamilyLinkUserInternalsMessageHandler();
+
+ FamilyLinkUserInternalsMessageHandler(
+ const FamilyLinkUserInternalsMessageHandler&) = delete;
+ FamilyLinkUserInternalsMessageHandler& operator=(
+ const FamilyLinkUserInternalsMessageHandler&) = delete;
+
~FamilyLinkUserInternalsMessageHandler() override;
private:
@@ -66,8 +72,6 @@
base::WeakPtrFactory<FamilyLinkUserInternalsMessageHandler> weak_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(FamilyLinkUserInternalsMessageHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_FAMILY_LINK_USER_INTERNALS_FAMILY_LINK_USER_INTERNALS_MESSAGE_HANDLER_H_
diff --git a/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_ui.h b/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_ui.h
index 0a129dfb..c91ec18 100644
--- a/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_ui.h
+++ b/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_ui.h
@@ -12,10 +12,12 @@
class FamilyLinkUserInternalsUI : public content::WebUIController {
public:
explicit FamilyLinkUserInternalsUI(content::WebUI* web_ui);
- ~FamilyLinkUserInternalsUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(FamilyLinkUserInternalsUI);
+ FamilyLinkUserInternalsUI(const FamilyLinkUserInternalsUI&) = delete;
+ FamilyLinkUserInternalsUI& operator=(const FamilyLinkUserInternalsUI&) =
+ delete;
+
+ ~FamilyLinkUserInternalsUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_FAMILY_LINK_USER_INTERNALS_FAMILY_LINK_USER_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/favicon_source.h b/chrome/browser/ui/webui/favicon_source.h
index 42bb467..fdd2a7b 100644
--- a/chrome/browser/ui/webui/favicon_source.h
+++ b/chrome/browser/ui/webui/favicon_source.h
@@ -41,6 +41,9 @@
// |type| is the type of icon this FaviconSource will provide.
explicit FaviconSource(Profile* profile, chrome::FaviconUrlFormat format);
+ FaviconSource(const FaviconSource&) = delete;
+ FaviconSource& operator=(const FaviconSource&) = delete;
+
~FaviconSource() override;
// content::URLDataSource implementation.
@@ -103,8 +106,6 @@
base::CancelableTaskTracker cancelable_task_tracker_;
base::WeakPtrFactory<FaviconSource> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FaviconSource);
};
#endif // CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_
diff --git a/chrome/browser/ui/webui/feed_internals/feed_internals_ui.h b/chrome/browser/ui/webui/feed_internals/feed_internals_ui.h
index fc850b4..8986c08 100644
--- a/chrome/browser/ui/webui/feed_internals/feed_internals_ui.h
+++ b/chrome/browser/ui/webui/feed_internals/feed_internals_ui.h
@@ -26,6 +26,10 @@
class FeedInternalsUI : public ui::MojoWebUIController {
public:
explicit FeedInternalsUI(content::WebUI* web_ui);
+
+ FeedInternalsUI(const FeedInternalsUI&) = delete;
+ FeedInternalsUI& operator=(const FeedInternalsUI&) = delete;
+
~FeedInternalsUI() override;
// Instantiates the implementor of the feed_internals::mojom::PageHandler mojo
@@ -37,8 +41,6 @@
Profile* profile_;
std::unique_ptr<FeedV2InternalsPageHandler> v2_page_handler_;
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(FeedInternalsUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_FEED_INTERNALS_FEED_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/fileicon_source.h b/chrome/browser/ui/webui/fileicon_source.h
index 89cc0d1..5c26dbfa 100644
--- a/chrome/browser/ui/webui/fileicon_source.h
+++ b/chrome/browser/ui/webui/fileicon_source.h
@@ -22,6 +22,10 @@
class FileIconSource : public content::URLDataSource {
public:
FileIconSource();
+
+ FileIconSource(const FileIconSource&) = delete;
+ FileIconSource& operator=(const FileIconSource&) = delete;
+
~FileIconSource() override;
// content::URLDataSource implementation.
@@ -64,7 +68,5 @@
// Tracks tasks requesting file icons.
base::CancelableTaskTracker cancelable_task_tracker_;
-
- DISALLOW_COPY_AND_ASSIGN(FileIconSource);
};
#endif // CHROME_BROWSER_UI_WEBUI_FILEICON_SOURCE_H_
diff --git a/chrome/browser/ui/webui/flags/flags_ui.h b/chrome/browser/ui/webui/flags/flags_ui.h
index bd6b050..66e2607 100644
--- a/chrome/browser/ui/webui/flags/flags_ui.h
+++ b/chrome/browser/ui/webui/flags/flags_ui.h
@@ -23,6 +23,10 @@
class FlagsUI : public content::WebUIController {
public:
explicit FlagsUI(content::WebUI* web_ui);
+
+ FlagsUI(const FlagsUI&) = delete;
+ FlagsUI& operator=(const FlagsUI&) = delete;
+
~FlagsUI() override;
static void AddStrings(content::WebUIDataSource* source);
@@ -31,13 +35,15 @@
private:
base::WeakPtrFactory<FlagsUI> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FlagsUI);
};
class FlagsDeprecatedUI : public content::WebUIController {
public:
explicit FlagsDeprecatedUI(content::WebUI* web_ui);
+
+ FlagsDeprecatedUI(const FlagsDeprecatedUI&) = delete;
+ FlagsDeprecatedUI& operator=(const FlagsDeprecatedUI&) = delete;
+
~FlagsDeprecatedUI() override;
static void AddStrings(content::WebUIDataSource* source);
@@ -45,7 +51,5 @@
private:
base::WeakPtrFactory<FlagsDeprecatedUI> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FlagsDeprecatedUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_FLAGS_FLAGS_UI_H_
diff --git a/chrome/browser/ui/webui/flags/flags_ui_handler.h b/chrome/browser/ui/webui/flags/flags_ui_handler.h
index ae061a8d..dc83326 100644
--- a/chrome/browser/ui/webui/flags/flags_ui_handler.h
+++ b/chrome/browser/ui/webui/flags/flags_ui_handler.h
@@ -19,6 +19,10 @@
class FlagsUIHandler : public content::WebUIMessageHandler {
public:
FlagsUIHandler();
+
+ FlagsUIHandler(const FlagsUIHandler&) = delete;
+ FlagsUIHandler& operator=(const FlagsUIHandler&) = delete;
+
~FlagsUIHandler() override;
// Initializes the UI handler with the provided flags storage and flags
@@ -58,8 +62,6 @@
flags_ui::FlagAccess access_;
std::string experimental_features_callback_id_;
bool deprecated_features_only_;
-
- DISALLOW_COPY_AND_ASSIGN(FlagsUIHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_FLAGS_FLAGS_UI_HANDLER_H_
diff --git a/chrome/browser/ui/webui/gcm_internals_ui.cc b/chrome/browser/ui/webui/gcm_internals_ui.cc
index 81cf5c6c..43beef84 100644
--- a/chrome/browser/ui/webui/gcm_internals_ui.cc
+++ b/chrome/browser/ui/webui/gcm_internals_ui.cc
@@ -32,6 +32,11 @@
class GcmInternalsUIMessageHandler : public content::WebUIMessageHandler {
public:
GcmInternalsUIMessageHandler();
+
+ GcmInternalsUIMessageHandler(const GcmInternalsUIMessageHandler&) = delete;
+ GcmInternalsUIMessageHandler& operator=(const GcmInternalsUIMessageHandler&) =
+ delete;
+
~GcmInternalsUIMessageHandler() override;
// WebUIMessageHandler implementation.
@@ -57,8 +62,6 @@
// Factory for creating references in callbacks.
base::WeakPtrFactory<GcmInternalsUIMessageHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(GcmInternalsUIMessageHandler);
};
GcmInternalsUIMessageHandler::GcmInternalsUIMessageHandler() {}
diff --git a/chrome/browser/ui/webui/gcm_internals_ui.h b/chrome/browser/ui/webui/gcm_internals_ui.h
index 9a3b0e84..add01b2 100644
--- a/chrome/browser/ui/webui/gcm_internals_ui.h
+++ b/chrome/browser/ui/webui/gcm_internals_ui.h
@@ -12,10 +12,11 @@
class GCMInternalsUI : public content::WebUIController {
public:
explicit GCMInternalsUI(content::WebUI* web_ui);
- ~GCMInternalsUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(GCMInternalsUI);
+ GCMInternalsUI(const GCMInternalsUI&) = delete;
+ GCMInternalsUI& operator=(const GCMInternalsUI&) = delete;
+
+ ~GCMInternalsUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_GCM_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/help/test_version_updater.h b/chrome/browser/ui/webui/help/test_version_updater.h
index 3714e44..afa7344 100644
--- a/chrome/browser/ui/webui/help/test_version_updater.h
+++ b/chrome/browser/ui/webui/help/test_version_updater.h
@@ -17,6 +17,10 @@
class TestVersionUpdater : public VersionUpdater {
public:
TestVersionUpdater();
+
+ TestVersionUpdater(const TestVersionUpdater&) = delete;
+ TestVersionUpdater& operator=(const TestVersionUpdater&) = delete;
+
~TestVersionUpdater() override;
void CheckForUpdate(StatusCallback callback, PromoteCallback) override;
@@ -46,8 +50,6 @@
std::string version_;
int64_t update_size_ = 0;
std::u16string message_;
-
- DISALLOW_COPY_AND_ASSIGN(TestVersionUpdater);
};
#endif // CHROME_BROWSER_UI_WEBUI_HELP_TEST_VERSION_UPDATER_H_
diff --git a/chrome/browser/ui/webui/help/version_updater_win.h b/chrome/browser/ui/webui/help/version_updater_win.h
index 52b38ca..c17b64b 100644
--- a/chrome/browser/ui/webui/help/version_updater_win.h
+++ b/chrome/browser/ui/webui/help/version_updater_win.h
@@ -23,6 +23,10 @@
// will be parented to this widget. |owner_widget| may be given a value of
// nullptr in which case the UAC prompt will be parented to the desktop.
explicit VersionUpdaterWin(gfx::AcceleratedWidget owner_widget);
+
+ VersionUpdaterWin(const VersionUpdaterWin&) = delete;
+ VersionUpdaterWin& operator=(const VersionUpdaterWin&) = delete;
+
~VersionUpdaterWin() override;
// VersionUpdater:
@@ -52,8 +56,6 @@
// Used for callbacks.
base::WeakPtrFactory<VersionUpdaterWin> weak_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(VersionUpdaterWin);
};
#endif // CHROME_BROWSER_UI_WEBUI_HELP_VERSION_UPDATER_WIN_H_
diff --git a/chrome/browser/ui/webui/history/browsing_history_handler.h b/chrome/browser/ui/webui/history/browsing_history_handler.h
index 0c16d05..2d3c46d 100644
--- a/chrome/browser/ui/webui/history/browsing_history_handler.h
+++ b/chrome/browser/ui/webui/history/browsing_history_handler.h
@@ -26,6 +26,10 @@
public ProfileBasedBrowsingHistoryDriver {
public:
BrowsingHistoryHandler();
+
+ BrowsingHistoryHandler(const BrowsingHistoryHandler&) = delete;
+ BrowsingHistoryHandler& operator=(const BrowsingHistoryHandler&) = delete;
+
~BrowsingHistoryHandler() override;
// WebUIMessageHandler implementation.
@@ -93,8 +97,6 @@
std::string remove_visits_callback_;
base::WeakPtrFactory<BrowsingHistoryHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_HISTORY_BROWSING_HISTORY_HANDLER_H_
diff --git a/chrome/browser/ui/webui/history/foreign_session_handler.h b/chrome/browser/ui/webui/history/foreign_session_handler.h
index 65b1305..05295cd 100644
--- a/chrome/browser/ui/webui/history/foreign_session_handler.h
+++ b/chrome/browser/ui/webui/history/foreign_session_handler.h
@@ -54,6 +54,10 @@
void OnJavascriptDisallowed() override;
ForeignSessionHandler();
+
+ ForeignSessionHandler(const ForeignSessionHandler&) = delete;
+ ForeignSessionHandler& operator=(const ForeignSessionHandler&) = delete;
+
~ForeignSessionHandler() override;
void InitializeForeignSessions();
@@ -105,8 +109,6 @@
base::Value initial_session_list_;
base::CallbackListSubscription foreign_session_updated_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(ForeignSessionHandler);
};
} // namespace browser_sync
diff --git a/chrome/browser/ui/webui/history/history_login_handler.h b/chrome/browser/ui/webui/history/history_login_handler.h
index c10c6dbd..795df9b 100644
--- a/chrome/browser/ui/webui/history/history_login_handler.h
+++ b/chrome/browser/ui/webui/history/history_login_handler.h
@@ -17,6 +17,10 @@
class HistoryLoginHandler : public content::WebUIMessageHandler {
public:
explicit HistoryLoginHandler(base::RepeatingClosure signin_callback);
+
+ HistoryLoginHandler(const HistoryLoginHandler&) = delete;
+ HistoryLoginHandler& operator=(const HistoryLoginHandler&) = delete;
+
~HistoryLoginHandler() override;
// WebUIMessageHandler implementation.
@@ -39,8 +43,6 @@
std::unique_ptr<ProfileInfoWatcher> profile_info_watcher_;
base::RepeatingClosure signin_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(HistoryLoginHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_HISTORY_HISTORY_LOGIN_HANDLER_H_
diff --git a/chrome/browser/ui/webui/history/navigation_handler.h b/chrome/browser/ui/webui/history/navigation_handler.h
index 51c57c4..d19d2694 100644
--- a/chrome/browser/ui/webui/history/navigation_handler.h
+++ b/chrome/browser/ui/webui/history/navigation_handler.h
@@ -19,6 +19,10 @@
class NavigationHandler : public content::WebUIMessageHandler {
public:
NavigationHandler();
+
+ NavigationHandler(const NavigationHandler&) = delete;
+ NavigationHandler& operator=(const NavigationHandler&) = delete;
+
~NavigationHandler() override;
// WebUIMessageHandler implementation.
@@ -26,8 +30,6 @@
private:
void HandleNavigateToUrl(const base::ListValue* args);
-
- DISALLOW_COPY_AND_ASSIGN(NavigationHandler);
};
} // namespace webui
diff --git a/chrome/browser/ui/webui/identity_internals_ui.cc b/chrome/browser/ui/webui/identity_internals_ui.cc
index bde874d..959ca11 100644
--- a/chrome/browser/ui/webui/identity_internals_ui.cc
+++ b/chrome/browser/ui/webui/identity_internals_ui.cc
@@ -103,6 +103,11 @@
const std::string& callback_id,
Profile* profile,
IdentityInternalsUIMessageHandler* consumer);
+
+ IdentityInternalsTokenRevoker(const IdentityInternalsTokenRevoker&) = delete;
+ IdentityInternalsTokenRevoker& operator=(
+ const IdentityInternalsTokenRevoker&) = delete;
+
~IdentityInternalsTokenRevoker() override;
// Returns the access token being revoked.
@@ -126,8 +131,6 @@
const std::string callback_id_;
// An object that needs to be notified once the access token is revoked.
IdentityInternalsUIMessageHandler* consumer_; // weak.
-
- DISALLOW_COPY_AND_ASSIGN(IdentityInternalsTokenRevoker);
};
IdentityInternalsUIMessageHandler::IdentityInternalsUIMessageHandler() {}
diff --git a/chrome/browser/ui/webui/identity_internals_ui.h b/chrome/browser/ui/webui/identity_internals_ui.h
index a3e965c..5ff6841 100644
--- a/chrome/browser/ui/webui/identity_internals_ui.h
+++ b/chrome/browser/ui/webui/identity_internals_ui.h
@@ -13,10 +13,11 @@
: public content::WebUIController {
public:
explicit IdentityInternalsUI(content::WebUI* web_ui);
- ~IdentityInternalsUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(IdentityInternalsUI);
+ IdentityInternalsUI(const IdentityInternalsUI&) = delete;
+ IdentityInternalsUI& operator=(const IdentityInternalsUI&) = delete;
+
+ ~IdentityInternalsUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_IDENTITY_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/identity_internals_ui_browsertest.h b/chrome/browser/ui/webui/identity_internals_ui_browsertest.h
index a7f0dfc..f38635fde 100644
--- a/chrome/browser/ui/webui/identity_internals_ui_browsertest.h
+++ b/chrome/browser/ui/webui/identity_internals_ui_browsertest.h
@@ -14,6 +14,12 @@
class IdentityInternalsUIBrowserTest : public WebUIBrowserTest {
public:
IdentityInternalsUIBrowserTest();
+
+ IdentityInternalsUIBrowserTest(const IdentityInternalsUIBrowserTest&) =
+ delete;
+ IdentityInternalsUIBrowserTest& operator=(
+ const IdentityInternalsUIBrowserTest&) = delete;
+
~IdentityInternalsUIBrowserTest() override;
protected:
@@ -27,8 +33,6 @@
const std::string& account_id,
const std::vector<std::string>& scopes,
int time_to_live);
-
- DISALLOW_COPY_AND_ASSIGN(IdentityInternalsUIBrowserTest);
};
#endif // CHROME_BROWSER_UI_WEBUI_IDENTITY_INTERNALS_UI_BROWSERTEST_H_
diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
index 8140370..22f650d 100644
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -99,6 +99,10 @@
class InterstitialHTMLSource : public content::URLDataSource {
public:
InterstitialHTMLSource() = default;
+
+ InterstitialHTMLSource(const InterstitialHTMLSource&) = delete;
+ InterstitialHTMLSource& operator=(const InterstitialHTMLSource&) = delete;
+
~InterstitialHTMLSource() override = default;
// content::URLDataSource:
@@ -115,8 +119,6 @@
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
std::string GetSupervisedUserInterstitialHTML(const std::string& path);
#endif
-
- DISALLOW_COPY_AND_ASSIGN(InterstitialHTMLSource);
};
std::unique_ptr<SSLBlockingPage> CreateSslBlockingPage(
diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.h b/chrome/browser/ui/webui/interstitials/interstitial_ui.h
index c020ae5..4817f4c 100644
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.h
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.h
@@ -14,10 +14,10 @@
public:
explicit InterstitialUI(content::WebUI* web_ui);
- ~InterstitialUI() override;
+ InterstitialUI(const InterstitialUI&) = delete;
+ InterstitialUI& operator=(const InterstitialUI&) = delete;
- private:
- DISALLOW_COPY_AND_ASSIGN(InterstitialUI);
+ ~InterstitialUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_INTERSTITIALS_INTERSTITIAL_UI_H_
diff --git a/chrome/browser/ui/webui/invalidations/invalidations_message_handler.h b/chrome/browser/ui/webui/invalidations/invalidations_message_handler.h
index 9847011..e9e0f75 100644
--- a/chrome/browser/ui/webui/invalidations/invalidations_message_handler.h
+++ b/chrome/browser/ui/webui/invalidations/invalidations_message_handler.h
@@ -25,6 +25,11 @@
public invalidation::InvalidationLoggerObserver {
public:
InvalidationsMessageHandler();
+
+ InvalidationsMessageHandler(const InvalidationsMessageHandler&) = delete;
+ InvalidationsMessageHandler& operator=(const InvalidationsMessageHandler&) =
+ delete;
+
~InvalidationsMessageHandler() override;
// Implementation of InvalidationLoggerObserver.
@@ -60,8 +65,6 @@
invalidation::InvalidationLogger* logger_;
base::WeakPtrFactory<InvalidationsMessageHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(InvalidationsMessageHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_INVALIDATIONS_INVALIDATIONS_MESSAGE_HANDLER_H_
diff --git a/chrome/browser/ui/webui/invalidations/invalidations_ui.h b/chrome/browser/ui/webui/invalidations/invalidations_ui.h
index 83176b4..a0b34a6 100644
--- a/chrome/browser/ui/webui/invalidations/invalidations_ui.h
+++ b/chrome/browser/ui/webui/invalidations/invalidations_ui.h
@@ -12,10 +12,11 @@
class InvalidationsUI : public content::WebUIController {
public:
explicit InvalidationsUI(content::WebUI* web_ui);
- ~InvalidationsUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(InvalidationsUI);
+ InvalidationsUI(const InvalidationsUI&) = delete;
+ InvalidationsUI& operator=(const InvalidationsUI&) = delete;
+
+ ~InvalidationsUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_INVALIDATIONS_INVALIDATIONS_UI_H_
diff --git a/chrome/browser/ui/webui/local_state/local_state_ui.cc b/chrome/browser/ui/webui/local_state/local_state_ui.cc
index 2a967b7..51b0896 100644
--- a/chrome/browser/ui/webui/local_state/local_state_ui.cc
+++ b/chrome/browser/ui/webui/local_state/local_state_ui.cc
@@ -38,6 +38,10 @@
class LocalStateUIHandler : public content::WebUIMessageHandler {
public:
LocalStateUIHandler();
+
+ LocalStateUIHandler(const LocalStateUIHandler&) = delete;
+ LocalStateUIHandler& operator=(const LocalStateUIHandler&) = delete;
+
~LocalStateUIHandler() override;
// content::WebUIMessageHandler:
@@ -47,8 +51,6 @@
// Called from JS when the page has loaded. Serializes local state prefs and
// sends them to the page.
void HandleRequestJson(const base::ListValue* args);
-
- DISALLOW_COPY_AND_ASSIGN(LocalStateUIHandler);
};
LocalStateUIHandler::LocalStateUIHandler() {
diff --git a/chrome/browser/ui/webui/local_state/local_state_ui.h b/chrome/browser/ui/webui/local_state/local_state_ui.h
index d7a2fb3..dbabd70 100644
--- a/chrome/browser/ui/webui/local_state/local_state_ui.h
+++ b/chrome/browser/ui/webui/local_state/local_state_ui.h
@@ -29,10 +29,11 @@
class LocalStateUI : public content::WebUIController {
public:
explicit LocalStateUI(content::WebUI* web_ui);
- ~LocalStateUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(LocalStateUI);
+ LocalStateUI(const LocalStateUI&) = delete;
+ LocalStateUI& operator=(const LocalStateUI&) = delete;
+
+ ~LocalStateUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_LOCAL_STATE_LOCAL_STATE_UI_H_
diff --git a/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc b/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc
index 81140e29..66ed91d 100644
--- a/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc
+++ b/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc
@@ -34,6 +34,10 @@
class LogWebUIUrlTest : public InProcessBrowserTest {
public:
LogWebUIUrlTest() {}
+
+ LogWebUIUrlTest(const LogWebUIUrlTest&) = delete;
+ LogWebUIUrlTest& operator=(const LogWebUIUrlTest&) = delete;
+
~LogWebUIUrlTest() override {}
void RunTest(int title_ids, const GURL& url) {
@@ -49,8 +53,6 @@
private:
base::HistogramTester histogram_tester_;
-
- DISALLOW_COPY_AND_ASSIGN(LogWebUIUrlTest);
};
IN_PROC_BROWSER_TEST_F(LogWebUIUrlTest, TestExtensionsPage) {
diff --git a/chrome/browser/ui/webui/managed_ui_handler.h b/chrome/browser/ui/webui/managed_ui_handler.h
index 99cba63..f832a28 100644
--- a/chrome/browser/ui/webui/managed_ui_handler.h
+++ b/chrome/browser/ui/webui/managed_ui_handler.h
@@ -24,6 +24,10 @@
public policy::PolicyService::Observer {
public:
explicit ManagedUIHandler(Profile* profile);
+
+ ManagedUIHandler(const ManagedUIHandler&) = delete;
+ ManagedUIHandler& operator=(const ManagedUIHandler&) = delete;
+
~ManagedUIHandler() override;
// Sets load-time constants on |source|. This handles a flicker-free initial
@@ -78,8 +82,6 @@
// Name of the WebUIDataSource to update.
std::string source_name_;
-
- DISALLOW_COPY_AND_ASSIGN(ManagedUIHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_MANAGED_UI_HANDLER_H_
diff --git a/chrome/browser/ui/webui/management/management_ui.h b/chrome/browser/ui/webui/management/management_ui.h
index e4d7380..6c5812e 100644
--- a/chrome/browser/ui/webui/management/management_ui.h
+++ b/chrome/browser/ui/webui/management/management_ui.h
@@ -22,15 +22,16 @@
class ManagementUI : public content::WebUIController {
public:
explicit ManagementUI(content::WebUI* web_ui);
+
+ ManagementUI(const ManagementUI&) = delete;
+ ManagementUI& operator=(const ManagementUI&) = delete;
+
~ManagementUI() override;
static base::RefCountedMemory* GetFaviconResourceBytes(
ui::ResourceScaleFactor scale_factor);
static std::u16string GetManagementPageSubtitle(Profile* profile);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ManagementUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_MANAGEMENT_MANAGEMENT_UI_H_
diff --git a/chrome/browser/ui/webui/management/management_ui_browsertest.cc b/chrome/browser/ui/webui/management/management_ui_browsertest.cc
index 95b62959..0e6e0416 100644
--- a/chrome/browser/ui/webui/management/management_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/management/management_ui_browsertest.cc
@@ -25,6 +25,10 @@
class ManagementUITest : public InProcessBrowserTest {
public:
ManagementUITest() = default;
+
+ ManagementUITest(const ManagementUITest&) = delete;
+ ManagementUITest& operator=(const ManagementUITest&) = delete;
+
~ManagementUITest() override = default;
void SetUpInProcessBrowserTestFixture() override {
@@ -53,8 +57,6 @@
private:
testing::NiceMock<policy::MockConfigurationPolicyProvider> provider_;
policy::FakeBrowserDMTokenStorage fake_dm_token_storage_;
-
- DISALLOW_COPY_AND_ASSIGN(ManagementUITest);
};
#if !BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/ui/webui/management/management_ui_handler.h b/chrome/browser/ui/webui/management/management_ui_handler.h
index fdbe7f52..fdd8a3ba 100644
--- a/chrome/browser/ui/webui/management/management_ui_handler.h
+++ b/chrome/browser/ui/webui/management/management_ui_handler.h
@@ -111,6 +111,10 @@
public BitmapFetcherDelegate {
public:
ManagementUIHandler();
+
+ ManagementUIHandler(const ManagementUIHandler&) = delete;
+ ManagementUIHandler& operator=(const ManagementUIHandler&) = delete;
+
~ManagementUIHandler() override;
static void Initialize(content::WebUI* web_ui,
@@ -216,8 +220,6 @@
GURL logo_url_;
std::string fetched_image_;
std::unique_ptr<BitmapFetcher> icon_fetcher_;
-
- DISALLOW_COPY_AND_ASSIGN(ManagementUIHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_MANAGEMENT_MANAGEMENT_UI_HANDLER_H_
diff --git a/chrome/browser/ui/webui/media/media_engagement_ui.cc b/chrome/browser/ui/webui/media/media_engagement_ui.cc
index 5a0d1af..dd66822f 100644
--- a/chrome/browser/ui/webui/media/media_engagement_ui.cc
+++ b/chrome/browser/ui/webui/media/media_engagement_ui.cc
@@ -62,6 +62,11 @@
service_ = MediaEngagementService::Get(profile_);
}
+ MediaEngagementScoreDetailsProviderImpl(
+ const MediaEngagementScoreDetailsProviderImpl&) = delete;
+ MediaEngagementScoreDetailsProviderImpl& operator=(
+ const MediaEngagementScoreDetailsProviderImpl&) = delete;
+
~MediaEngagementScoreDetailsProviderImpl() override {}
// media::mojom::MediaEngagementScoreDetailsProvider overrides:
@@ -133,8 +138,6 @@
MediaEngagementService* service_;
mojo::Receiver<media::mojom::MediaEngagementScoreDetailsProvider> receiver_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaEngagementScoreDetailsProviderImpl);
};
} // namespace
diff --git a/chrome/browser/ui/webui/media/media_engagement_ui.h b/chrome/browser/ui/webui/media/media_engagement_ui.h
index f7824a6..09959ae 100644
--- a/chrome/browser/ui/webui/media/media_engagement_ui.h
+++ b/chrome/browser/ui/webui/media/media_engagement_ui.h
@@ -16,6 +16,10 @@
class MediaEngagementUI : public ui::MojoWebUIController {
public:
explicit MediaEngagementUI(content::WebUI* web_ui);
+
+ MediaEngagementUI(const MediaEngagementUI&) = delete;
+ MediaEngagementUI& operator=(const MediaEngagementUI&) = delete;
+
~MediaEngagementUI() override;
// Instantiates the implementor of the MediaEngagementScoreDetailsProvider
@@ -29,8 +33,6 @@
ui_handler_;
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(MediaEngagementUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_MEDIA_MEDIA_ENGAGEMENT_UI_H_
diff --git a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc
index c3047cf8..e7cade30 100644
--- a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc
+++ b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc
@@ -91,6 +91,10 @@
class WebRtcLogsDOMHandler final : public WebUIMessageHandler {
public:
explicit WebRtcLogsDOMHandler(Profile* profile);
+
+ WebRtcLogsDOMHandler(const WebRtcLogsDOMHandler&) = delete;
+ WebRtcLogsDOMHandler& operator=(const WebRtcLogsDOMHandler&) = delete;
+
~WebRtcLogsDOMHandler() override;
// WebUIMessageHandler implementation.
@@ -159,8 +163,6 @@
// Factory for creating weak references to instances of this class.
base::WeakPtrFactory<WebRtcLogsDOMHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WebRtcLogsDOMHandler);
};
WebRtcLogsDOMHandler::WebRtcLogsDOMHandler(Profile* profile)
diff --git a/chrome/browser/ui/webui/media_router/media_router_internals_ui.h b/chrome/browser/ui/webui/media_router/media_router_internals_ui.h
index 0fa42a3..6569424c 100644
--- a/chrome/browser/ui/webui/media_router/media_router_internals_ui.h
+++ b/chrome/browser/ui/webui/media_router/media_router_internals_ui.h
@@ -15,10 +15,11 @@
public:
// |web_ui| owns this object and is used to initialize the base class.
explicit MediaRouterInternalsUI(content::WebUI* web_ui);
- ~MediaRouterInternalsUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(MediaRouterInternalsUI);
+ MediaRouterInternalsUI(const MediaRouterInternalsUI&) = delete;
+ MediaRouterInternalsUI& operator=(const MediaRouterInternalsUI&) = delete;
+
+ ~MediaRouterInternalsUI() override;
};
} // namespace media_router
diff --git a/chrome/browser/ui/webui/memory_internals_ui.cc b/chrome/browser/ui/webui/memory_internals_ui.cc
index 4646500..c34c9b1 100644
--- a/chrome/browser/ui/webui/memory_internals_ui.cc
+++ b/chrome/browser/ui/webui/memory_internals_ui.cc
@@ -128,6 +128,11 @@
ui::SelectFileDialog::Listener {
public:
explicit MemoryInternalsDOMHandler(content::WebUI* web_ui);
+
+ MemoryInternalsDOMHandler(const MemoryInternalsDOMHandler&) = delete;
+ MemoryInternalsDOMHandler& operator=(const MemoryInternalsDOMHandler&) =
+ delete;
+
~MemoryInternalsDOMHandler() override;
// WebUIMessageHandler implementation.
@@ -169,8 +174,6 @@
content::WebUI* web_ui_; // The WebUI that owns us.
base::WeakPtrFactory<MemoryInternalsDOMHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MemoryInternalsDOMHandler);
};
MemoryInternalsDOMHandler::MemoryInternalsDOMHandler(content::WebUI* web_ui)
diff --git a/chrome/browser/ui/webui/memory_internals_ui.h b/chrome/browser/ui/webui/memory_internals_ui.h
index b83b79a..7a4793a 100644
--- a/chrome/browser/ui/webui/memory_internals_ui.h
+++ b/chrome/browser/ui/webui/memory_internals_ui.h
@@ -11,10 +11,11 @@
class MemoryInternalsUI : public content::WebUIController {
public:
explicit MemoryInternalsUI(content::WebUI* web_ui);
- ~MemoryInternalsUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(MemoryInternalsUI);
+ MemoryInternalsUI(const MemoryInternalsUI&) = delete;
+ MemoryInternalsUI& operator=(const MemoryInternalsUI&) = delete;
+
+ ~MemoryInternalsUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_MEMORY_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/metrics_handler.h b/chrome/browser/ui/webui/metrics_handler.h
index dd2d16f..60ac6837 100644
--- a/chrome/browser/ui/webui/metrics_handler.h
+++ b/chrome/browser/ui/webui/metrics_handler.h
@@ -26,6 +26,10 @@
class MetricsHandler : public content::WebUIMessageHandler {
public:
MetricsHandler();
+
+ MetricsHandler(const MetricsHandler&) = delete;
+ MetricsHandler& operator=(const MetricsHandler&) = delete;
+
~MetricsHandler() override;
// WebUIMessageHandler implementation.
@@ -58,9 +62,6 @@
// UmaHistogramMedium. Handles times up to 3 minutes. |args| contains the
// histogram name and a value in milliseconds.
void HandleRecordMediumTime(const base::ListValue* args);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MetricsHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_METRICS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc
index 1300096..3db10d6 100644
--- a/chrome/browser/ui/webui/nacl_ui.cc
+++ b/chrome/browser/ui/webui/nacl_ui.cc
@@ -83,6 +83,10 @@
class NaClDomHandler : public WebUIMessageHandler {
public:
NaClDomHandler();
+
+ NaClDomHandler(const NaClDomHandler&) = delete;
+ NaClDomHandler& operator=(const NaClDomHandler&) = delete;
+
~NaClDomHandler() override;
// WebUIMessageHandler implementation.
@@ -137,8 +141,6 @@
std::string pnacl_version_string_;
base::WeakPtrFactory<NaClDomHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NaClDomHandler);
};
NaClDomHandler::NaClDomHandler()
diff --git a/chrome/browser/ui/webui/net_export_ui.cc b/chrome/browser/ui/webui/net_export_ui.cc
index 096f4ca..7f2d0593 100644
--- a/chrome/browser/ui/webui/net_export_ui.cc
+++ b/chrome/browser/ui/webui/net_export_ui.cc
@@ -88,6 +88,10 @@
public net_log::NetExportFileWriter::StateObserver {
public:
NetExportMessageHandler();
+
+ NetExportMessageHandler(const NetExportMessageHandler&) = delete;
+ NetExportMessageHandler& operator=(const NetExportMessageHandler&) = delete;
+
~NetExportMessageHandler() override;
// WebUIMessageHandler implementation.
@@ -155,8 +159,6 @@
scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
base::WeakPtrFactory<NetExportMessageHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NetExportMessageHandler);
};
NetExportMessageHandler::NetExportMessageHandler()
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index e699ec3..a4706e74 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -55,6 +55,11 @@
class NetInternalsMessageHandler : public content::WebUIMessageHandler {
public:
explicit NetInternalsMessageHandler(content::WebUI* web_ui);
+
+ NetInternalsMessageHandler(const NetInternalsMessageHandler&) = delete;
+ NetInternalsMessageHandler& operator=(const NetInternalsMessageHandler&) =
+ delete;
+
~NetInternalsMessageHandler() override = default;
protected:
@@ -91,8 +96,6 @@
content::WebUI* web_ui_;
base::WeakPtrFactory<NetInternalsMessageHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NetInternalsMessageHandler);
};
NetInternalsMessageHandler::NetInternalsMessageHandler(content::WebUI* web_ui)
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h
index 002e033..ee4ec72 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h
@@ -13,6 +13,10 @@
class NetInternalsTest : public WebUIBrowserTest {
public:
NetInternalsTest();
+
+ NetInternalsTest(const NetInternalsTest&) = delete;
+ NetInternalsTest& operator=(const NetInternalsTest&) = delete;
+
~NetInternalsTest() override;
void SetUpOnMainThread() override;
@@ -31,8 +35,6 @@
// True if the test server has already been successfully started.
bool test_server_started_;
-
- DISALLOW_COPY_AND_ASSIGN(NetInternalsTest);
};
#endif // CHROME_BROWSER_UI_WEBUI_NET_INTERNALS_NET_INTERNALS_UI_BROWSERTEST_H_
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.h b/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.h
index 4d73df5..8d6cf92 100644
--- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.h
+++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.h
@@ -68,6 +68,10 @@
const ui::ThemeProvider* theme_provider,
content::WebContents* web_contents,
const base::Time& ntp_navigation_start_time);
+
+ NewTabPageHandler(const NewTabPageHandler&) = delete;
+ NewTabPageHandler& operator=(const NewTabPageHandler&) = delete;
+
~NewTabPageHandler() override;
// Histograms being recorded when a module is dismissed or restored.
@@ -206,8 +210,6 @@
mojo::Receiver<new_tab_page::mojom::PageHandler> receiver_;
base::WeakPtrFactory<NewTabPageHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NewTabPageHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_NEW_TAB_PAGE_NEW_TAB_PAGE_HANDLER_H_
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h
index 2ba8221d..a952cf4 100644
--- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h
+++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h
@@ -73,6 +73,10 @@
content::WebContentsObserver {
public:
explicit NewTabPageUI(content::WebUI* web_ui);
+
+ NewTabPageUI(const NewTabPageUI&) = delete;
+ NewTabPageUI& operator=(const NewTabPageUI&) = delete;
+
~NewTabPageUI() override;
static bool IsNewTabPageOrigin(const GURL& url);
@@ -234,8 +238,6 @@
base::WeakPtrFactory<NewTabPageUI> weak_ptr_factory_{this};
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(NewTabPageUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_NEW_TAB_PAGE_NEW_TAB_PAGE_UI_H_
diff --git a/chrome/browser/ui/webui/new_tab_page_third_party/new_tab_page_third_party_handler.h b/chrome/browser/ui/webui/new_tab_page_third_party/new_tab_page_third_party_handler.h
index 580b24292..e21ee115 100644
--- a/chrome/browser/ui/webui/new_tab_page_third_party/new_tab_page_third_party_handler.h
+++ b/chrome/browser/ui/webui/new_tab_page_third_party/new_tab_page_third_party_handler.h
@@ -33,6 +33,11 @@
mojo::PendingRemote<new_tab_page_third_party::mojom::Page> pending_page,
Profile* profile,
content::WebContents* web_contents);
+
+ NewTabPageThirdPartyHandler(const NewTabPageThirdPartyHandler&) = delete;
+ NewTabPageThirdPartyHandler& operator=(const NewTabPageThirdPartyHandler&) =
+ delete;
+
~NewTabPageThirdPartyHandler() override;
// new_tab_page_third_party::mojom::PageHandler:
@@ -56,8 +61,6 @@
mojo::Receiver<new_tab_page_third_party::mojom::PageHandler> receiver_;
base::WeakPtrFactory<NewTabPageThirdPartyHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NewTabPageThirdPartyHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_NEW_TAB_PAGE_THIRD_PARTY_NEW_TAB_PAGE_THIRD_PARTY_HANDLER_H_
diff --git a/chrome/browser/ui/webui/new_tab_page_third_party/new_tab_page_third_party_ui.h b/chrome/browser/ui/webui/new_tab_page_third_party/new_tab_page_third_party_ui.h
index 2a2fbd3..a4fdd89 100644
--- a/chrome/browser/ui/webui/new_tab_page_third_party/new_tab_page_third_party_ui.h
+++ b/chrome/browser/ui/webui/new_tab_page_third_party/new_tab_page_third_party_ui.h
@@ -33,6 +33,10 @@
public most_visited::mojom::MostVisitedPageHandlerFactory {
public:
explicit NewTabPageThirdPartyUI(content::WebUI* web_ui);
+
+ NewTabPageThirdPartyUI(const NewTabPageThirdPartyUI&) = delete;
+ NewTabPageThirdPartyUI& operator=(const NewTabPageThirdPartyUI&) = delete;
+
~NewTabPageThirdPartyUI() override;
static bool IsNewTabPageOrigin(const GURL& url);
@@ -76,8 +80,6 @@
base::Time navigation_start_time_;
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(NewTabPageThirdPartyUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_NEW_TAB_PAGE_THIRD_PARTY_NEW_TAB_PAGE_THIRD_PARTY_UI_H_
diff --git a/chrome/browser/ui/webui/ntp/app_icon_webui_handler.h b/chrome/browser/ui/webui/ntp/app_icon_webui_handler.h
index 18b05194..092eb7c 100644
--- a/chrome/browser/ui/webui/ntp/app_icon_webui_handler.h
+++ b/chrome/browser/ui/webui/ntp/app_icon_webui_handler.h
@@ -23,6 +23,10 @@
public ExtensionIconManager::Observer {
public:
AppIconWebUIHandler();
+
+ AppIconWebUIHandler(const AppIconWebUIHandler&) = delete;
+ AppIconWebUIHandler& operator=(const AppIconWebUIHandler&) = delete;
+
~AppIconWebUIHandler() override;
// WebUIMessageHandler
@@ -39,8 +43,6 @@
// Manage retrieval of icons from apps.
ExtensionIconManager extension_icon_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(AppIconWebUIHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_NTP_APP_ICON_WEBUI_HANDLER_H_
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h
index 67e4cf5..724ea48 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h
@@ -64,6 +64,10 @@
public:
AppLauncherHandler(extensions::ExtensionService* extension_service,
web_app::WebAppProvider* web_app_provider);
+
+ AppLauncherHandler(const AppLauncherHandler&) = delete;
+ AppLauncherHandler& operator=(const AppLauncherHandler&) = delete;
+
~AppLauncherHandler() override;
void CreateWebAppInfo(const web_app::AppId& app_id,
@@ -279,8 +283,6 @@
// Used for passing callbacks.
base::WeakPtrFactory<AppLauncherHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AppLauncherHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_NTP_APP_LAUNCHER_HANDLER_H_
diff --git a/chrome/browser/ui/webui/ntp/cookie_controls_handler.h b/chrome/browser/ui/webui/ntp/cookie_controls_handler.h
index c0d8519..0f5a5d0 100644
--- a/chrome/browser/ui/webui/ntp/cookie_controls_handler.h
+++ b/chrome/browser/ui/webui/ntp/cookie_controls_handler.h
@@ -19,6 +19,10 @@
public CookieControlsService::Observer {
public:
explicit CookieControlsHandler(Profile* profile);
+
+ CookieControlsHandler(const CookieControlsHandler&) = delete;
+ CookieControlsHandler& operator=(const CookieControlsHandler&) = delete;
+
~CookieControlsHandler() override;
// WebUIMessageHandler
@@ -40,8 +44,6 @@
void SendCookieControlsUIChanges();
CookieControlsService* service_;
-
- DISALLOW_COPY_AND_ASSIGN(CookieControlsHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_NTP_COOKIE_CONTROLS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/ntp/core_app_launcher_handler.h b/chrome/browser/ui/webui/ntp/core_app_launcher_handler.h
index bc6c779..0f42475 100644
--- a/chrome/browser/ui/webui/ntp/core_app_launcher_handler.h
+++ b/chrome/browser/ui/webui/ntp/core_app_launcher_handler.h
@@ -22,6 +22,10 @@
class CoreAppLauncherHandler : public content::WebUIMessageHandler {
public:
CoreAppLauncherHandler();
+
+ CoreAppLauncherHandler(const CoreAppLauncherHandler&) = delete;
+ CoreAppLauncherHandler& operator=(const CoreAppLauncherHandler&) = delete;
+
~CoreAppLauncherHandler() override;
// Register app launcher preferences.
@@ -41,8 +45,6 @@
// WebUIMessageHandler implementation.
void RegisterMessages() override;
-
- DISALLOW_COPY_AND_ASSIGN(CoreAppLauncherHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_NTP_CORE_APP_LAUNCHER_HANDLER_H_
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.h b/chrome/browser/ui/webui/ntp/new_tab_ui.h
index d8595c4..886adfb 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui.h
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui.h
@@ -27,6 +27,10 @@
class NewTabUI : public content::WebUIController {
public:
explicit NewTabUI(content::WebUI* web_ui);
+
+ NewTabUI(const NewTabUI&) = delete;
+ NewTabUI& operator=(const NewTabUI&) = delete;
+
~NewTabUI() override;
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
@@ -52,6 +56,10 @@
class NewTabHTMLSource : public content::URLDataSource {
public:
explicit NewTabHTMLSource(Profile* profile);
+
+ NewTabHTMLSource(const NewTabHTMLSource&) = delete;
+ NewTabHTMLSource& operator=(const NewTabHTMLSource&) = delete;
+
~NewTabHTMLSource() override;
// content::URLDataSource implementation.
@@ -68,15 +76,11 @@
private:
// Pointer back to the original profile.
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(NewTabHTMLSource);
};
void OnShowBookmarkBarChanged();
Profile* GetProfile() const;
-
- DISALLOW_COPY_AND_ASSIGN(NewTabUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_UI_H_
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h
index 56592f2d..a920df63 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h
@@ -60,6 +60,10 @@
};
explicit NTPResourceCache(Profile* profile);
+
+ NTPResourceCache(const NTPResourceCache&) = delete;
+ NTPResourceCache& operator=(const NTPResourceCache&) = delete;
+
~NTPResourceCache() override;
base::RefCountedMemory* GetNewTabGuestHTML();
@@ -120,8 +124,6 @@
theme_observation_{this};
std::unique_ptr<policy::PolicyChangeRegistrar> policy_change_registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(NTPResourceCache);
};
#endif // CHROME_BROWSER_UI_WEBUI_NTP_NTP_RESOURCE_CACHE_H_
diff --git a/chrome/browser/ui/webui/ntp_tiles_internals_ui.h b/chrome/browser/ui/webui/ntp_tiles_internals_ui.h
index 1d1a363..c1f834e 100644
--- a/chrome/browser/ui/webui/ntp_tiles_internals_ui.h
+++ b/chrome/browser/ui/webui/ntp_tiles_internals_ui.h
@@ -12,10 +12,11 @@
class NTPTilesInternalsUI : public content::WebUIController {
public:
explicit NTPTilesInternalsUI(content::WebUI* web_ui);
- ~NTPTilesInternalsUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(NTPTilesInternalsUI);
+ NTPTilesInternalsUI(const NTPTilesInternalsUI&) = delete;
+ NTPTilesInternalsUI& operator=(const NTPTilesInternalsUI&) = delete;
+
+ ~NTPTilesInternalsUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_NTP_TILES_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/offline/offline_internals_ui.h b/chrome/browser/ui/webui/offline/offline_internals_ui.h
index 0afcec2..192a452a 100644
--- a/chrome/browser/ui/webui/offline/offline_internals_ui.h
+++ b/chrome/browser/ui/webui/offline/offline_internals_ui.h
@@ -12,10 +12,11 @@
class OfflineInternalsUI : public content::WebUIController {
public:
explicit OfflineInternalsUI(content::WebUI* web_ui);
- ~OfflineInternalsUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(OfflineInternalsUI);
+ OfflineInternalsUI(const OfflineInternalsUI&) = delete;
+ OfflineInternalsUI& operator=(const OfflineInternalsUI&) = delete;
+
+ ~OfflineInternalsUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_OFFLINE_OFFLINE_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.h b/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.h
index 0ff5ed1..951ce3b 100644
--- a/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.h
+++ b/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.h
@@ -29,6 +29,12 @@
class OfflineInternalsUIMessageHandler : public content::WebUIMessageHandler {
public:
OfflineInternalsUIMessageHandler();
+
+ OfflineInternalsUIMessageHandler(const OfflineInternalsUIMessageHandler&) =
+ delete;
+ OfflineInternalsUIMessageHandler& operator=(
+ const OfflineInternalsUIMessageHandler&) = delete;
+
~OfflineInternalsUIMessageHandler() override;
// WebUIMessageHandler implementation.
@@ -133,8 +139,6 @@
// Factory for creating references in callbacks.
base::WeakPtrFactory<OfflineInternalsUIMessageHandler> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(OfflineInternalsUIMessageHandler);
};
} // namespace offline_internals
diff --git a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.h b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.h
index ff0766c..aaccb9b 100644
--- a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.h
+++ b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.h
@@ -37,6 +37,10 @@
// OmniboxPageHandler is deleted when the supplied pipe is destroyed.
OmniboxPageHandler(Profile* profile,
mojo::PendingReceiver<mojom::OmniboxPageHandler> receiver);
+
+ OmniboxPageHandler(const OmniboxPageHandler&) = delete;
+ OmniboxPageHandler& operator=(const OmniboxPageHandler&) = delete;
+
~OmniboxPageHandler() override;
// AutocompleteController::Observer overrides:
@@ -95,8 +99,6 @@
observation_{this};
base::WeakPtrFactory<OmniboxPageHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(OmniboxPageHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_OMNIBOX_OMNIBOX_PAGE_HANDLER_H_
diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui.h b/chrome/browser/ui/webui/omnibox/omnibox_ui.h
index bab7f36..8ce119e 100644
--- a/chrome/browser/ui/webui/omnibox/omnibox_ui.h
+++ b/chrome/browser/ui/webui/omnibox/omnibox_ui.h
@@ -21,6 +21,10 @@
class OmniboxUI : public ui::MojoWebUIController {
public:
explicit OmniboxUI(content::WebUI* contents);
+
+ OmniboxUI(const OmniboxUI&) = delete;
+ OmniboxUI& operator=(const OmniboxUI&) = delete;
+
~OmniboxUI() override;
// Instantiates the implementor of the mojom::OmniboxPageHandler mojo
@@ -40,8 +44,6 @@
#endif
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(OmniboxUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_OMNIBOX_OMNIBOX_UI_H_
diff --git a/chrome/browser/ui/webui/plural_string_handler.h b/chrome/browser/ui/webui/plural_string_handler.h
index 1b103af..7e30956 100644
--- a/chrome/browser/ui/webui/plural_string_handler.h
+++ b/chrome/browser/ui/webui/plural_string_handler.h
@@ -15,6 +15,10 @@
class PluralStringHandler : public content::WebUIMessageHandler {
public:
PluralStringHandler();
+
+ PluralStringHandler(const PluralStringHandler&) = delete;
+ PluralStringHandler& operator=(const PluralStringHandler&) = delete;
+
~PluralStringHandler() override;
void AddLocalizedString(const std::string& name, int id);
@@ -44,8 +48,6 @@
int count);
std::map<std::string, int> name_to_id_;
-
- DISALLOW_COPY_AND_ASSIGN(PluralStringHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_PLURAL_STRING_HANDLER_H_
diff --git a/chrome/browser/ui/webui/policy/policy_ui.h b/chrome/browser/ui/webui/policy/policy_ui.h
index eb4aa44..133881d 100644
--- a/chrome/browser/ui/webui/policy/policy_ui.h
+++ b/chrome/browser/ui/webui/policy/policy_ui.h
@@ -16,10 +16,11 @@
class PolicyUI : public content::WebUIController {
public:
explicit PolicyUI(content::WebUI* web_ui);
- ~PolicyUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(PolicyUI);
+ PolicyUI(const PolicyUI&) = delete;
+ PolicyUI& operator=(const PolicyUI&) = delete;
+
+ ~PolicyUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_POLICY_POLICY_UI_H_
diff --git a/chrome/browser/ui/webui/policy/policy_ui_browsertest.cc b/chrome/browser/ui/webui/policy/policy_ui_browsertest.cc
index e4ad5051..e423077c 100644
--- a/chrome/browser/ui/webui/policy/policy_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/policy/policy_ui_browsertest.cc
@@ -71,6 +71,10 @@
: registry_(profile->GetPolicySchemaRegistryService()->registry()),
policy_namespace_(policy_namespace) {}
+ PolicySchemaAvailableWaiter(const PolicySchemaAvailableWaiter&) = delete;
+ PolicySchemaAvailableWaiter& operator=(const PolicySchemaAvailableWaiter&) =
+ delete;
+
~PolicySchemaAvailableWaiter() override { registry_->RemoveObserver(this); }
// Starts waiting for a policy schema to be available for the
@@ -101,8 +105,6 @@
policy::SchemaRegistry* const registry_;
const policy::PolicyNamespace policy_namespace_;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(PolicySchemaAvailableWaiter);
};
std::vector<std::string> PopulateExpectedPolicy(
@@ -198,6 +200,10 @@
class PolicyUITest : public InProcessBrowserTest {
public:
PolicyUITest();
+
+ PolicyUITest(const PolicyUITest&) = delete;
+ PolicyUITest& operator=(const PolicyUITest&) = delete;
+
~PolicyUITest() override;
protected:
@@ -216,9 +222,6 @@
protected:
testing::NiceMock<policy::MockConfigurationPolicyProvider> provider_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PolicyUITest);
};
// An artificial SelectFileDialog that immediately returns the location of test
diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.cc b/chrome/browser/ui/webui/policy/policy_ui_handler.cc
index a57abd9b..6e74f25 100644
--- a/chrome/browser/ui/webui/policy/policy_ui_handler.cc
+++ b/chrome/browser/ui/webui/policy/policy_ui_handler.cc
@@ -210,6 +210,11 @@
public policy::CloudPolicyStore::Observer {
public:
explicit CloudPolicyCoreStatusProvider(policy::CloudPolicyCore* core);
+
+ CloudPolicyCoreStatusProvider(const CloudPolicyCoreStatusProvider&) = delete;
+ CloudPolicyCoreStatusProvider& operator=(
+ const CloudPolicyCoreStatusProvider&) = delete;
+
~CloudPolicyCoreStatusProvider() override;
// policy::CloudPolicyStore::Observer implementation.
@@ -220,9 +225,6 @@
// Policy status is read from the CloudPolicyClient, CloudPolicyStore and
// CloudPolicyRefreshScheduler hosted by this |core_|.
policy::CloudPolicyCore* core_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CloudPolicyCoreStatusProvider);
};
// A cloud policy status provider for user policy.
@@ -230,6 +232,11 @@
public:
explicit UserCloudPolicyStatusProvider(policy::CloudPolicyCore* core,
Profile* profile);
+
+ UserCloudPolicyStatusProvider(const UserCloudPolicyStatusProvider&) = delete;
+ UserCloudPolicyStatusProvider& operator=(
+ const UserCloudPolicyStatusProvider&) = delete;
+
~UserCloudPolicyStatusProvider() override;
// CloudPolicyCoreStatusProvider implementation.
@@ -237,7 +244,6 @@
private:
Profile* profile_;
- DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyStatusProvider);
};
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -247,6 +253,12 @@
public:
explicit UserCloudPolicyStatusProviderChromeOS(policy::CloudPolicyCore* core,
Profile* profile);
+
+ UserCloudPolicyStatusProviderChromeOS(
+ const UserCloudPolicyStatusProviderChromeOS&) = delete;
+ UserCloudPolicyStatusProviderChromeOS& operator=(
+ const UserCloudPolicyStatusProviderChromeOS&) = delete;
+
~UserCloudPolicyStatusProviderChromeOS() override;
// CloudPolicyCoreStatusProvider implementation.
@@ -254,7 +266,6 @@
private:
Profile* profile_;
- DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyStatusProviderChromeOS);
};
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -265,6 +276,12 @@
public:
explicit DeviceCloudPolicyStatusProviderChromeOS(
policy::BrowserPolicyConnectorAsh* connector);
+
+ DeviceCloudPolicyStatusProviderChromeOS(
+ const DeviceCloudPolicyStatusProviderChromeOS&) = delete;
+ DeviceCloudPolicyStatusProviderChromeOS& operator=(
+ const DeviceCloudPolicyStatusProviderChromeOS&) = delete;
+
~DeviceCloudPolicyStatusProviderChromeOS() override;
// CloudPolicyCoreStatusProvider implementation.
@@ -272,8 +289,6 @@
private:
std::string enterprise_domain_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceCloudPolicyStatusProviderChromeOS);
};
// A cloud policy status provider that reads policy status from the policy core
@@ -289,6 +304,12 @@
DeviceLocalAccountPolicyStatusProvider(
const std::string& user_id,
policy::DeviceLocalAccountPolicyService* service);
+
+ DeviceLocalAccountPolicyStatusProvider(
+ const DeviceLocalAccountPolicyStatusProvider&) = delete;
+ DeviceLocalAccountPolicyStatusProvider& operator=(
+ const DeviceLocalAccountPolicyStatusProvider&) = delete;
+
~DeviceLocalAccountPolicyStatusProvider() override;
// PolicyStatusProvider implementation.
@@ -301,8 +322,6 @@
private:
const std::string user_id_;
policy::DeviceLocalAccountPolicyService* service_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountPolicyStatusProvider);
};
// Provides status for Active Directory user policy.
@@ -314,6 +333,11 @@
policy::ActiveDirectoryPolicyManager* policy_manager,
Profile* profile);
+ UserActiveDirectoryPolicyStatusProvider(
+ const UserActiveDirectoryPolicyStatusProvider&) = delete;
+ UserActiveDirectoryPolicyStatusProvider& operator=(
+ const UserActiveDirectoryPolicyStatusProvider&) = delete;
+
~UserActiveDirectoryPolicyStatusProvider() override;
// PolicyStatusProvider implementation.
@@ -326,7 +350,6 @@
private:
policy::ActiveDirectoryPolicyManager* const policy_manager_; // not owned.
Profile* profile_;
- DISALLOW_COPY_AND_ASSIGN(UserActiveDirectoryPolicyStatusProvider);
};
// Provides status for Device Active Directory policy.
@@ -337,6 +360,11 @@
policy::ActiveDirectoryPolicyManager* policy_manager,
const std::string& enterprise_domain_manager);
+ DeviceActiveDirectoryPolicyStatusProvider(
+ const DeviceActiveDirectoryPolicyStatusProvider&) = delete;
+ DeviceActiveDirectoryPolicyStatusProvider& operator=(
+ const DeviceActiveDirectoryPolicyStatusProvider&) = delete;
+
~DeviceActiveDirectoryPolicyStatusProvider() override = default;
// PolicyStatusProvider implementation.
@@ -344,8 +372,6 @@
private:
std::string enterprise_domain_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(DeviceActiveDirectoryPolicyStatusProvider);
};
#endif
diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.h b/chrome/browser/ui/webui/policy/policy_ui_handler.h
index 328cfca..57f776bd 100644
--- a/chrome/browser/ui/webui/policy/policy_ui_handler.h
+++ b/chrome/browser/ui/webui/policy/policy_ui_handler.h
@@ -49,6 +49,10 @@
public ui::SelectFileDialog::Listener {
public:
PolicyUIHandler();
+
+ PolicyUIHandler(const PolicyUIHandler&) = delete;
+ PolicyUIHandler& operator=(const PolicyUIHandler&) = delete;
+
~PolicyUIHandler() override;
static void AddCommonLocalizedStringsToSource(
@@ -145,8 +149,6 @@
std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;
base::WeakPtrFactory<PolicyUIHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PolicyUIHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_POLICY_POLICY_UI_HANDLER_H_
diff --git a/chrome/browser/ui/webui/predictors/predictors_handler.h b/chrome/browser/ui/webui/predictors/predictors_handler.h
index 61d5d9a..650acc23 100644
--- a/chrome/browser/ui/webui/predictors/predictors_handler.h
+++ b/chrome/browser/ui/webui/predictors/predictors_handler.h
@@ -25,6 +25,10 @@
class PredictorsHandler : public content::WebUIMessageHandler {
public:
explicit PredictorsHandler(Profile* profile);
+
+ PredictorsHandler(const PredictorsHandler&) = delete;
+ PredictorsHandler& operator=(const PredictorsHandler&) = delete;
+
~PredictorsHandler() override;
// WebUIMessageHandler implementation.
@@ -46,8 +50,6 @@
predictors::AutocompleteActionPredictor* autocomplete_action_predictor_;
predictors::LoadingPredictor* loading_predictor_;
-
- DISALLOW_COPY_AND_ASSIGN(PredictorsHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_PREDICTORS_PREDICTORS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/prefs_internals_source.h b/chrome/browser/ui/webui/prefs_internals_source.h
index 5fc4058..cc81c27c 100644
--- a/chrome/browser/ui/webui/prefs_internals_source.h
+++ b/chrome/browser/ui/webui/prefs_internals_source.h
@@ -14,6 +14,10 @@
class PrefsInternalsSource : public content::URLDataSource {
public:
explicit PrefsInternalsSource(Profile* profile);
+
+ PrefsInternalsSource(const PrefsInternalsSource&) = delete;
+ PrefsInternalsSource& operator=(const PrefsInternalsSource&) = delete;
+
~PrefsInternalsSource() override;
// content::URLDataSource:
@@ -26,8 +30,6 @@
private:
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(PrefsInternalsSource);
};
#endif // CHROME_BROWSER_UI_WEBUI_PREFS_INTERNALS_SOURCE_H_
diff --git a/chrome/browser/ui/webui/print_preview/extension_printer_handler.h b/chrome/browser/ui/webui/print_preview/extension_printer_handler.h
index 9507d55d..cc2b0b0 100644
--- a/chrome/browser/ui/webui/print_preview/extension_printer_handler.h
+++ b/chrome/browser/ui/webui/print_preview/extension_printer_handler.h
@@ -43,6 +43,9 @@
explicit ExtensionPrinterHandler(Profile* profile);
+ ExtensionPrinterHandler(const ExtensionPrinterHandler&) = delete;
+ ExtensionPrinterHandler& operator=(const ExtensionPrinterHandler&) = delete;
+
~ExtensionPrinterHandler() override;
// PrinterHandler implementation:
@@ -102,8 +105,6 @@
int pending_enumeration_count_ = 0;
base::WeakPtrFactory<ExtensionPrinterHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionPrinterHandler);
};
} // namespace printing
diff --git a/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc b/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc
index 129a7d54..4c8c5f3 100644
--- a/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc
@@ -325,6 +325,10 @@
class FakePwgRasterConverter : public PwgRasterConverter {
public:
FakePwgRasterConverter() {}
+
+ FakePwgRasterConverter(const FakePwgRasterConverter&) = delete;
+ FakePwgRasterConverter& operator=(const FakePwgRasterConverter&) = delete;
+
~FakePwgRasterConverter() override = default;
// PwgRasterConverter implementation. It writes |data| to shared memory.
@@ -366,8 +370,6 @@
PdfRenderSettings conversion_settings_;
PwgRasterSettings bitmap_settings_;
bool fail_conversion_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(FakePwgRasterConverter);
};
// Information about received print requests.
@@ -382,6 +384,10 @@
class FakePrinterProviderAPI : public PrinterProviderAPI {
public:
FakePrinterProviderAPI() = default;
+
+ FakePrinterProviderAPI(const FakePrinterProviderAPI&) = delete;
+ FakePrinterProviderAPI& operator=(const FakePrinterProviderAPI&) = delete;
+
~FakePrinterProviderAPI() override = default;
void DispatchGetPrintersRequested(
@@ -480,8 +486,6 @@
base::queue<PrintRequestInfo> pending_print_requests_;
base::queue<PrinterProviderAPI::GetPrinterInfoCallback>
pending_usb_info_callbacks_;
-
- DISALLOW_COPY_AND_ASSIGN(FakePrinterProviderAPI);
};
std::unique_ptr<KeyedService> BuildTestingPrinterProviderAPI(
@@ -494,6 +498,11 @@
class ExtensionPrinterHandlerTest : public testing::Test {
public:
ExtensionPrinterHandlerTest() = default;
+
+ ExtensionPrinterHandlerTest(const ExtensionPrinterHandlerTest&) = delete;
+ ExtensionPrinterHandlerTest& operator=(const ExtensionPrinterHandlerTest&) =
+ delete;
+
~ExtensionPrinterHandlerTest() override = default;
void SetUp() override {
@@ -528,9 +537,6 @@
// Owned by |extension_printer_handler_|.
FakePwgRasterConverter* pwg_raster_converter_ = nullptr;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ExtensionPrinterHandlerTest);
};
TEST_F(ExtensionPrinterHandlerTest, GetPrinters) {
diff --git a/chrome/browser/ui/webui/print_preview/local_printer_handler_default.h b/chrome/browser/ui/webui/print_preview/local_printer_handler_default.h
index e577718..8a41119 100644
--- a/chrome/browser/ui/webui/print_preview/local_printer_handler_default.h
+++ b/chrome/browser/ui/webui/print_preview/local_printer_handler_default.h
@@ -29,6 +29,11 @@
public:
explicit LocalPrinterHandlerDefault(
content::WebContents* preview_web_contents);
+
+ LocalPrinterHandlerDefault(const LocalPrinterHandlerDefault&) = delete;
+ LocalPrinterHandlerDefault& operator=(const LocalPrinterHandlerDefault&) =
+ delete;
+
~LocalPrinterHandlerDefault() override;
// PrinterHandler implementation.
@@ -53,8 +58,6 @@
// TaskRunner for blocking tasks. Threading behavior is platform-specific.
scoped_refptr<base::TaskRunner> const task_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(LocalPrinterHandlerDefault);
};
} // namespace printing
diff --git a/chrome/browser/ui/webui/print_preview/pdf_printer_handler.h b/chrome/browser/ui/webui/print_preview/pdf_printer_handler.h
index e326047..b3a6eaa2 100644
--- a/chrome/browser/ui/webui/print_preview/pdf_printer_handler.h
+++ b/chrome/browser/ui/webui/print_preview/pdf_printer_handler.h
@@ -37,6 +37,9 @@
content::WebContents* preview_web_contents,
PrintPreviewStickySettings* sticky_settings);
+ PdfPrinterHandler(const PdfPrinterHandler&) = delete;
+ PdfPrinterHandler& operator=(const PdfPrinterHandler&) = delete;
+
~PdfPrinterHandler() override;
// PrinterHandler implementation
@@ -122,8 +125,6 @@
#endif
base::WeakPtrFactory<PdfPrinterHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PdfPrinterHandler);
};
} // namespace printing
diff --git a/chrome/browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc b/chrome/browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc
index b25ec6b..caa57e0 100644
--- a/chrome/browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc
@@ -95,6 +95,10 @@
class PdfPrinterHandlerWinTest : public BrowserWithTestWindowTest {
public:
PdfPrinterHandlerWinTest() {}
+
+ PdfPrinterHandlerWinTest(const PdfPrinterHandlerWinTest&) = delete;
+ PdfPrinterHandlerWinTest& operator=(const PdfPrinterHandlerWinTest&) = delete;
+
~PdfPrinterHandlerWinTest() override {}
void SetUp() override {
@@ -111,9 +115,6 @@
protected:
std::unique_ptr<FakePdfPrinterHandler> pdf_printer_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PdfPrinterHandlerWinTest);
};
TEST_F(PdfPrinterHandlerWinTest, TestSaveAsPdf) {
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index 424ee91..bdb4b9d 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -142,6 +142,12 @@
class PrintPreviewRequestIdMapWithLock {
public:
PrintPreviewRequestIdMapWithLock() {}
+
+ PrintPreviewRequestIdMapWithLock(const PrintPreviewRequestIdMapWithLock&) =
+ delete;
+ PrintPreviewRequestIdMapWithLock& operator=(
+ const PrintPreviewRequestIdMapWithLock&) = delete;
+
~PrintPreviewRequestIdMapWithLock() {}
// Gets the value for |preview_id|.
@@ -173,8 +179,6 @@
PrintPreviewRequestIdMap map_;
base::Lock lock_;
-
- DISALLOW_COPY_AND_ASSIGN(PrintPreviewRequestIdMapWithLock);
};
// Written to on the UI thread, read from any thread.
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.h b/chrome/browser/ui/webui/print_preview/print_preview_ui.h
index d1080e2..72a8db0e 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui.h
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.h
@@ -43,6 +43,9 @@
public:
explicit PrintPreviewUI(content::WebUI* web_ui);
+ PrintPreviewUI(const PrintPreviewUI&) = delete;
+ PrintPreviewUI& operator=(const PrintPreviewUI&) = delete;
+
~PrintPreviewUI() override;
mojo::PendingAssociatedRemote<mojom::PrintPreviewUI> BindPrintPreviewUI();
@@ -321,8 +324,6 @@
mojo::AssociatedReceiver<mojom::PrintPreviewUI> receiver_{this};
base::WeakPtrFactory<PrintPreviewUI> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PrintPreviewUI);
};
} // namespace printing
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
index d75d446..0c139483 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
@@ -49,6 +49,10 @@
class PrintPreviewUIUnitTest : public PrintPreviewTest {
public:
PrintPreviewUIUnitTest() {}
+
+ PrintPreviewUIUnitTest(const PrintPreviewUIUnitTest&) = delete;
+ PrintPreviewUIUnitTest& operator=(const PrintPreviewUIUnitTest&) = delete;
+
~PrintPreviewUIUnitTest() override {}
protected:
@@ -57,9 +61,6 @@
chrome::NewTab(browser());
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PrintPreviewUIUnitTest);
};
// Create/Get a preview tab for initiator.
diff --git a/chrome/browser/ui/webui/profile_info_watcher.h b/chrome/browser/ui/webui/profile_info_watcher.h
index 129ed86..5862b33 100644
--- a/chrome/browser/ui/webui/profile_info_watcher.h
+++ b/chrome/browser/ui/webui/profile_info_watcher.h
@@ -23,6 +23,10 @@
class ProfileInfoWatcher : public ProfileAttributesStorage::Observer {
public:
ProfileInfoWatcher(Profile* profile, base::RepeatingClosure callback);
+
+ ProfileInfoWatcher(const ProfileInfoWatcher&) = delete;
+ ProfileInfoWatcher& operator=(const ProfileInfoWatcher&) = delete;
+
~ProfileInfoWatcher() override;
// Gets the authenticated username (e.g. [email protected]) for |profile_|.
@@ -46,8 +50,6 @@
base::RepeatingClosure callback_;
BooleanPrefMember signin_allowed_pref_;
-
- DISALLOW_COPY_AND_ASSIGN(ProfileInfoWatcher);
};
#endif // CHROME_BROWSER_UI_WEBUI_PROFILE_INFO_WATCHER_H_
diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_handler.h b/chrome/browser/ui/webui/quota_internals/quota_internals_handler.h
index 2d155a6..44620a8 100644
--- a/chrome/browser/ui/webui/quota_internals/quota_internals_handler.h
+++ b/chrome/browser/ui/webui/quota_internals/quota_internals_handler.h
@@ -32,6 +32,10 @@
class QuotaInternalsHandler : public content::WebUIMessageHandler {
public:
QuotaInternalsHandler();
+
+ QuotaInternalsHandler(const QuotaInternalsHandler&) = delete;
+ QuotaInternalsHandler& operator=(const QuotaInternalsHandler&) = delete;
+
~QuotaInternalsHandler() override;
void RegisterMessages() override;
@@ -48,8 +52,6 @@
void OnTriggerStoragePressure(const base::ListValue*);
scoped_refptr<QuotaInternalsProxy> proxy_;
-
- DISALLOW_COPY_AND_ASSIGN(QuotaInternalsHandler);
};
} // namespace quota_internals
diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_ui.h b/chrome/browser/ui/webui/quota_internals/quota_internals_ui.h
index 9dc78b0..4106c87b 100644
--- a/chrome/browser/ui/webui/quota_internals/quota_internals_ui.h
+++ b/chrome/browser/ui/webui/quota_internals/quota_internals_ui.h
@@ -11,10 +11,11 @@
class QuotaInternalsUI : public content::WebUIController {
public:
explicit QuotaInternalsUI(content::WebUI* web_ui);
- ~QuotaInternalsUI() override {}
- private:
- DISALLOW_COPY_AND_ASSIGN(QuotaInternalsUI);
+ QuotaInternalsUI(const QuotaInternalsUI&) = delete;
+ QuotaInternalsUI& operator=(const QuotaInternalsUI&) = delete;
+
+ ~QuotaInternalsUI() override {}
};
#endif // CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/realbox/realbox_handler.h b/chrome/browser/ui/webui/realbox/realbox_handler.h
index c44c41f..4a533a5 100644
--- a/chrome/browser/ui/webui/realbox/realbox_handler.h
+++ b/chrome/browser/ui/webui/realbox/realbox_handler.h
@@ -43,6 +43,10 @@
mojo::PendingReceiver<realbox::mojom::PageHandler> pending_page_handler,
Profile* profile,
content::WebContents* web_contents);
+
+ RealboxHandler(const RealboxHandler&) = delete;
+ RealboxHandler& operator=(const RealboxHandler&) = delete;
+
~RealboxHandler() override;
// realbox::mojom::PageHandler:
@@ -87,8 +91,6 @@
mojo::Receiver<realbox::mojom::PageHandler> page_handler_;
base::WeakPtrFactory<RealboxHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(RealboxHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_REALBOX_REALBOX_HANDLER_H_
diff --git a/chrome/browser/ui/webui/reset_password/reset_password_ui.cc b/chrome/browser/ui/webui/reset_password/reset_password_ui.cc
index 22158f99..8430e79 100644
--- a/chrome/browser/ui/webui/reset_password/reset_password_ui.cc
+++ b/chrome/browser/ui/webui/reset_password/reset_password_ui.cc
@@ -55,6 +55,9 @@
DCHECK(web_contents);
}
+ ResetPasswordHandlerImpl(const ResetPasswordHandlerImpl&) = delete;
+ ResetPasswordHandlerImpl& operator=(const ResetPasswordHandlerImpl&) = delete;
+
~ResetPasswordHandlerImpl() override {}
// mojom::ResetPasswordHandler overrides:
@@ -77,8 +80,6 @@
private:
content::WebContents* web_contents_;
mojo::Receiver<mojom::ResetPasswordHandler> receiver_;
-
- DISALLOW_COPY_AND_ASSIGN(ResetPasswordHandlerImpl);
};
// Gets the reused password type from post data, or returns
diff --git a/chrome/browser/ui/webui/reset_password/reset_password_ui.h b/chrome/browser/ui/webui/reset_password/reset_password_ui.h
index 901a026b..e84d57b 100644
--- a/chrome/browser/ui/webui/reset_password/reset_password_ui.h
+++ b/chrome/browser/ui/webui/reset_password/reset_password_ui.h
@@ -22,6 +22,10 @@
class ResetPasswordUI : public ui::MojoWebUIController {
public:
explicit ResetPasswordUI(content::WebUI* web_ui);
+
+ ResetPasswordUI(const ResetPasswordUI&) = delete;
+ ResetPasswordUI& operator=(const ResetPasswordUI&) = delete;
+
~ResetPasswordUI() override;
// Instantiates the implementor of the mojom::ResetPasswordHandler mojo
@@ -36,8 +40,6 @@
const PasswordType password_type_;
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(ResetPasswordUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_RESET_PASSWORD_RESET_PASSWORD_UI_H_
diff --git a/chrome/browser/ui/webui/sandbox/sandbox_handler.h b/chrome/browser/ui/webui/sandbox/sandbox_handler.h
index 822044f..264782e 100644
--- a/chrome/browser/ui/webui/sandbox/sandbox_handler.h
+++ b/chrome/browser/ui/webui/sandbox/sandbox_handler.h
@@ -20,6 +20,10 @@
class SandboxHandler : public content::WebUIMessageHandler {
public:
SandboxHandler();
+
+ SandboxHandler(const SandboxHandler&) = delete;
+ SandboxHandler& operator=(const SandboxHandler&) = delete;
+
~SandboxHandler() override;
private:
@@ -43,8 +47,6 @@
// Always keep this the last member of this class to make sure it's the
// first thing to be destructed.
base::WeakPtrFactory<SandboxHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SandboxHandler);
};
} // namespace sandbox_handler
diff --git a/chrome/browser/ui/webui/settings/about_handler.h b/chrome/browser/ui/webui/settings/about_handler.h
index eb45490..6b41290 100644
--- a/chrome/browser/ui/webui/settings/about_handler.h
+++ b/chrome/browser/ui/webui/settings/about_handler.h
@@ -40,6 +40,10 @@
public UpgradeObserver {
public:
explicit AboutHandler(Profile* profile);
+
+ AboutHandler(const AboutHandler&) = delete;
+ AboutHandler& operator=(const AboutHandler&) = delete;
+
~AboutHandler() override;
// WebUIMessageHandler implementation.
@@ -194,8 +198,6 @@
// Used for callbacks.
base::WeakPtrFactory<AboutHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AboutHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/appearance_handler.h b/chrome/browser/ui/webui/settings/appearance_handler.h
index 535cd2b..52298081 100644
--- a/chrome/browser/ui/webui/settings/appearance_handler.h
+++ b/chrome/browser/ui/webui/settings/appearance_handler.h
@@ -27,6 +27,10 @@
class AppearanceHandler : public SettingsPageUIHandler {
public:
explicit AppearanceHandler(content::WebUI* webui);
+
+ AppearanceHandler(const AppearanceHandler&) = delete;
+ AppearanceHandler& operator=(const AppearanceHandler&) = delete;
+
~AppearanceHandler() override;
// SettingsPageUIHandler implementation.
@@ -48,8 +52,6 @@
Profile* profile_; // Weak pointer.
base::WeakPtrFactory<AppearanceHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AppearanceHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/browser_lifetime_handler.h b/chrome/browser/ui/webui/settings/browser_lifetime_handler.h
index 6ded5ac3..21afd85 100644
--- a/chrome/browser/ui/webui/settings/browser_lifetime_handler.h
+++ b/chrome/browser/ui/webui/settings/browser_lifetime_handler.h
@@ -18,6 +18,10 @@
class BrowserLifetimeHandler : public SettingsPageUIHandler {
public:
BrowserLifetimeHandler();
+
+ BrowserLifetimeHandler(const BrowserLifetimeHandler&) = delete;
+ BrowserLifetimeHandler& operator=(const BrowserLifetimeHandler&) = delete;
+
~BrowserLifetimeHandler() override;
// SettingsPageUIHandler:
@@ -32,8 +36,6 @@
void HandleSignOutAndRestart(const base::ListValue* /*args*/);
void HandleFactoryReset(const base::ListValue* /*args*/);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
- DISALLOW_COPY_AND_ASSIGN(BrowserLifetimeHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chrome_cleanup_handler_win.h b/chrome/browser/ui/webui/settings/chrome_cleanup_handler_win.h
index 8b790e28..33fa64a2 100644
--- a/chrome/browser/ui/webui/settings/chrome_cleanup_handler_win.h
+++ b/chrome/browser/ui/webui/settings/chrome_cleanup_handler_win.h
@@ -25,6 +25,10 @@
public safe_browsing::ChromeCleanerController::Observer {
public:
explicit ChromeCleanupHandler(Profile* profile);
+
+ ChromeCleanupHandler(const ChromeCleanupHandler&) = delete;
+ ChromeCleanupHandler& operator=(const ChromeCleanupHandler&) = delete;
+
~ChromeCleanupHandler() override;
// SettingsPageUIHandler implementation.
@@ -85,8 +89,6 @@
safe_browsing::ChromeCleanerController* controller_;
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeCleanupHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h b/chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h
index 0346146..9c42c49 100644
--- a/chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h
@@ -24,6 +24,10 @@
public speech::SodaInstaller::Observer {
public:
explicit AccessibilityHandler(Profile* profile);
+
+ AccessibilityHandler(const AccessibilityHandler&) = delete;
+ AccessibilityHandler& operator=(const AccessibilityHandler&) = delete;
+
~AccessibilityHandler() override;
// SettingsPageUIHandler implementation.
@@ -79,8 +83,6 @@
soda_observation_{this};
base::WeakPtrFactory<AccessibilityHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AccessibilityHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc b/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc
index e3b48b4..acfb390 100644
--- a/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc
@@ -87,6 +87,10 @@
class AccountBuilder {
public:
AccountBuilder() = default;
+
+ AccountBuilder(const AccountBuilder&) = delete;
+ AccountBuilder& operator=(const AccountBuilder&) = delete;
+
~AccountBuilder() = default;
void PopulateFrom(base::DictionaryValue account) {
@@ -158,7 +162,6 @@
private:
base::DictionaryValue account_;
- DISALLOW_COPY_AND_ASSIGN(AccountBuilder);
};
} // namespace
diff --git a/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.h b/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.h
index d7789b1..29f84a3 100644
--- a/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.h
@@ -34,6 +34,10 @@
account_manager::AccountManager* account_manager,
account_manager::AccountManagerFacade* account_manager_facade,
signin::IdentityManager* identity_manager);
+
+ AccountManagerUIHandler(const AccountManagerUIHandler&) = delete;
+ AccountManagerUIHandler& operator=(const AccountManagerUIHandler&) = delete;
+
~AccountManagerUIHandler() override;
// WebUIMessageHandler implementation.
@@ -124,8 +128,6 @@
identity_manager_observation_{this};
base::WeakPtrFactory<AccountManagerUIHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AccountManagerUIHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h b/chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h
index 070e280..3caefee 100644
--- a/chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h
@@ -32,6 +32,10 @@
public:
explicit AndroidAppsHandler(Profile* profile,
apps::AppServiceProxyChromeOs* app_service_proxy);
+
+ AndroidAppsHandler(const AndroidAppsHandler&) = delete;
+ AndroidAppsHandler& operator=(const AndroidAppsHandler&) = delete;
+
~AndroidAppsHandler() override;
// SettingsPageUIHandler
@@ -65,8 +69,6 @@
Profile* profile_; // unowned
apps::AppServiceProxyChromeOs* app_service_proxy_;
base::WeakPtrFactory<AndroidAppsHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AndroidAppsHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/app_management/app_management_page_handler_factory.h b/chrome/browser/ui/webui/settings/chromeos/app_management/app_management_page_handler_factory.h
index ca3d617..11f58719 100644
--- a/chrome/browser/ui/webui/settings/chromeos/app_management/app_management_page_handler_factory.h
+++ b/chrome/browser/ui/webui/settings/chromeos/app_management/app_management_page_handler_factory.h
@@ -21,6 +21,12 @@
: public app_management::mojom::PageHandlerFactory {
public:
explicit AppManagementPageHandlerFactory(Profile* profile);
+
+ AppManagementPageHandlerFactory(const AppManagementPageHandlerFactory&) =
+ delete;
+ AppManagementPageHandlerFactory& operator=(
+ const AppManagementPageHandlerFactory&) = delete;
+
~AppManagementPageHandlerFactory() override;
void Bind(mojo::PendingReceiver<app_management::mojom::PageHandlerFactory>
@@ -39,8 +45,6 @@
page_factory_receiver_{this};
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(AppManagementPageHandlerFactory);
};
#endif // CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_APP_MANAGEMENT_APP_MANAGEMENT_PAGE_HANDLER_FACTORY_H_
diff --git a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h
index db89522a..810f1099 100644
--- a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h
@@ -36,6 +36,10 @@
public CameraPresenceNotifier::Observer {
public:
ChangePictureHandler();
+
+ ChangePictureHandler(const ChangePictureHandler&) = delete;
+ ChangePictureHandler& operator=(const ChangePictureHandler&) = delete;
+
~ChangePictureHandler() override;
// The name of the histogram that records when a user changes a device image.
@@ -152,8 +156,6 @@
camera_observation_{this};
base::WeakPtrFactory<ChangePictureHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ChangePictureHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/crostini_handler.h b/chrome/browser/ui/webui/settings/chromeos/crostini_handler.h
index 4935da2..da98bd40 100644
--- a/chrome/browser/ui/webui/settings/chromeos/crostini_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/crostini_handler.h
@@ -35,6 +35,10 @@
public crostini::ContainerShutdownObserver {
public:
explicit CrostiniHandler(Profile* profile);
+
+ CrostiniHandler(const CrostiniHandler&) = delete;
+ CrostiniHandler& operator=(const CrostiniHandler&) = delete;
+
~CrostiniHandler() override;
// SettingsPageUIHandler
@@ -132,8 +136,6 @@
PrefChangeRegistrar pref_change_registrar_;
// weak_ptr_factory_ should always be last member.
base::WeakPtrFactory<CrostiniHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CrostiniHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h b/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h
index fbc358d07..6e412d8e3 100644
--- a/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h
@@ -54,6 +54,10 @@
CupsPrintersManager* printers_manager);
CupsPrintersHandler(Profile* profile, CupsPrintersManager* printers_manager);
+
+ CupsPrintersHandler(const CupsPrintersHandler&) = delete;
+ CupsPrintersHandler& operator=(const CupsPrintersHandler&) = delete;
+
~CupsPrintersHandler() override;
// SettingsPageUIHandler overrides:
@@ -262,8 +266,6 @@
printers_manager_observation_{this};
base::WeakPtrFactory<CupsPrintersHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CupsPrintersHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/date_time_handler.h b/chrome/browser/ui/webui/settings/chromeos/date_time_handler.h
index 4807502d..ececb2ba 100644
--- a/chrome/browser/ui/webui/settings/chromeos/date_time_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/date_time_handler.h
@@ -25,6 +25,10 @@
public SystemClockClient::Observer {
public:
DateTimeHandler();
+
+ DateTimeHandler(const DateTimeHandler&) = delete;
+ DateTimeHandler& operator=(const DateTimeHandler&) = delete;
+
~DateTimeHandler() override;
// SettingsPageUIHandler implementation.
@@ -65,8 +69,6 @@
base::ScopedObservation<SystemClockClient, SystemClockClient::Observer>
scoped_observation_{this};
base::WeakPtrFactory<DateTimeHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DateTimeHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/device_name_handler.h b/chrome/browser/ui/webui/settings/chromeos/device_name_handler.h
index 0d45b88..59cf11dea 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_name_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/device_name_handler.h
@@ -23,6 +23,10 @@
public chromeos::DeviceNameStore::Observer {
public:
DeviceNameHandler();
+
+ DeviceNameHandler(const DeviceNameHandler&) = delete;
+ DeviceNameHandler& operator=(const DeviceNameHandler&) = delete;
+
~DeviceNameHandler() override;
// SettingsPageUIHandler implementation.
@@ -49,8 +53,6 @@
base::ScopedObservation<chromeos::DeviceNameStore,
chromeos::DeviceNameStore::Observer>
observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DeviceNameHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h b/chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h
index 676b25c..1e71243de 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h
@@ -24,6 +24,10 @@
public chromeos::system::PointerDeviceObserver::Observer {
public:
PointerHandler();
+
+ PointerHandler(const PointerHandler&) = delete;
+ PointerHandler& operator=(const PointerHandler&) = delete;
+
~PointerHandler() override;
// SettingsPageUIHandler implementation.
@@ -42,8 +46,6 @@
std::unique_ptr<chromeos::system::PointerDeviceObserver>
pointer_device_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(PointerHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/device_power_handler.h b/chrome/browser/ui/webui/settings/chromeos/device_power_handler.h
index de7ceae6..c4a5f81b 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_power_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/device_power_handler.h
@@ -58,6 +58,10 @@
class TestAPI {
public:
explicit TestAPI(PowerHandler* handler);
+
+ TestAPI(const TestAPI&) = delete;
+ TestAPI& operator=(const TestAPI&) = delete;
+
~TestAPI();
void RequestPowerManagementSettings();
@@ -68,8 +72,6 @@
private:
PowerHandler* handler_; // Not owned.
-
- DISALLOW_COPY_AND_ASSIGN(TestAPI);
};
explicit PowerHandler(PrefService* prefs);
diff --git a/chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h b/chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h
index 0daf7333..848116f 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h
@@ -48,6 +48,10 @@
public calculator::SizeCalculator::Observer {
public:
StorageHandler(Profile* profile, content::WebUIDataSource* html_source);
+
+ StorageHandler(const StorageHandler&) = delete;
+ StorageHandler& operator=(const StorageHandler&) = delete;
+
~StorageHandler() override;
// ::settings::SettingsPageUIHandler:
@@ -132,8 +136,6 @@
const re2::RE2 special_volume_path_pattern_;
base::WeakPtrFactory<StorageHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(StorageHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/device_storage_handler_unittest.cc b/chrome/browser/ui/webui/settings/chromeos/device_storage_handler_unittest.cc
index 245a8a518..4758d09f 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_storage_handler_unittest.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/device_storage_handler_unittest.cc
@@ -53,6 +53,10 @@
class StorageHandlerTest : public testing::Test {
public:
StorageHandlerTest() = default;
+
+ StorageHandlerTest(const StorageHandlerTest&) = delete;
+ StorageHandlerTest& operator=(const StorageHandlerTest&) = delete;
+
~StorageHandlerTest() override = default;
void SetUp() override {
@@ -207,7 +211,6 @@
private:
std::unique_ptr<arc::ArcServiceManager> arc_service_manager_;
std::unique_ptr<arc::ArcSessionManager> arc_session_manager_;
- DISALLOW_COPY_AND_ASSIGN(StorageHandlerTest);
};
TEST_F(StorageHandlerTest, RoundByteSize) {
diff --git a/chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.h b/chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.h
index 8e1ca21a..04bb1d9 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.h
@@ -28,6 +28,10 @@
public ui::InputDeviceEventObserver {
public:
StylusHandler();
+
+ StylusHandler(const StylusHandler&) = delete;
+ StylusHandler& operator=(const StylusHandler&) = delete;
+
~StylusHandler() override;
// SettingsPageUIHandler implementation.
@@ -64,8 +68,6 @@
note_observation_{this};
base::ScopedObservation<ui::DeviceDataManager, ui::InputDeviceEventObserver>
input_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(StylusHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.h b/chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.h
index b18be765..e8a49ad 100644
--- a/chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.h
@@ -29,6 +29,10 @@
public session_manager::SessionManagerObserver {
public:
explicit FingerprintHandler(Profile* profile);
+
+ FingerprintHandler(const FingerprintHandler&) = delete;
+ FingerprintHandler& operator=(const FingerprintHandler&) = delete;
+
~FingerprintHandler() override;
// SettingsPageUIHandler overrides:
@@ -84,8 +88,6 @@
session_observation_{this};
base::WeakPtrFactory<FingerprintHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FingerprintHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.h b/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.h
index dc4afb8..b9f9921f 100644
--- a/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.h
@@ -17,6 +17,10 @@
chromeos::CrasAudioHandler::AudioObserver {
public:
GoogleAssistantHandler();
+
+ GoogleAssistantHandler(const GoogleAssistantHandler&) = delete;
+ GoogleAssistantHandler& operator=(const GoogleAssistantHandler&) = delete;
+
~GoogleAssistantHandler() override;
void RegisterMessages() override;
@@ -39,8 +43,6 @@
bool pending_hotword_update_ = false;
base::WeakPtrFactory<GoogleAssistantHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(GoogleAssistantHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/internet_handler.h b/chrome/browser/ui/webui/settings/chromeos/internet_handler.h
index 50c1561..45cf0db 100644
--- a/chrome/browser/ui/webui/settings/chromeos/internet_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/internet_handler.h
@@ -28,6 +28,10 @@
public ::settings::SettingsPageUIHandler {
public:
explicit InternetHandler(Profile* profile);
+
+ InternetHandler(const InternetHandler&) = delete;
+ InternetHandler& operator=(const InternetHandler&) = delete;
+
~InternetHandler() override;
// SettingsPageUIHandler implementation.
@@ -68,8 +72,6 @@
chromeos::tether::GmsCoreNotificationsStateTracker*
gms_core_notifications_state_tracker_;
-
- DISALLOW_COPY_AND_ASSIGN(InternetHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.h b/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.h
index 60301d4..0032898 100644
--- a/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.h
@@ -41,6 +41,9 @@
content::WebUIDataSource* html_source,
KerberosCredentialsManager* kerberos_credentials_manager);
+ KerberosAccountsHandler(const KerberosAccountsHandler&) = delete;
+ KerberosAccountsHandler& operator=(const KerberosAccountsHandler&) = delete;
+
~KerberosAccountsHandler() override;
// WebUIMessageHandler:
@@ -100,8 +103,6 @@
KerberosCredentialsManager* kerberos_credentials_manager_;
base::WeakPtrFactory<KerberosAccountsHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(KerberosAccountsHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/multidevice_handler.h b/chrome/browser/ui/webui/settings/chromeos/multidevice_handler.h
index 0958367..3bbdd67a 100644
--- a/chrome/browser/ui/webui/settings/chromeos/multidevice_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/multidevice_handler.h
@@ -48,6 +48,10 @@
multidevice_setup::AndroidSmsPairingStateTracker*
android_sms_pairing_state_tracker,
android_sms::AndroidSmsAppManager* android_sms_app_manager);
+
+ MultideviceHandler(const MultideviceHandler&) = delete;
+ MultideviceHandler& operator=(const MultideviceHandler&) = delete;
+
~MultideviceHandler() override;
protected:
@@ -156,8 +160,6 @@
// Used to cancel callbacks when JavaScript becomes disallowed.
base::WeakPtrFactory<MultideviceHandler> callback_weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MultideviceHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/os_settings_ui.h b/chrome/browser/ui/webui/settings/chromeos/os_settings_ui.h
index 368c2de..c21b89d 100644
--- a/chrome/browser/ui/webui/settings/chromeos/os_settings_ui.h
+++ b/chrome/browser/ui/webui/settings/chromeos/os_settings_ui.h
@@ -41,6 +41,10 @@
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
explicit OSSettingsUI(content::WebUI* web_ui);
+
+ OSSettingsUI(const OSSettingsUI&) = delete;
+ OSSettingsUI& operator=(const OSSettingsUI&) = delete;
+
~OSSettingsUI() override;
// Instantiates implementor of the mojom::CellularSetup mojo interface
@@ -108,8 +112,6 @@
app_management_page_handler_factory_;
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(OSSettingsUI);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.h b/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.h
index cb498d3..94da0a9 100644
--- a/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.h
@@ -17,6 +17,10 @@
class ParentalControlsHandler : public ::settings::SettingsPageUIHandler {
public:
explicit ParentalControlsHandler(Profile* profile);
+
+ ParentalControlsHandler(const ParentalControlsHandler&) = delete;
+ ParentalControlsHandler& operator=(const ParentalControlsHandler&) = delete;
+
~ParentalControlsHandler() override;
protected:
@@ -33,8 +37,6 @@
void HandleLaunchFamilyLinkSettings(const base::ListValue* args);
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(ParentalControlsHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/plugin_vm_handler.h b/chrome/browser/ui/webui/settings/chromeos/plugin_vm_handler.h
index ab1715e..93ae19c 100644
--- a/chrome/browser/ui/webui/settings/chromeos/plugin_vm_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/plugin_vm_handler.h
@@ -16,6 +16,10 @@
class PluginVmHandler : public ::settings::SettingsPageUIHandler {
public:
explicit PluginVmHandler(Profile* profile);
+
+ PluginVmHandler(const PluginVmHandler&) = delete;
+ PluginVmHandler& operator=(const PluginVmHandler&) = delete;
+
~PluginVmHandler() override;
// SettingsPageUIHandler
@@ -33,8 +37,6 @@
Profile* profile_;
// weak_ptr_factory_ should always be last member.
base::WeakPtrFactory<PluginVmHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PluginVmHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/tts_handler.h b/chrome/browser/ui/webui/settings/chromeos/tts_handler.h
index 09084c53..2ec989d 100644
--- a/chrome/browser/ui/webui/settings/chromeos/tts_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/tts_handler.h
@@ -17,6 +17,10 @@
public content::UtteranceEventDelegate {
public:
TtsHandler();
+
+ TtsHandler(const TtsHandler&) = delete;
+ TtsHandler& operator=(const TtsHandler&) = delete;
+
~TtsHandler() override;
void HandleGetAllTtsVoiceData(const base::ListValue* args);
@@ -46,8 +50,6 @@
void RemoveTtsControllerDelegates();
base::WeakPtrFactory<TtsHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TtsHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/chromeos/wallpaper_handler.h b/chrome/browser/ui/webui/settings/chromeos/wallpaper_handler.h
index f6bd13d6..e13d88fe 100644
--- a/chrome/browser/ui/webui/settings/chromeos/wallpaper_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/wallpaper_handler.h
@@ -19,6 +19,10 @@
class WallpaperHandler : public ::settings::SettingsPageUIHandler {
public:
WallpaperHandler();
+
+ WallpaperHandler(const WallpaperHandler&) = delete;
+ WallpaperHandler& operator=(const WallpaperHandler&) = delete;
+
~WallpaperHandler() override;
// SettingsPageUIHandler implementation.
@@ -38,8 +42,6 @@
// Helper function to resolve the Javascript callback.
void ResolveCallback(const base::Value& callback_id, bool result);
-
- DISALLOW_COPY_AND_ASSIGN(WallpaperHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/custom_home_pages_table_model.h b/chrome/browser/ui/webui/settings/custom_home_pages_table_model.h
index a4d0bf03..2f6aab60 100644
--- a/chrome/browser/ui/webui/settings/custom_home_pages_table_model.h
+++ b/chrome/browser/ui/webui/settings/custom_home_pages_table_model.h
@@ -32,6 +32,11 @@
class CustomHomePagesTableModel : public ui::TableModel {
public:
explicit CustomHomePagesTableModel(Profile* profile);
+
+ CustomHomePagesTableModel(const CustomHomePagesTableModel&) = delete;
+ CustomHomePagesTableModel& operator=(const CustomHomePagesTableModel&) =
+ delete;
+
~CustomHomePagesTableModel() override;
// Sets the set of urls that this model contains.
@@ -112,8 +117,6 @@
// Used to keep track of when it's time to update the observer when loading
// multiple titles.
int num_outstanding_title_lookups_;
-
- DISALLOW_COPY_AND_ASSIGN(CustomHomePagesTableModel);
};
#endif // CHROME_BROWSER_UI_WEBUI_SETTINGS_CUSTOM_HOME_PAGES_TABLE_MODEL_H_
diff --git a/chrome/browser/ui/webui/settings/downloads_handler.h b/chrome/browser/ui/webui/settings/downloads_handler.h
index ae3dd3b..a6e7bbf 100644
--- a/chrome/browser/ui/webui/settings/downloads_handler.h
+++ b/chrome/browser/ui/webui/settings/downloads_handler.h
@@ -21,6 +21,10 @@
public ui::SelectFileDialog::Listener {
public:
explicit DownloadsHandler(Profile* profile);
+
+ DownloadsHandler(const DownloadsHandler&) = delete;
+ DownloadsHandler& operator=(const DownloadsHandler&) = delete;
+
~DownloadsHandler() override;
// SettingsPageUIHandler implementation.
@@ -80,8 +84,6 @@
scoped_refptr<ui::SelectFileDialog> select_folder_dialog_;
base::WeakPtrFactory<DownloadsHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DownloadsHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/extension_control_handler.h b/chrome/browser/ui/webui/settings/extension_control_handler.h
index b948e79..68a8ede 100644
--- a/chrome/browser/ui/webui/settings/extension_control_handler.h
+++ b/chrome/browser/ui/webui/settings/extension_control_handler.h
@@ -17,6 +17,10 @@
class ExtensionControlHandler : public SettingsPageUIHandler {
public:
ExtensionControlHandler();
+
+ ExtensionControlHandler(const ExtensionControlHandler&) = delete;
+ ExtensionControlHandler& operator=(const ExtensionControlHandler&) = delete;
+
~ExtensionControlHandler() override;
// SettingsPageUIHandler:
@@ -28,8 +32,6 @@
// Handler for the "disableExtension" message. Extension ID is passed as the
// single string argument.
void HandleDisableExtension(const base::ListValue* args);
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionControlHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/font_handler.h b/chrome/browser/ui/webui/settings/font_handler.h
index 96669a5..9e311a6 100644
--- a/chrome/browser/ui/webui/settings/font_handler.h
+++ b/chrome/browser/ui/webui/settings/font_handler.h
@@ -24,6 +24,10 @@
class FontHandler : public SettingsPageUIHandler {
public:
explicit FontHandler(Profile* profile);
+
+ FontHandler(const FontHandler&) = delete;
+ FontHandler& operator=(const FontHandler&) = delete;
+
~FontHandler() override;
// SettingsPageUIHandler implementation.
@@ -40,8 +44,6 @@
std::unique_ptr<base::ListValue> list);
base::WeakPtrFactory<FontHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FontHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/import_data_handler.h b/chrome/browser/ui/webui/settings/import_data_handler.h
index d9f1f500..f11411c 100644
--- a/chrome/browser/ui/webui/settings/import_data_handler.h
+++ b/chrome/browser/ui/webui/settings/import_data_handler.h
@@ -27,6 +27,10 @@
public ui::SelectFileDialog::Listener {
public:
ImportDataHandler();
+
+ ImportDataHandler(const ImportDataHandler&) = delete;
+ ImportDataHandler& operator=(const ImportDataHandler&) = delete;
+
~ImportDataHandler() override;
// SettingsPageUIHandler
@@ -74,8 +78,6 @@
bool importer_list_loaded_{false};
scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
-
- DISALLOW_COPY_AND_ASSIGN(ImportDataHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/incompatible_applications_handler_win.h b/chrome/browser/ui/webui/settings/incompatible_applications_handler_win.h
index 630c2f9f..d5bfdcbf 100644
--- a/chrome/browser/ui/webui/settings/incompatible_applications_handler_win.h
+++ b/chrome/browser/ui/webui/settings/incompatible_applications_handler_win.h
@@ -24,6 +24,12 @@
class IncompatibleApplicationsHandler : public SettingsPageUIHandler {
public:
IncompatibleApplicationsHandler();
+
+ IncompatibleApplicationsHandler(const IncompatibleApplicationsHandler&) =
+ delete;
+ IncompatibleApplicationsHandler& operator=(
+ const IncompatibleApplicationsHandler&) = delete;
+
~IncompatibleApplicationsHandler() override;
// SettingsPageUIHandler:
@@ -51,8 +57,6 @@
std::map<InstalledApplications::ApplicationInfo,
std::unique_ptr<RegistryKeyWatcher>>
registry_key_watchers_;
-
- DISALLOW_COPY_AND_ASSIGN(IncompatibleApplicationsHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/languages_handler.h b/chrome/browser/ui/webui/settings/languages_handler.h
index 0e17ea9..ae453fd 100644
--- a/chrome/browser/ui/webui/settings/languages_handler.h
+++ b/chrome/browser/ui/webui/settings/languages_handler.h
@@ -27,6 +27,10 @@
#else
LanguagesHandler();
#endif
+
+ LanguagesHandler(const LanguagesHandler&) = delete;
+ LanguagesHandler& operator=(const LanguagesHandler&) = delete;
+
~LanguagesHandler() override;
// SettingsPageUIHandler implementation.
@@ -47,8 +51,6 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
Profile* profile_; // Weak pointer.
#endif
-
- DISALLOW_COPY_AND_ASSIGN(LanguagesHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/metrics_reporting_handler.h b/chrome/browser/ui/webui/settings/metrics_reporting_handler.h
index d7bb54f..c6d17ae 100644
--- a/chrome/browser/ui/webui/settings/metrics_reporting_handler.h
+++ b/chrome/browser/ui/webui/settings/metrics_reporting_handler.h
@@ -31,6 +31,10 @@
class MetricsReportingHandler : public SettingsPageUIHandler {
public:
MetricsReportingHandler();
+
+ MetricsReportingHandler(const MetricsReportingHandler&) = delete;
+ MetricsReportingHandler& operator=(const MetricsReportingHandler&) = delete;
+
~MetricsReportingHandler() override;
// SettingsPageUIHandler:
@@ -75,8 +79,6 @@
// The metrics reporting interface in ash-chrome.
mojo::Remote<crosapi::mojom::MetricsReporting> metrics_reporting_remote_;
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
-
- DISALLOW_COPY_AND_ASSIGN(MetricsReportingHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/native_certificates_handler.h b/chrome/browser/ui/webui/settings/native_certificates_handler.h
index 3264392..e8b392f 100644
--- a/chrome/browser/ui/webui/settings/native_certificates_handler.h
+++ b/chrome/browser/ui/webui/settings/native_certificates_handler.h
@@ -13,6 +13,11 @@
class NativeCertificatesHandler : public SettingsPageUIHandler {
public:
NativeCertificatesHandler();
+
+ NativeCertificatesHandler(const NativeCertificatesHandler&) = delete;
+ NativeCertificatesHandler& operator=(const NativeCertificatesHandler&) =
+ delete;
+
~NativeCertificatesHandler() override;
// SettingsPageUIHandler implementation.
@@ -23,9 +28,6 @@
// Callback for the "showManageSSLCertificates" message. This will invoke
// an appropriate certificate management action based on the platform.
void HandleShowManageSSLCertificates(const base::ListValue* args);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NativeCertificatesHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/on_startup_handler.h b/chrome/browser/ui/webui/settings/on_startup_handler.h
index a9952c2..05540e6 100644
--- a/chrome/browser/ui/webui/settings/on_startup_handler.h
+++ b/chrome/browser/ui/webui/settings/on_startup_handler.h
@@ -28,6 +28,10 @@
static const char kOnStartupNtpExtensionEventName[];
explicit OnStartupHandler(Profile* profile);
+
+ OnStartupHandler(const OnStartupHandler&) = delete;
+ OnStartupHandler& operator=(const OnStartupHandler&) = delete;
+
~OnStartupHandler() override;
// SettingsPageUIHandler:
@@ -65,8 +69,6 @@
extension_registry_observation_{this};
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(OnStartupHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/people_handler.h b/chrome/browser/ui/webui/settings/people_handler.h
index 6999ae5..5bf90c7 100644
--- a/chrome/browser/ui/webui/settings/people_handler.h
+++ b/chrome/browser/ui/webui/settings/people_handler.h
@@ -53,6 +53,10 @@
static const char kPassphraseFailedPageStatus[];
explicit PeopleHandler(Profile* profile);
+
+ PeopleHandler(const PeopleHandler&) = delete;
+ PeopleHandler& operator=(const PeopleHandler&) = delete;
+
~PeopleHandler() override;
protected:
@@ -234,8 +238,6 @@
sync_service_observation_{this};
base::WeakPtrFactory<PeopleHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PeopleHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/people_handler_unittest.cc b/chrome/browser/ui/webui/settings/people_handler_unittest.cc
index 854db35c..8b595f0 100644
--- a/chrome/browser/ui/webui/settings/people_handler_unittest.cc
+++ b/chrome/browser/ui/webui/settings/people_handler_unittest.cc
@@ -202,6 +202,10 @@
class PeopleHandlerTest : public ChromeRenderViewHostTestHarness {
public:
PeopleHandlerTest() = default;
+
+ PeopleHandlerTest(const PeopleHandlerTest&) = delete;
+ PeopleHandlerTest& operator=(const PeopleHandlerTest&) = delete;
+
~PeopleHandlerTest() override = default;
void SetUp() override {
@@ -368,8 +372,6 @@
TestWebUIProvider test_provider_;
std::unique_ptr<TestChromeWebUIControllerFactory> test_factory_;
std::unique_ptr<TestingPeopleHandler> handler_;
-
- DISALLOW_COPY_AND_ASSIGN(PeopleHandlerTest);
};
#if !BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/ui/webui/settings/profile_info_handler.h b/chrome/browser/ui/webui/settings/profile_info_handler.h
index 06c70a4..5b3563df 100644
--- a/chrome/browser/ui/webui/settings/profile_info_handler.h
+++ b/chrome/browser/ui/webui/settings/profile_info_handler.h
@@ -37,6 +37,10 @@
static const char kProfileStatsCountReadyEventName[];
explicit ProfileInfoHandler(Profile* profile);
+
+ ProfileInfoHandler(const ProfileInfoHandler&) = delete;
+ ProfileInfoHandler& operator=(const ProfileInfoHandler&) = delete;
+
~ProfileInfoHandler() override;
// SettingsPageUIHandler implementation.
@@ -87,8 +91,6 @@
// Used to cancel callbacks when JavaScript becomes disallowed.
base::WeakPtrFactory<ProfileInfoHandler> callback_weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ProfileInfoHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/protocol_handlers_handler.h b/chrome/browser/ui/webui/settings/protocol_handlers_handler.h
index f11fd346fb..a57ca0cf 100644
--- a/chrome/browser/ui/webui/settings/protocol_handlers_handler.h
+++ b/chrome/browser/ui/webui/settings/protocol_handlers_handler.h
@@ -32,6 +32,10 @@
public ProtocolHandlerRegistry::Observer {
public:
ProtocolHandlersHandler();
+
+ ProtocolHandlersHandler(const ProtocolHandlersHandler&) = delete;
+ ProtocolHandlersHandler& operator=(const ProtocolHandlersHandler&) = delete;
+
~ProtocolHandlersHandler() override;
// SettingsPageUIHandler:
@@ -86,8 +90,6 @@
base::ScopedObservation<ProtocolHandlerRegistry,
ProtocolHandlerRegistry::Observer>
registry_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ProtocolHandlersHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.h b/chrome/browser/ui/webui/settings/reset_settings_handler.h
index 2c08f8c..e58fcb1 100644
--- a/chrome/browser/ui/webui/settings/reset_settings_handler.h
+++ b/chrome/browser/ui/webui/settings/reset_settings_handler.h
@@ -39,6 +39,10 @@
static bool ShouldShowResetProfileBanner(Profile* profile);
explicit ResetSettingsHandler(Profile* profile);
+
+ ResetSettingsHandler(const ResetSettingsHandler&) = delete;
+ ResetSettingsHandler& operator=(const ResetSettingsHandler&) = delete;
+
~ResetSettingsHandler() override;
// WebUIMessageHandler implementation.
@@ -107,8 +111,6 @@
// Used to cancel callbacks when JavaScript becomes disallowed.
base::WeakPtrFactory<ResetSettingsHandler> callback_weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ResetSettingsHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.h b/chrome/browser/ui/webui/settings/search_engines_handler.h
index 8be927c..0a97ece 100644
--- a/chrome/browser/ui/webui/settings/search_engines_handler.h
+++ b/chrome/browser/ui/webui/settings/search_engines_handler.h
@@ -34,6 +34,10 @@
public EditSearchEngineControllerDelegate {
public:
explicit SearchEnginesHandler(Profile* profile);
+
+ SearchEnginesHandler(const SearchEnginesHandler&) = delete;
+ SearchEnginesHandler& operator=(const SearchEnginesHandler&) = delete;
+
~SearchEnginesHandler() override;
// ui::TableModelObserver implementation.
@@ -106,8 +110,6 @@
std::unique_ptr<EditSearchEngineController> edit_controller_;
PrefChangeRegistrar pref_change_registrar_;
base::WeakPtrFactory<SearchEnginesHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SearchEnginesHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h
index 3d6e9606..2ebead28 100644
--- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h
+++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h
@@ -37,6 +37,10 @@
public TemplateURLServiceObserver {
public:
ClearBrowsingDataHandler(content::WebUI* webui, Profile* profile);
+
+ ClearBrowsingDataHandler(const ClearBrowsingDataHandler&) = delete;
+ ClearBrowsingDataHandler& operator=(const ClearBrowsingDataHandler&) = delete;
+
~ClearBrowsingDataHandler() override;
// WebUIMessageHandler implementation.
@@ -146,8 +150,6 @@
// The weak pointers are invalidated in |OnJavascriptDisallowed()| and
// |HandleInitialize()| to cancel previously initiated tasks.
base::WeakPtrFactory<ClearBrowsingDataHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ClearBrowsingDataHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/settings_cookies_view_handler.h b/chrome/browser/ui/webui/settings/settings_cookies_view_handler.h
index 27cee0df..9e267f7 100644
--- a/chrome/browser/ui/webui/settings/settings_cookies_view_handler.h
+++ b/chrome/browser/ui/webui/settings/settings_cookies_view_handler.h
@@ -24,6 +24,10 @@
public CookiesTreeModel::Observer {
public:
CookiesViewHandler();
+
+ CookiesViewHandler(const CookiesViewHandler&) = delete;
+ CookiesViewHandler& operator=(const CookiesViewHandler&) = delete;
+
~CookiesViewHandler() override;
// SettingsPageUIHandler:
@@ -181,8 +185,6 @@
// Used to cancel callbacks when JavaScript becomes disallowed.
base::WeakPtrFactory<CookiesViewHandler> callback_weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CookiesViewHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/settings_default_browser_handler.h b/chrome/browser/ui/webui/settings/settings_default_browser_handler.h
index 92f83a2..3b6cc6b 100644
--- a/chrome/browser/ui/webui/settings/settings_default_browser_handler.h
+++ b/chrome/browser/ui/webui/settings/settings_default_browser_handler.h
@@ -28,6 +28,10 @@
class DefaultBrowserHandler : public SettingsPageUIHandler {
public:
DefaultBrowserHandler();
+
+ DefaultBrowserHandler(const DefaultBrowserHandler&) = delete;
+ DefaultBrowserHandler& operator=(const DefaultBrowserHandler&) = delete;
+
~DefaultBrowserHandler() override;
// SettingsPageUIHandler implementation.
@@ -62,8 +66,6 @@
// Used to invalidate the DefaultBrowserWorker callback.
base::WeakPtrFactory<DefaultBrowserHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DefaultBrowserHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/settings_manage_profile_handler.h b/chrome/browser/ui/webui/settings/settings_manage_profile_handler.h
index 989cee1..7150b60 100644
--- a/chrome/browser/ui/webui/settings/settings_manage_profile_handler.h
+++ b/chrome/browser/ui/webui/settings/settings_manage_profile_handler.h
@@ -23,6 +23,10 @@
public ProfileAttributesStorage::Observer {
public:
explicit ManageProfileHandler(Profile* profile);
+
+ ManageProfileHandler(const ManageProfileHandler&) = delete;
+ ManageProfileHandler& operator=(const ManageProfileHandler&) = delete;
+
~ManageProfileHandler() override;
// settings::SettingsPageUIHandler:
@@ -98,8 +102,6 @@
// For generating weak pointers to itself for callbacks.
base::WeakPtrFactory<ManageProfileHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ManageProfileHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.h b/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.h
index fa36422..b6ab8c1 100644
--- a/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.h
+++ b/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.h
@@ -19,6 +19,11 @@
public SettingsPageUIHandler {
public:
explicit MediaDevicesSelectionHandler(Profile* profile);
+
+ MediaDevicesSelectionHandler(const MediaDevicesSelectionHandler&) = delete;
+ MediaDevicesSelectionHandler& operator=(const MediaDevicesSelectionHandler&) =
+ delete;
+
~MediaDevicesSelectionHandler() override;
// SettingsPageUIHandler:
@@ -58,8 +63,6 @@
base::ScopedObservation<MediaCaptureDevicesDispatcher,
MediaCaptureDevicesDispatcher::Observer>
observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MediaDevicesSelectionHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/settings_page_ui_handler.h b/chrome/browser/ui/webui/settings/settings_page_ui_handler.h
index 835a5c3a..e190f8e 100644
--- a/chrome/browser/ui/webui/settings/settings_page_ui_handler.h
+++ b/chrome/browser/ui/webui/settings/settings_page_ui_handler.h
@@ -14,14 +14,16 @@
class SettingsPageUIHandler : public content::WebUIMessageHandler {
public:
SettingsPageUIHandler();
+
+ SettingsPageUIHandler(const SettingsPageUIHandler&) = delete;
+ SettingsPageUIHandler& operator=(const SettingsPageUIHandler&) = delete;
+
~SettingsPageUIHandler() override;
private:
// SettingsPageUIHandler subclasses must be JavaScript-lifecycle safe.
void OnJavascriptAllowed() override = 0;
void OnJavascriptDisallowed() override = 0;
-
- DISALLOW_COPY_AND_ASSIGN(SettingsPageUIHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/settings_secure_dns_handler.h b/chrome/browser/ui/webui/settings/settings_secure_dns_handler.h
index dddaea2..caee8656 100644
--- a/chrome/browser/ui/webui/settings/settings_secure_dns_handler.h
+++ b/chrome/browser/ui/webui/settings/settings_secure_dns_handler.h
@@ -25,6 +25,10 @@
class SecureDnsHandler : public SettingsPageUIHandler {
public:
SecureDnsHandler();
+
+ SecureDnsHandler(const SecureDnsHandler&) = delete;
+ SecureDnsHandler& operator=(const SecureDnsHandler&) = delete;
+
~SecureDnsHandler() override;
// SettingsPageUIHandler:
@@ -81,8 +85,6 @@
// there is no probe currently in progress.
std::string probe_callback_id_;
PrefChangeRegistrar pref_registrar_;
-
- DISALLOW_COPY_AND_ASSIGN(SecureDnsHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/settings_startup_pages_handler.h b/chrome/browser/ui/webui/settings/settings_startup_pages_handler.h
index 56b2f41..72b68c6 100644
--- a/chrome/browser/ui/webui/settings/settings_startup_pages_handler.h
+++ b/chrome/browser/ui/webui/settings/settings_startup_pages_handler.h
@@ -26,6 +26,10 @@
public ui::TableModelObserver {
public:
explicit StartupPagesHandler(content::WebUI* webui);
+
+ StartupPagesHandler(const StartupPagesHandler&) = delete;
+ StartupPagesHandler& operator=(const StartupPagesHandler&) = delete;
+
~StartupPagesHandler() override;
// SettingsPageUIHandler:
@@ -68,8 +72,6 @@
// The set of pages to launch on startup.
CustomHomePagesTableModel startup_custom_pages_table_model_;
-
- DISALLOW_COPY_AND_ASSIGN(StartupPagesHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/settings_ui.h b/chrome/browser/ui/webui/settings/settings_ui.h
index e8e71c92..65bd00b7 100644
--- a/chrome/browser/ui/webui/settings/settings_ui.h
+++ b/chrome/browser/ui/webui/settings/settings_ui.h
@@ -49,6 +49,10 @@
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
explicit SettingsUI(content::WebUI* web_ui);
+
+ SettingsUI(const SettingsUI&) = delete;
+ SettingsUI& operator=(const SettingsUI&) = delete;
+
~SettingsUI() override;
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -87,8 +91,6 @@
WebuiLoadTimer webui_load_timer_;
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(SettingsUI);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler.h b/chrome/browser/ui/webui/settings/site_settings_handler.h
index ee8d325f..2726944 100644
--- a/chrome/browser/ui/webui/settings/site_settings_handler.h
+++ b/chrome/browser/ui/webui/settings/site_settings_handler.h
@@ -42,6 +42,10 @@
public CookiesTreeModel::Observer {
public:
explicit SiteSettingsHandler(Profile* profile);
+
+ SiteSettingsHandler(const SiteSettingsHandler&) = delete;
+ SiteSettingsHandler& operator=(const SiteSettingsHandler&) = delete;
+
~SiteSettingsHandler() override;
// SettingsPageUIHandler:
@@ -304,8 +308,6 @@
// Whether to send site detail data on cookie tree model update.
bool update_site_details_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(SiteSettingsHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/settings/system_handler.h b/chrome/browser/ui/webui/settings/system_handler.h
index 8bfadf7..2c172f51 100644
--- a/chrome/browser/ui/webui/settings/system_handler.h
+++ b/chrome/browser/ui/webui/settings/system_handler.h
@@ -21,6 +21,10 @@
class SystemHandler : public SettingsPageUIHandler {
public:
SystemHandler();
+
+ SystemHandler(const SystemHandler&) = delete;
+ SystemHandler& operator=(const SystemHandler&) = delete;
+
~SystemHandler() override;
// Populates handler-specific loadTimeData values used by the system page.
@@ -34,8 +38,6 @@
private:
// Handler for the "showProxySettings" message. No args.
void HandleShowProxySettings(const base::ListValue* /*args*/);
-
- DISALLOW_COPY_AND_ASSIGN(SystemHandler);
};
} // namespace settings
diff --git a/chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_delegate_impl.h b/chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_delegate_impl.h
index 8d54c46..2ccb5796 100644
--- a/chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_delegate_impl.h
+++ b/chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_delegate_impl.h
@@ -24,6 +24,12 @@
public LoginUIService::Observer {
public:
explicit DiceTurnSyncOnHelperDelegateImpl(Browser* browser);
+
+ DiceTurnSyncOnHelperDelegateImpl(const DiceTurnSyncOnHelperDelegateImpl&) =
+ delete;
+ DiceTurnSyncOnHelperDelegateImpl& operator=(
+ const DiceTurnSyncOnHelperDelegateImpl&) = delete;
+
~DiceTurnSyncOnHelperDelegateImpl() override;
protected:
@@ -64,8 +70,6 @@
sync_confirmation_callback_;
base::ScopedObservation<LoginUIService, LoginUIService::Observer>
scoped_login_ui_service_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DiceTurnSyncOnHelperDelegateImpl);
};
#endif // CHROME_BROWSER_UI_WEBUI_SIGNIN_DICE_TURN_SYNC_ON_HELPER_DELEGATE_IMPL_H_
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler.h b/chrome/browser/ui/webui/signin/inline_login_handler.h
index 4503b6d..fbc9dce 100644
--- a/chrome/browser/ui/webui/signin/inline_login_handler.h
+++ b/chrome/browser/ui/webui/signin/inline_login_handler.h
@@ -28,6 +28,10 @@
class InlineLoginHandler : public content::WebUIMessageHandler {
public:
InlineLoginHandler();
+
+ InlineLoginHandler(const InlineLoginHandler&) = delete;
+ InlineLoginHandler& operator=(const InlineLoginHandler&) = delete;
+
~InlineLoginHandler() override;
// content::WebUIMessageHandler overrides:
@@ -88,8 +92,6 @@
base::Value edu_login_params) = 0;
base::WeakPtrFactory<InlineLoginHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(InlineLoginHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_SIGNIN_INLINE_LOGIN_HANDLER_H_
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_chromeos.h b/chrome/browser/ui/webui/signin/inline_login_handler_chromeos.h
index be42bb4..fe804af 100644
--- a/chrome/browser/ui/webui/signin/inline_login_handler_chromeos.h
+++ b/chrome/browser/ui/webui/signin/inline_login_handler_chromeos.h
@@ -22,6 +22,11 @@
public:
explicit InlineLoginHandlerChromeOS(
const base::RepeatingClosure& close_dialog_closure);
+
+ InlineLoginHandlerChromeOS(const InlineLoginHandlerChromeOS&) = delete;
+ InlineLoginHandlerChromeOS& operator=(const InlineLoginHandlerChromeOS&) =
+ delete;
+
~InlineLoginHandlerChromeOS() override;
static void RegisterProfilePrefs(PrefRegistrySimple* registry);
@@ -49,7 +54,6 @@
base::RepeatingClosure close_dialog_closure_;
base::WeakPtrFactory<InlineLoginHandlerChromeOS> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(InlineLoginHandlerChromeOS);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.h b/chrome/browser/ui/webui/signin/inline_login_handler_impl.h
index d5d18c99..68f99d7 100644
--- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.h
+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.h
@@ -36,6 +36,10 @@
class InlineLoginHandlerImpl : public InlineLoginHandler {
public:
InlineLoginHandlerImpl();
+
+ InlineLoginHandlerImpl(const InlineLoginHandlerImpl&) = delete;
+ InlineLoginHandlerImpl& operator=(const InlineLoginHandlerImpl&) = delete;
+
~InlineLoginHandlerImpl() override;
using InlineLoginHandler::web_ui;
@@ -126,8 +130,6 @@
bool confirm_untrusted_signin_;
base::WeakPtrFactory<InlineLoginHandlerImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(InlineLoginHandlerImpl);
};
// Handles details of signing the user in with IdentityManager and turning on
@@ -150,6 +152,10 @@
const std::string& signin_scoped_device_id,
bool confirm_untrusted_signin,
bool is_force_sign_in_with_usermanager);
+
+ InlineSigninHelper(const InlineSigninHelper&) = delete;
+ InlineSigninHelper& operator=(const InlineSigninHelper&) = delete;
+
~InlineSigninHelper() override;
protected:
@@ -185,8 +191,6 @@
std::string auth_code_;
bool confirm_untrusted_signin_;
bool is_force_sign_in_with_usermanager_;
-
- DISALLOW_COPY_AND_ASSIGN(InlineSigninHelper);
};
#endif // CHROME_BROWSER_UI_WEBUI_SIGNIN_INLINE_LOGIN_HANDLER_IMPL_H_
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_modal_delegate.h b/chrome/browser/ui/webui/signin/inline_login_handler_modal_delegate.h
index 8ca37afa..db8f743 100644
--- a/chrome/browser/ui/webui/signin/inline_login_handler_modal_delegate.h
+++ b/chrome/browser/ui/webui/signin/inline_login_handler_modal_delegate.h
@@ -20,6 +20,12 @@
// (|InlineLoginHandlerDialogChromeOS|).
explicit InlineLoginHandlerModalDelegate(
web_modal::WebContentsModalDialogHost* host);
+
+ InlineLoginHandlerModalDelegate(const InlineLoginHandlerModalDelegate&) =
+ delete;
+ InlineLoginHandlerModalDelegate& operator=(
+ const InlineLoginHandlerModalDelegate&) = delete;
+
~InlineLoginHandlerModalDelegate() override;
// web_modal::WebContentsModalDialogManagerDelegate overrides.
@@ -29,8 +35,6 @@
private:
// Non-owning pointer.
web_modal::WebContentsModalDialogHost* host_;
-
- DISALLOW_COPY_AND_ASSIGN(InlineLoginHandlerModalDelegate);
};
} // namespace chromeos
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.h b/chrome/browser/ui/webui/signin/inline_login_ui.h
index 82c0959..061a7dd2 100644
--- a/chrome/browser/ui/webui/signin/inline_login_ui.h
+++ b/chrome/browser/ui/webui/signin/inline_login_ui.h
@@ -15,11 +15,14 @@
class InlineLoginUI : public ui::WebDialogUI {
public:
explicit InlineLoginUI(content::WebUI* web_ui);
+
+ InlineLoginUI(const InlineLoginUI&) = delete;
+ InlineLoginUI& operator=(const InlineLoginUI&) = delete;
+
~InlineLoginUI() override;
private:
base::WeakPtrFactory<InlineLoginUI> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(InlineLoginUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_SIGNIN_INLINE_LOGIN_UI_H_
diff --git a/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc b/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc
index deee8de..c1ac34e0 100644
--- a/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc
+++ b/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc
@@ -38,6 +38,10 @@
LoginUIServiceTest()
: profile_manager_(TestingBrowserProcess::GetGlobal()),
profile_(nullptr) {}
+
+ LoginUIServiceTest(const LoginUIServiceTest&) = delete;
+ LoginUIServiceTest& operator=(const LoginUIServiceTest&) = delete;
+
~LoginUIServiceTest() override {}
void SetUp() override {
@@ -51,19 +55,17 @@
TestingProfileManager profile_manager_;
// Test profile used by all tests - this is owned by profile_manager_.
TestingProfile* profile_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LoginUIServiceTest);
};
class TestLoginUI : public LoginUIService::LoginUI {
public:
TestLoginUI() { }
+
+ TestLoginUI(const TestLoginUI&) = delete;
+ TestLoginUI& operator=(const TestLoginUI&) = delete;
+
~TestLoginUI() override {}
void FocusUI() override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestLoginUI);
};
TEST_F(LoginUIServiceTest, CanSetMultipleLoginUIs) {
diff --git a/chrome/browser/ui/webui/signin/profile_picker_handler.h b/chrome/browser/ui/webui/signin/profile_picker_handler.h
index 8fe9e4f..cb316e7 100644
--- a/chrome/browser/ui/webui/signin/profile_picker_handler.h
+++ b/chrome/browser/ui/webui/signin/profile_picker_handler.h
@@ -24,6 +24,10 @@
public ProfileAttributesStorage::Observer {
public:
ProfilePickerHandler();
+
+ ProfilePickerHandler(const ProfilePickerHandler&) = delete;
+ ProfilePickerHandler& operator=(const ProfilePickerHandler&) = delete;
+
~ProfilePickerHandler() override;
// Enables the startup performance metrics. Should only be called when the
@@ -135,8 +139,6 @@
// be added to the end of the list.
std::unordered_map<base::FilePath, size_t> profiles_order_;
base::WeakPtrFactory<ProfilePickerHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ProfilePickerHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_SIGNIN_PROFILE_PICKER_HANDLER_H_
diff --git a/chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.cc b/chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.cc
index 66ba4cd..98869c2 100644
--- a/chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.cc
+++ b/chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.cc
@@ -45,6 +45,11 @@
SigninEmailConfirmationDialog* dialog)
: content::WebContentsObserver(web_contents),
signin_email_confirmation_dialog_(dialog) {}
+
+ DialogWebContentsObserver(const DialogWebContentsObserver&) = delete;
+ DialogWebContentsObserver& operator=(const DialogWebContentsObserver&) =
+ delete;
+
~DialogWebContentsObserver() override {}
private:
@@ -59,8 +64,6 @@
}
SigninEmailConfirmationDialog* const signin_email_confirmation_dialog_;
-
- DISALLOW_COPY_AND_ASSIGN(DialogWebContentsObserver);
};
SigninEmailConfirmationDialog::SigninEmailConfirmationDialog(
diff --git a/chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.h b/chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.h
index 93e5035..4d88a8d9 100644
--- a/chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.h
+++ b/chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.h
@@ -52,6 +52,10 @@
const std::string& email,
Callback callback);
+ SigninEmailConfirmationDialog(const SigninEmailConfirmationDialog&) = delete;
+ SigninEmailConfirmationDialog& operator=(
+ const SigninEmailConfirmationDialog&) = delete;
+
~SigninEmailConfirmationDialog() override;
private:
@@ -106,8 +110,6 @@
// Observer for lifecycle events of the web contents of the dialog.
std::unique_ptr<DialogWebContentsObserver> dialog_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(SigninEmailConfirmationDialog);
};
#endif // CHROME_BROWSER_UI_WEBUI_SIGNIN_SIGNIN_EMAIL_CONFIRMATION_DIALOG_H_
diff --git a/chrome/browser/ui/webui/signin/signin_email_confirmation_ui.h b/chrome/browser/ui/webui/signin/signin_email_confirmation_ui.h
index 9da37438..e3633bf 100644
--- a/chrome/browser/ui/webui/signin/signin_email_confirmation_ui.h
+++ b/chrome/browser/ui/webui/signin/signin_email_confirmation_ui.h
@@ -11,13 +11,15 @@
class SigninEmailConfirmationUI : public ConstrainedWebDialogUI {
public:
explicit SigninEmailConfirmationUI(content::WebUI* web_ui);
+
+ SigninEmailConfirmationUI(const SigninEmailConfirmationUI&) = delete;
+ SigninEmailConfirmationUI& operator=(const SigninEmailConfirmationUI&) =
+ delete;
+
~SigninEmailConfirmationUI() override;
// Closes this sign-in email confirmation webUI.
void Close();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SigninEmailConfirmationUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_SIGNIN_SIGNIN_EMAIL_CONFIRMATION_UI_H_
diff --git a/chrome/browser/ui/webui/signin/signin_error_handler.h b/chrome/browser/ui/webui/signin/signin_error_handler.h
index cab620d..e57c9ad 100644
--- a/chrome/browser/ui/webui/signin/signin_error_handler.h
+++ b/chrome/browser/ui/webui/signin/signin_error_handler.h
@@ -24,6 +24,10 @@
// sign-in error dialog was presented on a browser window and |browser| must
// not be null.
SigninErrorHandler(Browser* browser, bool is_system_profile);
+
+ SigninErrorHandler(const SigninErrorHandler&) = delete;
+ SigninErrorHandler& operator=(const SigninErrorHandler&) = delete;
+
~SigninErrorHandler() override;
// BrowserListObserver:
@@ -84,8 +88,6 @@
bool is_system_profile_;
base::FilePath duplicate_profile_path_;
-
- DISALLOW_COPY_AND_ASSIGN(SigninErrorHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_SIGNIN_SIGNIN_ERROR_HANDLER_H_
diff --git a/chrome/browser/ui/webui/signin/signin_error_ui.h b/chrome/browser/ui/webui/signin/signin_error_ui.h
index 9aa7207..c82d7d9 100644
--- a/chrome/browser/ui/webui/signin/signin_error_ui.h
+++ b/chrome/browser/ui/webui/signin/signin_error_ui.h
@@ -15,6 +15,10 @@
class SigninErrorUI : public SigninWebDialogUI {
public:
explicit SigninErrorUI(content::WebUI* web_ui);
+
+ SigninErrorUI(const SigninErrorUI&) = delete;
+ SigninErrorUI& operator=(const SigninErrorUI&) = delete;
+
~SigninErrorUI() override {}
// SigninWebDialogUI:
@@ -23,8 +27,6 @@
private:
void InitializeMessageHandlerForProfilePicker();
void Initialize(Browser* browser, bool is_system_profile);
-
- DISALLOW_COPY_AND_ASSIGN(SigninErrorUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_SIGNIN_SIGNIN_ERROR_UI_H_
diff --git a/chrome/browser/ui/webui/signin/sync_confirmation_handler.h b/chrome/browser/ui/webui/signin/sync_confirmation_handler.h
index 8c69d61..9a6c2f9e 100644
--- a/chrome/browser/ui/webui/signin/sync_confirmation_handler.h
+++ b/chrome/browser/ui/webui/signin/sync_confirmation_handler.h
@@ -37,6 +37,10 @@
Profile* profile,
const std::unordered_map<std::string, int>& string_to_grd_id_map,
Browser* browser = nullptr);
+
+ SyncConfirmationHandler(const SyncConfirmationHandler&) = delete;
+ SyncConfirmationHandler& operator=(const SyncConfirmationHandler&) = delete;
+
~SyncConfirmationHandler() override;
// content::WebUIMessageHandler:
@@ -110,8 +114,6 @@
Browser* browser_;
signin::IdentityManager* identity_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncConfirmationHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_SIGNIN_SYNC_CONFIRMATION_HANDLER_H_
diff --git a/chrome/browser/ui/webui/signin/sync_confirmation_ui.h b/chrome/browser/ui/webui/signin/sync_confirmation_ui.h
index 9a1586bf..2e6d5296 100644
--- a/chrome/browser/ui/webui/signin/sync_confirmation_ui.h
+++ b/chrome/browser/ui/webui/signin/sync_confirmation_ui.h
@@ -32,6 +32,10 @@
enum class DesignVersion { kMonotone, kColored };
explicit SyncConfirmationUI(content::WebUI* web_ui);
+
+ SyncConfirmationUI(const SyncConfirmationUI&) = delete;
+ SyncConfirmationUI& operator=(const SyncConfirmationUI&) = delete;
+
~SyncConfirmationUI() override;
// SigninWebDialogUI:
@@ -66,8 +70,6 @@
std::unordered_map<std::string, int> js_localized_string_to_ids_map_;
Profile* const profile_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncConfirmationUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_SIGNIN_SYNC_CONFIRMATION_UI_H_
diff --git a/chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.h b/chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.h
index cf0d02a2..28eb75d 100644
--- a/chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.h
+++ b/chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.h
@@ -16,6 +16,10 @@
class DumpDatabaseHandler : public content::WebUIMessageHandler {
public:
explicit DumpDatabaseHandler(Profile* profile);
+
+ DumpDatabaseHandler(const DumpDatabaseHandler&) = delete;
+ DumpDatabaseHandler& operator=(const DumpDatabaseHandler&) = delete;
+
~DumpDatabaseHandler() override;
// WebUIMessageHandler implementation.
@@ -26,8 +30,6 @@
void DidGetDatabaseDump(std::string callback_id, const base::ListValue& list);
Profile* profile_;
-
- DISALLOW_COPY_AND_ASSIGN(DumpDatabaseHandler);
};
} // namespace syncfs_internals
diff --git a/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.h b/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.h
index 19b0c95..85bdc85 100644
--- a/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.h
+++ b/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.h
@@ -21,6 +21,10 @@
class ExtensionStatusesHandler : public content::WebUIMessageHandler {
public:
explicit ExtensionStatusesHandler(Profile* profile);
+
+ ExtensionStatusesHandler(const ExtensionStatusesHandler&) = delete;
+ ExtensionStatusesHandler& operator=(const ExtensionStatusesHandler&) = delete;
+
~ExtensionStatusesHandler() override;
// Shared by Extension Statuses Tab and also File Metadata Tab to generate the
@@ -39,8 +43,6 @@
Profile* profile_;
base::WeakPtrFactory<ExtensionStatusesHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ExtensionStatusesHandler);
};
} // namespace syncfs_internals
diff --git a/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.h b/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.h
index 64d6e08c..d16760c 100644
--- a/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.h
+++ b/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.h
@@ -25,6 +25,10 @@
class FileMetadataHandler : public content::WebUIMessageHandler {
public:
explicit FileMetadataHandler(Profile* profile);
+
+ FileMetadataHandler(const FileMetadataHandler&) = delete;
+ FileMetadataHandler& operator=(const FileMetadataHandler&) = delete;
+
~FileMetadataHandler() override;
// WebUIMessageHandler implementation.
@@ -40,8 +44,6 @@
Profile* profile_;
base::WeakPtrFactory<FileMetadataHandler> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FileMetadataHandler);
};
} // namespace syncfs_internals
diff --git a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.h b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.h
index 7c532d4..06c16dc 100644
--- a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.h
+++ b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.h
@@ -27,6 +27,12 @@
public sync_file_system::TaskLogger::Observer {
public:
explicit SyncFileSystemInternalsHandler(Profile* profile);
+
+ SyncFileSystemInternalsHandler(const SyncFileSystemInternalsHandler&) =
+ delete;
+ SyncFileSystemInternalsHandler& operator=(
+ const SyncFileSystemInternalsHandler&) = delete;
+
~SyncFileSystemInternalsHandler() override;
// content::WebUIMessageHandler implementation.
@@ -55,8 +61,6 @@
Profile* profile_;
bool observing_task_log_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncFileSystemInternalsHandler);
};
} // namespace syncfs_internals
diff --git a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h
index f8d8b45..1b021a6 100644
--- a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h
+++ b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h
@@ -11,10 +11,12 @@
class SyncFileSystemInternalsUI : public content::WebUIController {
public:
explicit SyncFileSystemInternalsUI(content::WebUI* web_ui);
- ~SyncFileSystemInternalsUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(SyncFileSystemInternalsUI);
+ SyncFileSystemInternalsUI(const SyncFileSystemInternalsUI&) = delete;
+ SyncFileSystemInternalsUI& operator=(const SyncFileSystemInternalsUI&) =
+ delete;
+
+ ~SyncFileSystemInternalsUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_SYNC_FILE_SYSTEM_INTERNALS_SYNC_FILE_SYSTEM_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.h b/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.h
index 5bc06fee0..b1d6aeb 100644
--- a/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.h
+++ b/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.h
@@ -29,6 +29,11 @@
public syncer::InvalidationsListener {
public:
SyncInternalsMessageHandler();
+
+ SyncInternalsMessageHandler(const SyncInternalsMessageHandler&) = delete;
+ SyncInternalsMessageHandler& operator=(const SyncInternalsMessageHandler&) =
+ delete;
+
~SyncInternalsMessageHandler() override;
// content::WebUIMessageHandler implementation.
@@ -123,8 +128,6 @@
AboutSyncDataDelegate about_sync_data_delegate_;
base::WeakPtrFactory<SyncInternalsMessageHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SyncInternalsMessageHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_SYNC_INTERNALS_SYNC_INTERNALS_MESSAGE_HANDLER_H_
diff --git a/chrome/browser/ui/webui/sync_internals/sync_internals_ui.h b/chrome/browser/ui/webui/sync_internals/sync_internals_ui.h
index 8a0e174..c7be8a1b 100644
--- a/chrome/browser/ui/webui/sync_internals/sync_internals_ui.h
+++ b/chrome/browser/ui/webui/sync_internals/sync_internals_ui.h
@@ -13,10 +13,11 @@
class SyncInternalsUI : public content::WebUIController {
public:
explicit SyncInternalsUI(content::WebUI* web_ui);
- ~SyncInternalsUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(SyncInternalsUI);
+ SyncInternalsUI(const SyncInternalsUI&) = delete;
+ SyncInternalsUI& operator=(const SyncInternalsUI&) = delete;
+
+ ~SyncInternalsUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_SYNC_INTERNALS_SYNC_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/system_info_ui.cc b/chrome/browser/ui/webui/system_info_ui.cc
index 6e72ad4..09aaa05 100644
--- a/chrome/browser/ui/webui/system_info_ui.cc
+++ b/chrome/browser/ui/webui/system_info_ui.cc
@@ -76,6 +76,10 @@
class SystemInfoHandler : public WebUIMessageHandler {
public:
SystemInfoHandler();
+
+ SystemInfoHandler(const SystemInfoHandler&) = delete;
+ SystemInfoHandler& operator=(const SystemInfoHandler&) = delete;
+
~SystemInfoHandler() override;
// WebUIMessageHandler implementation.
@@ -91,7 +95,6 @@
private:
std::string callback_id_;
base::WeakPtrFactory<SystemInfoHandler> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(SystemInfoHandler);
};
////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/webui/tab_strip/chrome_content_browser_client_tab_strip_part.h b/chrome/browser/ui/webui/tab_strip/chrome_content_browser_client_tab_strip_part.h
index 11206f3..063317d3 100644
--- a/chrome/browser/ui/webui/tab_strip/chrome_content_browser_client_tab_strip_part.h
+++ b/chrome/browser/ui/webui/tab_strip/chrome_content_browser_client_tab_strip_part.h
@@ -14,14 +14,17 @@
: public ChromeContentBrowserClientParts {
public:
ChromeContentBrowserClientTabStripPart();
+
+ ChromeContentBrowserClientTabStripPart(
+ const ChromeContentBrowserClientTabStripPart&) = delete;
+ ChromeContentBrowserClientTabStripPart& operator=(
+ const ChromeContentBrowserClientTabStripPart&) = delete;
+
~ChromeContentBrowserClientTabStripPart() override;
// ChromeContentBrowserClientParts:
void OverrideWebkitPrefs(content::WebContents* web_contents,
blink::web_pref::WebPreferences* web_prefs) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClientTabStripPart);
};
#endif // CHROME_BROWSER_UI_WEBUI_TAB_STRIP_CHROME_CONTENT_BROWSER_CLIENT_TAB_STRIP_PART_H_
diff --git a/chrome/browser/ui/webui/tab_strip/tab_strip_ui.h b/chrome/browser/ui/webui/tab_strip/tab_strip_ui.h
index 068661b..b7f56bc 100644
--- a/chrome/browser/ui/webui/tab_strip/tab_strip_ui.h
+++ b/chrome/browser/ui/webui/tab_strip/tab_strip_ui.h
@@ -28,6 +28,10 @@
public tab_strip::mojom::PageHandlerFactory {
public:
explicit TabStripUI(content::WebUI* web_ui);
+
+ TabStripUI(const TabStripUI&) = delete;
+ TabStripUI& operator=(const TabStripUI&) = delete;
+
~TabStripUI() override;
// Instantiates the implementor of the mojom::PageHandlerFactory mojo
@@ -68,7 +72,6 @@
TabStripUIEmbedder* embedder_ = nullptr;
WEB_UI_CONTROLLER_TYPE_DECL();
- DISALLOW_COPY_AND_ASSIGN(TabStripUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_TAB_STRIP_TAB_STRIP_UI_H_
diff --git a/chrome/browser/ui/webui/test_data_source.h b/chrome/browser/ui/webui/test_data_source.h
index 57cab71..a535c61b 100644
--- a/chrome/browser/ui/webui/test_data_source.h
+++ b/chrome/browser/ui/webui/test_data_source.h
@@ -17,6 +17,10 @@
class TestDataSource : public content::URLDataSource {
public:
explicit TestDataSource(std::string root);
+
+ TestDataSource(const TestDataSource&) = delete;
+ TestDataSource& operator=(const TestDataSource&) = delete;
+
~TestDataSource() override;
private:
@@ -44,8 +48,6 @@
base::FilePath src_root_;
base::FilePath gen_root_;
std::map<std::string, std::string> custom_paths_;
-
- DISALLOW_COPY_AND_ASSIGN(TestDataSource);
};
#endif // CHROME_BROWSER_UI_WEBUI_TEST_DATA_SOURCE_H_
diff --git a/chrome/browser/ui/webui/theme_handler.h b/chrome/browser/ui/webui/theme_handler.h
index 11a0959..6d71634 100644
--- a/chrome/browser/ui/webui/theme_handler.h
+++ b/chrome/browser/ui/webui/theme_handler.h
@@ -24,6 +24,10 @@
public ui::NativeThemeObserver {
public:
ThemeHandler();
+
+ ThemeHandler(const ThemeHandler&) = delete;
+ ThemeHandler& operator=(const ThemeHandler&) = delete;
+
~ThemeHandler() override;
private:
@@ -51,8 +55,6 @@
base::ScopedObservation<ui::NativeTheme, ui::NativeThemeObserver>
theme_observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ThemeHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_THEME_HANDLER_H_
diff --git a/chrome/browser/ui/webui/theme_source.h b/chrome/browser/ui/webui/theme_source.h
index fb32e98..174d234 100644
--- a/chrome/browser/ui/webui/theme_source.h
+++ b/chrome/browser/ui/webui/theme_source.h
@@ -19,6 +19,10 @@
public:
explicit ThemeSource(Profile* profile);
ThemeSource(Profile* profile, bool serve_untrusted);
+
+ ThemeSource(const ThemeSource&) = delete;
+ ThemeSource& operator=(const ThemeSource&) = delete;
+
~ThemeSource() override;
// content::URLDataSource implementation.
@@ -55,8 +59,6 @@
// Whether this source services chrome-unstrusted://theme.
bool serve_untrusted_;
-
- DISALLOW_COPY_AND_ASSIGN(ThemeSource);
};
#endif // CHROME_BROWSER_UI_WEBUI_THEME_SOURCE_H_
diff --git a/chrome/browser/ui/webui/translate_internals/chrome_translate_internals_handler.h b/chrome/browser/ui/webui/translate_internals/chrome_translate_internals_handler.h
index 011f6baf..c568156 100644
--- a/chrome/browser/ui/webui/translate_internals/chrome_translate_internals_handler.h
+++ b/chrome/browser/ui/webui/translate_internals/chrome_translate_internals_handler.h
@@ -18,6 +18,12 @@
public content::WebUIMessageHandler {
public:
ChromeTranslateInternalsHandler();
+
+ ChromeTranslateInternalsHandler(const ChromeTranslateInternalsHandler&) =
+ delete;
+ ChromeTranslateInternalsHandler& operator=(
+ const ChromeTranslateInternalsHandler&) = delete;
+
~ChromeTranslateInternalsHandler() override;
// translate::TranslateInternalsHandler.
@@ -39,8 +45,6 @@
private:
base::CallbackListSubscription detection_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeTranslateInternalsHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_TRANSLATE_INTERNALS_CHROME_TRANSLATE_INTERNALS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/translate_internals/translate_internals_ui.h b/chrome/browser/ui/webui/translate_internals/translate_internals_ui.h
index b35cf1c..0b671af2 100644
--- a/chrome/browser/ui/webui/translate_internals/translate_internals_ui.h
+++ b/chrome/browser/ui/webui/translate_internals/translate_internals_ui.h
@@ -12,10 +12,11 @@
class TranslateInternalsUI : public content::WebUIController {
public:
explicit TranslateInternalsUI(content::WebUI* web_ui);
- ~TranslateInternalsUI() override {}
- private:
- DISALLOW_COPY_AND_ASSIGN(TranslateInternalsUI);
+ TranslateInternalsUI(const TranslateInternalsUI&) = delete;
+ TranslateInternalsUI& operator=(const TranslateInternalsUI&) = delete;
+
+ ~TranslateInternalsUI() override {}
};
#endif // CHROME_BROWSER_UI_WEBUI_TRANSLATE_INTERNALS_TRANSLATE_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/usb_internals/usb_internals_page_handler.h b/chrome/browser/ui/webui/usb_internals/usb_internals_page_handler.h
index 11532cc..29f0409 100644
--- a/chrome/browser/ui/webui/usb_internals/usb_internals_page_handler.h
+++ b/chrome/browser/ui/webui/usb_internals/usb_internals_page_handler.h
@@ -16,6 +16,10 @@
public:
explicit UsbInternalsPageHandler(
mojo::PendingReceiver<mojom::UsbInternalsPageHandler> receiver);
+
+ UsbInternalsPageHandler(const UsbInternalsPageHandler&) = delete;
+ UsbInternalsPageHandler& operator=(const UsbInternalsPageHandler&) = delete;
+
~UsbInternalsPageHandler() override;
void BindUsbDeviceManagerInterface(
@@ -27,8 +31,6 @@
private:
mojo::Receiver<mojom::UsbInternalsPageHandler> receiver_;
-
- DISALLOW_COPY_AND_ASSIGN(UsbInternalsPageHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_USB_INTERNALS_USB_INTERNALS_PAGE_HANDLER_H_
diff --git a/chrome/browser/ui/webui/usb_internals/usb_internals_ui.h b/chrome/browser/ui/webui/usb_internals/usb_internals_ui.h
index 968d9be..85eb63b 100644
--- a/chrome/browser/ui/webui/usb_internals/usb_internals_ui.h
+++ b/chrome/browser/ui/webui/usb_internals/usb_internals_ui.h
@@ -16,6 +16,10 @@
class UsbInternalsUI : public ui::MojoWebUIController {
public:
explicit UsbInternalsUI(content::WebUI* web_ui);
+
+ UsbInternalsUI(const UsbInternalsUI&) = delete;
+ UsbInternalsUI& operator=(const UsbInternalsUI&) = delete;
+
~UsbInternalsUI() override;
// Instantiates the implementor of the mojom::UsbInternalsPageHandler mojo
@@ -27,8 +31,6 @@
std::unique_ptr<UsbInternalsPageHandler> page_handler_;
WEB_UI_CONTROLLER_TYPE_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(UsbInternalsUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_USB_INTERNALS_USB_INTERNALS_UI_H_
diff --git a/chrome/browser/ui/webui/user_actions/user_actions_ui.h b/chrome/browser/ui/webui/user_actions/user_actions_ui.h
index cc25fef..664b9009 100644
--- a/chrome/browser/ui/webui/user_actions/user_actions_ui.h
+++ b/chrome/browser/ui/webui/user_actions/user_actions_ui.h
@@ -12,10 +12,11 @@
class UserActionsUI : public content::WebUIController {
public:
explicit UserActionsUI(content::WebUI* contents);
- ~UserActionsUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(UserActionsUI);
+ UserActionsUI(const UserActionsUI&) = delete;
+ UserActionsUI& operator=(const UserActionsUI&) = delete;
+
+ ~UserActionsUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_USER_ACTIONS_USER_ACTIONS_UI_H_
diff --git a/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.h b/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.h
index 20891dac..2d58292 100644
--- a/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.h
+++ b/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.h
@@ -20,6 +20,10 @@
class UserActionsUIHandler : public content::WebUIMessageHandler {
public:
UserActionsUIHandler();
+
+ UserActionsUIHandler(const UserActionsUIHandler&) = delete;
+ UserActionsUIHandler& operator=(const UserActionsUIHandler&) = delete;
+
~UserActionsUIHandler() override;
// WebUIMessageHandler implementation:
@@ -32,8 +36,6 @@
void OnUserAction(const std::string& action, base::TimeTicks action_time);
base::ActionCallback action_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(UserActionsUIHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_USER_ACTIONS_USER_ACTIONS_UI_HANDLER_H_
diff --git a/chrome/browser/ui/webui/version/version_handler.h b/chrome/browser/ui/webui/version/version_handler.h
index 40143c2..fcb3846 100644
--- a/chrome/browser/ui/webui/version/version_handler.h
+++ b/chrome/browser/ui/webui/version/version_handler.h
@@ -16,6 +16,10 @@
class VersionHandler : public content::WebUIMessageHandler {
public:
VersionHandler();
+
+ VersionHandler(const VersionHandler&) = delete;
+ VersionHandler& operator=(const VersionHandler&) = delete;
+
~VersionHandler() override;
// content::WebUIMessageHandler implementation.
@@ -44,8 +48,6 @@
// Factory for the creating refs in callbacks.
base::WeakPtrFactory<VersionHandler> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(VersionHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_VERSION_VERSION_HANDLER_H_
diff --git a/chrome/browser/ui/webui/version/version_handler_chromeos.h b/chrome/browser/ui/webui/version/version_handler_chromeos.h
index b831a0f0..3a8cebef 100644
--- a/chrome/browser/ui/webui/version/version_handler_chromeos.h
+++ b/chrome/browser/ui/webui/version/version_handler_chromeos.h
@@ -17,6 +17,10 @@
class VersionHandlerChromeOS : public VersionHandler {
public:
VersionHandlerChromeOS();
+
+ VersionHandlerChromeOS(const VersionHandlerChromeOS&) = delete;
+ VersionHandlerChromeOS& operator=(const VersionHandlerChromeOS&) = delete;
+
~VersionHandlerChromeOS() override;
// VersionHandler overrides:
@@ -29,8 +33,6 @@
private:
base::WeakPtrFactory<VersionHandlerChromeOS> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(VersionHandlerChromeOS);
};
#endif // CHROME_BROWSER_UI_WEBUI_VERSION_VERSION_HANDLER_CHROMEOS_H_
diff --git a/chrome/browser/ui/webui/version/version_handler_win.h b/chrome/browser/ui/webui/version/version_handler_win.h
index 01d389dd..9244313 100644
--- a/chrome/browser/ui/webui/version/version_handler_win.h
+++ b/chrome/browser/ui/webui/version/version_handler_win.h
@@ -15,6 +15,10 @@
class VersionHandlerWindows : public VersionHandler {
public:
VersionHandlerWindows();
+
+ VersionHandlerWindows(const VersionHandlerWindows&) = delete;
+ VersionHandlerWindows& operator=(const VersionHandlerWindows&) = delete;
+
~VersionHandlerWindows() override;
// VersionHandler overrides:
@@ -28,8 +32,6 @@
private:
base::WeakPtrFactory<VersionHandlerWindows> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(VersionHandlerWindows);
};
#endif // CHROME_BROWSER_UI_WEBUI_VERSION_VERSION_HANDLER_WIN_H_
diff --git a/chrome/browser/ui/webui/version/version_ui.h b/chrome/browser/ui/webui/version/version_ui.h
index 4ba0c5d..5df8505 100644
--- a/chrome/browser/ui/webui/version/version_ui.h
+++ b/chrome/browser/ui/webui/version/version_ui.h
@@ -13,6 +13,10 @@
class VersionUI : public content::WebUIController {
public:
explicit VersionUI(content::WebUI* web_ui);
+
+ VersionUI(const VersionUI&) = delete;
+ VersionUI& operator=(const VersionUI&) = delete;
+
~VersionUI() override;
// Returns the IDS_* string id for the variation of the processor.
@@ -21,9 +25,6 @@
// Loads a data source with many named details comprising version info.
// The keys are from version_ui_constants.
static void AddVersionDetailStrings(content::WebUIDataSource* html_source);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(VersionUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_VERSION_VERSION_UI_H_
diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
index c55cb5a..c50d766 100644
--- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
+++ b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
@@ -39,10 +39,11 @@
: WebDialogWebContentsDelegate(
context,
std::make_unique<ChromeWebContentsHandler>()) {}
- ~TestWebContentsDelegate() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(TestWebContentsDelegate);
+ TestWebContentsDelegate(const TestWebContentsDelegate&) = delete;
+ TestWebContentsDelegate& operator=(const TestWebContentsDelegate&) = delete;
+
+ ~TestWebContentsDelegate() override = default;
};
class WebDialogWebContentsDelegateTest : public BrowserWithTestWindowTest {
diff --git a/chrome/browser/ui/webui/web_ui_test_handler.h b/chrome/browser/ui/webui/web_ui_test_handler.h
index 31c83c8..682cf02 100644
--- a/chrome/browser/ui/webui/web_ui_test_handler.h
+++ b/chrome/browser/ui/webui/web_ui_test_handler.h
@@ -25,6 +25,10 @@
class WebUITestHandler {
public:
WebUITestHandler();
+
+ WebUITestHandler(const WebUITestHandler&) = delete;
+ WebUITestHandler& operator=(const WebUITestHandler&) = delete;
+
virtual ~WebUITestHandler();
// Sends a message through |preload_frame| with the |js_text| to preload at
@@ -76,8 +80,6 @@
// Quits the currently running RunLoop.
base::RepeatingClosure quit_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(WebUITestHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_WEB_UI_TEST_HANDLER_H_
diff --git a/chrome/browser/ui/webui/webapks/webapks_handler.h b/chrome/browser/ui/webui/webapks/webapks_handler.h
index ede4c45..a2f04be 100644
--- a/chrome/browser/ui/webui/webapks/webapks_handler.h
+++ b/chrome/browser/ui/webui/webapks/webapks_handler.h
@@ -19,6 +19,10 @@
class WebApksHandler : public content::WebUIMessageHandler {
public:
WebApksHandler();
+
+ WebApksHandler(const WebApksHandler&) = delete;
+ WebApksHandler& operator=(const WebApksHandler&) = delete;
+
~WebApksHandler() override;
// content::WebUIMessageHandler:
@@ -39,8 +43,6 @@
void OnWebApkInfoRetrieved(const WebApkInfo& webapk_info);
WebApkHandlerDelegate delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(WebApksHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_WEBAPKS_WEBAPKS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/webapks/webapks_ui.h b/chrome/browser/ui/webui/webapks/webapks_ui.h
index 6c1f52df..df2b96a4 100644
--- a/chrome/browser/ui/webui/webapks/webapks_ui.h
+++ b/chrome/browser/ui/webui/webapks/webapks_ui.h
@@ -12,10 +12,11 @@
class WebApksUI : public content::WebUIController {
public:
explicit WebApksUI(content::WebUI* web_ui);
- ~WebApksUI() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(WebApksUI);
+ WebApksUI(const WebApksUI&) = delete;
+ WebApksUI& operator=(const WebApksUI&) = delete;
+
+ ~WebApksUI() override;
};
#endif // CHROME_BROWSER_UI_WEBUI_WEBAPKS_WEBAPKS_UI_H_
diff --git a/chrome/browser/ui/webui/webui_load_timer.h b/chrome/browser/ui/webui/webui_load_timer.h
index cd635f1..fd0c13b 100644
--- a/chrome/browser/ui/webui/webui_load_timer.h
+++ b/chrome/browser/ui/webui/webui_load_timer.h
@@ -26,6 +26,10 @@
WebuiLoadTimer(content::WebContents* web_contents,
const std::string& document_initial_load_uma_id,
const std::string& document_load_completed_uma_id);
+
+ WebuiLoadTimer(const WebuiLoadTimer&) = delete;
+ WebuiLoadTimer& operator=(const WebuiLoadTimer&) = delete;
+
~WebuiLoadTimer() override;
// WebContentsObserver
@@ -39,8 +43,6 @@
std::string document_initial_load_uma_id_;
std::string document_load_completed_uma_id_;
std::unique_ptr<base::ElapsedTimer> timer_;
-
- DISALLOW_COPY_AND_ASSIGN(WebuiLoadTimer);
};
#endif // CHROME_BROWSER_UI_WEBUI_WEBUI_LOAD_TIMER_H_
diff --git a/chrome/browser/ui/webui/welcome/bookmark_handler.h b/chrome/browser/ui/webui/welcome/bookmark_handler.h
index c3cf53d9..79ab6b5 100644
--- a/chrome/browser/ui/webui/welcome/bookmark_handler.h
+++ b/chrome/browser/ui/webui/welcome/bookmark_handler.h
@@ -16,6 +16,10 @@
class BookmarkHandler : public content::WebUIMessageHandler {
public:
explicit BookmarkHandler(PrefService* prefs);
+
+ BookmarkHandler(const BookmarkHandler&) = delete;
+ BookmarkHandler& operator=(const BookmarkHandler&) = delete;
+
~BookmarkHandler() override;
// WebUIMessageHandler:
@@ -28,8 +32,6 @@
private:
// Weak reference.
PrefService* prefs_;
-
- DISALLOW_COPY_AND_ASSIGN(BookmarkHandler);
};
} // namespace welcome
diff --git a/chrome/browser/ui/webui/welcome/google_apps_handler.h b/chrome/browser/ui/webui/welcome/google_apps_handler.h
index 1d28ebf..28804af 100644
--- a/chrome/browser/ui/webui/welcome/google_apps_handler.h
+++ b/chrome/browser/ui/webui/welcome/google_apps_handler.h
@@ -28,6 +28,10 @@
class GoogleAppsHandler : public content::WebUIMessageHandler {
public:
GoogleAppsHandler();
+
+ GoogleAppsHandler(const GoogleAppsHandler&) = delete;
+ GoogleAppsHandler& operator=(const GoogleAppsHandler&) = delete;
+
~GoogleAppsHandler() override;
// WebUIMessageHandler:
@@ -39,8 +43,6 @@
private:
std::vector<BookmarkItem> google_apps_;
-
- DISALLOW_COPY_AND_ASSIGN(GoogleAppsHandler);
};
} // namespace welcome
diff --git a/chrome/browser/ui/webui/welcome/ntp_background_fetcher.h b/chrome/browser/ui/webui/welcome/ntp_background_fetcher.h
index f7ec424..cf2f9a4 100644
--- a/chrome/browser/ui/webui/welcome/ntp_background_fetcher.h
+++ b/chrome/browser/ui/webui/welcome/ntp_background_fetcher.h
@@ -22,6 +22,10 @@
public:
NtpBackgroundFetcher(size_t index,
content::WebUIDataSource::GotDataCallback callback);
+
+ NtpBackgroundFetcher(const NtpBackgroundFetcher&) = delete;
+ NtpBackgroundFetcher& operator=(const NtpBackgroundFetcher&) = delete;
+
~NtpBackgroundFetcher();
private:
@@ -30,8 +34,6 @@
size_t index_;
content::WebUIDataSource::GotDataCallback callback_;
std::unique_ptr<network::SimpleURLLoader> simple_loader_;
-
- DISALLOW_COPY_AND_ASSIGN(NtpBackgroundFetcher);
};
} // namespace welcome
diff --git a/chrome/browser/ui/webui/welcome/ntp_background_handler.h b/chrome/browser/ui/webui/welcome/ntp_background_handler.h
index acf86d3..7bbfaa1 100644
--- a/chrome/browser/ui/webui/welcome/ntp_background_handler.h
+++ b/chrome/browser/ui/webui/welcome/ntp_background_handler.h
@@ -12,6 +12,10 @@
class NtpBackgroundHandler : public content::WebUIMessageHandler {
public:
NtpBackgroundHandler();
+
+ NtpBackgroundHandler(const NtpBackgroundHandler&) = delete;
+ NtpBackgroundHandler& operator=(const NtpBackgroundHandler&) = delete;
+
~NtpBackgroundHandler() override;
// WebUIMessageHandler:
@@ -21,9 +25,6 @@
void HandleClearBackground(const base::ListValue* args);
void HandleGetBackgrounds(const base::ListValue* args);
void HandleSetBackground(const base::ListValue* args);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NtpBackgroundHandler);
};
} // namespace welcome
diff --git a/chrome/browser/ui/webui/welcome/set_as_default_handler.h b/chrome/browser/ui/webui/welcome/set_as_default_handler.h
index e06476a..e3501cbd 100644
--- a/chrome/browser/ui/webui/welcome/set_as_default_handler.h
+++ b/chrome/browser/ui/webui/welcome/set_as_default_handler.h
@@ -13,12 +13,14 @@
class SetAsDefaultHandler : public settings::DefaultBrowserHandler {
public:
SetAsDefaultHandler();
+
+ SetAsDefaultHandler(const SetAsDefaultHandler&) = delete;
+ SetAsDefaultHandler& operator=(const SetAsDefaultHandler&) = delete;
+
~SetAsDefaultHandler() override;
protected:
void RecordSetAsDefaultUMA() override;
-
- DISALLOW_COPY_AND_ASSIGN(SetAsDefaultHandler);
};
} // namespace welcome
diff --git a/chrome/browser/ui/webui/welcome/welcome_handler.h b/chrome/browser/ui/webui/welcome/welcome_handler.h
index 430f379..cdeb42e 100644
--- a/chrome/browser/ui/webui/welcome/welcome_handler.h
+++ b/chrome/browser/ui/webui/welcome/welcome_handler.h
@@ -17,6 +17,10 @@
class WelcomeHandler : public content::WebUIMessageHandler {
public:
explicit WelcomeHandler(content::WebUI* web_ui);
+
+ WelcomeHandler(const WelcomeHandler&) = delete;
+ WelcomeHandler& operator=(const WelcomeHandler&) = delete;
+
~WelcomeHandler() override;
// content::WebUIMessageHandler:
@@ -55,8 +59,6 @@
// Indicates whether this WelcomeHandler instance is spawned due to users
// being redirected back to welcome page as part of the onboarding flow.
bool is_redirected_welcome_impression_;
-
- DISALLOW_COPY_AND_ASSIGN(WelcomeHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_WELCOME_WELCOME_HANDLER_H_
diff --git a/chrome/browser/ui/webui/welcome/welcome_ui.h b/chrome/browser/ui/webui/welcome/welcome_ui.h
index 4b51947..6700d32 100644
--- a/chrome/browser/ui/webui/welcome/welcome_ui.h
+++ b/chrome/browser/ui/webui/welcome/welcome_ui.h
@@ -22,6 +22,10 @@
class WelcomeUI : public content::WebUIController {
public:
WelcomeUI(content::WebUI* web_ui, const GURL& url);
+
+ WelcomeUI(const WelcomeUI&) = delete;
+ WelcomeUI& operator=(const WelcomeUI&) = delete;
+
~WelcomeUI() override;
void CreateBackgroundFetcher(
@@ -36,8 +40,6 @@
void StorePageSeen(Profile* profile);
std::unique_ptr<welcome::NtpBackgroundFetcher> background_fetcher_;
base::WeakPtrFactory<WelcomeUI> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WelcomeUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_WELCOME_WELCOME_UI_H_
diff --git a/chrome/browser/ui/window_sizer/window_sizer_chromeos_uitest.cc b/chrome/browser/ui/window_sizer/window_sizer_chromeos_uitest.cc
index fc29daf..d8a5b697 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_chromeos_uitest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_chromeos_uitest.cc
@@ -80,6 +80,10 @@
class WindowSizerTest : public InProcessBrowserTest {
public:
WindowSizerTest() {}
+
+ WindowSizerTest(const WindowSizerTest&) = delete;
+ WindowSizerTest& operator=(const WindowSizerTest&) = delete;
+
~WindowSizerTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -87,9 +91,6 @@
command_line->AppendSwitchASCII("ash-host-window-bounds",
"600x600,601+0-600x600");
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WindowSizerTest);
};
// TODO(crbug.com/1038342): Test is flaky.
diff --git a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc
index 42021ff5..2b7773c 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc
@@ -30,6 +30,10 @@
TestScreen() : previous_screen_(display::Screen::GetScreen()) {
display::Screen::SetScreenInstance(this);
}
+
+ TestScreen(const TestScreen&) = delete;
+ TestScreen& operator=(const TestScreen&) = delete;
+
~TestScreen() override {
display::Screen::SetScreenInstance(previous_screen_);
}
@@ -44,8 +48,6 @@
private:
display::Screen* previous_screen_;
-
- DISALLOW_COPY_AND_ASSIGN(TestScreen);
};
} // namespace
diff --git a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.h b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.h
index b0c3f1c0..f5478c9 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.h
+++ b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.h
@@ -48,6 +48,10 @@
class TestStateProvider : public WindowSizer::StateProvider {
public:
TestStateProvider();
+
+ TestStateProvider(const TestStateProvider&) = delete;
+ TestStateProvider& operator=(const TestStateProvider&) = delete;
+
~TestStateProvider() override {}
void SetPersistentState(const gfx::Rect& bounds,
@@ -72,8 +76,6 @@
gfx::Rect last_active_bounds_;
bool has_last_active_data_;
ui::WindowShowState last_active_show_state_;
-
- DISALLOW_COPY_AND_ASSIGN(TestStateProvider);
};
// Several convenience functions which allow to set up a state for
diff --git a/chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.h b/chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.h
index 5368c267..1f64c4d 100644
--- a/chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.h
+++ b/chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.h
@@ -22,6 +22,11 @@
public:
ChromeZoomLevelOTRDelegate(
base::WeakPtr<zoom::ZoomEventManager> zoom_event_manager);
+
+ ChromeZoomLevelOTRDelegate(const ChromeZoomLevelOTRDelegate&) = delete;
+ ChromeZoomLevelOTRDelegate& operator=(const ChromeZoomLevelOTRDelegate&) =
+ delete;
+
~ChromeZoomLevelOTRDelegate() override;
// content::ZoomLevelDelegate
@@ -36,8 +41,6 @@
base::WeakPtr<zoom::ZoomEventManager> zoom_event_manager_;
content::HostZoomMap* host_zoom_map_;
base::CallbackListSubscription zoom_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeZoomLevelOTRDelegate);
};
#endif // CHROME_BROWSER_UI_ZOOM_CHROME_ZOOM_LEVEL_OTR_DELEGATE_H_
diff --git a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h
index 053a46d..957ad1e 100644
--- a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h
+++ b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h
@@ -42,6 +42,10 @@
const base::FilePath& profile_path,
const base::FilePath& partition_path,
base::WeakPtr<zoom::ZoomEventManager> zoom_event_manager);
+
+ ChromeZoomLevelPrefs(const ChromeZoomLevelPrefs&) = delete;
+ ChromeZoomLevelPrefs& operator=(const ChromeZoomLevelPrefs&) = delete;
+
~ChromeZoomLevelPrefs() override;
static std::string GetPartitionKeyForTesting(
@@ -71,8 +75,6 @@
base::CallbackListSubscription zoom_subscription_;
std::string partition_key_;
base::RepeatingClosureList default_zoom_changed_callbacks_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeZoomLevelPrefs);
};
#endif // CHROME_BROWSER_UI_ZOOM_CHROME_ZOOM_LEVEL_PREFS_H_
diff --git a/chrome/browser/unified_consent/unified_consent_browsertest.cc b/chrome/browser/unified_consent/unified_consent_browsertest.cc
index 775ea663..f1cd8c0 100644
--- a/chrome/browser/unified_consent/unified_consent_browsertest.cc
+++ b/chrome/browser/unified_consent/unified_consent_browsertest.cc
@@ -26,6 +26,11 @@
class UnifiedConsentBrowserTest : public SyncTest {
public:
UnifiedConsentBrowserTest() : SyncTest(TWO_CLIENT) {}
+
+ UnifiedConsentBrowserTest(const UnifiedConsentBrowserTest&) = delete;
+ UnifiedConsentBrowserTest& operator=(const UnifiedConsentBrowserTest&) =
+ delete;
+
~UnifiedConsentBrowserTest() override = default;
void EnableSync(int client_id) {
@@ -66,8 +71,6 @@
}
std::unique_ptr<syncer::SyncSetupInProgressHandle> sync_blocker_;
-
- DISALLOW_COPY_AND_ASSIGN(UnifiedConsentBrowserTest);
};
// Tests that the settings histogram is recorded if unified consent is enabled.
diff --git a/chrome/browser/update_client/chrome_update_query_params_delegate.h b/chrome/browser/update_client/chrome_update_query_params_delegate.h
index b8f9e38..f6cef09 100644
--- a/chrome/browser/update_client/chrome_update_query_params_delegate.h
+++ b/chrome/browser/update_client/chrome_update_query_params_delegate.h
@@ -14,6 +14,12 @@
: public update_client::UpdateQueryParamsDelegate {
public:
ChromeUpdateQueryParamsDelegate();
+
+ ChromeUpdateQueryParamsDelegate(const ChromeUpdateQueryParamsDelegate&) =
+ delete;
+ ChromeUpdateQueryParamsDelegate& operator=(
+ const ChromeUpdateQueryParamsDelegate&) = delete;
+
~ChromeUpdateQueryParamsDelegate() override;
// Gets the LazyInstance for ChromeUpdateQueryParamsDelegate.
@@ -25,9 +31,6 @@
// Returns the language for the present locale. Possible return values are
// standard tags for languages, such as "en", "en-US", "de", "fr", "af", etc.
static const char* GetLang();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeUpdateQueryParamsDelegate);
};
#endif // CHROME_BROWSER_UPDATE_CLIENT_CHROME_UPDATE_QUERY_PARAMS_DELEGATE_H_
diff --git a/chrome/browser/updates/announcement_notification/announcement_notification_delegate.h b/chrome/browser/updates/announcement_notification/announcement_notification_delegate.h
index b68c64a..37a0b62 100644
--- a/chrome/browser/updates/announcement_notification/announcement_notification_delegate.h
+++ b/chrome/browser/updates/announcement_notification/announcement_notification_delegate.h
@@ -20,6 +20,12 @@
public:
explicit AnnouncementNotificationDelegate(
NotificationDisplayService* display_service);
+
+ AnnouncementNotificationDelegate(const AnnouncementNotificationDelegate&) =
+ delete;
+ AnnouncementNotificationDelegate& operator=(
+ const AnnouncementNotificationDelegate&) = delete;
+
~AnnouncementNotificationDelegate() override;
private:
@@ -29,8 +35,6 @@
// Used to show the notification.
NotificationDisplayService* display_service_;
-
- DISALLOW_COPY_AND_ASSIGN(AnnouncementNotificationDelegate);
};
#endif // CHROME_BROWSER_UPDATES_ANNOUNCEMENT_NOTIFICATION_ANNOUNCEMENT_NOTIFICATION_DELEGATE_H_
diff --git a/chrome/browser/updates/announcement_notification/announcement_notification_delegate_android.h b/chrome/browser/updates/announcement_notification/announcement_notification_delegate_android.h
index 224a1ef..a5d4376 100644
--- a/chrome/browser/updates/announcement_notification/announcement_notification_delegate_android.h
+++ b/chrome/browser/updates/announcement_notification/announcement_notification_delegate_android.h
@@ -12,14 +12,18 @@
: public AnnouncementNotificationService::Delegate {
public:
AnnouncementNotificationDelegateAndroid();
+
+ AnnouncementNotificationDelegateAndroid(
+ const AnnouncementNotificationDelegateAndroid&) = delete;
+ AnnouncementNotificationDelegateAndroid& operator=(
+ const AnnouncementNotificationDelegateAndroid&) = delete;
+
~AnnouncementNotificationDelegateAndroid() override;
private:
// AnnouncementNotificationService::Delegate implementation.
void ShowNotification() override;
bool IsFirstRun() override;
-
- DISALLOW_COPY_AND_ASSIGN(AnnouncementNotificationDelegateAndroid);
};
#endif // CHROME_BROWSER_UPDATES_ANNOUNCEMENT_NOTIFICATION_ANNOUNCEMENT_NOTIFICATION_DELEGATE_ANDROID_H_
diff --git a/chrome/browser/updates/announcement_notification/announcement_notification_handler.h b/chrome/browser/updates/announcement_notification/announcement_notification_handler.h
index 83a074a..6eec61f3 100644
--- a/chrome/browser/updates/announcement_notification/announcement_notification_handler.h
+++ b/chrome/browser/updates/announcement_notification/announcement_notification_handler.h
@@ -16,6 +16,12 @@
class AnnouncementNotificationHandler : public NotificationHandler {
public:
AnnouncementNotificationHandler();
+
+ AnnouncementNotificationHandler(const AnnouncementNotificationHandler&) =
+ delete;
+ AnnouncementNotificationHandler& operator=(
+ const AnnouncementNotificationHandler&) = delete;
+
~AnnouncementNotificationHandler() override;
private:
@@ -33,8 +39,6 @@
base::OnceClosure completed_closure) override;
void OpenAnnouncement(Profile* profile);
-
- DISALLOW_COPY_AND_ASSIGN(AnnouncementNotificationHandler);
};
#endif // CHROME_BROWSER_UPDATES_ANNOUNCEMENT_NOTIFICATION_ANNOUNCEMENT_NOTIFICATION_HANDLER_H_
diff --git a/chrome/browser/updates/announcement_notification/announcement_notification_service.cc b/chrome/browser/updates/announcement_notification/announcement_notification_service.cc
index d4a2df6..42858a2 100644
--- a/chrome/browser/updates/announcement_notification/announcement_notification_service.cc
+++ b/chrome/browser/updates/announcement_notification/announcement_notification_service.cc
@@ -77,6 +77,11 @@
skip_first_run_after_ = base::Time();
}
+ AnnouncementNotificationServiceImpl(
+ const AnnouncementNotificationServiceImpl&) = delete;
+ AnnouncementNotificationServiceImpl& operator=(
+ const AnnouncementNotificationServiceImpl&) = delete;
+
~AnnouncementNotificationServiceImpl() override = default;
private:
@@ -219,8 +224,6 @@
base::WeakPtrFactory<AnnouncementNotificationServiceImpl> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(AnnouncementNotificationServiceImpl);
};
const base::Feature kAnnouncementNotification{
diff --git a/chrome/browser/updates/announcement_notification/announcement_notification_service.h b/chrome/browser/updates/announcement_notification/announcement_notification_service.h
index 81cd838..2123133 100644
--- a/chrome/browser/updates/announcement_notification/announcement_notification_service.h
+++ b/chrome/browser/updates/announcement_notification/announcement_notification_service.h
@@ -70,6 +70,10 @@
class Delegate {
public:
Delegate() = default;
+
+ Delegate(const Delegate&) = delete;
+ Delegate& operator=(const Delegate&) = delete;
+
virtual ~Delegate() = default;
// Show notification.
@@ -77,9 +81,6 @@
// Is Chrome first time to run.
virtual bool IsFirstRun() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Delegate);
};
static void RegisterProfilePrefs(PrefRegistrySimple* registry);
@@ -94,14 +95,17 @@
static bool CanOpenAnnouncement(Profile* profile);
AnnouncementNotificationService();
+
+ AnnouncementNotificationService(const AnnouncementNotificationService&) =
+ delete;
+ AnnouncementNotificationService& operator=(
+ const AnnouncementNotificationService&) = delete;
+
~AnnouncementNotificationService() override;
// Show notification if needed based on a version number in Finch parameters
// and the version cached in PrefService.
virtual void MaybeShowNotification() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AnnouncementNotificationService);
};
#endif // CHROME_BROWSER_UPDATES_ANNOUNCEMENT_NOTIFICATION_ANNOUNCEMENT_NOTIFICATION_SERVICE_H_
diff --git a/chrome/browser/updates/announcement_notification/announcement_notification_service_unittest.cc b/chrome/browser/updates/announcement_notification/announcement_notification_service_unittest.cc
index 068d1082..fb89a8c 100644
--- a/chrome/browser/updates/announcement_notification/announcement_notification_service_unittest.cc
+++ b/chrome/browser/updates/announcement_notification/announcement_notification_service_unittest.cc
@@ -40,17 +40,24 @@
class MockDelegate : public AnnouncementNotificationService::Delegate {
public:
MockDelegate() = default;
+
+ MockDelegate(const MockDelegate&) = delete;
+ MockDelegate& operator=(const MockDelegate&) = delete;
+
~MockDelegate() override = default;
MOCK_METHOD0(ShowNotification, void());
MOCK_METHOD0(IsFirstRun, bool());
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockDelegate);
};
class AnnouncementNotificationServiceTest : public testing::Test {
public:
AnnouncementNotificationServiceTest() = default;
+
+ AnnouncementNotificationServiceTest(
+ const AnnouncementNotificationServiceTest&) = delete;
+ AnnouncementNotificationServiceTest& operator=(
+ const AnnouncementNotificationServiceTest&) = delete;
+
~AnnouncementNotificationServiceTest() override = default;
protected:
@@ -158,7 +165,6 @@
std::unique_ptr<TestingPrefServiceSimple> pref_service_;
std::unique_ptr<TestingProfile> test_profile_;
MockDelegate* delegate_ = nullptr;
- DISALLOW_COPY_AND_ASSIGN(AnnouncementNotificationServiceTest);
};
TEST_F(AnnouncementNotificationServiceTest, RequireSignOut) {
@@ -316,10 +322,13 @@
public ::testing::WithParamInterface<VersionTestParam> {
public:
AnnouncementNotificationServiceVersionTest() = default;
- ~AnnouncementNotificationServiceVersionTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(AnnouncementNotificationServiceVersionTest);
+ AnnouncementNotificationServiceVersionTest(
+ const AnnouncementNotificationServiceVersionTest&) = delete;
+ AnnouncementNotificationServiceVersionTest& operator=(
+ const AnnouncementNotificationServiceVersionTest&) = delete;
+
+ ~AnnouncementNotificationServiceVersionTest() override = default;
};
const VersionTestParam kVersionTestParams[] = {
diff --git a/chrome/browser/updates/announcement_notification/empty_announcement_notification_service.h b/chrome/browser/updates/announcement_notification/empty_announcement_notification_service.h
index f21ce13a..2a69f36 100644
--- a/chrome/browser/updates/announcement_notification/empty_announcement_notification_service.h
+++ b/chrome/browser/updates/announcement_notification/empty_announcement_notification_service.h
@@ -13,13 +13,17 @@
: public AnnouncementNotificationService {
public:
EmptyAnnouncementNotificationService();
+
+ EmptyAnnouncementNotificationService(
+ const EmptyAnnouncementNotificationService&) = delete;
+ EmptyAnnouncementNotificationService& operator=(
+ const EmptyAnnouncementNotificationService&) = delete;
+
~EmptyAnnouncementNotificationService() override;
private:
// AnnouncementNotificationService overrides.
void MaybeShowNotification() override;
-
- DISALLOW_COPY_AND_ASSIGN(EmptyAnnouncementNotificationService);
};
#endif // CHROME_BROWSER_UPDATES_ANNOUNCEMENT_NOTIFICATION_EMPTY_ANNOUNCEMENT_NOTIFICATION_SERVICE_H_
diff --git a/chrome/browser/updates/test/mock_update_notification_service_bridge.h b/chrome/browser/updates/test/mock_update_notification_service_bridge.h
index 326161d..f0acb6c 100644
--- a/chrome/browser/updates/test/mock_update_notification_service_bridge.h
+++ b/chrome/browser/updates/test/mock_update_notification_service_bridge.h
@@ -18,6 +18,12 @@
: public UpdateNotificationServiceBridge {
public:
MockUpdateNotificationServiceBridge();
+
+ MockUpdateNotificationServiceBridge(
+ const MockUpdateNotificationServiceBridge&) = delete;
+ MockUpdateNotificationServiceBridge& operator=(
+ const MockUpdateNotificationServiceBridge&) = delete;
+
~MockUpdateNotificationServiceBridge();
MOCK_METHOD1(UpdateLastShownTimeStamp, void(base::Time timestamp));
@@ -27,9 +33,6 @@
MOCK_METHOD1(UpdateNegativeActionCount, void(int count));
MOCK_METHOD0(GetNegativeActionCount, int());
MOCK_METHOD1(LaunchChromeActivity, void(int state));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockUpdateNotificationServiceBridge);
};
} // namespace test
diff --git a/chrome/browser/upgrade_detector/upgrade_detector.h b/chrome/browser/upgrade_detector/upgrade_detector.h
index 29abdec..9781ede 100644
--- a/chrome/browser/upgrade_detector/upgrade_detector.h
+++ b/chrome/browser/upgrade_detector/upgrade_detector.h
@@ -74,6 +74,9 @@
// Returns the singleton implementation instance.
static UpgradeDetector* GetInstance();
+ UpgradeDetector(const UpgradeDetector&) = delete;
+ UpgradeDetector& operator=(const UpgradeDetector&) = delete;
+
virtual ~UpgradeDetector();
// Returns the default delta from upgrade detection until high annoyance is
@@ -395,8 +398,6 @@
base::ObserverList<UpgradeObserver>::Unchecked observer_list_;
base::WeakPtrFactory<UpgradeDetector> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UpgradeDetector);
};
#endif // CHROME_BROWSER_UPGRADE_DETECTOR_UPGRADE_DETECTOR_H_
diff --git a/chrome/browser/upgrade_detector/upgrade_detector_chromeos.h b/chrome/browser/upgrade_detector/upgrade_detector_chromeos.h
index 9fa5f48..427b7b93 100644
--- a/chrome/browser/upgrade_detector/upgrade_detector_chromeos.h
+++ b/chrome/browser/upgrade_detector/upgrade_detector_chromeos.h
@@ -25,6 +25,9 @@
public BuildStateObserver,
public chromeos::UpdateEngineClient::Observer {
public:
+ UpgradeDetectorChromeos(const UpgradeDetectorChromeos&) = delete;
+ UpgradeDetectorChromeos& operator=(const UpgradeDetectorChromeos&) = delete;
+
~UpgradeDetectorChromeos() override;
// Register ChromeOS specific Prefs.
@@ -102,8 +105,6 @@
// Indicates whether there is an update in progress.
bool update_in_progress_;
-
- DISALLOW_COPY_AND_ASSIGN(UpgradeDetectorChromeos);
};
#endif // CHROME_BROWSER_UPGRADE_DETECTOR_UPGRADE_DETECTOR_CHROMEOS_H_
diff --git a/chrome/browser/upgrade_detector/upgrade_detector_chromeos_unittest.cc b/chrome/browser/upgrade_detector/upgrade_detector_chromeos_unittest.cc
index d63245e..b17fbd5 100644
--- a/chrome/browser/upgrade_detector/upgrade_detector_chromeos_unittest.cc
+++ b/chrome/browser/upgrade_detector/upgrade_detector_chromeos_unittest.cc
@@ -34,6 +34,11 @@
explicit TestUpgradeDetectorChromeos(const base::Clock* clock,
const base::TickClock* tick_clock)
: UpgradeDetectorChromeos(clock, tick_clock) {}
+
+ TestUpgradeDetectorChromeos(const TestUpgradeDetectorChromeos&) = delete;
+ TestUpgradeDetectorChromeos& operator=(const TestUpgradeDetectorChromeos&) =
+ delete;
+
~TestUpgradeDetectorChromeos() override = default;
// Exposed for testing.
@@ -46,8 +51,6 @@
GetAnnoyanceLevelDeadline(
UpgradeDetector::UPGRADE_ANNOYANCE_ELEVATED);
}
-
- DISALLOW_COPY_AND_ASSIGN(TestUpgradeDetectorChromeos);
};
class MockUpgradeObserver : public UpgradeObserver {
@@ -56,6 +59,10 @@
: upgrade_detector_(upgrade_detector) {
upgrade_detector_->AddObserver(this);
}
+
+ MockUpgradeObserver(const MockUpgradeObserver&) = delete;
+ MockUpgradeObserver& operator=(const MockUpgradeObserver&) = delete;
+
~MockUpgradeObserver() override { upgrade_detector_->RemoveObserver(this); }
MOCK_METHOD0(OnUpdateOverCellularAvailable, void());
MOCK_METHOD0(OnUpdateOverCellularOneTimePermissionGranted, void());
@@ -67,7 +74,6 @@
private:
UpgradeDetector* const upgrade_detector_;
- DISALLOW_COPY_AND_ASSIGN(MockUpgradeObserver);
};
} // namespace
diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl_unittest.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl_unittest.cc
index eaeeb62..a4141de 100644
--- a/chrome/browser/upgrade_detector/upgrade_detector_impl_unittest.cc
+++ b/chrome/browser/upgrade_detector/upgrade_detector_impl_unittest.cc
@@ -44,6 +44,10 @@
explicit TestUpgradeDetectorImpl(const base::Clock* clock,
const base::TickClock* tick_clock)
: UpgradeDetectorImpl(clock, tick_clock) {}
+
+ TestUpgradeDetectorImpl(const TestUpgradeDetectorImpl&) = delete;
+ TestUpgradeDetectorImpl& operator=(const TestUpgradeDetectorImpl&) = delete;
+
~TestUpgradeDetectorImpl() override = default;
// Exposed for testing.
@@ -68,8 +72,6 @@
// How many times TriggerCriticalUpdate() has been called. Expected to either
// be 0 or 1.
int trigger_critical_update_call_count_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(TestUpgradeDetectorImpl);
};
class TestUpgradeNotificationListener : public UpgradeObserver {
@@ -79,6 +81,12 @@
DCHECK(detector_);
detector_->AddObserver(this);
}
+
+ TestUpgradeNotificationListener(const TestUpgradeNotificationListener&) =
+ delete;
+ TestUpgradeNotificationListener& operator=(
+ const TestUpgradeNotificationListener&) = delete;
+
~TestUpgradeNotificationListener() override {
detector_->RemoveObserver(this);
}
@@ -93,8 +101,6 @@
int notifications_count_;
UpgradeDetector* detector_;
-
- DISALLOW_COPY_AND_ASSIGN(TestUpgradeNotificationListener);
};
class MockUpgradeObserver : public UpgradeObserver {
@@ -103,6 +109,10 @@
: upgrade_detector_(upgrade_detector) {
upgrade_detector_->AddObserver(this);
}
+
+ MockUpgradeObserver(const MockUpgradeObserver&) = delete;
+ MockUpgradeObserver& operator=(const MockUpgradeObserver&) = delete;
+
~MockUpgradeObserver() override { upgrade_detector_->RemoveObserver(this); }
MOCK_METHOD0(OnUpdateOverCellularAvailable, void());
MOCK_METHOD0(OnUpdateOverCellularOneTimePermissionGranted, void());
@@ -113,7 +123,6 @@
private:
UpgradeDetector* const upgrade_detector_;
- DISALLOW_COPY_AND_ASSIGN(MockUpgradeObserver);
};
} // namespace
diff --git a/chrome/browser/usb/usb_blocklist.h b/chrome/browser/usb/usb_blocklist.h
index 4587d41..1ffc2a8 100644
--- a/chrome/browser/usb/usb_blocklist.h
+++ b/chrome/browser/usb/usb_blocklist.h
@@ -37,6 +37,9 @@
uint16_t max_version;
};
+ UsbBlocklist(const UsbBlocklist&) = delete;
+ UsbBlocklist& operator=(const UsbBlocklist&) = delete;
+
~UsbBlocklist();
// Returns a singleton instance of the blocklist.
@@ -76,8 +79,6 @@
// Set of blocklist entries.
std::vector<Entry> dynamic_entries_;
-
- DISALLOW_COPY_AND_ASSIGN(UsbBlocklist);
};
#endif // CHROME_BROWSER_USB_USB_BLOCKLIST_H_
diff --git a/chrome/browser/usb/usb_browsertest.cc b/chrome/browser/usb/usb_browsertest.cc
index abbf1fb0..880ffc6 100644
--- a/chrome/browser/usb/usb_browsertest.cc
+++ b/chrome/browser/usb/usb_browsertest.cc
@@ -55,6 +55,9 @@
controller_->set_view(this);
}
+ FakeChooserView(const FakeChooserView&) = delete;
+ FakeChooserView& operator=(const FakeChooserView&) = delete;
+
~FakeChooserView() override { controller_->set_view(nullptr); }
void OnOptionsInitialized() override {
@@ -73,8 +76,6 @@
private:
std::unique_ptr<permissions::ChooserController> controller_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeChooserView);
};
class FakeUsbChooser : public WebUsbChooser {
@@ -82,6 +83,9 @@
explicit FakeUsbChooser(RenderFrameHost* render_frame_host)
: WebUsbChooser(render_frame_host) {}
+ FakeUsbChooser(const FakeUsbChooser&) = delete;
+ FakeUsbChooser& operator=(const FakeUsbChooser&) = delete;
+
~FakeUsbChooser() override {}
void ShowChooser(std::unique_ptr<UsbChooserController> controller) override {
@@ -100,14 +104,15 @@
private:
base::WeakPtrFactory<FakeUsbChooser> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FakeUsbChooser);
};
class TestContentBrowserClient : public ChromeContentBrowserClient {
public:
TestContentBrowserClient() {}
+ TestContentBrowserClient(const TestContentBrowserClient&) = delete;
+ TestContentBrowserClient& operator=(const TestContentBrowserClient&) = delete;
+
~TestContentBrowserClient() override {}
// ChromeContentBrowserClient:
@@ -131,8 +136,6 @@
bool use_real_chooser_ = false;
std::unique_ptr<WebUsbServiceImpl> web_usb_service_;
std::unique_ptr<WebUsbChooser> usb_chooser_;
-
- DISALLOW_COPY_AND_ASSIGN(TestContentBrowserClient);
};
class WebUsbTest : public InProcessBrowserTest {
diff --git a/chrome/browser/usb/usb_chooser_context.h b/chrome/browser/usb/usb_chooser_context.h
index fe33e48..bac064c 100644
--- a/chrome/browser/usb/usb_chooser_context.h
+++ b/chrome/browser/usb/usb_chooser_context.h
@@ -33,6 +33,10 @@
public device::mojom::UsbDeviceManagerClient {
public:
explicit UsbChooserContext(Profile* profile);
+
+ UsbChooserContext(const UsbChooserContext&) = delete;
+ UsbChooserContext& operator=(const UsbChooserContext&) = delete;
+
~UsbChooserContext() override;
// This observer can be used to be notified of changes to USB devices that are
@@ -123,8 +127,6 @@
base::ObserverList<DeviceObserver> device_observer_list_;
base::WeakPtrFactory<UsbChooserContext> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UsbChooserContext);
};
#endif // CHROME_BROWSER_USB_USB_CHOOSER_CONTEXT_H_
diff --git a/chrome/browser/usb/usb_chooser_controller.h b/chrome/browser/usb/usb_chooser_controller.h
index 9acbb27..c25ebdd4 100644
--- a/chrome/browser/usb/usb_chooser_controller.h
+++ b/chrome/browser/usb/usb_chooser_controller.h
@@ -32,6 +32,10 @@
content::RenderFrameHost* render_frame_host,
std::vector<device::mojom::UsbDeviceFilterPtr> device_filters,
blink::mojom::WebUsbService::GetPermissionCallback callback);
+
+ UsbChooserController(const UsbChooserController&) = delete;
+ UsbChooserController& operator=(const UsbChooserController&) = delete;
+
~UsbChooserController() override;
// permissions::ChooserController:
@@ -71,8 +75,6 @@
// Maps from device name to number of devices.
std::unordered_map<std::u16string, int> device_name_map_;
base::WeakPtrFactory<UsbChooserController> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UsbChooserController);
};
#endif // CHROME_BROWSER_USB_USB_CHOOSER_CONTROLLER_H_
diff --git a/chrome/browser/usb/usb_tab_helper.h b/chrome/browser/usb/usb_tab_helper.h
index a69a70d..7e00af1 100644
--- a/chrome/browser/usb/usb_tab_helper.h
+++ b/chrome/browser/usb/usb_tab_helper.h
@@ -16,6 +16,9 @@
static UsbTabHelper* GetOrCreateForWebContents(
content::WebContents* web_contents);
+ UsbTabHelper(const UsbTabHelper&) = delete;
+ UsbTabHelper& operator=(const UsbTabHelper&) = delete;
+
~UsbTabHelper() override;
void IncrementConnectionCount();
@@ -35,8 +38,6 @@
content::WebContents* web_contents_;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(UsbTabHelper);
};
#endif // CHROME_BROWSER_USB_USB_TAB_HELPER_H_
diff --git a/chrome/browser/usb/web_usb_chooser.h b/chrome/browser/usb/web_usb_chooser.h
index 4dbfcc0..807ea738 100644
--- a/chrome/browser/usb/web_usb_chooser.h
+++ b/chrome/browser/usb/web_usb_chooser.h
@@ -24,6 +24,9 @@
public:
explicit WebUsbChooser(content::RenderFrameHost* render_frame_host);
+ WebUsbChooser(const WebUsbChooser&) = delete;
+ WebUsbChooser& operator=(const WebUsbChooser&) = delete;
+
virtual ~WebUsbChooser();
void GetPermission(
@@ -39,8 +42,6 @@
private:
content::RenderFrameHost* const render_frame_host_;
-
- DISALLOW_COPY_AND_ASSIGN(WebUsbChooser);
};
#endif // CHROME_BROWSER_USB_WEB_USB_CHOOSER_H_
diff --git a/chrome/browser/usb/web_usb_chooser_desktop.h b/chrome/browser/usb/web_usb_chooser_desktop.h
index 9dba9cb..59b4b72 100644
--- a/chrome/browser/usb/web_usb_chooser_desktop.h
+++ b/chrome/browser/usb/web_usb_chooser_desktop.h
@@ -16,6 +16,10 @@
class WebUsbChooserDesktop : public WebUsbChooser {
public:
explicit WebUsbChooserDesktop(content::RenderFrameHost* render_frame_host);
+
+ WebUsbChooserDesktop(const WebUsbChooserDesktop&) = delete;
+ WebUsbChooserDesktop& operator=(const WebUsbChooserDesktop&) = delete;
+
~WebUsbChooserDesktop() override;
// WebUsbChooser implementation
@@ -27,7 +31,6 @@
base::ScopedClosureRunner closure_runner_{base::DoNothing()};
base::WeakPtrFactory<WebUsbChooserDesktop> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(WebUsbChooserDesktop);
};
#endif // CHROME_BROWSER_USB_WEB_USB_CHOOSER_DESKTOP_H_
diff --git a/chrome/browser/usb/web_usb_service_impl.h b/chrome/browser/usb/web_usb_service_impl.h
index 292c2f23..566876d 100644
--- a/chrome/browser/usb/web_usb_service_impl.h
+++ b/chrome/browser/usb/web_usb_service_impl.h
@@ -40,6 +40,10 @@
public:
WebUsbServiceImpl(content::RenderFrameHost* render_frame_host,
base::WeakPtr<WebUsbChooser> usb_chooser);
+
+ WebUsbServiceImpl(const WebUsbServiceImpl&) = delete;
+ WebUsbServiceImpl& operator=(const WebUsbServiceImpl&) = delete;
+
~WebUsbServiceImpl() override;
void BindReceiver(
@@ -103,8 +107,6 @@
permission_observation_{this};
base::WeakPtrFactory<WebUsbServiceImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WebUsbServiceImpl);
};
#endif // CHROME_BROWSER_USB_WEB_USB_SERVICE_IMPL_H_
diff --git a/chrome/browser/video_tutorials/internal/android/video_tutorial_service_bridge.h b/chrome/browser/video_tutorials/internal/android/video_tutorial_service_bridge.h
index 670bd50b..220c3aa5 100644
--- a/chrome/browser/video_tutorials/internal/android/video_tutorial_service_bridge.h
+++ b/chrome/browser/video_tutorials/internal/android/video_tutorial_service_bridge.h
@@ -27,6 +27,11 @@
explicit VideoTutorialServiceBridge(
VideoTutorialService* video_tutorial_service);
+
+ VideoTutorialServiceBridge(const VideoTutorialServiceBridge&) = delete;
+ VideoTutorialServiceBridge& operator=(const VideoTutorialServiceBridge&) =
+ delete;
+
~VideoTutorialServiceBridge() override;
// Methods called from Java via JNI.
@@ -58,8 +63,6 @@
// Not owned.
VideoTutorialService* video_tutorial_service_;
-
- DISALLOW_COPY_AND_ASSIGN(VideoTutorialServiceBridge);
};
} // namespace video_tutorials
diff --git a/chrome/browser/vr/base_graphics_delegate.h b/chrome/browser/vr/base_graphics_delegate.h
index 82b194f9..466754b 100644
--- a/chrome/browser/vr/base_graphics_delegate.h
+++ b/chrome/browser/vr/base_graphics_delegate.h
@@ -20,6 +20,10 @@
class VR_EXPORT BaseGraphicsDelegate : public GraphicsDelegate {
public:
BaseGraphicsDelegate();
+
+ BaseGraphicsDelegate(const BaseGraphicsDelegate&) = delete;
+ BaseGraphicsDelegate& operator=(const BaseGraphicsDelegate&) = delete;
+
~BaseGraphicsDelegate() override;
// GraphicsDelegate implementation.
@@ -38,8 +42,6 @@
scoped_refptr<gl::GLShareGroup> share_group_;
scoped_refptr<gl::GLContext> contexts_[kNumContexts];
ContextId curr_context_id_ = kNone;
-
- DISALLOW_COPY_AND_ASSIGN(BaseGraphicsDelegate);
};
} // namespace vr
diff --git a/chrome/browser/vr/base_scheduler_delegate.h b/chrome/browser/vr/base_scheduler_delegate.h
index 3ac8135..6180742 100644
--- a/chrome/browser/vr/base_scheduler_delegate.h
+++ b/chrome/browser/vr/base_scheduler_delegate.h
@@ -24,6 +24,10 @@
bool start_in_webxr_mode,
int webxr_spinner_timeout,
int webxr_initial_frame_timeout);
+
+ BaseSchedulerDelegate(const BaseSchedulerDelegate&) = delete;
+ BaseSchedulerDelegate& operator=(const BaseSchedulerDelegate&) = delete;
+
~BaseSchedulerDelegate() override;
// SchedulerDelegate implementations.
@@ -57,8 +61,6 @@
base::CancelableOnceClosure webxr_spinner_timeout_closure_;
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(BaseSchedulerDelegate);
};
} // namespace vr
diff --git a/chrome/browser/vr/browser_renderer.h b/chrome/browser/vr/browser_renderer.h
index db2f882..9c091fa 100644
--- a/chrome/browser/vr/browser_renderer.h
+++ b/chrome/browser/vr/browser_renderer.h
@@ -50,6 +50,10 @@
std::unique_ptr<InputDelegate> input_delegate,
BrowserRendererBrowserInterface* browser,
size_t sliding_time_size);
+
+ BrowserRenderer(const BrowserRenderer&) = delete;
+ BrowserRenderer& operator=(const BrowserRenderer&) = delete;
+
~BrowserRenderer() override;
void OnPause();
@@ -136,8 +140,6 @@
std::unique_ptr<UiInterface> ui_;
base::WeakPtrFactory<BrowserRenderer> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BrowserRenderer);
};
} // namespace vr
diff --git a/chrome/browser/vr/content_input_delegate.h b/chrome/browser/vr/content_input_delegate.h
index 980f339b..dd89bce 100644
--- a/chrome/browser/vr/content_input_delegate.h
+++ b/chrome/browser/vr/content_input_delegate.h
@@ -30,6 +30,10 @@
ContentInputDelegate();
explicit ContentInputDelegate(PlatformInputHandler* content);
+
+ ContentInputDelegate(const ContentInputDelegate&) = delete;
+ ContentInputDelegate& operator=(const ContentInputDelegate&) = delete;
+
~ContentInputDelegate() override;
// Text Input specific.
@@ -69,8 +73,6 @@
EditedText last_keyboard_edit_;
TextRequestState pending_text_request_state_ = kNoPendingRequest;
std::queue<TextInputUpdateCallback> update_state_callbacks_;
-
- DISALLOW_COPY_AND_ASSIGN(ContentInputDelegate);
};
} // namespace vr
diff --git a/chrome/browser/vr/databinding/binding.h b/chrome/browser/vr/databinding/binding.h
index 1180e63..3b338630 100644
--- a/chrome/browser/vr/databinding/binding.h
+++ b/chrome/browser/vr/databinding/binding.h
@@ -57,6 +57,9 @@
: getter_(getter), historic_setter_(setter) {}
#endif
+ Binding(const Binding&) = delete;
+ Binding& operator=(const Binding&) = delete;
+
~Binding() override = default;
// This function will check if the getter is producing a different value than
@@ -97,8 +100,6 @@
std::string getter_text_;
std::string setter_text_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(Binding);
};
// These macros are sugar for constructing a simple binding. It is meant to make
diff --git a/chrome/browser/vr/databinding/binding_base.h b/chrome/browser/vr/databinding/binding_base.h
index 3d0448b..3405e94 100644
--- a/chrome/browser/vr/databinding/binding_base.h
+++ b/chrome/browser/vr/databinding/binding_base.h
@@ -15,6 +15,10 @@
class BindingBase {
public:
BindingBase() = default;
+
+ BindingBase(const BindingBase&) = delete;
+ BindingBase& operator=(const BindingBase&) = delete;
+
virtual ~BindingBase() = default;
// This function updates the binding. The exact behavior depends on the
@@ -23,9 +27,6 @@
virtual bool Update() = 0;
virtual std::string ToString() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BindingBase);
};
} // namespace vr
diff --git a/chrome/browser/vr/databinding/vector_binding.h b/chrome/browser/vr/databinding/vector_binding.h
index f808e34..79a662c 100644
--- a/chrome/browser/vr/databinding/vector_binding.h
+++ b/chrome/browser/vr/databinding/vector_binding.h
@@ -32,6 +32,9 @@
added_callback_(added_callback),
removed_callback_(removed_callback) {}
+ VectorBinding(const VectorBinding&) = delete;
+ VectorBinding& operator=(const VectorBinding&) = delete;
+
~VectorBinding() {}
// The update function for this collection binding is responsible for two
@@ -77,8 +80,6 @@
absl::optional<size_t> last_size_;
ModelAddedCallback added_callback_;
ModelRemovedCallback removed_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(VectorBinding);
};
} // namespace vr
diff --git a/chrome/browser/vr/databinding/vector_element_binding.h b/chrome/browser/vr/databinding/vector_element_binding.h
index 068a0f40..d52feb1b 100644
--- a/chrome/browser/vr/databinding/vector_element_binding.h
+++ b/chrome/browser/vr/databinding/vector_element_binding.h
@@ -20,6 +20,10 @@
public:
VectorElementBinding(std::vector<M>* models, size_t index)
: models_(models), index_(index) {}
+
+ VectorElementBinding(const VectorElementBinding&) = delete;
+ VectorElementBinding& operator=(const VectorElementBinding&) = delete;
+
~VectorElementBinding() override {}
// This function will check if the getter is producing a different value than
@@ -54,8 +58,6 @@
size_t index_ = 0;
V* view_;
std::vector<std::unique_ptr<BindingBase>> bindings_;
-
- DISALLOW_COPY_AND_ASSIGN(VectorElementBinding);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/button.h b/chrome/browser/vr/elements/button.h
index 351a00ce..90708444 100644
--- a/chrome/browser/vr/elements/button.h
+++ b/chrome/browser/vr/elements/button.h
@@ -29,6 +29,10 @@
public:
explicit Button(base::RepeatingCallback<void()> click_handler,
AudioDelegate* audio_delegate);
+
+ Button(const Button&) = delete;
+ Button& operator=(const Button&) = delete;
+
~Button() override;
void Render(UiElementRenderer* renderer,
@@ -89,8 +93,6 @@
Rect* background_;
UiElement* hit_plane_;
Sounds disabled_sounds_;
-
- DISALLOW_COPY_AND_ASSIGN(Button);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/content_element.h b/chrome/browser/vr/elements/content_element.h
index 0519b21..332724fe 100644
--- a/chrome/browser/vr/elements/content_element.h
+++ b/chrome/browser/vr/elements/content_element.h
@@ -27,6 +27,10 @@
ScreenBoundsChangedCallback;
ContentElement(ContentInputDelegate* delegate, ScreenBoundsChangedCallback);
+
+ ContentElement(const ContentElement&) = delete;
+ ContentElement& operator=(const ContentElement&) = delete;
+
~ContentElement() override;
// UiElement overrides.
@@ -70,8 +74,6 @@
ContentInputDelegate* content_delegate_ = nullptr;
base::RepeatingCallback<void(const gfx::SizeF& size)>
on_size_changed_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ContentElement);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/content_element_unittest.cc b/chrome/browser/vr/elements/content_element_unittest.cc
index 277e9e30..0c3f8e2 100644
--- a/chrome/browser/vr/elements/content_element_unittest.cc
+++ b/chrome/browser/vr/elements/content_element_unittest.cc
@@ -53,6 +53,10 @@
class TestPlatformInputHandler : public PlatformInputHandler {
public:
TestPlatformInputHandler() {}
+
+ TestPlatformInputHandler(const TestPlatformInputHandler&) = delete;
+ TestPlatformInputHandler& operator=(const TestPlatformInputHandler&) = delete;
+
~TestPlatformInputHandler() override {}
void ForwardEventToPlatformUi(std::unique_ptr<InputEvent>) override {}
@@ -87,8 +91,6 @@
TextEdits edits_;
bool clear_focus_called_ = false;
std::queue<TextStateUpdateCallback> web_input_text_requests;
-
- DISALLOW_COPY_AND_ASSIGN(TestPlatformInputHandler);
};
class ContentElementSceneTest : public UiTest {
diff --git a/chrome/browser/vr/elements/controller.h b/chrome/browser/vr/elements/controller.h
index 95d7439..e7389e8b 100644
--- a/chrome/browser/vr/elements/controller.h
+++ b/chrome/browser/vr/elements/controller.h
@@ -17,6 +17,10 @@
class Controller : public UiElement {
public:
Controller();
+
+ Controller(const Controller&) = delete;
+ Controller& operator=(const Controller&) = delete;
+
~Controller() override;
void set_local_transform(const gfx::Transform& transform) {
@@ -29,6 +33,10 @@
class Renderer : public BaseRenderer {
public:
Renderer();
+
+ Renderer(const Renderer&) = delete;
+ Renderer& operator=(const Renderer&) = delete;
+
~Renderer() override;
void Draw(float opacity, const gfx::Transform& view_proj_matrix);
@@ -43,8 +51,6 @@
GLuint vertex_buffer_ = 0;
GLuint color_buffer_ = 0;
GLuint index_buffer_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(Renderer);
};
private:
@@ -55,8 +61,6 @@
gfx::Transform GetTargetLocalTransform() const override;
gfx::Transform local_transform_;
-
- DISALLOW_COPY_AND_ASSIGN(Controller);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/disc_button.h b/chrome/browser/vr/elements/disc_button.h
index 8495edb..45a0d97 100644
--- a/chrome/browser/vr/elements/disc_button.h
+++ b/chrome/browser/vr/elements/disc_button.h
@@ -23,6 +23,10 @@
DiscButton(base::RepeatingCallback<void()> click_handler,
const gfx::VectorIcon& icon,
AudioDelegate* audio_delegate);
+
+ DiscButton(const DiscButton&) = delete;
+ DiscButton& operator=(const DiscButton&) = delete;
+
~DiscButton() override;
private:
@@ -30,8 +34,6 @@
void OnSizeAnimated(const gfx::SizeF& size,
int target_property_id,
gfx::KeyframeModel* keyframe_model) override;
-
- DISALLOW_COPY_AND_ASSIGN(DiscButton);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/environment/background.h b/chrome/browser/vr/elements/environment/background.h
index cc257e5..83906dd 100644
--- a/chrome/browser/vr/elements/environment/background.h
+++ b/chrome/browser/vr/elements/environment/background.h
@@ -18,6 +18,10 @@
class Background : public UiElement {
public:
Background();
+
+ Background(const Background&) = delete;
+ Background& operator=(const Background&) = delete;
+
~Background() override;
// UiElement:
@@ -39,6 +43,10 @@
class Renderer final : public BaseRenderer {
public:
Renderer();
+
+ Renderer(const Renderer&) = delete;
+ Renderer& operator=(const Renderer&) = delete;
+
~Renderer() override;
void Draw(const gfx::Transform& view_proj_matrix,
@@ -63,8 +71,6 @@
GLuint vertex_buffer_;
GLuint index_buffer_;
GLuint index_count_;
-
- DISALLOW_COPY_AND_ASSIGN(Renderer);
};
private:
@@ -92,8 +98,6 @@
float normal_factor_ = 1.0f;
float incognito_factor_ = 0.0f;
float fullscreen_factor_ = 0.0f;
-
- DISALLOW_COPY_AND_ASSIGN(Background);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/environment/grid.h b/chrome/browser/vr/elements/environment/grid.h
index adf4d59..b6df388 100644
--- a/chrome/browser/vr/elements/environment/grid.h
+++ b/chrome/browser/vr/elements/environment/grid.h
@@ -15,6 +15,10 @@
class Grid : public Rect {
public:
Grid();
+
+ Grid(const Grid&) = delete;
+ Grid& operator=(const Grid&) = delete;
+
~Grid() override;
void Render(UiElementRenderer* renderer,
@@ -35,6 +39,10 @@
class Renderer : public BaseQuadRenderer {
public:
Renderer();
+
+ Renderer(const Renderer&) = delete;
+ Renderer& operator=(const Renderer&) = delete;
+
~Renderer() override;
void Draw(const gfx::Transform& model_view_proj_matrix,
@@ -49,15 +57,11 @@
GLuint grid_color_handle_;
GLuint opacity_handle_;
GLuint lines_count_handle_;
-
- DISALLOW_COPY_AND_ASSIGN(Renderer);
};
private:
SkColor grid_color_ = SK_ColorWHITE;
int gridline_count_ = 1;
-
- DISALLOW_COPY_AND_ASSIGN(Grid);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/environment/stars.h b/chrome/browser/vr/elements/environment/stars.h
index 5018a73..d723d81 100644
--- a/chrome/browser/vr/elements/environment/stars.h
+++ b/chrome/browser/vr/elements/environment/stars.h
@@ -13,6 +13,10 @@
class Stars : public UiElement {
public:
Stars();
+
+ Stars(const Stars&) = delete;
+ Stars& operator=(const Stars&) = delete;
+
~Stars() override;
void Render(UiElementRenderer* renderer,
@@ -21,6 +25,10 @@
class Renderer : public BaseRenderer {
public:
Renderer();
+
+ Renderer(const Renderer&) = delete;
+ Renderer& operator=(const Renderer&) = delete;
+
~Renderer() override;
void Draw(float t, const gfx::Transform& view_proj_matrix);
@@ -37,16 +45,12 @@
// Attributes
GLuint opacity_handle_;
GLuint phase_handle_;
-
- DISALLOW_COPY_AND_ASSIGN(Renderer);
};
private:
void Initialize(SkiaSurfaceProvider* provider) override;
base::TimeTicks start_time_;
-
- DISALLOW_COPY_AND_ASSIGN(Stars);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/full_screen_rect.h b/chrome/browser/vr/elements/full_screen_rect.h
index 9bb2d7d8..e32e567 100644
--- a/chrome/browser/vr/elements/full_screen_rect.h
+++ b/chrome/browser/vr/elements/full_screen_rect.h
@@ -15,14 +15,16 @@
class FullScreenRect : public Rect {
public:
FullScreenRect();
+
+ FullScreenRect(const FullScreenRect&) = delete;
+ FullScreenRect& operator=(const FullScreenRect&) = delete;
+
~FullScreenRect() override;
private:
void Render(UiElementRenderer* renderer,
const CameraModel& model) const final;
bool IsWorldPositioned() const final;
-
- DISALLOW_COPY_AND_ASSIGN(FullScreenRect);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/invisible_hit_target.h b/chrome/browser/vr/elements/invisible_hit_target.h
index 2269fd6..3d5578c 100644
--- a/chrome/browser/vr/elements/invisible_hit_target.h
+++ b/chrome/browser/vr/elements/invisible_hit_target.h
@@ -14,6 +14,10 @@
class InvisibleHitTarget : public UiElement {
public:
InvisibleHitTarget();
+
+ InvisibleHitTarget(const InvisibleHitTarget&) = delete;
+ InvisibleHitTarget& operator=(const InvisibleHitTarget&) = delete;
+
~InvisibleHitTarget() override;
void Render(UiElementRenderer* renderer,
@@ -24,9 +28,6 @@
void OnHoverLeave(base::TimeTicks timestamp) override;
bool hovered() const { return hovered_; }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(InvisibleHitTarget);
bool hovered_ = false;
};
diff --git a/chrome/browser/vr/elements/keyboard.h b/chrome/browser/vr/elements/keyboard.h
index 902e1a624..f2632bd 100644
--- a/chrome/browser/vr/elements/keyboard.h
+++ b/chrome/browser/vr/elements/keyboard.h
@@ -18,6 +18,10 @@
class VR_UI_EXPORT Keyboard : public UiElement {
public:
Keyboard();
+
+ Keyboard(const Keyboard&) = delete;
+ Keyboard& operator=(const Keyboard&) = delete;
+
~Keyboard() override;
// The gvr keyboard requires that we advance its frame after initilization,
@@ -44,11 +48,12 @@
class Renderer : public BaseRenderer {
public:
Renderer();
+
+ Renderer(const Renderer&) = delete;
+ Renderer& operator=(const Renderer&) = delete;
+
~Renderer() override;
void Draw(const CameraModel& camera_model, KeyboardDelegate* delegate);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Renderer);
};
private:
@@ -61,8 +66,6 @@
void UpdateDelegateVisibility();
KeyboardDelegate* delegate_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(Keyboard);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/laser.h b/chrome/browser/vr/elements/laser.h
index fee0dc6..2dc51d70 100644
--- a/chrome/browser/vr/elements/laser.h
+++ b/chrome/browser/vr/elements/laser.h
@@ -16,11 +16,19 @@
class Laser : public UiElement {
public:
explicit Laser(Model* model);
+
+ Laser(const Laser&) = delete;
+ Laser& operator=(const Laser&) = delete;
+
~Laser() override;
class Renderer : public BaseQuadRenderer {
public:
Renderer();
+
+ Renderer(const Renderer&) = delete;
+ Renderer& operator=(const Renderer&) = delete;
+
~Renderer() override;
void Draw(float opacity, const gfx::Transform& view_proj_matrix);
@@ -33,8 +41,6 @@
GLuint fade_point_handle_;
GLuint fade_end_handle_;
GLuint opacity_handle_;
-
- DISALLOW_COPY_AND_ASSIGN(Renderer);
};
private:
@@ -47,8 +53,6 @@
// changes, however, are not latency sensitive and are bound in the usual way
// (they also do not update due to input).
Model* model_;
-
- DISALLOW_COPY_AND_ASSIGN(Laser);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/omnibox_text_field.h b/chrome/browser/vr/elements/omnibox_text_field.h
index a55cde3..79a0e56c 100644
--- a/chrome/browser/vr/elements/omnibox_text_field.h
+++ b/chrome/browser/vr/elements/omnibox_text_field.h
@@ -21,6 +21,10 @@
base::RepeatingCallback<void(const AutocompleteRequest&)>
autocomplete_start_callback,
base::RepeatingCallback<void()> autocomplete_stop_callback);
+
+ OmniboxTextField(const OmniboxTextField&) = delete;
+ OmniboxTextField& operator=(const OmniboxTextField&) = delete;
+
~OmniboxTextField() override;
// This element uses its enabled status to manage outstanding autocomplete
@@ -41,8 +45,6 @@
base::RepeatingCallback<void()> autocomplete_stop_callback_;
bool allow_inline_autocomplete_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(OmniboxTextField);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/oval.h b/chrome/browser/vr/elements/oval.h
index 0b50899..3833cf5 100644
--- a/chrome/browser/vr/elements/oval.h
+++ b/chrome/browser/vr/elements/oval.h
@@ -15,14 +15,16 @@
class VR_UI_EXPORT Oval : public Rect {
public:
Oval();
+
+ Oval(const Oval&) = delete;
+ Oval& operator=(const Oval&) = delete;
+
~Oval() override;
private:
void OnSizeAnimated(const gfx::SizeF& size,
int target_property_id,
gfx::KeyframeModel* keyframe_model) override;
-
- DISALLOW_COPY_AND_ASSIGN(Oval);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/platform_ui_element.h b/chrome/browser/vr/elements/platform_ui_element.h
index 16161a5..8856ca1 100644
--- a/chrome/browser/vr/elements/platform_ui_element.h
+++ b/chrome/browser/vr/elements/platform_ui_element.h
@@ -20,6 +20,10 @@
class PlatformUiElement : public UiElement {
public:
PlatformUiElement();
+
+ PlatformUiElement(const PlatformUiElement&) = delete;
+ PlatformUiElement& operator=(const PlatformUiElement&) = delete;
+
~PlatformUiElement() override;
void OnHoverEnter(const gfx::PointF& position,
@@ -59,8 +63,6 @@
PlatformUiInputDelegate* delegate_ = nullptr;
unsigned int texture_id_ = 0;
GlTextureLocation texture_location_ = kGlTextureLocationExternal;
-
- DISALLOW_COPY_AND_ASSIGN(PlatformUiElement);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/rect.h b/chrome/browser/vr/elements/rect.h
index d63acedc..6347eda 100644
--- a/chrome/browser/vr/elements/rect.h
+++ b/chrome/browser/vr/elements/rect.h
@@ -21,6 +21,10 @@
class VR_UI_EXPORT Rect : public UiElement {
public:
Rect();
+
+ Rect(const Rect&) = delete;
+ Rect& operator=(const Rect&) = delete;
+
~Rect() override;
// Syntactic sugar for setting both the edge and center colors simultaneously.
@@ -53,8 +57,6 @@
// This value is not inherited by descendants.
float local_opacity_ = 1.0f;
-
- DISALLOW_COPY_AND_ASSIGN(Rect);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/render_text_wrapper.h b/chrome/browser/vr/elements/render_text_wrapper.h
index 62f6c310..a4e1dd4 100644
--- a/chrome/browser/vr/elements/render_text_wrapper.h
+++ b/chrome/browser/vr/elements/render_text_wrapper.h
@@ -16,6 +16,10 @@
class VR_UI_EXPORT RenderTextWrapper {
public:
explicit RenderTextWrapper(gfx::RenderText* render_text);
+
+ RenderTextWrapper(const RenderTextWrapper&) = delete;
+ RenderTextWrapper& operator=(const RenderTextWrapper&) = delete;
+
virtual ~RenderTextWrapper();
virtual void SetColor(SkColor value);
@@ -33,8 +37,6 @@
private:
gfx::RenderText* render_text_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(RenderTextWrapper);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/repositioner.h b/chrome/browser/vr/elements/repositioner.h
index cdbd9c1..e80e631 100644
--- a/chrome/browser/vr/elements/repositioner.h
+++ b/chrome/browser/vr/elements/repositioner.h
@@ -24,6 +24,10 @@
class VR_UI_EXPORT Repositioner : public UiElement {
public:
Repositioner();
+
+ Repositioner(const Repositioner&) = delete;
+ Repositioner& operator=(const Repositioner&) = delete;
+
~Repositioner() override;
void set_laser_direction(const gfx::Vector3dF& laser_direction) {
@@ -58,8 +62,6 @@
gfx::Transform initial_transform_;
gfx::Vector3dF initial_laser_direction_;
-
- DISALLOW_COPY_AND_ASSIGN(Repositioner);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/resizer.h b/chrome/browser/vr/elements/resizer.h
index 5edfaed..6b7d2640 100644
--- a/chrome/browser/vr/elements/resizer.h
+++ b/chrome/browser/vr/elements/resizer.h
@@ -19,6 +19,10 @@
class VR_UI_EXPORT Resizer : public UiElement {
public:
Resizer();
+
+ Resizer(const Resizer&) = delete;
+ Resizer& operator=(const Resizer&) = delete;
+
~Resizer() override;
void set_touch_position(const gfx::PointF& position) {
@@ -53,8 +57,6 @@
gfx::PointF touchpad_position_;
gfx::PointF initial_touchpad_position_;
-
- DISALLOW_COPY_AND_ASSIGN(Resizer);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/reticle.h b/chrome/browser/vr/elements/reticle.h
index c5be3a5..2c36c0b 100644
--- a/chrome/browser/vr/elements/reticle.h
+++ b/chrome/browser/vr/elements/reticle.h
@@ -17,6 +17,10 @@
class Reticle : public UiElement {
public:
Reticle(UiScene* scene, Model* model);
+
+ Reticle(const Reticle&) = delete;
+ Reticle& operator=(const Reticle&) = delete;
+
~Reticle() override;
UiElement* TargetElement() const;
@@ -24,6 +28,10 @@
class Renderer : public BaseQuadRenderer {
public:
Renderer();
+
+ Renderer(const Renderer&) = delete;
+ Renderer& operator=(const Renderer&) = delete;
+
~Renderer() override;
void Draw(float opacity, const gfx::Transform& view_proj_matrix);
@@ -40,8 +48,6 @@
GLuint mid_ring_end_handle_;
GLuint mid_ring_opacity_handle_;
GLuint opacity_handle_;
-
- DISALLOW_COPY_AND_ASSIGN(Renderer);
};
private:
@@ -66,8 +72,6 @@
// fully updated its geometry. We therefore retain a pointer to the model and
// make use of it in |Render|.
Model* model_;
-
- DISALLOW_COPY_AND_ASSIGN(Reticle);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/scaled_depth_adjuster.h b/chrome/browser/vr/elements/scaled_depth_adjuster.h
index 902cf9bd..7eb227e 100644
--- a/chrome/browser/vr/elements/scaled_depth_adjuster.h
+++ b/chrome/browser/vr/elements/scaled_depth_adjuster.h
@@ -21,6 +21,10 @@
class VR_UI_EXPORT ScaledDepthAdjuster : public UiElement {
public:
explicit ScaledDepthAdjuster(float delta_z);
+
+ ScaledDepthAdjuster(const ScaledDepthAdjuster&) = delete;
+ ScaledDepthAdjuster& operator=(const ScaledDepthAdjuster&) = delete;
+
~ScaledDepthAdjuster() override;
private:
@@ -40,8 +44,6 @@
// if we use a delta_z_ of -0.1, this will cause our descendants to be
// positioned at depth 2.4.
float delta_z_;
-
- DISALLOW_COPY_AND_ASSIGN(ScaledDepthAdjuster);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/scrollable_element.h b/chrome/browser/vr/elements/scrollable_element.h
index 6e2ff4e5..89bca18 100644
--- a/chrome/browser/vr/elements/scrollable_element.h
+++ b/chrome/browser/vr/elements/scrollable_element.h
@@ -22,6 +22,10 @@
enum Orientation { kVertical, kHorizontal };
explicit ScrollableElement(Orientation orientation);
+
+ ScrollableElement(const ScrollableElement&) = delete;
+ ScrollableElement& operator=(const ScrollableElement&) = delete;
+
~ScrollableElement() override;
// Sets the maximum size the element can have in the axis of orientation.
@@ -68,8 +72,6 @@
float scroll_offset_ = 0.0f;
gfx::Transition cached_transition_;
-
- DISALLOW_COPY_AND_ASSIGN(ScrollableElement);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/shadow.h b/chrome/browser/vr/elements/shadow.h
index 9b387c0..9e85ee13 100644
--- a/chrome/browser/vr/elements/shadow.h
+++ b/chrome/browser/vr/elements/shadow.h
@@ -20,6 +20,10 @@
class VR_UI_EXPORT Shadow : public UiElement {
public:
Shadow();
+
+ Shadow(const Shadow&) = delete;
+ Shadow& operator=(const Shadow&) = delete;
+
~Shadow() override;
void Render(UiElementRenderer* renderer,
@@ -34,6 +38,10 @@
class Renderer : public BaseQuadRenderer {
public:
Renderer();
+
+ Renderer(const Renderer&) = delete;
+ Renderer& operator=(const Renderer&) = delete;
+
~Renderer() override;
void Draw(const gfx::Transform& model_view_proj_matrix,
@@ -54,8 +62,6 @@
GLuint opacity_handle_;
GLuint x_corner_radius_handle_;
GLuint y_corner_radius_handle_;
-
- DISALLOW_COPY_AND_ASSIGN(Renderer);
};
private:
@@ -63,8 +69,6 @@
float intensity_ = 1.0f;
UiElement* shadow_caster_ = nullptr;
gfx::SizeF contributed_size_;
-
- DISALLOW_COPY_AND_ASSIGN(Shadow);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/spinner.cc b/chrome/browser/vr/elements/spinner.cc
index dbd37a7c..402923d 100644
--- a/chrome/browser/vr/elements/spinner.cc
+++ b/chrome/browser/vr/elements/spinner.cc
@@ -30,6 +30,10 @@
class SpinnerTexture : public UiTexture {
public:
SpinnerTexture() {}
+
+ SpinnerTexture(const SpinnerTexture&) = delete;
+ SpinnerTexture& operator=(const SpinnerTexture&) = delete;
+
~SpinnerTexture() override {}
void SetAngleSweep(float angle) { SetAndDirty(&angle_sweep_, angle); }
@@ -57,8 +61,6 @@
float angle_start_ = 0.0f;
float rotation_ = 0.0f;
SkColor color_ = SK_ColorWHITE;
-
- DISALLOW_COPY_AND_ASSIGN(SpinnerTexture);
};
Spinner::Spinner(int texture_width)
diff --git a/chrome/browser/vr/elements/spinner.h b/chrome/browser/vr/elements/spinner.h
index 8a775174..cef59f5 100644
--- a/chrome/browser/vr/elements/spinner.h
+++ b/chrome/browser/vr/elements/spinner.h
@@ -19,6 +19,10 @@
class VR_UI_EXPORT Spinner : public TexturedElement {
public:
explicit Spinner(int texture_width);
+
+ Spinner(const Spinner&) = delete;
+ Spinner& operator=(const Spinner&) = delete;
+
~Spinner() override;
void SetColor(SkColor color);
@@ -35,8 +39,6 @@
gfx::KeyframeModel* keyframe_model) override;
std::unique_ptr<SpinnerTexture> texture_;
int texture_width_;
-
- DISALLOW_COPY_AND_ASSIGN(Spinner);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/spinner_unittest.cc b/chrome/browser/vr/elements/spinner_unittest.cc
index d598700..46389698 100644
--- a/chrome/browser/vr/elements/spinner_unittest.cc
+++ b/chrome/browser/vr/elements/spinner_unittest.cc
@@ -24,12 +24,13 @@
class TestSpinner : public Spinner {
public:
explicit TestSpinner(int maximum_width) : Spinner(maximum_width) {}
+
+ TestSpinner(const TestSpinner&) = delete;
+ TestSpinner& operator=(const TestSpinner&) = delete;
+
~TestSpinner() override {}
UiTexture* GetTexture() const override { return Spinner::GetTexture(); }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestSpinner);
};
} // namespace
diff --git a/chrome/browser/vr/elements/text.cc b/chrome/browser/vr/elements/text.cc
index 27277a9..97ce2bc2 100644
--- a/chrome/browser/vr/elements/text.cc
+++ b/chrome/browser/vr/elements/text.cc
@@ -149,6 +149,9 @@
public:
explicit TextTexture(Text* element) : element_(element) {}
+ TextTexture(const TextTexture&) = delete;
+ TextTexture& operator=(const TextTexture&) = delete;
+
~TextTexture() override {}
void SetFontHeightInDmm(float font_height_dmms) {
@@ -256,8 +259,6 @@
render_text_rendered_callback_;
bool unsupported_code_point_for_test_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(TextTexture);
};
Text::Text(float font_height_dmms)
diff --git a/chrome/browser/vr/elements/text.h b/chrome/browser/vr/elements/text.h
index 396a191..a51d251 100644
--- a/chrome/browser/vr/elements/text.h
+++ b/chrome/browser/vr/elements/text.h
@@ -96,6 +96,10 @@
class VR_UI_EXPORT Text : public TexturedElement {
public:
explicit Text(float font_height_dmms);
+
+ Text(const Text&) = delete;
+ Text& operator=(const Text&) = delete;
+
~Text() override;
void SetFontHeightInDmm(float font_height_dmms);
@@ -156,8 +160,6 @@
std::unique_ptr<TextTexture> texture_;
gfx::Size text_texture_size_;
float field_width_ = 0.f;
-
- DISALLOW_COPY_AND_ASSIGN(Text);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/text_button.h b/chrome/browser/vr/elements/text_button.h
index 9ef10bb6e..2c76297 100644
--- a/chrome/browser/vr/elements/text_button.h
+++ b/chrome/browser/vr/elements/text_button.h
@@ -17,6 +17,10 @@
class TextButton : public Button {
public:
TextButton(float text_height, AudioDelegate* audio_delegate);
+
+ TextButton(const TextButton&) = delete;
+ TextButton& operator=(const TextButton&) = delete;
+
~TextButton() override;
void SetText(const std::u16string& text);
@@ -25,8 +29,6 @@
void OnSetColors(const ButtonColors& colors) override;
Text* text_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(TextButton);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/text_input.h b/chrome/browser/vr/elements/text_input.h
index 27b982b..af688b2 100644
--- a/chrome/browser/vr/elements/text_input.h
+++ b/chrome/browser/vr/elements/text_input.h
@@ -32,6 +32,10 @@
OnInputCommittedCallback;
TextInput(float font_height_meters,
OnInputEditedCallback input_edit_callback);
+
+ TextInput(const TextInput&) = delete;
+ TextInput& operator=(const TextInput&) = delete;
+
~TextInput() override;
void OnButtonDown(const gfx::PointF& position,
@@ -85,8 +89,6 @@
Text* hint_element_ = nullptr;
Text* text_element_ = nullptr;
Rect* cursor_element_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(TextInput);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/textured_element.h b/chrome/browser/vr/elements/textured_element.h
index 565ac92..7b45530 100644
--- a/chrome/browser/vr/elements/textured_element.h
+++ b/chrome/browser/vr/elements/textured_element.h
@@ -22,6 +22,9 @@
public:
TexturedElement();
+ TexturedElement(const TexturedElement&) = delete;
+ TexturedElement& operator=(const TexturedElement&) = delete;
+
~TexturedElement() override;
void Initialize(SkiaSurfaceProvider* provider) final;
@@ -60,8 +63,6 @@
sk_sp<SkSurface> surface_;
SkiaSurfaceProvider* provider_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(TexturedElement);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/throbber.h b/chrome/browser/vr/elements/throbber.h
index 12455ee..8c83a09 100644
--- a/chrome/browser/vr/elements/throbber.h
+++ b/chrome/browser/vr/elements/throbber.h
@@ -16,6 +16,10 @@
class VR_UI_EXPORT Throbber : public Rect {
public:
Throbber();
+
+ Throbber(const Throbber&) = delete;
+ Throbber& operator=(const Throbber&) = delete;
+
~Throbber() override;
void OnFloatAnimated(const float& value,
@@ -27,8 +31,6 @@
private:
gfx::TransformOperation scale_before_animation_;
float opacity_before_animation_ = 0.f;
-
- DISALLOW_COPY_AND_ASSIGN(Throbber);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/transient_element.h b/chrome/browser/vr/elements/transient_element.h
index 9d99da0..130cb2bb 100644
--- a/chrome/browser/vr/elements/transient_element.h
+++ b/chrome/browser/vr/elements/transient_element.h
@@ -15,6 +15,9 @@
// point in time. The exacly transience behavior depends on the subclass.
class VR_UI_EXPORT TransientElement : public UiElement {
public:
+ TransientElement(const TransientElement&) = delete;
+ TransientElement& operator=(const TransientElement&) = delete;
+
~TransientElement() override;
// Sets the elements visibility to the given value. If the visibility is
@@ -35,22 +38,22 @@
private:
typedef UiElement super;
-
- DISALLOW_COPY_AND_ASSIGN(TransientElement);
};
// An element that hides itself after after a set timeout.
class VR_UI_EXPORT SimpleTransientElement : public TransientElement {
public:
explicit SimpleTransientElement(const base::TimeDelta& timeout);
+
+ SimpleTransientElement(const SimpleTransientElement&) = delete;
+ SimpleTransientElement& operator=(const SimpleTransientElement&) = delete;
+
~SimpleTransientElement() override;
private:
bool OnBeginFrame(const gfx::Transform& head_pose) override;
typedef TransientElement super;
-
- DISALLOW_COPY_AND_ASSIGN(SimpleTransientElement);
};
// The reason why a transient element hid itself. Note that this is only used by
diff --git a/chrome/browser/vr/elements/ui_element.h b/chrome/browser/vr/elements/ui_element.h
index 6cb4183d..cd77135 100644
--- a/chrome/browser/vr/elements/ui_element.h
+++ b/chrome/browser/vr/elements/ui_element.h
@@ -102,6 +102,10 @@
public gfx::ColorAnimationCurve::Target {
public:
UiElement();
+
+ UiElement(const UiElement&) = delete;
+ UiElement& operator=(const UiElement&) = delete;
+
~UiElement() override;
enum OperationIndex {
@@ -673,8 +677,6 @@
bool resizable_by_layout_ = false;
CursorType cursor_type_ = kCursorDefault;
-
- DISALLOW_COPY_AND_ASSIGN(UiElement);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/ui_texture.h b/chrome/browser/vr/elements/ui_texture.h
index 8da7303..f541801 100644
--- a/chrome/browser/vr/elements/ui_texture.h
+++ b/chrome/browser/vr/elements/ui_texture.h
@@ -25,6 +25,10 @@
class UiTexture {
public:
UiTexture();
+
+ UiTexture(const UiTexture&) = delete;
+ UiTexture& operator=(const UiTexture&) = delete;
+
virtual ~UiTexture();
void DrawTexture(SkCanvas* canvas, const gfx::Size& texture_size);
@@ -72,8 +76,6 @@
bool dirty_ = true;
absl::optional<SkColor> foreground_color_;
absl::optional<SkColor> background_color_;
-
- DISALLOW_COPY_AND_ASSIGN(UiTexture);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/url_text.h b/chrome/browser/vr/elements/url_text.h
index 736d8842..e35e3d7 100644
--- a/chrome/browser/vr/elements/url_text.h
+++ b/chrome/browser/vr/elements/url_text.h
@@ -20,6 +20,10 @@
class VR_UI_EXPORT UrlText : public Text {
public:
explicit UrlText(float font_height_dmm);
+
+ UrlText(const UrlText&) = delete;
+ UrlText& operator=(const UrlText&) = delete;
+
~UrlText() override;
void SetUrl(const GURL& url);
@@ -40,8 +44,6 @@
SkColor deemphasized_color_ = SK_ColorBLACK;
ElisionParameters elision_parameters_;
float font_height_dmm_ = 0.f;
-
- DISALLOW_COPY_AND_ASSIGN(UrlText);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/vector_icon.cc b/chrome/browser/vr/elements/vector_icon.cc
index 0570a5d..6f790ae7 100644
--- a/chrome/browser/vr/elements/vector_icon.cc
+++ b/chrome/browser/vr/elements/vector_icon.cc
@@ -16,6 +16,10 @@
class VectorIconTexture : public UiTexture {
public:
VectorIconTexture() {}
+
+ VectorIconTexture(const VectorIconTexture&) = delete;
+ VectorIconTexture& operator=(const VectorIconTexture&) = delete;
+
~VectorIconTexture() override {}
void SetColor(SkColor color) { SetAndDirty(&color_, color); }
@@ -44,7 +48,6 @@
gfx::SizeF size_;
const gfx::VectorIcon* icon_ = nullptr;
SkColor color_ = SK_ColorWHITE;
- DISALLOW_COPY_AND_ASSIGN(VectorIconTexture);
};
VectorIcon::VectorIcon(int texture_width)
diff --git a/chrome/browser/vr/elements/vector_icon.h b/chrome/browser/vr/elements/vector_icon.h
index 106d09b..2ba4665 100644
--- a/chrome/browser/vr/elements/vector_icon.h
+++ b/chrome/browser/vr/elements/vector_icon.h
@@ -23,6 +23,10 @@
class VR_UI_EXPORT VectorIcon : public TexturedElement {
public:
explicit VectorIcon(int texture_width);
+
+ VectorIcon(const VectorIcon&) = delete;
+ VectorIcon& operator=(const VectorIcon&) = delete;
+
~VectorIcon() override;
// TODO(vollick): should just use TexturedElement::SetForegroundColor.
@@ -46,8 +50,6 @@
std::unique_ptr<VectorIconTexture> texture_;
int texture_width_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(VectorIcon);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/vector_icon_button.h b/chrome/browser/vr/elements/vector_icon_button.h
index e0f6fff0..27bc184 100644
--- a/chrome/browser/vr/elements/vector_icon_button.h
+++ b/chrome/browser/vr/elements/vector_icon_button.h
@@ -23,6 +23,10 @@
VectorIconButton(base::RepeatingCallback<void()> click_handler,
const gfx::VectorIcon& icon,
AudioDelegate* audio_delegate);
+
+ VectorIconButton(const VectorIconButton&) = delete;
+ VectorIconButton& operator=(const VectorIconButton&) = delete;
+
~VectorIconButton() override;
VectorIcon* foreground() const { return foreground_; }
@@ -43,7 +47,6 @@
// externally to create a smaller or larger icon.
float icon_scale_factor_;
VectorIcon* foreground_;
- DISALLOW_COPY_AND_ASSIGN(VectorIconButton);
};
} // namespace vr
diff --git a/chrome/browser/vr/elements/vector_icon_unittest.cc b/chrome/browser/vr/elements/vector_icon_unittest.cc
index f28ad52..28297447 100644
--- a/chrome/browser/vr/elements/vector_icon_unittest.cc
+++ b/chrome/browser/vr/elements/vector_icon_unittest.cc
@@ -26,12 +26,13 @@
class TestVectorIcon : public VectorIcon {
public:
explicit TestVectorIcon(int maximum_width) : VectorIcon(maximum_width) {}
+
+ TestVectorIcon(const TestVectorIcon&) = delete;
+ TestVectorIcon& operator=(const TestVectorIcon&) = delete;
+
~TestVectorIcon() override {}
UiTexture* GetTexture() const override { return VectorIcon::GetTexture(); }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestVectorIcon);
};
} // namespace
diff --git a/chrome/browser/vr/elements/viewport_aware_root.h b/chrome/browser/vr/elements/viewport_aware_root.h
index 110c28e2..5345fdd 100644
--- a/chrome/browser/vr/elements/viewport_aware_root.h
+++ b/chrome/browser/vr/elements/viewport_aware_root.h
@@ -20,6 +20,10 @@
static const float kViewportRotationTriggerDegrees;
ViewportAwareRoot();
+
+ ViewportAwareRoot(const ViewportAwareRoot&) = delete;
+ ViewportAwareRoot& operator=(const ViewportAwareRoot&) = delete;
+
~ViewportAwareRoot() override;
void Reset();
@@ -42,8 +46,6 @@
float z_center = 0;
bool children_visible_ = false;
bool recenter_on_rotate_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ViewportAwareRoot);
};
} // namespace vr
diff --git a/chrome/browser/vr/gesture_detector.h b/chrome/browser/vr/gesture_detector.h
index 80f779f..1803c00 100644
--- a/chrome/browser/vr/gesture_detector.h
+++ b/chrome/browser/vr/gesture_detector.h
@@ -24,6 +24,10 @@
class VR_EXPORT GestureDetector {
public:
GestureDetector();
+
+ GestureDetector(const GestureDetector&) = delete;
+ GestureDetector& operator=(const GestureDetector&) = delete;
+
virtual ~GestureDetector();
InputEventList DetectGestures(const PlatformController& controller,
@@ -104,8 +108,6 @@
base::TimeTicks menu_button_down_timestamp_;
bool menu_button_long_pressed_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(GestureDetector);
};
} // namespace vr
diff --git a/chrome/browser/vr/input_delegate_for_testing.h b/chrome/browser/vr/input_delegate_for_testing.h
index d42851ba..72c17d17f 100644
--- a/chrome/browser/vr/input_delegate_for_testing.h
+++ b/chrome/browser/vr/input_delegate_for_testing.h
@@ -20,6 +20,10 @@
class InputDelegateForTesting : public InputDelegate {
public:
explicit InputDelegateForTesting(UiInterface* ui);
+
+ InputDelegateForTesting(const InputDelegateForTesting&) = delete;
+ InputDelegateForTesting& operator=(const InputDelegateForTesting&) = delete;
+
~InputDelegateForTesting() override;
void QueueControllerActionForTesting(ControllerTestInput controller_input);
@@ -46,8 +50,6 @@
ControllerModel previous_controller_model_;
base::TimeTicks last_touchpad_timestamp_;
std::unique_ptr<GestureDetector> gesture_detector_;
-
- DISALLOW_COPY_AND_ASSIGN(InputDelegateForTesting);
};
} // namespace vr
diff --git a/chrome/browser/vr/keyboard_delegate_for_testing.h b/chrome/browser/vr/keyboard_delegate_for_testing.h
index e78485f..5712420 100644
--- a/chrome/browser/vr/keyboard_delegate_for_testing.h
+++ b/chrome/browser/vr/keyboard_delegate_for_testing.h
@@ -26,6 +26,11 @@
class VR_BASE_EXPORT KeyboardDelegateForTesting : public KeyboardDelegate {
public:
KeyboardDelegateForTesting();
+
+ KeyboardDelegateForTesting(const KeyboardDelegateForTesting&) = delete;
+ KeyboardDelegateForTesting& operator=(const KeyboardDelegateForTesting&) =
+ delete;
+
~KeyboardDelegateForTesting() override;
void QueueKeyboardInputForTesting(KeyboardTestInput keyboard_input);
@@ -50,8 +55,6 @@
TextInputInfo cached_keyboard_input_;
bool keyboard_shown_ = false;
bool pause_keyboard_input_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(KeyboardDelegateForTesting);
};
} // namespace vr
diff --git a/chrome/browser/vr/platform_controller_for_testing.h b/chrome/browser/vr/platform_controller_for_testing.h
index a3aa0f17..77172830 100644
--- a/chrome/browser/vr/platform_controller_for_testing.h
+++ b/chrome/browser/vr/platform_controller_for_testing.h
@@ -18,6 +18,11 @@
ControllerModel* prev_model,
ControllerModel* cur_model,
base::TimeTicks last_touchpad_timestamp);
+
+ PlatformControllerForTesting(const PlatformControllerForTesting&) = delete;
+ PlatformControllerForTesting& operator=(const PlatformControllerForTesting&) =
+ delete;
+
~PlatformControllerForTesting() override {}
bool IsButtonDown(PlatformController::ButtonType type) const override;
@@ -36,7 +41,6 @@
ControllerModel* prev_model_;
ControllerModel* cur_model_;
base::TimeTicks last_touchpad_timestamp_;
- DISALLOW_COPY_AND_ASSIGN(PlatformControllerForTesting);
};
} // namespace vr
diff --git a/chrome/browser/vr/platform_ui_input_delegate.h b/chrome/browser/vr/platform_ui_input_delegate.h
index 5daf9ea4..b865d0b 100644
--- a/chrome/browser/vr/platform_ui_input_delegate.h
+++ b/chrome/browser/vr/platform_ui_input_delegate.h
@@ -36,6 +36,10 @@
public:
PlatformUiInputDelegate();
explicit PlatformUiInputDelegate(PlatformInputHandler* input_handler);
+
+ PlatformUiInputDelegate(const PlatformUiInputDelegate&) = delete;
+ PlatformUiInputDelegate& operator=(const PlatformUiInputDelegate&) = delete;
+
virtual ~PlatformUiInputDelegate();
const gfx::Size& size() const { return size_; }
@@ -78,8 +82,6 @@
gfx::Size size_;
PlatformInputHandler* input_handler_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(PlatformUiInputDelegate);
};
} // namespace vr
diff --git a/chrome/browser/vr/renderers/base_quad_renderer.h b/chrome/browser/vr/renderers/base_quad_renderer.h
index 22cd848a..cbb579d3 100644
--- a/chrome/browser/vr/renderers/base_quad_renderer.h
+++ b/chrome/browser/vr/renderers/base_quad_renderer.h
@@ -18,6 +18,10 @@
class BaseQuadRenderer : public BaseRenderer {
public:
BaseQuadRenderer(const char* vertex_src, const char* fragment_src);
+
+ BaseQuadRenderer(const BaseQuadRenderer&) = delete;
+ BaseQuadRenderer& operator=(const BaseQuadRenderer&) = delete;
+
~BaseQuadRenderer() override;
VR_UI_EXPORT static void CreateBuffers();
@@ -29,8 +33,6 @@
static GLuint vertex_buffer_;
static GLuint index_buffer_;
-
- DISALLOW_COPY_AND_ASSIGN(BaseQuadRenderer);
};
} // namespace vr
diff --git a/chrome/browser/vr/renderers/base_renderer.h b/chrome/browser/vr/renderers/base_renderer.h
index 6a5395c..2ac6a37 100644
--- a/chrome/browser/vr/renderers/base_renderer.h
+++ b/chrome/browser/vr/renderers/base_renderer.h
@@ -12,6 +12,9 @@
class BaseRenderer {
public:
+ BaseRenderer(const BaseRenderer&) = delete;
+ BaseRenderer& operator=(const BaseRenderer&) = delete;
+
virtual ~BaseRenderer();
virtual void Flush();
@@ -24,8 +27,6 @@
GLuint position_handle_ = 0;
GLuint clip_rect_handle_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(BaseRenderer);
};
} // namespace vr
diff --git a/chrome/browser/vr/renderers/external_textured_quad_renderer.h b/chrome/browser/vr/renderers/external_textured_quad_renderer.h
index 6760cd3..6d15882 100644
--- a/chrome/browser/vr/renderers/external_textured_quad_renderer.h
+++ b/chrome/browser/vr/renderers/external_textured_quad_renderer.h
@@ -13,12 +13,15 @@
class ExternalTexturedQuadRenderer : public TexturedQuadRenderer {
public:
ExternalTexturedQuadRenderer();
+
+ ExternalTexturedQuadRenderer(const ExternalTexturedQuadRenderer&) = delete;
+ ExternalTexturedQuadRenderer& operator=(const ExternalTexturedQuadRenderer&) =
+ delete;
+
~ExternalTexturedQuadRenderer() override;
private:
GLenum TextureType() const override;
-
- DISALLOW_COPY_AND_ASSIGN(ExternalTexturedQuadRenderer);
};
} // namespace vr
diff --git a/chrome/browser/vr/renderers/radial_gradient_quad_renderer.h b/chrome/browser/vr/renderers/radial_gradient_quad_renderer.h
index 330ca77..e8a50ca 100644
--- a/chrome/browser/vr/renderers/radial_gradient_quad_renderer.h
+++ b/chrome/browser/vr/renderers/radial_gradient_quad_renderer.h
@@ -23,6 +23,11 @@
class RadialGradientQuadRenderer : public BaseRenderer {
public:
RadialGradientQuadRenderer();
+
+ RadialGradientQuadRenderer(const RadialGradientQuadRenderer&) = delete;
+ RadialGradientQuadRenderer& operator=(const RadialGradientQuadRenderer&) =
+ delete;
+
~RadialGradientQuadRenderer() override;
void Draw(const gfx::Transform& model_view_proj_matrix,
@@ -45,8 +50,6 @@
GLuint center_color_handle_;
GLuint edge_color_handle_;
GLuint aspect_ratio_handle_;
-
- DISALLOW_COPY_AND_ASSIGN(RadialGradientQuadRenderer);
};
} // namespace vr
diff --git a/chrome/browser/vr/renderers/texture_copy_renderer.h b/chrome/browser/vr/renderers/texture_copy_renderer.h
index 9486406..de08837 100644
--- a/chrome/browser/vr/renderers/texture_copy_renderer.h
+++ b/chrome/browser/vr/renderers/texture_copy_renderer.h
@@ -15,6 +15,10 @@
class VR_UI_EXPORT TextureCopyRenderer : public BaseQuadRenderer {
public:
TextureCopyRenderer();
+
+ TextureCopyRenderer(const TextureCopyRenderer&) = delete;
+ TextureCopyRenderer& operator=(const TextureCopyRenderer&) = delete;
+
~TextureCopyRenderer() override;
void Draw(int texture_handle,
@@ -27,8 +31,6 @@
GLuint uv_transform_;
GLuint x_border_handle_;
GLuint y_border_handle_;
-
- DISALLOW_COPY_AND_ASSIGN(TextureCopyRenderer);
};
} // namespace vr
diff --git a/chrome/browser/vr/renderers/textured_quad_renderer.h b/chrome/browser/vr/renderers/textured_quad_renderer.h
index 1f0cd90..b90e064 100644
--- a/chrome/browser/vr/renderers/textured_quad_renderer.h
+++ b/chrome/browser/vr/renderers/textured_quad_renderer.h
@@ -19,6 +19,10 @@
public:
TexturedQuadRenderer(const char* vertex_src, const char* fragment_src);
TexturedQuadRenderer();
+
+ TexturedQuadRenderer(const TexturedQuadRenderer&) = delete;
+ TexturedQuadRenderer& operator=(const TexturedQuadRenderer&) = delete;
+
~TexturedQuadRenderer() override;
// Enqueues a textured quad for rendering. The GL will ultimately be issued
@@ -72,8 +76,6 @@
GLuint uses_overlay_handle_;
base::queue<QuadData> quad_queue_;
-
- DISALLOW_COPY_AND_ASSIGN(TexturedQuadRenderer);
};
} // namespace vr
diff --git a/chrome/browser/vr/renderers/transparent_quad_renderer.h b/chrome/browser/vr/renderers/transparent_quad_renderer.h
index a4b7b3d..ecd5705 100644
--- a/chrome/browser/vr/renderers/transparent_quad_renderer.h
+++ b/chrome/browser/vr/renderers/transparent_quad_renderer.h
@@ -13,9 +13,11 @@
class TransparentQuadRenderer : public TexturedQuadRenderer {
public:
TransparentQuadRenderer();
- ~TransparentQuadRenderer() override;
- DISALLOW_COPY_AND_ASSIGN(TransparentQuadRenderer);
+ TransparentQuadRenderer(const TransparentQuadRenderer&) = delete;
+ TransparentQuadRenderer& operator=(const TransparentQuadRenderer&) = delete;
+
+ ~TransparentQuadRenderer() override;
};
} // namespace vr
diff --git a/chrome/browser/vr/sequence.h b/chrome/browser/vr/sequence.h
index 33988b95..f60d98fa 100644
--- a/chrome/browser/vr/sequence.h
+++ b/chrome/browser/vr/sequence.h
@@ -18,6 +18,10 @@
class Sequence {
public:
Sequence();
+
+ Sequence(const Sequence&) = delete;
+ Sequence& operator=(const Sequence&) = delete;
+
~Sequence();
void Tick(base::TimeTicks now);
@@ -38,8 +42,6 @@
std::list<SequencedTask> tasks_;
base::TimeTicks start_time_;
bool started_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(Sequence);
};
} // namespace vr
diff --git a/chrome/browser/vr/sounds_manager_audio_delegate.h b/chrome/browser/vr/sounds_manager_audio_delegate.h
index 266cd71..dd69b65 100644
--- a/chrome/browser/vr/sounds_manager_audio_delegate.h
+++ b/chrome/browser/vr/sounds_manager_audio_delegate.h
@@ -16,6 +16,11 @@
class VR_EXPORT SoundsManagerAudioDelegate : public AudioDelegate {
public:
SoundsManagerAudioDelegate();
+
+ SoundsManagerAudioDelegate(const SoundsManagerAudioDelegate&) = delete;
+ SoundsManagerAudioDelegate& operator=(const SoundsManagerAudioDelegate&) =
+ delete;
+
~SoundsManagerAudioDelegate() override;
// AudioDelegate implementation.
@@ -25,8 +30,6 @@
private:
std::unordered_map<SoundId, std::unique_ptr<std::string>> sounds_;
-
- DISALLOW_COPY_AND_ASSIGN(SoundsManagerAudioDelegate);
};
} // namespace vr
diff --git a/chrome/browser/vr/speech_recognizer.cc b/chrome/browser/vr/speech_recognizer.cc
index ca3a7f1..db4ae40 100644
--- a/chrome/browser/vr/speech_recognizer.cc
+++ b/chrome/browser/vr/speech_recognizer.cc
@@ -53,6 +53,10 @@
class SpeechRecognizerOnIO : public content::SpeechRecognitionEventListener {
public:
SpeechRecognizerOnIO();
+
+ SpeechRecognizerOnIO(const SpeechRecognizerOnIO&) = delete;
+ SpeechRecognizerOnIO& operator=(const SpeechRecognizerOnIO&) = delete;
+
~SpeechRecognizerOnIO() override;
// |pending_shared_url_loader_factory| must be non-null for the first call to
@@ -109,8 +113,6 @@
std::u16string last_result_str_;
base::WeakPtrFactory<SpeechRecognizerOnIO> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SpeechRecognizerOnIO);
};
SpeechRecognizerOnIO::SpeechRecognizerOnIO()
diff --git a/chrome/browser/vr/speech_recognizer.h b/chrome/browser/vr/speech_recognizer.h
index 95a4a66c..81edcdab 100644
--- a/chrome/browser/vr/speech_recognizer.h
+++ b/chrome/browser/vr/speech_recognizer.h
@@ -92,6 +92,10 @@
pending_shared_url_loader_factory,
const std::string& accept_language,
const std::string& locale);
+
+ SpeechRecognizer(const SpeechRecognizer&) = delete;
+ SpeechRecognizer& operator=(const SpeechRecognizer&) = delete;
+
~SpeechRecognizer() override;
// Start/stop the speech recognizer.
@@ -127,8 +131,6 @@
// Note that this object is destroyed on IO thread.
std::unique_ptr<SpeechRecognizerOnIO> speech_recognizer_on_io_;
base::WeakPtrFactory<SpeechRecognizer> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SpeechRecognizer);
};
} // namespace vr
diff --git a/chrome/browser/vr/speech_recognizer_unittest.cc b/chrome/browser/vr/speech_recognizer_unittest.cc
index e5153fc..973990dd 100644
--- a/chrome/browser/vr/speech_recognizer_unittest.cc
+++ b/chrome/browser/vr/speech_recognizer_unittest.cc
@@ -95,6 +95,12 @@
: public network::PendingSharedURLLoaderFactory {
public:
FakePendingSharedURLLoaderFactory() {}
+
+ FakePendingSharedURLLoaderFactory(const FakePendingSharedURLLoaderFactory&) =
+ delete;
+ FakePendingSharedURLLoaderFactory& operator=(
+ const FakePendingSharedURLLoaderFactory&) = delete;
+
~FakePendingSharedURLLoaderFactory() override {}
protected:
@@ -104,14 +110,16 @@
scoped_refptr<network::SharedURLLoaderFactory> CreateFactory() override {
return base::MakeRefCounted<FakeSharedURLLoaderFactory>();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FakePendingSharedURLLoaderFactory);
};
class FakeSpeechRecognitionManager : public content::SpeechRecognitionManager {
public:
FakeSpeechRecognitionManager() {}
+
+ FakeSpeechRecognitionManager(const FakeSpeechRecognitionManager&) = delete;
+ FakeSpeechRecognitionManager& operator=(const FakeSpeechRecognitionManager&) =
+ delete;
+
~FakeSpeechRecognitionManager() override {}
// SpeechRecognitionManager methods.
@@ -239,19 +247,18 @@
int session_id_ = 0;
content::SpeechRecognitionSessionContext session_ctx_;
content::SpeechRecognitionSessionConfig session_config_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeSpeechRecognitionManager);
};
class MockVoiceSearchDelegate : public VoiceResultDelegate {
public:
MockVoiceSearchDelegate() = default;
+
+ MockVoiceSearchDelegate(const MockVoiceSearchDelegate&) = delete;
+ MockVoiceSearchDelegate& operator=(const MockVoiceSearchDelegate&) = delete;
+
~MockVoiceSearchDelegate() override = default;
MOCK_METHOD1(OnVoiceResults, void(const std::u16string& result));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockVoiceSearchDelegate);
};
class SpeechRecognizerTest : public testing::Test {
@@ -269,6 +276,9 @@
SpeechRecognizer::SetManagerForTest(fake_speech_recognition_manager_.get());
}
+ SpeechRecognizerTest(const SpeechRecognizerTest&) = delete;
+ SpeechRecognizerTest& operator=(const SpeechRecognizerTest&) = delete;
+
~SpeechRecognizerTest() override {
SpeechRecognizer::SetManagerForTest(nullptr);
}
@@ -279,9 +289,6 @@
std::unique_ptr<MockBrowserUiInterface> ui_;
std::unique_ptr<MockVoiceSearchDelegate> delegate_;
std::unique_ptr<SpeechRecognizer> speech_recognizer_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SpeechRecognizerTest);
};
TEST_F(SpeechRecognizerTest, ReceivedCorrectSpeechResult) {
diff --git a/chrome/browser/vr/test/mock_browser_ui_interface.h b/chrome/browser/vr/test/mock_browser_ui_interface.h
index e1d15ba..101db15c 100644
--- a/chrome/browser/vr/test/mock_browser_ui_interface.h
+++ b/chrome/browser/vr/test/mock_browser_ui_interface.h
@@ -18,6 +18,10 @@
class MockBrowserUiInterface : public BrowserUiInterface {
public:
MockBrowserUiInterface();
+
+ MockBrowserUiInterface(const MockBrowserUiInterface&) = delete;
+ MockBrowserUiInterface& operator=(const MockBrowserUiInterface&) = delete;
+
~MockBrowserUiInterface() override;
MOCK_METHOD1(SetWebVrMode, void(bool enabled));
@@ -61,9 +65,6 @@
MOCK_METHOD1(PerformKeyboardInputForTesting, void(KeyboardTestInput));
MOCK_METHOD1(SetVisibleExternalPromptNotification,
void(ExternalPromptNotificationType));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockBrowserUiInterface);
};
} // namespace vr
diff --git a/chrome/browser/vr/test/mock_keyboard_delegate.h b/chrome/browser/vr/test/mock_keyboard_delegate.h
index 47d2941..8b26c2d 100644
--- a/chrome/browser/vr/test/mock_keyboard_delegate.h
+++ b/chrome/browser/vr/test/mock_keyboard_delegate.h
@@ -17,6 +17,10 @@
class MockKeyboardDelegate : public KeyboardDelegate {
public:
MockKeyboardDelegate();
+
+ MockKeyboardDelegate(const MockKeyboardDelegate&) = delete;
+ MockKeyboardDelegate& operator=(const MockKeyboardDelegate&) = delete;
+
~MockKeyboardDelegate() override;
MOCK_METHOD0(ShowKeyboard, void());
@@ -32,9 +36,6 @@
MOCK_METHOD1(OnHoverMove, void(const gfx::PointF&));
MOCK_METHOD1(OnButtonDown, void(const gfx::PointF&));
MOCK_METHOD1(OnButtonUp, void(const gfx::PointF&));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockKeyboardDelegate);
};
} // namespace vr
diff --git a/chrome/browser/vr/test/mock_render_text.h b/chrome/browser/vr/test/mock_render_text.h
index 932484b..07181e8 100644
--- a/chrome/browser/vr/test/mock_render_text.h
+++ b/chrome/browser/vr/test/mock_render_text.h
@@ -14,6 +14,10 @@
class MockRenderText : public RenderTextWrapper {
public:
MockRenderText();
+
+ MockRenderText(const MockRenderText&) = delete;
+ MockRenderText& operator=(const MockRenderText&) = delete;
+
~MockRenderText() override;
MOCK_METHOD1(SetColor, void(SkColor value));
@@ -25,9 +29,6 @@
MOCK_METHOD2(ApplyWeight,
void(gfx::Font::Weight weight, const gfx::Range& range));
MOCK_METHOD1(SetDirectionalityMode, void(gfx::DirectionalityMode mode));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockRenderText);
};
} // namespace vr
diff --git a/chrome/browser/vr/test/mock_text_input_delegate.h b/chrome/browser/vr/test/mock_text_input_delegate.h
index 2d66f46..7781360b 100644
--- a/chrome/browser/vr/test/mock_text_input_delegate.h
+++ b/chrome/browser/vr/test/mock_text_input_delegate.h
@@ -15,13 +15,14 @@
class MockTextInputDelegate : public TextInputDelegate {
public:
MockTextInputDelegate();
+
+ MockTextInputDelegate(const MockTextInputDelegate&) = delete;
+ MockTextInputDelegate& operator=(const MockTextInputDelegate&) = delete;
+
~MockTextInputDelegate() override;
MOCK_METHOD1(UpdateInput, void(const TextInputInfo& info));
MOCK_METHOD1(RequestFocus, void(int));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockTextInputDelegate);
};
} // namespace vr
diff --git a/chrome/browser/vr/test/mock_ui_browser_interface.h b/chrome/browser/vr/test/mock_ui_browser_interface.h
index 20234f19..894a6eb 100644
--- a/chrome/browser/vr/test/mock_ui_browser_interface.h
+++ b/chrome/browser/vr/test/mock_ui_browser_interface.h
@@ -14,6 +14,10 @@
class MockUiBrowserInterface : public UiBrowserInterface {
public:
MockUiBrowserInterface();
+
+ MockUiBrowserInterface(const MockUiBrowserInterface&) = delete;
+ MockUiBrowserInterface& operator=(const MockUiBrowserInterface&) = delete;
+
~MockUiBrowserInterface() override;
MOCK_METHOD0(ExitPresent, void());
@@ -43,9 +47,6 @@
MOCK_METHOD0(StopAutocomplete, void());
MOCK_METHOD0(ShowPageInfo, void());
MOCK_METHOD0(LoadAssets, void());
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockUiBrowserInterface);
};
} // namespace vr
diff --git a/chrome/browser/vr/test/ui_utils.h b/chrome/browser/vr/test/ui_utils.h
index 732ec3d..9bbf6e4b 100644
--- a/chrome/browser/vr/test/ui_utils.h
+++ b/chrome/browser/vr/test/ui_utils.h
@@ -33,6 +33,10 @@
static std::unique_ptr<UiUtils> Create();
UiUtils();
+
+ UiUtils(const UiUtils&) = delete;
+ UiUtils& operator=(const UiUtils&) = delete;
+
~UiUtils();
// Runs |action| and waits until the native UI reports that |element_name|'s
@@ -63,8 +67,6 @@
std::vector<base::OnceCallback<void()>> ui_operation_callbacks_;
scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(UiUtils);
};
} // namespace vr
diff --git a/chrome/browser/vr/test/vr_test_suite.h b/chrome/browser/vr/test/vr_test_suite.h
index 2213aeb..09f760cb 100644
--- a/chrome/browser/vr/test/vr_test_suite.h
+++ b/chrome/browser/vr/test/vr_test_suite.h
@@ -16,6 +16,10 @@
class VrTestSuite : public base::TestSuite {
public:
VrTestSuite(int argc, char** argv);
+
+ VrTestSuite(const VrTestSuite&) = delete;
+ VrTestSuite& operator=(const VrTestSuite&) = delete;
+
~VrTestSuite() override;
protected:
@@ -24,8 +28,6 @@
private:
std::unique_ptr<content::BrowserTaskEnvironment> task_environment_;
-
- DISALLOW_COPY_AND_ASSIGN(VrTestSuite);
};
} // namespace vr
diff --git a/chrome/browser/vr/test/xr_browser_test.h b/chrome/browser/vr/test/xr_browser_test.h
index d963ed95..c6378240 100644
--- a/chrome/browser/vr/test/xr_browser_test.h
+++ b/chrome/browser/vr/test/xr_browser_test.h
@@ -70,6 +70,10 @@
};
XrBrowserTestBase();
+
+ XrBrowserTestBase(const XrBrowserTestBase&) = delete;
+ XrBrowserTestBase& operator=(const XrBrowserTestBase&) = delete;
+
~XrBrowserTestBase() override;
void SetUp() override;
@@ -235,7 +239,6 @@
base::test::ScopedFeatureList scoped_feature_list_;
bool test_skipped_at_startup_ = false;
bool javascript_failed_ = false;
- DISALLOW_COPY_AND_ASSIGN(XrBrowserTestBase);
};
} // namespace vr
diff --git a/chrome/browser/vr/text_input_delegate.h b/chrome/browser/vr/text_input_delegate.h
index 834a4f5f..84486d0 100644
--- a/chrome/browser/vr/text_input_delegate.h
+++ b/chrome/browser/vr/text_input_delegate.h
@@ -16,6 +16,10 @@
class VR_BASE_EXPORT TextInputDelegate {
public:
TextInputDelegate();
+
+ TextInputDelegate(const TextInputDelegate&) = delete;
+ TextInputDelegate& operator=(const TextInputDelegate&) = delete;
+
virtual ~TextInputDelegate();
// RequestFocusCallback gets called when an element requests focus.
@@ -39,8 +43,6 @@
RequestFocusCallback request_focus_callback_;
RequestUnfocusCallback request_unfocus_callback_;
UpdateInputCallback update_input_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(TextInputDelegate);
};
} // namespace vr
diff --git a/chrome/browser/vr/ui.h b/chrome/browser/vr/ui.h
index e9f57b0f..a65a066 100644
--- a/chrome/browser/vr/ui.h
+++ b/chrome/browser/vr/ui.h
@@ -65,6 +65,9 @@
std::unique_ptr<AudioDelegate> audio_delegate,
const UiInitialState& ui_initial_state);
+ Ui(const Ui&) = delete;
+ Ui& operator=(const Ui&) = delete;
+
~Ui() override;
void OnUiRequestedNavigation();
@@ -235,8 +238,6 @@
std::unique_ptr<AudioDelegate> audio_delegate_;
base::WeakPtrFactory<Ui> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(Ui);
};
} // namespace vr
diff --git a/chrome/browser/vr/ui_host/vr_ui_host_impl.h b/chrome/browser/vr/ui_host/vr_ui_host_impl.h
index 4835c1f..fd41ddae 100644
--- a/chrome/browser/vr/ui_host/vr_ui_host_impl.h
+++ b/chrome/browser/vr/ui_host/vr_ui_host_impl.h
@@ -35,6 +35,10 @@
public:
VRUiHostImpl(device::mojom::XRDeviceId device_id,
mojo::PendingRemote<device::mojom::XRCompositorHost> compositor);
+
+ VRUiHostImpl(const VRUiHostImpl&) = delete;
+ VRUiHostImpl& operator=(const VRUiHostImpl&) = delete;
+
~VRUiHostImpl() override;
private:
@@ -119,8 +123,6 @@
THREAD_CHECKER(thread_checker_);
base::WeakPtrFactory<VRUiHostImpl> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(VRUiHostImpl);
};
} // namespace vr
diff --git a/chrome/browser/vr/ui_input_manager_unittest.cc b/chrome/browser/vr/ui_input_manager_unittest.cc
index e83f068..ba4aaae 100644
--- a/chrome/browser/vr/ui_input_manager_unittest.cc
+++ b/chrome/browser/vr/ui_input_manager_unittest.cc
@@ -44,6 +44,10 @@
class MockRect : public Rect {
public:
MockRect() = default;
+
+ MockRect(const MockRect&) = delete;
+ MockRect& operator=(const MockRect&) = delete;
+
~MockRect() override = default;
MOCK_METHOD2(OnHoverEnter,
@@ -67,23 +71,21 @@
MOCK_METHOD1(OnFocusChanged, void(bool));
MOCK_METHOD1(OnInputEdited, void(const EditedText&));
MOCK_METHOD1(OnInputCommitted, void(const EditedText&));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockRect);
};
class MockTextInput : public TextInput {
public:
MockTextInput()
: TextInput(1, base::RepeatingCallback<void(const EditedText&)>()) {}
+
+ MockTextInput(const MockTextInput&) = delete;
+ MockTextInput& operator=(const MockTextInput&) = delete;
+
~MockTextInput() override = default;
MOCK_METHOD1(OnFocusChanged, void(bool));
MOCK_METHOD1(OnInputEdited, void(const EditedText&));
MOCK_METHOD1(OnInputCommitted, void(const EditedText&));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockTextInput);
};
class UiInputManagerTest : public testing::Test {
diff --git a/chrome/browser/vr/ui_scene.h b/chrome/browser/vr/ui_scene.h
index a893802..41184d2 100644
--- a/chrome/browser/vr/ui_scene.h
+++ b/chrome/browser/vr/ui_scene.h
@@ -34,6 +34,10 @@
typedef base::RepeatingCallback<void()> PerFrameCallback;
UiScene();
+
+ UiScene(const UiScene&) = delete;
+ UiScene& operator=(const UiScene&) = delete;
+
~UiScene();
void AddUiElement(UiElementName parent, std::unique_ptr<UiElement> element);
@@ -110,8 +114,6 @@
std::vector<std::unique_ptr<Sequence>> scheduled_tasks_;
SkiaSurfaceProvider* provider_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(UiScene);
};
} // namespace vr
diff --git a/chrome/browser/vr/ui_scene_creator.h b/chrome/browser/vr/ui_scene_creator.h
index 9e05edc..a5345f3 100644
--- a/chrome/browser/vr/ui_scene_creator.h
+++ b/chrome/browser/vr/ui_scene_creator.h
@@ -32,6 +32,10 @@
TextInputDelegate* text_input_delegate,
AudioDelegate* audio_delegate,
Model* model);
+
+ UiSceneCreator(const UiSceneCreator&) = delete;
+ UiSceneCreator& operator=(const UiSceneCreator&) = delete;
+
~UiSceneCreator();
void CreateScene();
@@ -67,8 +71,6 @@
TextInputDelegate* text_input_delegate_;
AudioDelegate* audio_delegate_;
Model* model_;
-
- DISALLOW_COPY_AND_ASSIGN(UiSceneCreator);
};
} // namespace vr
diff --git a/chrome/browser/vr/vr_tab_helper.h b/chrome/browser/vr/vr_tab_helper.h
index daf343a6..49e40ac 100644
--- a/chrome/browser/vr/vr_tab_helper.h
+++ b/chrome/browser/vr/vr_tab_helper.h
@@ -13,6 +13,9 @@
class VrTabHelper : public content::WebContentsUserData<VrTabHelper> {
public:
+ VrTabHelper(const VrTabHelper&) = delete;
+ VrTabHelper& operator=(const VrTabHelper&) = delete;
+
~VrTabHelper() override;
bool is_in_vr() const { return is_in_vr_; }
@@ -62,8 +65,6 @@
bool is_content_displayed_in_headset_ = false;
WEB_CONTENTS_USER_DATA_KEY_DECL();
-
- DISALLOW_COPY_AND_ASSIGN(VrTabHelper);
};
} // namespace vr
diff --git a/chrome/browser/vr/vr_web_contents_observer.h b/chrome/browser/vr/vr_web_contents_observer.h
index 46088d6..3f7e6f8 100644
--- a/chrome/browser/vr/vr_web_contents_observer.h
+++ b/chrome/browser/vr/vr_web_contents_observer.h
@@ -25,6 +25,10 @@
BrowserUiInterface* ui_interface,
LocationBarHelper* toolbar,
base::OnceClosure on_destroy);
+
+ VrWebContentsObserver(const VrWebContentsObserver&) = delete;
+ VrWebContentsObserver& operator=(const VrWebContentsObserver&) = delete;
+
~VrWebContentsObserver() override;
private:
@@ -49,8 +53,6 @@
LocationBarHelper* toolbar_;
base::OnceClosure on_destroy_;
-
- DISALLOW_COPY_AND_ASSIGN(VrWebContentsObserver);
};
} // namespace vr
diff --git a/chrome/browser/web_launch/web_launch_files_helper.h b/chrome/browser/web_launch/web_launch_files_helper.h
index 4958fec..618e083 100644
--- a/chrome/browser/web_launch/web_launch_files_helper.h
+++ b/chrome/browser/web_launch/web_launch_files_helper.h
@@ -40,6 +40,9 @@
public:
WEB_CONTENTS_USER_DATA_KEY_DECL();
+ WebLaunchFilesHelper(const WebLaunchFilesHelper&) = delete;
+ WebLaunchFilesHelper& operator=(const WebLaunchFilesHelper&) = delete;
+
~WebLaunchFilesHelper() override;
static WebLaunchFilesHelper* GetForWebContents(
@@ -105,7 +108,6 @@
bool passed_permission_check_ = false;
base::WeakPtrFactory<WebLaunchFilesHelper> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(WebLaunchFilesHelper);
};
} // namespace web_launch
diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.h b/chrome/browser/webauthn/authenticator_request_dialog_model.h
index b3f734ba..5196c4a 100644
--- a/chrome/browser/webauthn/authenticator_request_dialog_model.h
+++ b/chrome/browser/webauthn/authenticator_request_dialog_model.h
@@ -217,6 +217,12 @@
};
explicit AuthenticatorRequestDialogModel(const std::string& relying_party_id);
+
+ AuthenticatorRequestDialogModel(const AuthenticatorRequestDialogModel&) =
+ delete;
+ AuthenticatorRequestDialogModel& operator=(
+ const AuthenticatorRequestDialogModel&) = delete;
+
~AuthenticatorRequestDialogModel();
Step current_step() const { return current_step_; }
@@ -674,8 +680,6 @@
absl::optional<std::string> cable_qr_string_;
base::WeakPtrFactory<AuthenticatorRequestDialogModel> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(AuthenticatorRequestDialogModel);
};
#endif // CHROME_BROWSER_WEBAUTHN_AUTHENTICATOR_REQUEST_DIALOG_MODEL_H_
diff --git a/chrome/browser/webauthn/authenticator_request_scheduler.cc b/chrome/browser/webauthn/authenticator_request_scheduler.cc
index b63716d4..6833e7c3 100644
--- a/chrome/browser/webauthn/authenticator_request_scheduler.cc
+++ b/chrome/browser/webauthn/authenticator_request_scheduler.cc
@@ -15,6 +15,10 @@
class ActiveRequestWeakHolder : public base::SupportsUserData::Data {
public:
ActiveRequestWeakHolder() = default;
+
+ ActiveRequestWeakHolder(const ActiveRequestWeakHolder&) = delete;
+ ActiveRequestWeakHolder& operator=(const ActiveRequestWeakHolder&) = delete;
+
~ActiveRequestWeakHolder() override = default;
static ActiveRequestWeakHolder* EnsureForWebContents(
@@ -35,8 +39,6 @@
private:
base::WeakPtr<ChromeAuthenticatorRequestDelegate> request_;
-
- DISALLOW_COPY_AND_ASSIGN(ActiveRequestWeakHolder);
};
} // namespace
diff --git a/chrome/browser/webauthn/authenticator_request_scheduler.h b/chrome/browser/webauthn/authenticator_request_scheduler.h
index b40784b..92c94de 100644
--- a/chrome/browser/webauthn/authenticator_request_scheduler.h
+++ b/chrome/browser/webauthn/authenticator_request_scheduler.h
@@ -25,6 +25,11 @@
class AuthenticatorRequestScheduler {
public:
AuthenticatorRequestScheduler() = default;
+
+ AuthenticatorRequestScheduler(const AuthenticatorRequestScheduler&) = delete;
+ AuthenticatorRequestScheduler& operator=(
+ const AuthenticatorRequestScheduler&) = delete;
+
~AuthenticatorRequestScheduler() = default;
// Returns a nullptr delegate if there is already an ongoing request in the
@@ -36,9 +41,6 @@
// nullptr if there is none.
static ChromeAuthenticatorRequestDelegate* GetRequestDelegate(
content::WebContents* web_contents);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AuthenticatorRequestScheduler);
};
#endif // CHROME_BROWSER_WEBAUTHN_AUTHENTICATOR_REQUEST_SCHEDULER_H_
diff --git a/chrome/browser/webauthn/authenticator_request_scheduler_unittest.cc b/chrome/browser/webauthn/authenticator_request_scheduler_unittest.cc
index 072ebf98..9d05644f 100644
--- a/chrome/browser/webauthn/authenticator_request_scheduler_unittest.cc
+++ b/chrome/browser/webauthn/authenticator_request_scheduler_unittest.cc
@@ -12,10 +12,13 @@
: public ChromeRenderViewHostTestHarness {
public:
AuthenticatorRequestSchedulerTest() = default;
- ~AuthenticatorRequestSchedulerTest() override = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(AuthenticatorRequestSchedulerTest);
+ AuthenticatorRequestSchedulerTest(const AuthenticatorRequestSchedulerTest&) =
+ delete;
+ AuthenticatorRequestSchedulerTest& operator=(
+ const AuthenticatorRequestSchedulerTest&) = delete;
+
+ ~AuthenticatorRequestSchedulerTest() override = default;
};
TEST_F(AuthenticatorRequestSchedulerTest,
diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.h b/chrome/browser/webauthn/chrome_authenticator_request_delegate.h
index 65826a9..2372ca36 100644
--- a/chrome/browser/webauthn/chrome_authenticator_request_delegate.h
+++ b/chrome/browser/webauthn/chrome_authenticator_request_delegate.h
@@ -101,6 +101,12 @@
// The |render_frame_host| must outlive this instance.
explicit ChromeAuthenticatorRequestDelegate(
content::RenderFrameHost* render_frame_host);
+
+ ChromeAuthenticatorRequestDelegate(
+ const ChromeAuthenticatorRequestDelegate&) = delete;
+ ChromeAuthenticatorRequestDelegate& operator=(
+ const ChromeAuthenticatorRequestDelegate&) = delete;
+
~ChromeAuthenticatorRequestDelegate() override;
// SetGlobalObserverForTesting sets the single |TestObserver| that is active
@@ -218,8 +224,6 @@
base::WeakPtrFactory<ChromeAuthenticatorRequestDelegate> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(ChromeAuthenticatorRequestDelegate);
};
#endif // CHROME_BROWSER_WEBAUTHN_CHROME_AUTHENTICATOR_REQUEST_DELEGATE_H_
diff --git a/chrome/browser/webauthn/observable_authenticator_list.h b/chrome/browser/webauthn/observable_authenticator_list.h
index 4b48d1d3..6353b9df 100644
--- a/chrome/browser/webauthn/observable_authenticator_list.h
+++ b/chrome/browser/webauthn/observable_authenticator_list.h
@@ -21,6 +21,11 @@
class ObservableAuthenticatorList {
public:
ObservableAuthenticatorList();
+
+ ObservableAuthenticatorList(const ObservableAuthenticatorList&) = delete;
+ ObservableAuthenticatorList& operator=(const ObservableAuthenticatorList&) =
+ delete;
+
~ObservableAuthenticatorList();
void AddAuthenticator(AuthenticatorReference authenticator);
@@ -46,8 +51,6 @@
std::vector<AuthenticatorReference> authenticator_list_;
AuthenticatorListObserver* observer_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(ObservableAuthenticatorList);
};
#endif // CHROME_BROWSER_WEBAUTHN_OBSERVABLE_AUTHENTICATOR_LIST_H_
diff --git a/chrome/browser/win/automation_controller.cc b/chrome/browser/win/automation_controller.cc
index 529c46b..80e7b7d 100644
--- a/chrome/browser/win/automation_controller.cc
+++ b/chrome/browser/win/automation_controller.cc
@@ -160,6 +160,10 @@
END_COM_MAP()
EventHandler();
+
+ EventHandler(const EventHandler&) = delete;
+ EventHandler& operator=(const EventHandler&) = delete;
+
~EventHandler();
// Initializes the object. Events will be dispatched back to |context| via
@@ -179,8 +183,6 @@
// Pointer to the delegate.
scoped_refptr<RefCountedDelegate> ref_counted_delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(EventHandler);
};
AutomationController::Context::EventHandler::EventHandler() = default;
diff --git a/chrome/browser/win/automation_controller.h b/chrome/browser/win/automation_controller.h
index d9c16596..4f319383 100644
--- a/chrome/browser/win/automation_controller.h
+++ b/chrome/browser/win/automation_controller.h
@@ -72,6 +72,10 @@
};
explicit AutomationController(std::unique_ptr<Delegate> delegate);
+
+ AutomationController(const AutomationController&) = delete;
+ AutomationController& operator=(const AutomationController&) = delete;
+
~AutomationController();
private:
@@ -82,8 +86,6 @@
// A pointer to the context object that lives in the automation sequence.
base::WeakPtr<Context> context_;
-
- DISALLOW_COPY_AND_ASSIGN(AutomationController);
};
#endif // CHROME_BROWSER_WIN_AUTOMATION_CONTROLLER_H_
diff --git a/chrome/browser/win/chrome_select_file_dialog_factory.h b/chrome/browser/win/chrome_select_file_dialog_factory.h
index 272a1b7..980ab00c8 100644
--- a/chrome/browser/win/chrome_select_file_dialog_factory.h
+++ b/chrome/browser/win/chrome_select_file_dialog_factory.h
@@ -16,15 +16,17 @@
class ChromeSelectFileDialogFactory : public ui::SelectFileDialogFactory {
public:
ChromeSelectFileDialogFactory();
+
+ ChromeSelectFileDialogFactory(const ChromeSelectFileDialogFactory&) = delete;
+ ChromeSelectFileDialogFactory& operator=(
+ const ChromeSelectFileDialogFactory&) = delete;
+
~ChromeSelectFileDialogFactory() override;
// ui::SelectFileDialogFactory:
ui::SelectFileDialog* Create(
ui::SelectFileDialog::Listener* listener,
std::unique_ptr<ui::SelectFilePolicy> policy) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ChromeSelectFileDialogFactory);
};
#endif // CHROME_BROWSER_WIN_CHROME_SELECT_FILE_DIALOG_FACTORY_H_
diff --git a/chrome/browser/win/conflicts/enumerate_shell_extensions_unittest.cc b/chrome/browser/win/conflicts/enumerate_shell_extensions_unittest.cc
index ccd2ea2..3a31603 100644
--- a/chrome/browser/win/conflicts/enumerate_shell_extensions_unittest.cc
+++ b/chrome/browser/win/conflicts/enumerate_shell_extensions_unittest.cc
@@ -21,6 +21,11 @@
class EnumerateShellExtensionsTest : public testing::Test {
public:
EnumerateShellExtensionsTest() = default;
+
+ EnumerateShellExtensionsTest(const EnumerateShellExtensionsTest&) = delete;
+ EnumerateShellExtensionsTest& operator=(const EnumerateShellExtensionsTest&) =
+ delete;
+
~EnumerateShellExtensionsTest() override = default;
// Override all registry hives so that real shell extensions don't mess up
@@ -40,8 +45,6 @@
base::test::TaskEnvironment task_environment_;
registry_util::RegistryOverrideManager registry_override_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(EnumerateShellExtensionsTest);
};
// Adds a fake shell extension entry to the registry that should be found by
diff --git a/chrome/browser/win/conflicts/incompatible_applications_browsertest.cc b/chrome/browser/win/conflicts/incompatible_applications_browsertest.cc
index 4cb4f95..cc70b36 100644
--- a/chrome/browser/win/conflicts/incompatible_applications_browsertest.cc
+++ b/chrome/browser/win/conflicts/incompatible_applications_browsertest.cc
@@ -48,6 +48,11 @@
base::Unretained(this)));
}
+ IncompatibleApplicationsObserver(const IncompatibleApplicationsObserver&) =
+ delete;
+ IncompatibleApplicationsObserver& operator=(
+ const IncompatibleApplicationsObserver&) = delete;
+
~IncompatibleApplicationsObserver() = default;
// Wait until the kIncompatibleApplications preference is modified.
@@ -74,8 +79,6 @@
PrefChangeRegistrar pref_change_registrar_;
base::RepeatingClosure run_loop_quit_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(IncompatibleApplicationsObserver);
};
class IncompatibleApplicationsBrowserTest : public InProcessBrowserTest {
diff --git a/chrome/browser/win/conflicts/incompatible_applications_updater.h b/chrome/browser/win/conflicts/incompatible_applications_updater.h
index f74dd47..925eebb5 100644
--- a/chrome/browser/win/conflicts/incompatible_applications_updater.h
+++ b/chrome/browser/win/conflicts/incompatible_applications_updater.h
@@ -92,6 +92,12 @@
scoped_refptr<ModuleListFilter> module_list_filter,
const InstalledApplications& installed_applications,
bool module_analysis_disabled);
+
+ IncompatibleApplicationsUpdater(const IncompatibleApplicationsUpdater&) =
+ delete;
+ IncompatibleApplicationsUpdater& operator=(
+ const IncompatibleApplicationsUpdater&) = delete;
+
~IncompatibleApplicationsUpdater() override;
static void RegisterLocalStatePrefs(PrefRegistrySimple* registry);
@@ -146,8 +152,6 @@
bool module_analysis_disabled_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(IncompatibleApplicationsUpdater);
};
#endif // CHROME_BROWSER_WIN_CONFLICTS_INCOMPATIBLE_APPLICATIONS_UPDATER_H_
diff --git a/chrome/browser/win/conflicts/incompatible_applications_updater_unittest.cc b/chrome/browser/win/conflicts/incompatible_applications_updater_unittest.cc
index 523cb2e..1f9ab59 100644
--- a/chrome/browser/win/conflicts/incompatible_applications_updater_unittest.cc
+++ b/chrome/browser/win/conflicts/incompatible_applications_updater_unittest.cc
@@ -51,6 +51,11 @@
class MockInstalledApplications : public InstalledApplications {
public:
MockInstalledApplications() = default;
+
+ MockInstalledApplications(const MockInstalledApplications&) = delete;
+ MockInstalledApplications& operator=(const MockInstalledApplications&) =
+ delete;
+
~MockInstalledApplications() override = default;
void AddIncompatibleApplication(const base::FilePath& file_path,
@@ -73,8 +78,6 @@
private:
std::multimap<base::FilePath, ApplicationInfo> applications_;
-
- DISALLOW_COPY_AND_ASSIGN(MockInstalledApplications);
};
constexpr wchar_t kCertificatePath[] = L"CertificatePath";
diff --git a/chrome/browser/win/conflicts/installed_applications.h b/chrome/browser/win/conflicts/installed_applications.h
index d96d3fa..acc560ad 100644
--- a/chrome/browser/win/conflicts/installed_applications.h
+++ b/chrome/browser/win/conflicts/installed_applications.h
@@ -65,6 +65,9 @@
// public method can be used without such restrictions.
InstalledApplications();
+ InstalledApplications(const InstalledApplications&) = delete;
+ InstalledApplications& operator=(const InstalledApplications&) = delete;
+
virtual ~InstalledApplications();
// Given a |file|, checks if it matches an installed application on the user's
@@ -112,8 +115,6 @@
// parent of the other as equal.
// The second part of the pair is the index into |applications|.
std::vector<std::pair<base::FilePath, size_t>> install_directories_;
-
- DISALLOW_COPY_AND_ASSIGN(InstalledApplications);
};
bool operator<(const InstalledApplications::ApplicationInfo& lhs,
diff --git a/chrome/browser/win/conflicts/installed_applications_unittest.cc b/chrome/browser/win/conflicts/installed_applications_unittest.cc
index 88a6e253..5f66f11 100644
--- a/chrome/browser/win/conflicts/installed_applications_unittest.cc
+++ b/chrome/browser/win/conflicts/installed_applications_unittest.cc
@@ -68,6 +68,11 @@
class InstalledApplicationsTest : public testing::Test {
public:
InstalledApplicationsTest() = default;
+
+ InstalledApplicationsTest(const InstalledApplicationsTest&) = delete;
+ InstalledApplicationsTest& operator=(const InstalledApplicationsTest&) =
+ delete;
+
~InstalledApplicationsTest() override = default;
// Overrides HKLM and HKCU to prevent real keys from messing with the tests.
@@ -131,8 +136,6 @@
std::unique_ptr<TestInstalledApplications> installed_applications_;
std::map<std::wstring, std::vector<std::wstring>> component_paths_map_;
-
- DISALLOW_COPY_AND_ASSIGN(InstalledApplicationsTest);
};
} // namespace
diff --git a/chrome/browser/win/conflicts/module_blocklist_cache_updater.h b/chrome/browser/win/conflicts/module_blocklist_cache_updater.h
index 54d9d66..704ba08 100644
--- a/chrome/browser/win/conflicts/module_blocklist_cache_updater.h
+++ b/chrome/browser/win/conflicts/module_blocklist_cache_updater.h
@@ -157,6 +157,11 @@
initial_blocklisted_modules,
OnCacheUpdatedCallback on_cache_updated_callback,
bool module_analysis_disabled);
+
+ ModuleBlocklistCacheUpdater(const ModuleBlocklistCacheUpdater&) = delete;
+ ModuleBlocklistCacheUpdater& operator=(const ModuleBlocklistCacheUpdater&) =
+ delete;
+
~ModuleBlocklistCacheUpdater() override;
// Returns true if the blocking of third-party modules is enabled. Can be
@@ -246,8 +251,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<ModuleBlocklistCacheUpdater> weak_ptr_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(ModuleBlocklistCacheUpdater);
};
#endif // CHROME_BROWSER_WIN_CONFLICTS_MODULE_BLOCKLIST_CACHE_UPDATER_H_
diff --git a/chrome/browser/win/conflicts/module_database.h b/chrome/browser/win/conflicts/module_database.h
index b831a0f1..ee67da3 100644
--- a/chrome/browser/win/conflicts/module_database.h
+++ b/chrome/browser/win/conflicts/module_database.h
@@ -60,6 +60,10 @@
// Creates the ModuleDatabase. Must be created and set on the sequence
// returned by GetTaskRunner().
explicit ModuleDatabase(bool third_party_blocking_policy_enabled);
+
+ ModuleDatabase(const ModuleDatabase&) = delete;
+ ModuleDatabase& operator=(const ModuleDatabase&) = delete;
+
~ModuleDatabase() override;
// Returns the SequencedTaskRunner on which the ModuleDatabase lives. Can be
@@ -278,8 +282,6 @@
ThirdPartyMetricsRecorder third_party_metrics_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(ModuleDatabase);
};
#endif // CHROME_BROWSER_WIN_CONFLICTS_MODULE_DATABASE_H_
diff --git a/chrome/browser/win/conflicts/module_database_unittest.cc b/chrome/browser/win/conflicts/module_database_unittest.cc
index 19e43e9..d29fdc4a 100644
--- a/chrome/browser/win/conflicts/module_database_unittest.cc
+++ b/chrome/browser/win/conflicts/module_database_unittest.cc
@@ -135,6 +135,10 @@
class DummyObserver : public ModuleDatabaseObserver {
public:
DummyObserver() = default;
+
+ DummyObserver(const DummyObserver&) = delete;
+ DummyObserver& operator=(const DummyObserver&) = delete;
+
~DummyObserver() override = default;
void OnNewModuleFound(const ModuleInfoKey& module_key,
@@ -161,8 +165,6 @@
int new_module_count_ = 0;
int known_module_loaded_count_ = 0;
bool on_module_database_idle_called_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(DummyObserver);
};
TEST_F(ModuleDatabaseTest, Observers) {
diff --git a/chrome/browser/win/conflicts/module_event_sink_impl.h b/chrome/browser/win/conflicts/module_event_sink_impl.h
index d88d520..e46b8a7 100644
--- a/chrome/browser/win/conflicts/module_event_sink_impl.h
+++ b/chrome/browser/win/conflicts/module_event_sink_impl.h
@@ -41,6 +41,10 @@
ModuleEventSinkImpl(base::Process process,
content::ProcessType process_type,
const OnModuleLoadCallback& on_module_load_callback);
+
+ ModuleEventSinkImpl(const ModuleEventSinkImpl&) = delete;
+ ModuleEventSinkImpl& operator=(const ModuleEventSinkImpl&) = delete;
+
~ModuleEventSinkImpl() override;
// Factory function for use with service_manager::InterfaceRegistry. This
@@ -68,8 +72,6 @@
// The callback this forwards events to.
OnModuleLoadCallback on_module_load_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ModuleEventSinkImpl);
};
#endif // CHROME_BROWSER_WIN_CONFLICTS_MODULE_EVENT_SINK_IMPL_H_
diff --git a/chrome/browser/win/conflicts/module_inspector.h b/chrome/browser/win/conflicts/module_inspector.h
index c2d7a0e..3798278 100644
--- a/chrome/browser/win/conflicts/module_inspector.h
+++ b/chrome/browser/win/conflicts/module_inspector.h
@@ -46,6 +46,10 @@
explicit ModuleInspector(
const OnModuleInspectedCallback& on_module_inspected_callback);
+
+ ModuleInspector(const ModuleInspector&) = delete;
+ ModuleInspector& operator=(const ModuleInspector&) = delete;
+
~ModuleInspector() override;
// Adds the module to the queue of modules to inspect. Starts the inspection
@@ -160,8 +164,6 @@
// Weak pointers are used to safely post the inspection result back to the
// ModuleInspector from the task scheduler.
base::WeakPtrFactory<ModuleInspector> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ModuleInspector);
};
#endif // CHROME_BROWSER_WIN_CONFLICTS_MODULE_INSPECTOR_H_
diff --git a/chrome/browser/win/conflicts/module_list_component_updater.h b/chrome/browser/win/conflicts/module_list_component_updater.h
index 59d6bc8b..458e610 100644
--- a/chrome/browser/win/conflicts/module_list_component_updater.h
+++ b/chrome/browser/win/conflicts/module_list_component_updater.h
@@ -24,6 +24,10 @@
using UniquePtr =
std::unique_ptr<ModuleListComponentUpdater, base::OnTaskRunnerDeleter>;
+ ModuleListComponentUpdater(const ModuleListComponentUpdater&) = delete;
+ ModuleListComponentUpdater& operator=(const ModuleListComponentUpdater&) =
+ delete;
+
~ModuleListComponentUpdater() override;
// Creates a new instance that lives on the UI thread.
@@ -51,8 +55,6 @@
base::ScopedObservation<component_updater::ComponentUpdateService,
component_updater::ComponentUpdateService::Observer>
observation_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ModuleListComponentUpdater);
};
#endif // CHROME_BROWSER_WIN_CONFLICTS_MODULE_LIST_COMPONENT_UPDATER_H_
diff --git a/chrome/browser/win/conflicts/module_load_attempt_log_listener.h b/chrome/browser/win/conflicts/module_load_attempt_log_listener.h
index da83b7d..6dc0f60b 100644
--- a/chrome/browser/win/conflicts/module_load_attempt_log_listener.h
+++ b/chrome/browser/win/conflicts/module_load_attempt_log_listener.h
@@ -33,6 +33,11 @@
explicit ModuleLoadAttemptLogListener(
OnModuleBlockedCallback on_module_blocked_callback);
+
+ ModuleLoadAttemptLogListener(const ModuleLoadAttemptLogListener&) = delete;
+ ModuleLoadAttemptLogListener& operator=(const ModuleLoadAttemptLogListener&) =
+ delete;
+
~ModuleLoadAttemptLogListener() override;
// base::win::ObjectWatcher::Delegate:
@@ -72,8 +77,6 @@
device_to_letter_path_mapping_;
base::WeakPtrFactory<ModuleLoadAttemptLogListener> weak_ptr_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(ModuleLoadAttemptLogListener);
};
#endif // CHROME_BROWSER_WIN_CONFLICTS_MODULE_LOAD_ATTEMPT_LOG_LISTENER_H_
diff --git a/chrome/browser/win/conflicts/registry_key_watcher.h b/chrome/browser/win/conflicts/registry_key_watcher.h
index 4afd911..e8012b1 100644
--- a/chrome/browser/win/conflicts/registry_key_watcher.h
+++ b/chrome/browser/win/conflicts/registry_key_watcher.h
@@ -24,6 +24,9 @@
REGSAM wow64access,
base::OnceClosure on_registry_key_deleted);
+ RegistryKeyWatcher(const RegistryKeyWatcher&) = delete;
+ RegistryKeyWatcher& operator=(const RegistryKeyWatcher&) = delete;
+
~RegistryKeyWatcher();
private:
@@ -46,8 +49,6 @@
// Invoked when the registry key is deleted.
base::OnceClosure on_registry_key_deleted_;
-
- DISALLOW_COPY_AND_ASSIGN(RegistryKeyWatcher);
};
#endif // CHROME_BROWSER_WIN_CONFLICTS_REGISTRY_KEY_WATCHER_H_
diff --git a/chrome/browser/win/conflicts/third_party_conflicts_manager.h b/chrome/browser/win/conflicts/third_party_conflicts_manager.h
index 7eea2490..fa2dbd0 100644
--- a/chrome/browser/win/conflicts/third_party_conflicts_manager.h
+++ b/chrome/browser/win/conflicts/third_party_conflicts_manager.h
@@ -63,6 +63,11 @@
// |module_database_event_source| must outlive this.
explicit ThirdPartyConflictsManager(
ModuleDatabaseEventSource* module_database_event_source);
+
+ ThirdPartyConflictsManager(const ThirdPartyConflictsManager&) = delete;
+ ThirdPartyConflictsManager& operator=(const ThirdPartyConflictsManager&) =
+ delete;
+
~ThirdPartyConflictsManager() override;
static void RegisterLocalStatePrefs(PrefRegistrySimple* registry);
@@ -244,8 +249,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<ThirdPartyConflictsManager> weak_ptr_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(ThirdPartyConflictsManager);
};
#endif // CHROME_BROWSER_WIN_CONFLICTS_THIRD_PARTY_CONFLICTS_MANAGER_H_
diff --git a/chrome/browser/win/conflicts/third_party_metrics_recorder.h b/chrome/browser/win/conflicts/third_party_metrics_recorder.h
index 4b5967a..ec74a1c4 100644
--- a/chrome/browser/win/conflicts/third_party_metrics_recorder.h
+++ b/chrome/browser/win/conflicts/third_party_metrics_recorder.h
@@ -22,6 +22,11 @@
class ThirdPartyMetricsRecorder : public ModuleDatabaseObserver {
public:
ThirdPartyMetricsRecorder();
+
+ ThirdPartyMetricsRecorder(const ThirdPartyMetricsRecorder&) = delete;
+ ThirdPartyMetricsRecorder& operator=(const ThirdPartyMetricsRecorder&) =
+ delete;
+
~ThirdPartyMetricsRecorder() override;
// ModuleDatabaseObserver:
@@ -82,8 +87,6 @@
// Counts the number of shell extensions.
size_t shell_extensions_count_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(ThirdPartyMetricsRecorder);
};
#endif // CHROME_BROWSER_WIN_CONFLICTS_THIRD_PARTY_METRICS_RECORDER_H_
diff --git a/chrome/browser/win/conflicts/uninstall_application.cc b/chrome/browser/win/conflicts/uninstall_application.cc
index 992760f..159269e0 100644
--- a/chrome/browser/win/conflicts/uninstall_application.cc
+++ b/chrome/browser/win/conflicts/uninstall_application.cc
@@ -134,6 +134,11 @@
scoped_refptr<base::SequencedTaskRunner> controller_runner,
base::OnceClosure on_automation_finished,
const std::wstring& application_name);
+
+ AutomationControllerDelegate(const AutomationControllerDelegate&) = delete;
+ AutomationControllerDelegate& operator=(const AutomationControllerDelegate&) =
+ delete;
+
~AutomationControllerDelegate() override;
// AutomationController::Delegate:
@@ -157,8 +162,6 @@
mutable base::OnceClosure on_automation_finished_;
const std::wstring application_name_;
-
- DISALLOW_COPY_AND_ASSIGN(AutomationControllerDelegate);
};
UninstallAppController::AutomationControllerDelegate::
diff --git a/chrome/browser/win/jumplist_updater.h b/chrome/browser/win/jumplist_updater.h
index 9e0d1c3b..2117b74 100644
--- a/chrome/browser/win/jumplist_updater.h
+++ b/chrome/browser/win/jumplist_updater.h
@@ -98,6 +98,10 @@
class JumpListUpdater {
public:
explicit JumpListUpdater(const std::wstring& app_user_model_id);
+
+ JumpListUpdater(const JumpListUpdater&) = delete;
+ JumpListUpdater& operator=(const JumpListUpdater&) = delete;
+
~JumpListUpdater();
// Returns true if JumpLists are enabled on this OS.
@@ -140,8 +144,6 @@
// The current user setting for "Number of recent items to display in Jump
// Lists" option in the "Taskbar and Start Menu Properties".
size_t user_max_items_;
-
- DISALLOW_COPY_AND_ASSIGN(JumpListUpdater);
};
#endif // CHROME_BROWSER_WIN_JUMPLIST_UPDATER_H_
diff --git a/chrome/browser/win/settings_app_monitor.cc b/chrome/browser/win/settings_app_monitor.cc
index 83256637..2cb7c78 100644
--- a/chrome/browser/win/settings_app_monitor.cc
+++ b/chrome/browser/win/settings_app_monitor.cc
@@ -115,6 +115,11 @@
AutomationControllerDelegate(
scoped_refptr<base::SequencedTaskRunner> monitor_runner,
base::WeakPtr<SettingsAppMonitor> monitor);
+
+ AutomationControllerDelegate(const AutomationControllerDelegate&) = delete;
+ AutomationControllerDelegate& operator=(const AutomationControllerDelegate&) =
+ delete;
+
~AutomationControllerDelegate() override;
// AutomationController::Delegate:
@@ -149,8 +154,6 @@
// The browser chooser must only be invoked once.
mutable bool browser_chooser_invoked_;
-
- DISALLOW_COPY_AND_ASSIGN(AutomationControllerDelegate);
};
SettingsAppMonitor::AutomationControllerDelegate::AutomationControllerDelegate(
diff --git a/chrome/browser/win/settings_app_monitor.h b/chrome/browser/win/settings_app_monitor.h
index 1eccb70..e963735 100644
--- a/chrome/browser/win/settings_app_monitor.h
+++ b/chrome/browser/win/settings_app_monitor.h
@@ -50,6 +50,10 @@
// |delegate| must outlive the monitor.
explicit SettingsAppMonitor(Delegate* delegate);
+
+ SettingsAppMonitor(const SettingsAppMonitor&) = delete;
+ SettingsAppMonitor& operator=(const SettingsAppMonitor&) = delete;
+
~SettingsAppMonitor();
private:
@@ -73,8 +77,6 @@
// Weak pointers are passed to the AutomationControllerDelegate so that it can
// safely call back the monitor from any thread.
base::WeakPtrFactory<SettingsAppMonitor> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SettingsAppMonitor);
};
#endif // CHROME_BROWSER_WIN_SETTINGS_APP_MONITOR_H_
