Remove DISALLOW_COPY_AND_ASSIGN from chrome/browser/a*.
A little other miscellaneous cleanup, no functional changes.
Bug: 1010217
Change-Id: I9d1c56723c0de2293c06c810fa7175cbf5031f89
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2393633
Reviewed-by: Ted Choc <[email protected]>
Commit-Queue: David Bienvenu <[email protected]>
Cr-Commit-Position: refs/heads/master@{#806401}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index dd43b91..bcda2d5 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -6414,6 +6414,8 @@
FlagsStateSingleton()
: flags_state_(
std::make_unique<flags_ui::FlagsState>(kFeatureEntries, this)) {}
+ FlagsStateSingleton(const FlagsStateSingleton&) = delete;
+ FlagsStateSingleton& operator=(const FlagsStateSingleton&) = delete;
~FlagsStateSingleton() override = default;
static FlagsStateSingleton* GetInstance() {
@@ -6436,8 +6438,6 @@
}
std::unique_ptr<flags_ui::FlagsState> flags_state_;
-
- DISALLOW_COPY_AND_ASSIGN(FlagsStateSingleton);
};
bool ShouldSkipNonDeprecatedFeatureEntry(const FeatureEntry& entry) {
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
index 3e773af..d14f38ef 100644
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -12,7 +12,6 @@
#include "base/files/scoped_temp_dir.h"
#include "base/guid.h"
#include "base/location.h"
-#include "base/macros.h"
#include "base/path_service.h"
#include "base/process/process.h"
#include "base/run_loop.h"
@@ -160,8 +159,10 @@
WebContentsHiddenObserver(content::WebContents* web_contents,
base::OnceClosure hidden_callback)
: WebContentsObserver(web_contents),
- hidden_callback_(std::move(hidden_callback)),
- hidden_observed_(false) {}
+ hidden_callback_(std::move(hidden_callback)) {}
+ WebContentsHiddenObserver(const WebContentsHiddenObserver&) = delete;
+ WebContentsHiddenObserver& operator=(const WebContentsHiddenObserver&) =
+ delete;
// WebContentsObserver.
void OnVisibilityChanged(content::Visibility visibility) override {
@@ -171,13 +172,11 @@
}
}
- bool hidden_observed() { return hidden_observed_; }
+ bool hidden_observed() const { return hidden_observed_; }
private:
base::OnceClosure hidden_callback_;
- bool hidden_observed_;
-
- DISALLOW_COPY_AND_ASSIGN(WebContentsHiddenObserver);
+ bool hidden_observed_ = false;
};
// Watches for context menu to be shown, sets a boolean if it is shown.
@@ -187,7 +186,9 @@
RenderViewContextMenu::RegisterMenuShownCallbackForTesting(base::BindOnce(
&ContextMenuShownObserver::OnMenuShown, base::Unretained(this)));
}
- ~ContextMenuShownObserver() {}
+ ContextMenuShownObserver(const ContextMenuShownObserver&) = delete;
+ ContextMenuShownObserver& operator=(const ContextMenuShownObserver&) = delete;
+ ~ContextMenuShownObserver() = default;
void OnMenuShown(RenderViewContextMenu* context_menu) {
shown_ = true;
@@ -205,14 +206,15 @@
private:
bool shown_ = false;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(ContextMenuShownObserver);
};
class EmbedderWebContentsObserver : public content::WebContentsObserver {
public:
explicit EmbedderWebContentsObserver(content::WebContents* web_contents)
- : WebContentsObserver(web_contents), terminated_(false) {}
+ : WebContentsObserver(web_contents) {}
+ EmbedderWebContentsObserver(const EmbedderWebContentsObserver&) = delete;
+ EmbedderWebContentsObserver& operator=(const EmbedderWebContentsObserver&) =
+ delete;
// WebContentsObserver.
void RenderProcessGone(base::TerminationStatus status) override {
@@ -229,10 +231,8 @@
}
private:
- bool terminated_;
+ bool terminated_ = false;
scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(EmbedderWebContentsObserver);
};
void ExecuteScriptWaitForTitle(content::WebContents* web_contents,
@@ -254,6 +254,8 @@
public:
SelectControlWaiter() { aura::Env::GetInstance()->AddObserver(this); }
+ SelectControlWaiter(const SelectControlWaiter&) = delete;
+ SelectControlWaiter& operator=(const SelectControlWaiter&) = delete;
~SelectControlWaiter() override {
aura::Env::GetInstance()->RemoveObserver(this);
}
@@ -287,8 +289,6 @@
scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
std::set<aura::Window*> observed_windows_;
bool wait_for_widget_shown_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(SelectControlWaiter);
};
// Simulate real click with delay between mouse down and up.
@@ -302,6 +302,8 @@
mouse_event_.button = blink::WebMouseEvent::Button::kLeft;
}
+ LeftMouseClick(const LeftMouseClick&) = delete;
+ LeftMouseClick& operator=(const LeftMouseClick&) = delete;
~LeftMouseClick() {
DCHECK(click_completed_);
}
@@ -351,8 +353,6 @@
blink::WebMouseEvent mouse_event_;
bool click_completed_ = true;
-
- DISALLOW_COPY_AND_ASSIGN(LeftMouseClick);
};
#endif
@@ -379,10 +379,10 @@
// the test run successfully on trybots.
class MockWebContentsDelegate : public content::WebContentsDelegate {
public:
- MockWebContentsDelegate()
- : requested_(false),
- checked_(false) {}
- ~MockWebContentsDelegate() override {}
+ MockWebContentsDelegate() = default;
+ MockWebContentsDelegate(const MockWebContentsDelegate&) = delete;
+ MockWebContentsDelegate& operator=(const MockWebContentsDelegate&) = delete;
+ ~MockWebContentsDelegate() override = default;
void RequestMediaAccessPermission(
content::WebContents* web_contents,
@@ -417,12 +417,10 @@
}
private:
- bool requested_;
- bool checked_;
+ bool requested_ = false;
+ bool checked_ = false;
scoped_refptr<content::MessageLoopRunner> request_message_loop_runner_;
scoped_refptr<content::MessageLoopRunner> check_message_loop_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(MockWebContentsDelegate);
};
// This class intercepts download request from the guest.
@@ -430,12 +428,12 @@
public:
explicit MockDownloadWebContentsDelegate(
content::WebContentsDelegate* orig_delegate)
- : orig_delegate_(orig_delegate),
- waiting_for_decision_(false),
- expect_allow_(false),
- decision_made_(false),
- last_download_allowed_(false) {}
- ~MockDownloadWebContentsDelegate() override {}
+ : orig_delegate_(orig_delegate) {}
+ MockDownloadWebContentsDelegate(const MockDownloadWebContentsDelegate&) =
+ delete;
+ MockDownloadWebContentsDelegate& operator=(
+ const MockDownloadWebContentsDelegate&) = delete;
+ ~MockDownloadWebContentsDelegate() override = default;
void CanDownload(const GURL& url,
const std::string& request_method,
@@ -482,13 +480,11 @@
private:
content::WebContentsDelegate* orig_delegate_;
- bool waiting_for_decision_;
- bool expect_allow_;
- bool decision_made_;
- bool last_download_allowed_;
+ bool waiting_for_decision_ = false;
+ bool expect_allow_ = false;
+ bool decision_made_ = false;
+ bool last_download_allowed_ = false;
scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(MockDownloadWebContentsDelegate);
};
class WebViewTest : public extensions::PlatformAppBrowserTest {
@@ -906,8 +902,10 @@
public:
explicit WebContentsAudioMutedObserver(content::WebContents* web_contents)
: WebContentsObserver(web_contents),
- loop_runner_(new content::MessageLoopRunner),
- muting_update_observed_(false) {}
+ loop_runner_(new content::MessageLoopRunner) {}
+ WebContentsAudioMutedObserver(const WebContentsAudioMutedObserver&) = delete;
+ WebContentsAudioMutedObserver& operator=(
+ const WebContentsAudioMutedObserver&) = delete;
// WebContentsObserver.
void DidUpdateAudioMutingState(bool muted) override {
@@ -923,16 +921,16 @@
private:
scoped_refptr<content::MessageLoopRunner> loop_runner_;
- bool muting_update_observed_;
-
- DISALLOW_COPY_AND_ASSIGN(WebContentsAudioMutedObserver);
+ bool muting_update_observed_ = false;
};
class IsAudibleObserver : public content::WebContentsObserver {
public:
explicit IsAudibleObserver(content::WebContents* contents)
: WebContentsObserver(contents) {}
- ~IsAudibleObserver() override {}
+ IsAudibleObserver(const IsAudibleObserver&) = delete;
+ IsAudibleObserver& operator=(const IsAudibleObserver&) = delete;
+ ~IsAudibleObserver() override = default;
void WaitForCurrentlyAudible(bool audible) {
// If there's no state change to observe then return right away.
@@ -954,10 +952,8 @@
message_loop_runner_->Quit();
}
- bool audible_;
+ bool audible_ = false;
scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(IsAudibleObserver);
};
IN_PROC_BROWSER_TEST_F(WebViewTest, AudibilityStatePropagates) {
@@ -3284,10 +3280,11 @@
public testing::WithParamInterface<version_info::Channel> {
public:
WebViewChannelTest() : channel_(GetParam()) {}
+ WebViewChannelTest(const WebViewChannelTest&) = delete;
+ WebViewChannelTest& operator=(const WebViewChannelTest&) = delete;
private:
extensions::ScopedCurrentChannel channel_;
- DISALLOW_COPY_AND_ASSIGN(WebViewChannelTest);
};
// This test verify that the set of rules registries of a webview will be
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index d5ba23a..ae3a6eb 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -76,15 +76,16 @@
SearchProviderForTest(AutocompleteProviderClient* client,
AutocompleteProviderListener* listener,
Profile* profile);
- bool is_success() { return is_success_; }
+ SearchProviderForTest(const SearchProviderForTest&) = delete;
+ SearchProviderForTest& operator=(const SearchProviderForTest&) = delete;
+ bool is_success() const { return is_success_; }
protected:
~SearchProviderForTest() override;
private:
void RecordDeletionResult(bool success) override;
- bool is_success_;
- DISALLOW_COPY_AND_ASSIGN(SearchProviderForTest);
+ bool is_success_ = false;
};
SearchProviderForTest::SearchProviderForTest(
@@ -93,8 +94,7 @@
Profile* profile)
: SearchProvider(client, listener), is_success_(false) {}
-SearchProviderForTest::~SearchProviderForTest() {
-}
+SearchProviderForTest::~SearchProviderForTest() = default;
void SearchProviderForTest::RecordDeletionResult(bool success) {
is_success_ = success;
@@ -222,12 +222,9 @@
BaseSearchProviderTest(
const base::Optional<bool> warm_up_on_focus = base::nullopt,
const bool command_line_overrides = false)
- : default_t_url_(nullptr),
- term1_(ASCIIToUTF16("term1")),
- keyword_t_url_(nullptr),
- keyword_term_(ASCIIToUTF16("keyword")),
- feature_test_component_(warm_up_on_focus, command_line_overrides),
- run_loop_(nullptr) {}
+ : feature_test_component_(warm_up_on_focus, command_line_overrides) {}
+ BaseSearchProviderTest(const BaseSearchProviderTest&) = delete;
+ BaseSearchProviderTest& operator=(const BaseSearchProviderTest&) = delete;
void TearDown() override;
@@ -306,11 +303,11 @@
void ClearAllResults();
// See description above class for details of these fields.
- TemplateURL* default_t_url_;
- const base::string16 term1_;
+ TemplateURL* default_t_url_ = nullptr;
+ const base::string16 term1_ = ASCIIToUTF16("term1");
GURL term1_url_;
- TemplateURL* keyword_t_url_;
- const base::string16 keyword_term_;
+ TemplateURL* keyword_t_url_ = nullptr;
+ const base::string16 keyword_term_ = ASCIIToUTF16("keyword");
GURL keyword_url_;
// SearchProviderFeatureTestComponent must come before BrowserTaskEnvironment,
@@ -324,9 +321,7 @@
scoped_refptr<SearchProviderForTest> provider_;
// If not nullptr, OnProviderUpdate quits the current |run_loop_|.
- base::RunLoop* run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(BaseSearchProviderTest);
+ base::RunLoop* run_loop_ = nullptr;
};
// SearchProviderTest ---------------------------------------------------------
diff --git a/chrome/browser/autofill/autofill_interactive_uitest.cc b/chrome/browser/autofill/autofill_interactive_uitest.cc
index 7cb848df..0da36d8 100644
--- a/chrome/browser/autofill/autofill_interactive_uitest.cc
+++ b/chrome/browser/autofill/autofill_interactive_uitest.cc
@@ -14,7 +14,6 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_util.h"
-#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/metrics/field_trial.h"
#include "base/rand_util.h"
@@ -30,7 +29,6 @@
#include "base/test/mock_entropy_provider.h"
#include "base/test/scoped_feature_list.h"
#include "base/time/time.h"
-#include "build/build_config.h"
#include "chrome/browser/autofill/autofill_uitest.h"
#include "chrome/browser/autofill/autofill_uitest_util.h"
#include "chrome/browser/profiles/profile.h"
@@ -270,7 +268,13 @@
AutofillInteractiveTestBase()
: https_server_(net::EmbeddedTestServer::TYPE_HTTPS) {}
- ~AutofillInteractiveTestBase() override {}
+ public:
+ AutofillInteractiveTestBase(const AutofillInteractiveTestBase&) = delete;
+ AutofillInteractiveTestBase& operator=(const AutofillInteractiveTestBase&) =
+ delete;
+
+ protected:
+ ~AutofillInteractiveTestBase() override = default;
// InProcessBrowserTest:
void SetUp() override {
@@ -706,8 +710,6 @@
// The response to return for queries to |kTestUrlPath|
std::string test_url_content_;
-
- DISALLOW_COPY_AND_ASSIGN(AutofillInteractiveTestBase);
};
const char AutofillInteractiveTestBase::kTestUrlPath[] =
@@ -2523,6 +2525,14 @@
class AutofillCreditCardInteractiveTest : public AutofillInteractiveTestBase {
protected:
AutofillCreditCardInteractiveTest() = default;
+
+ public:
+ AutofillCreditCardInteractiveTest(const AutofillCreditCardInteractiveTest&) =
+ delete;
+ AutofillCreditCardInteractiveTest& operator=(
+ const AutofillCreditCardInteractiveTest&) = delete;
+
+ protected:
~AutofillCreditCardInteractiveTest() override = default;
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -2537,9 +2547,6 @@
// we won't be able to encrypt the cc number. There will be a crash while
// encrypting the cc number.
void TearDownOnMainThread() override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AutofillCreditCardInteractiveTest);
};
// Test that credit card autofill works.
@@ -2919,6 +2926,14 @@
// Setup that the test expects a re-fill to happen.
test_delegate()->SetIsExpectingDynamicRefill(true);
}
+
+ public:
+ AutofillDynamicFormInteractiveTest(
+ const AutofillDynamicFormInteractiveTest&) = delete;
+ AutofillDynamicFormInteractiveTest& operator=(
+ const AutofillDynamicFormInteractiveTest&) = delete;
+
+ protected:
~AutofillDynamicFormInteractiveTest() override = default;
// AutofillInteractiveTestBase:
@@ -2947,8 +2962,6 @@
private:
base::test::ScopedFeatureList scoped_feature_list_;
-
- DISALLOW_COPY_AND_ASSIGN(AutofillDynamicFormInteractiveTest);
};
// Test that we can Autofill dynamically generated forms.
