Skip to content

GitLab

T
tangled
Commit 15004768 authored by David Bienvenu's avatar David Bienvenu Committed by Commit Bot
Browse files
Options

Remove DISALLOW_COPY_AND_ASSIGN from chrome/test/base/* 

Also some lint fixes and other cleanup; no functional changes

Bug: 1010217
Change-Id: Ia41657b7e1892056074ba6a21488b78e4ddc65da
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2459062
Commit-Queue: David Bienvenu <davidbienvenu@chromium.org>
Reviewed-by: default avatarVasilii Sukhanov <vasilii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815148}
parent 7c6eef60
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 214 deletions
chrome/test/base/always_on_top_window_killer_win.cc
View file @ 15004768
......@@ -47,6 +47,8 @@ class WindowEnumerator {
// child process that timed out.
WindowEnumerator(RunType run_type,
const base::CommandLine* child_command_line);
WindowEnumerator(const WindowEnumerator&) = delete;
WindowEnumerator& operator=(const WindowEnumerator&) = delete;
void Run();
private:
......@@ -72,8 +74,7 @@ class WindowEnumerator {
const base::FilePath output_dir_;
const RunType run_type_;
const base::CommandLine* const child_command_line_;
bool saved_snapshot_;
DISALLOW_COPY_AND_ASSIGN(WindowEnumerator);
bool saved_snapshot_ = false;
};
WindowEnumerator::WindowEnumerator(RunType run_type,
......@@ -81,8 +82,7 @@ WindowEnumerator::WindowEnumerator(RunType run_type,
: output_dir_(base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
kSnapshotOutputDir)),
run_type_(run_type),
child_command_line_(child_command_line),
saved_snapshot_(false) {}
child_command_line_(child_command_line) {}
void WindowEnumerator::Run() {
if (run_type_ == RunType::AFTER_TEST_TIMEOUT && !output_dir_.empty()) {
......
chrome/test/base/browser_process_platform_part_test_api_chromeos.h
View file @ 15004768
......@@ -7,7 +7,6 @@
#include <memory>
#include "base/macros.h"
#include "chrome/browser/component_updater/cros_component_manager.h"
class BrowserProcessPlatformPart;
......@@ -17,6 +16,10 @@ class BrowserProcessPlatformPartTestApi {
public:
explicit BrowserProcessPlatformPartTestApi(
BrowserProcessPlatformPart* platform_part);
BrowserProcessPlatformPartTestApi(const BrowserProcessPlatformPartTestApi&) =
delete;
BrowserProcessPlatformPartTestApi& operator=(
const BrowserProcessPlatformPartTestApi&) = delete;
~BrowserProcessPlatformPartTestApi();
// Initializes cros component manager for tests. Expects that cros component
......@@ -31,8 +34,6 @@ class BrowserProcessPlatformPartTestApi {
private:
BrowserProcessPlatformPart* const platform_part_;
DISALLOW_COPY_AND_ASSIGN(BrowserProcessPlatformPartTestApi);
};
#endif // CHROME_TEST_BASE_BROWSER_PROCESS_PLATFORM_PART_TEST_API_CHROMEOS_H_
chrome/test/base/browser_with_test_window_test.h
View file @ 15004768
......@@ -8,7 +8,6 @@
#include <memory>
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "build/build_config.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/test/base/test_browser_window.h"
......@@ -99,6 +98,10 @@ class BrowserWithTestWindowTest : public testing::Test {
base::trait_helpers::HasTrait<HostedApp,
TaskEnvironmentTraits...>()) {}
BrowserWithTestWindowTest(const BrowserWithTestWindowTest&) = delete;
BrowserWithTestWindowTest& operator=(const BrowserWithTestWindowTest&) =
delete;
~BrowserWithTestWindowTest() override;
void SetUp() override;
......@@ -242,8 +245,6 @@ class BrowserWithTestWindowTest : public testing::Test {
// Whether the browser is part of a hosted app.
const bool hosted_app_;
DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
};
#endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
chrome/test/base/chrome_render_view_test.cc
View file @ 15004768
......@@ -5,7 +5,6 @@
#include "chrome/test/base/chrome_render_view_test.h"
#include "base/debug/leak_annotations.h"
#include "base/macros.h"
#include "base/run_loop.h"
#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/common/chrome_content_client.h"
......@@ -70,7 +69,9 @@ class MockAutofillAgent : public AutofillAgent {
autofill_assistant_agent,
registry) {}
~MockAutofillAgent() override {}
MockAutofillAgent(const MockAutofillAgent&) = delete;
MockAutofillAgent& operator=(const MockAutofillAgent&) = delete;
~MockAutofillAgent() override = default;
void WaitForAutofillDidAssociateFormControl() {
DCHECK(run_loop_ == nullptr);
......@@ -87,8 +88,6 @@ class MockAutofillAgent : public AutofillAgent {
}
std::unique_ptr<base::RunLoop> run_loop_;
DISALLOW_COPY_AND_ASSIGN(MockAutofillAgent);
};
} // namespace
......
chrome/test/base/chrome_test_launcher.cc
View file @ 15004768
......@@ -14,7 +14,6 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/macros.h"
#include "base/path_service.h"
#include "base/process/process_metrics.h"
#include "base/run_loop.h"
......@@ -67,9 +66,6 @@
#include "testing/gtest/include/gtest/gtest.h"
#endif
ChromeTestSuiteRunner::ChromeTestSuiteRunner() {}
ChromeTestSuiteRunner::~ChromeTestSuiteRunner() {}
int ChromeTestSuiteRunner::RunTestSuite(int argc, char** argv) {
ChromeTestSuite test_suite(argc, argv);
// Browser tests are expected not to tear-down various globals.
......@@ -102,6 +98,8 @@ class ChromeTestLauncherDelegate::ScopedFirewallRules {
<< "Failed to add Windows firewall rules -- Windows firewall dialogs "
"may appear.";
}
ScopedFirewallRules(const ScopedFirewallRules&) = delete;
ScopedFirewallRules& operator=(const ScopedFirewallRules&) = delete;
~ScopedFirewallRules() {
if (rules_added_)
......@@ -112,7 +110,6 @@ class ChromeTestLauncherDelegate::ScopedFirewallRules {
base::win::ScopedCOMInitializer com_initializer_;
std::unique_ptr<installer::FirewallManager> firewall_manager_;
bool rules_added_ = false;
DISALLOW_COPY_AND_ASSIGN(ScopedFirewallRules);
};
#endif // defined(OS_WIN)
......
chrome/test/base/chrome_test_launcher.h
View file @ 15004768
......@@ -6,8 +6,8 @@
#define CHROME_TEST_BASE_CHROME_TEST_LAUNCHER_H_
#include <memory>
#include <string>
#include "base/macros.h"
#include "build/build_config.h"
#include "content/public/test/test_launcher.h"
......@@ -15,13 +15,12 @@
// instance of ChromeTestSuite.
class ChromeTestSuiteRunner {
public:
ChromeTestSuiteRunner();
virtual ~ChromeTestSuiteRunner();
ChromeTestSuiteRunner() = default;
ChromeTestSuiteRunner(const ChromeTestSuiteRunner&) = delete;
ChromeTestSuiteRunner& operator=(const ChromeTestSuiteRunner&) = delete;
virtual ~ChromeTestSuiteRunner() = default;
virtual int RunTestSuite(int argc, char** argv);
private:
DISALLOW_COPY_AND_ASSIGN(ChromeTestSuiteRunner);
};
// Delegate used for setting up and running chrome browser tests.
......@@ -29,6 +28,9 @@ class ChromeTestLauncherDelegate : public content::TestLauncherDelegate {
public:
// Does not take ownership of ChromeTestSuiteRunner.
explicit ChromeTestLauncherDelegate(ChromeTestSuiteRunner* runner);
ChromeTestLauncherDelegate(const ChromeTestLauncherDelegate&) = delete;
ChromeTestLauncherDelegate& operator=(const ChromeTestLauncherDelegate&) =
delete;
~ChromeTestLauncherDelegate() override;
protected:
......@@ -49,8 +51,6 @@ class ChromeTestLauncherDelegate : public content::TestLauncherDelegate {
#endif
ChromeTestSuiteRunner* runner_;
DISALLOW_COPY_AND_ASSIGN(ChromeTestLauncherDelegate);
};
// Launches Chrome browser tests. |parallel_jobs| is number of test jobs to be
......
chrome/test/base/chrome_test_suite.cc
View file @ 15004768
......@@ -59,8 +59,7 @@ ChromeTestSuite::ChromeTestSuite(int argc, char** argv)
: content::ContentTestSuiteBase(argc, argv) {
}
ChromeTestSuite::~ChromeTestSuite() {
}
ChromeTestSuite::~ChromeTestSuite() = default;
void ChromeTestSuite::Initialize() {
#if defined(OS_MAC)
......
chrome/test/base/chrome_test_suite.h
View file @ 15004768
......@@ -9,7 +9,6 @@
#include <string>
#include "base/files/file_path.h"
#include "base/macros.h"
#include "content/public/test/content_test_suite_base.h"
// Test suite for unit and browser tests. Creates services needed by both.
......@@ -17,6 +16,8 @@
class ChromeTestSuite : public content::ContentTestSuiteBase {
public:
ChromeTestSuite(int argc, char** argv);
ChromeTestSuite(const ChromeTestSuite&) = delete;
ChromeTestSuite& operator=(const ChromeTestSuite&) = delete;
~ChromeTestSuite() override;
protected:
......@@ -30,8 +31,6 @@ class ChromeTestSuite : public content::ContentTestSuiteBase {
// Alternative path to browser binaries.
base::FilePath browser_dir_;
DISALLOW_COPY_AND_ASSIGN(ChromeTestSuite);
};
#endif // CHROME_TEST_BASE_CHROME_TEST_SUITE_H_
chrome/test/base/chrome_unit_test_suite.cc
View file @ 15004768
......@@ -6,7 +6,6 @@
#include <memory>
#include "base/macros.h"
#include "base/path_service.h"
#include "base/process/process_handle.h"
#include "build/build_config.h"
......@@ -56,8 +55,12 @@ class ChromeContentBrowserClientWithoutNetworkServiceInitialization
// Creates a TestingBrowserProcess for each test.
class ChromeUnitTestSuiteInitializer : public testing::EmptyTestEventListener {
public:
ChromeUnitTestSuiteInitializer() {}
virtual ~ChromeUnitTestSuiteInitializer() {}
ChromeUnitTestSuiteInitializer() = default;
ChromeUnitTestSuiteInitializer(const ChromeUnitTestSuiteInitializer&) =
delete;
ChromeUnitTestSuiteInitializer& operator=(
const ChromeUnitTestSuiteInitializer&) = delete;
~ChromeUnitTestSuiteInitializer() override = default;
void OnTestStart(const testing::TestInfo& test_info) override {
content_client_.reset(new ChromeContentClient);
......@@ -80,7 +83,7 @@ class ChromeUnitTestSuiteInitializer : public testing::EmptyTestEventListener {
browser_content_client_.reset();
utility_content_client_.reset();
content_client_.reset();
content::SetContentClient(NULL);
content::SetContentClient(nullptr);
TestingBrowserProcess::DeleteInstance();
}
......@@ -90,8 +93,6 @@ class ChromeUnitTestSuiteInitializer : public testing::EmptyTestEventListener {
std::unique_ptr<ChromeContentClient> content_client_;
std::unique_ptr<ChromeContentBrowserClient> browser_content_client_;
std::unique_ptr<ChromeContentUtilityClient> utility_content_client_;
DISALLOW_COPY_AND_ASSIGN(ChromeUnitTestSuiteInitializer);
};
} // namespace
......@@ -99,8 +100,6 @@ class ChromeUnitTestSuiteInitializer : public testing::EmptyTestEventListener {
ChromeUnitTestSuite::ChromeUnitTestSuite(int argc, char** argv)
: ChromeTestSuite(argc, argv) {}
ChromeUnitTestSuite::~ChromeUnitTestSuite() {}
void ChromeUnitTestSuite::Initialize() {
// Add an additional listener to do the extra initialization for unit tests.
// It will be started before the base class listeners and ended after the
......@@ -172,7 +171,7 @@ void ChromeUnitTestSuite::InitializeResourceBundle() {
// Force unittests to run using en-US so if we test against string
// output, it'll pass regardless of the system language.
ui::ResourceBundle::InitSharedInstanceWithLocale(
"en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
"en-US", nullptr, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
base::FilePath resources_pack_path;
base::PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
......
chrome/test/base/chrome_unit_test_suite.h
View file @ 15004768
......@@ -7,7 +7,6 @@
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
#include "base/macros.h"
#include "base/test/test_discardable_memory_allocator.h"
#include "build/build_config.h"
#include "chrome/test/base/chrome_test_suite.h"
......@@ -21,7 +20,9 @@
class ChromeUnitTestSuite : public ChromeTestSuite {
public:
ChromeUnitTestSuite(int argc, char** argv);
~ChromeUnitTestSuite() override;
ChromeUnitTestSuite(const ChromeUnitTestSuite&) = delete;
ChromeUnitTestSuite& operator=(const ChromeUnitTestSuite&) = delete;
~ChromeUnitTestSuite() override = default;
// base::TestSuite overrides:
void Initialize() override;
......@@ -43,8 +44,6 @@ class ChromeUnitTestSuite : public ChromeTestSuite {
// task which delays test completion.
instance_id::ScopedUseFakeInstanceIDAndroid fake_instance_id_android_;
#endif
DISALLOW_COPY_AND_ASSIGN(ChromeUnitTestSuite);
};
#endif // CHROME_TEST_BASE_CHROME_UNIT_TEST_SUITE_H_
chrome/test/base/dialog_test_browser_window.cc
View file @ 15004768
......@@ -4,6 +4,8 @@
#include "chrome/test/base/dialog_test_browser_window.h"
#include <utility>
#include "build/build_config.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
......@@ -27,9 +29,7 @@ DialogTestBrowserWindow::DialogTestBrowserWindow() {
#endif
}
DialogTestBrowserWindow::~DialogTestBrowserWindow() {
}
DialogTestBrowserWindow::~DialogTestBrowserWindow() = default;
WebContentsModalDialogHost*
DialogTestBrowserWindow::GetWebContentsModalDialogHost() {
......
chrome/test/base/dialog_test_browser_window.h
View file @ 15004768
......@@ -7,7 +7,6 @@
#include <memory>
#include "base/macros.h"
#include "chrome/test/base/test_browser_window.h"
#include "components/web_modal/web_contents_modal_dialog_host.h"
......@@ -22,6 +21,8 @@ class DialogTestBrowserWindow : public TestBrowserWindow,
public web_modal::WebContentsModalDialogHost {
public:
DialogTestBrowserWindow();
DialogTestBrowserWindow(const DialogTestBrowserWindow&) = delete;
DialogTestBrowserWindow& operator=(const DialogTestBrowserWindow&) = delete;
~DialogTestBrowserWindow() override;
// BrowserWindow overrides
......@@ -40,8 +41,6 @@ class DialogTestBrowserWindow : public TestBrowserWindow,
// Dummy window for parenting dialogs.
std::unique_ptr<views::Widget> host_window_;
DISALLOW_COPY_AND_ASSIGN(DialogTestBrowserWindow);
};
#endif // CHROME_TEST_BASE_DIALOG_TEST_BROWSER_WINDOW_H_
chrome/test/base/extension_js_browser_test.cc
View file @ 15004768
......@@ -14,7 +14,7 @@
#include "content/public/test/browser_test_utils.h"
#include "extensions/browser/browsertest_util.h"
ExtensionJSBrowserTest::ExtensionJSBrowserTest() : libs_loaded_(false) {}
ExtensionJSBrowserTest::ExtensionJSBrowserTest() {}
ExtensionJSBrowserTest::~ExtensionJSBrowserTest() {}
......
chrome/test/base/extension_js_browser_test.h
View file @ 15004768
......@@ -6,7 +6,6 @@
#define CHROME_TEST_BASE_EXTENSION_JS_BROWSER_TEST_H_
#include "base/callback_forward.h"
#include "base/macros.h"
#include "chrome/test/base/extension_load_waiter_one_shot.h"
#include "chrome/test/base/javascript_browser_test.h"
......@@ -17,7 +16,8 @@
class ExtensionJSBrowserTest : public JavaScriptBrowserTest {
public:
ExtensionJSBrowserTest();
ExtensionJSBrowserTest(const ExtensionJSBrowserTest&) = delete;
ExtensionJSBrowserTest& operator=(const ExtensionJSBrowserTest&) = delete;
~ExtensionJSBrowserTest() override;
protected:
......@@ -32,9 +32,7 @@ class ExtensionJSBrowserTest : public JavaScriptBrowserTest {
private:
std::unique_ptr<ExtensionLoadWaiterOneShot> load_waiter_;
bool libs_loaded_;
DISALLOW_COPY_AND_ASSIGN(ExtensionJSBrowserTest);
bool libs_loaded_ = false;
};
#endif // CHROME_TEST_BASE_EXTENSION_JS_BROWSER_TEST_H_
chrome/test/base/extension_load_waiter_one_shot.cc
View file @ 15004768
......@@ -11,12 +11,9 @@
#include "content/public/browser/notification_service.h"
#include "extensions/browser/extension_host.h"
ExtensionLoadWaiterOneShot::ExtensionLoadWaiterOneShot() : extension_id_(NULL),
browser_context_(NULL) {
}
ExtensionLoadWaiterOneShot::ExtensionLoadWaiterOneShot() = default;
ExtensionLoadWaiterOneShot::~ExtensionLoadWaiterOneShot() {
}
ExtensionLoadWaiterOneShot::~ExtensionLoadWaiterOneShot() = default;
void ExtensionLoadWaiterOneShot::WaitForExtension(const char* extension_id,
const base::Closure& load_cb) {
......
chrome/test/base/extension_load_waiter_one_shot.h
View file @ 15004768
......@@ -6,7 +6,6 @@
#define CHROME_TEST_BASE_EXTENSION_LOAD_WAITER_ONE_SHOT_H_
#include "base/callback_forward.h"
#include "base/macros.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/test/test_utils.h"
......@@ -20,6 +19,9 @@ class BrowserContext;
class ExtensionLoadWaiterOneShot : public content::NotificationObserver {
public:
ExtensionLoadWaiterOneShot();
ExtensionLoadWaiterOneShot(const ExtensionLoadWaiterOneShot&) = delete;
ExtensionLoadWaiterOneShot& operator=(const ExtensionLoadWaiterOneShot&) =
delete;
~ExtensionLoadWaiterOneShot() override;
// Waits for extension with |extension_id| to load. The id should be a pointer
......@@ -36,15 +38,13 @@ class ExtensionLoadWaiterOneShot : public content::NotificationObserver {
content::BrowserContext* browser_context() { return browser_context_; }
// Get the id of the loaded extension.
const char* extension_id() { return extension_id_; }
const char* extension_id() const { return extension_id_; }
private:
content::NotificationRegistrar registrar_;
scoped_refptr<content::MessageLoopRunner> load_looper_;
const char* extension_id_;
content::BrowserContext* browser_context_;
DISALLOW_COPY_AND_ASSIGN(ExtensionLoadWaiterOneShot);
const char* extension_id_ = nullptr;
content::BrowserContext* browser_context_ = nullptr;
};
#endif // CHROME_TEST_BASE_EXTENSION_LOAD_WAITER_ONE_SHOT_H_
chrome/test/base/find_result_waiter.h
View file @ 15004768
......@@ -7,7 +7,6 @@
#include <memory>
#include "base/macros.h"
#include "base/scoped_observer.h"
#include "components/find_in_page/find_result_observer.h"
#include "components/find_in_page/find_tab_helper.h"
......@@ -35,6 +34,8 @@ namespace ui_test_utils {
class FindResultWaiter : public find_in_page::FindResultObserver {
public:
explicit FindResultWaiter(content::WebContents* parent_tab);
FindResultWaiter(const FindResultWaiter&) = delete;
FindResultWaiter& operator=(const FindResultWaiter&) = delete;
~FindResultWaiter() override;
void Wait();
......@@ -61,8 +62,6 @@ class FindResultWaiter : public find_in_page::FindResultObserver {
int current_find_request_id_ = 0;
bool seen_ = false; // true after transition to expected state has been seen
DISALLOW_COPY_AND_ASSIGN(FindResultWaiter);
};
} // namespace ui_test_utils
......
chrome/test/base/in_process_browser_test.h
View file @ 15004768
......@@ -6,8 +6,8 @@
#define CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
#include <memory>
#include <string>
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
#include "base/memory/ref_counted.h"
......@@ -127,7 +127,8 @@ class InProcessBrowserTest : public content::BrowserTestBase {
explicit InProcessBrowserTest(
std::unique_ptr<views::ViewsDelegate> views_delegate);
#endif
InProcessBrowserTest(const InProcessBrowserTest&) = delete;
InProcessBrowserTest& operator=(const InProcessBrowserTest&) = delete;
~InProcessBrowserTest() override;
// Configures everything for an in process browser test, then invokes
......@@ -323,8 +324,6 @@ class InProcessBrowserTest : public content::BrowserTestBase {
#endif
std::unique_ptr<MainThreadStackSamplingProfiler> sampling_profiler_;
DISALLOW_COPY_AND_ASSIGN(InProcessBrowserTest);
};
// When including either in_process_browser_test.h or android_browser_test.h
......
chrome/test/base/in_process_browser_test_browsertest.cc
View file @ 15004768
......@@ -52,10 +52,9 @@ INSTANTIATE_TEST_SUITE_P(IPBTP,
class LoadFailObserver : public content::WebContentsObserver {
public:
explicit LoadFailObserver(content::WebContents* contents)
: content::WebContentsObserver(contents),
failed_load_(false),
error_code_(net::OK),
resolve_error_info_(net::ResolveErrorInfo(net::OK)) {}
: content::WebContentsObserver(contents) {}
LoadFailObserver(const LoadFailObserver&) = delete;
LoadFailObserver& operator=(const LoadFailObserver&) = delete;
void DidFinishNavigation(
content::NavigationHandle* navigation_handle) override {
......@@ -76,12 +75,10 @@ class LoadFailObserver : public content::WebContentsObserver {
const GURL& validated_url() const { return validated_url_; }
private:
bool failed_load_;
net::Error error_code_;
net::ResolveErrorInfo resolve_error_info_;
bool failed_load_ = false;
net::Error error_code_ = net::OK;
net::ResolveErrorInfo resolve_error_info_ = net::ResolveErrorInfo(net::OK);
GURL validated_url_;
DISALLOW_COPY_AND_ASSIGN(LoadFailObserver);
};
// Tests that InProcessBrowserTest cannot resolve external host, in this case
......
chrome/test/base/interactive_test_utils.cc
View file @ 15004768
......@@ -33,7 +33,7 @@ bool GetNativeWindow(const Browser* browser, gfx::NativeWindow* native_window) {
} // namespace
BrowserActivationWaiter::BrowserActivationWaiter(const Browser* browser)
: browser_(browser), observed_(false) {
: browser_(browser) {
// When the active browser closes, the next "last active browser" in the
// BrowserList might not be immediately activated. So we need to wait for the
// "last active browser" to actually be active.
......@@ -44,8 +44,6 @@ BrowserActivationWaiter::BrowserActivationWaiter(const Browser* browser)
BrowserList::AddObserver(this);
}
BrowserActivationWaiter::~BrowserActivationWaiter() {}
void BrowserActivationWaiter::WaitForActivation() {
if (observed_)
return;
......@@ -72,7 +70,7 @@ void BrowserActivationWaiter::OnBrowserSetLastActive(Browser* browser) {
}
BrowserDeactivationWaiter::BrowserDeactivationWaiter(const Browser* browser)
: browser_(browser), observed_(false) {
: browser_(browser) {
if (chrome::FindLastActive() != browser_ && !browser->window()->IsActive()) {
observed_ = true;
return;
......
chrome/test/base/interactive_test_utils.h
View file @ 15004768
......@@ -5,6 +5,8 @@
#ifndef CHROME_TEST_BASE_INTERACTIVE_TEST_UTILS_H_
#define CHROME_TEST_BASE_INTERACTIVE_TEST_UTILS_H_
#include <utility>
#include "base/macros.h"
#include "base/run_loop.h"
#include "build/build_config.h"
......@@ -31,7 +33,9 @@ namespace ui_test_utils {
class BrowserActivationWaiter : public BrowserListObserver {
public:
explicit BrowserActivationWaiter(const Browser* browser);
~BrowserActivationWaiter() override;
BrowserActivationWaiter(const BrowserActivationWaiter&) = delete;
BrowserActivationWaiter& operator=(const BrowserActivationWaiter&) = delete;
~BrowserActivationWaiter() override = default;
// Runs a message loop until the |browser_| supplied to the constructor is
// activated, or returns immediately if |browser_| has already become active.
......@@ -43,10 +47,8 @@ class BrowserActivationWaiter : public BrowserListObserver {
void OnBrowserSetLastActive(Browser* browser) override;
const Browser* const browser_;
bool observed_;
bool observed_ = false;
base::RunLoop run_loop_;
DISALLOW_COPY_AND_ASSIGN(BrowserActivationWaiter);
};
// Use in browser interactive uitests to wait until a browser is deactivated.
......@@ -54,6 +56,9 @@ class BrowserActivationWaiter : public BrowserListObserver {
class BrowserDeactivationWaiter : public BrowserListObserver {
public:
explicit BrowserDeactivationWaiter(const Browser* browser);
BrowserDeactivationWaiter(const BrowserDeactivationWaiter&) = delete;
BrowserDeactivationWaiter& operator=(const BrowserDeactivationWaiter&) =
delete;
~BrowserDeactivationWaiter() override;
// Runs a message loop until the |browser_| supplied to the constructor is
......@@ -67,10 +72,8 @@ class BrowserDeactivationWaiter : public BrowserListObserver {
void OnBrowserNoLongerActive(Browser* browser) override;
const Browser* const browser_;
bool observed_;
bool observed_ = false;
base::RunLoop run_loop_;
DISALLOW_COPY_AND_ASSIGN(BrowserDeactivationWaiter);
};
// Brings the native window for |browser| to the foreground and waits until the
......
chrome/test/base/interactive_test_utils_mac.mm
View file @ 15004768
......@@ -25,6 +25,9 @@ namespace {
class SendGlobalKeyEventsHelper {
public:
SendGlobalKeyEventsHelper();
SendGlobalKeyEventsHelper(const SendGlobalKeyEventsHelper&) = delete;
SendGlobalKeyEventsHelper& operator=(const SendGlobalKeyEventsHelper&) =
delete;
~SendGlobalKeyEventsHelper();
// Callback for MockCrApplication.
......@@ -48,8 +51,6 @@ class SendGlobalKeyEventsHelper {
// First key code pressed in the event sequence. This is also the last key
// code to be released and so it will be waited for.
base::Optional<int> first_key_down_code_;
DISALLOW_COPY_AND_ASSIGN(SendGlobalKeyEventsHelper);
};
SendGlobalKeyEventsHelper* g_global_key_events_helper = nullptr;
......
chrome/test/base/interactive_test_utils_views.cc
View file @ 15004768
......@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include "base/bind.h"
#include "base/macros.h"
#include "base/run_loop.h"
#include "build/buildflag.h"
#include "chrome/browser/ui/browser.h"
......@@ -30,6 +29,8 @@ class ViewFocusWaiter : public views::ViewObserver {
: view_(view), target_focused_(focused) {
view->AddObserver(this);
}
ViewFocusWaiter(const ViewFocusWaiter&) = delete;
ViewFocusWaiter& operator=(const ViewFocusWaiter&) = delete;
~ViewFocusWaiter() override { view_->RemoveObserver(this); }
......@@ -53,8 +54,6 @@ class ViewFocusWaiter : public views::ViewObserver {
base::RunLoop run_loop_;
views::View* view_;
const bool target_focused_;
DISALLOW_COPY_AND_ASSIGN(ViewFocusWaiter);
};
} // namespace
......
chrome/test/base/interactive_ui_tests_main.cc
View file @ 15004768
......@@ -38,7 +38,7 @@
class InteractiveUITestSuite : public ChromeTestSuite {
public:
InteractiveUITestSuite(int argc, char** argv) : ChromeTestSuite(argc, argv) {}
~InteractiveUITestSuite() override {}
~InteractiveUITestSuite() override = default;
protected:
// ChromeTestSuite overrides:
......@@ -98,6 +98,10 @@ class InteractiveUITestLauncherDelegate : public ChromeTestLauncherDelegate {
public:
explicit InteractiveUITestLauncherDelegate(ChromeTestSuiteRunner* runner)
: ChromeTestLauncherDelegate(runner) {}
InteractiveUITestLauncherDelegate(const InteractiveUITestLauncherDelegate&) =
delete;
InteractiveUITestLauncherDelegate& operator=(
const InteractiveUITestLauncherDelegate&) = delete;
protected:
// content::TestLauncherDelegate:
......@@ -138,9 +142,6 @@ class InteractiveUITestLauncherDelegate : public ChromeTestLauncherDelegate {
ChromeTestLauncherDelegate::PostRunTest(test_result);
}
#endif // defined(OS_MAC)
private:
DISALLOW_COPY_AND_ASSIGN(InteractiveUITestLauncherDelegate);
};
class InteractiveUITestSuiteRunner : public ChromeTestSuiteRunner {
......
chrome/test/base/javascript_browser_test.h
View file @ 15004768
......@@ -5,9 +5,9 @@
#ifndef CHROME_TEST_BASE_JAVASCRIPT_BROWSER_TEST_H_
#define CHROME_TEST_BASE_JAVASCRIPT_BROWSER_TEST_H_
#include <string>
#include <vector>
#include "base/macros.h"
#include "base/strings/string16.h"
#include "base/values.h"
#include "chrome/test/base/in_process_browser_test.h"
......@@ -15,6 +15,8 @@
// A base class providing construction of javascript testing assets.
class JavaScriptBrowserTest : public InProcessBrowserTest {
public:
JavaScriptBrowserTest(const JavaScriptBrowserTest&) = delete;
JavaScriptBrowserTest& operator=(const JavaScriptBrowserTest&) = delete;
// Add a custom helper JS library for your test.
// If a relative path is specified, it'll be read
// as relative to the test data dir.
......@@ -46,8 +48,6 @@ class JavaScriptBrowserTest : public InProcessBrowserTest {
// User library search paths.
std::vector<base::FilePath> library_search_paths_;
DISALLOW_COPY_AND_ASSIGN(JavaScriptBrowserTest);
};
#endif // CHROME_TEST_BASE_JAVASCRIPT_BROWSER_TEST_H_
chrome/test/base/mixin_based_in_process_browser_test.cc
View file @ 15004768
......@@ -13,8 +13,6 @@ InProcessBrowserTestMixin::InProcessBrowserTestMixin(
host->mixins_.push_back(this);
}
InProcessBrowserTestMixin::~InProcessBrowserTestMixin() = default;
void InProcessBrowserTestMixin::SetUp() {}
void InProcessBrowserTestMixin::SetUpCommandLine(
......
chrome/test/base/mixin_based_in_process_browser_test.h
View file @ 15004768
......@@ -21,13 +21,13 @@
// public:
// explicit MyMixin(InProcessBrowserTestMixinHost* host)
// : InProcessBrowserTestMixin(host) {}
// MyMixin(const MyMixin&) = delete;
// MyMixin& operator=(const MyMixin&) = delete;
// ~MyMixin() override = default;
//
// // InProcessBrowserTestMixin:
// void SetUpCommandLine(base::CommandLine* command_line) { /* ... */ }
//
// private:
// DISALLOW_COPY_AND_ASSIGN(MyMixin);
// };
//
//
......@@ -41,13 +41,13 @@
// class SimpleUsage : public MixinBasedInProcessBrowserTest {
// public:
// SimpleUsage() = default;
// SimpleUsage(const SimpleUsage&) = delete;
// SimpleUsage& operator=(const SimpleUsage&) = delete;
// ~SimpleUsage() override = default;
//
// private:
// MyMixin my_mixin_{&mixin_host_};
// SomeOtherMixin some_other_mixin_{&mixin_host_};
//
// DISALLOW_COPY_AND_ASSIGN(SimpleUsage);
// };
//
//
......@@ -62,7 +62,10 @@ class InProcessBrowserTestMixinHost;
class InProcessBrowserTestMixin {
public:
explicit InProcessBrowserTestMixin(InProcessBrowserTestMixinHost* host);
virtual ~InProcessBrowserTestMixin();
InProcessBrowserTestMixin(const InProcessBrowserTestMixin&) = delete;
InProcessBrowserTestMixin& operator=(const InProcessBrowserTestMixin&) =
delete;
virtual ~InProcessBrowserTestMixin() = default;
// See InProcessBrowserTest for docs. The call order is:
//
......@@ -90,15 +93,15 @@ class InProcessBrowserTestMixin {
virtual void TearDownOnMainThread();
virtual void TearDownInProcessBrowserTestFixture();
virtual void TearDown();
private:
DISALLOW_COPY_AND_ASSIGN(InProcessBrowserTestMixin);
};
// The mixin host executes the callbacks on the mixin instances.
class InProcessBrowserTestMixinHost final {
public:
InProcessBrowserTestMixinHost();
InProcessBrowserTestMixinHost(const InProcessBrowserTestMixinHost&) = delete;
InProcessBrowserTestMixinHost& operator=(
const InProcessBrowserTestMixinHost&) = delete;
~InProcessBrowserTestMixinHost();
void SetUp();
......@@ -119,14 +122,16 @@ class InProcessBrowserTestMixinHost final {
friend class InProcessBrowserTestMixin;
std::vector<InProcessBrowserTestMixin*> mixins_;
DISALLOW_COPY_AND_ASSIGN(InProcessBrowserTestMixinHost);
};
// An InProcessBrowserTest which supports mixins.
class MixinBasedInProcessBrowserTest : public InProcessBrowserTest {
public:
MixinBasedInProcessBrowserTest();
MixinBasedInProcessBrowserTest(const MixinBasedInProcessBrowserTest&) =
delete;
MixinBasedInProcessBrowserTest& operator=(
const MixinBasedInProcessBrowserTest&) = delete;
~MixinBasedInProcessBrowserTest() override;
// InProcessBrowserTest:
......@@ -144,9 +149,6 @@ class MixinBasedInProcessBrowserTest : public InProcessBrowserTest {
protected:
InProcessBrowserTestMixinHost mixin_host_;
private:
DISALLOW_COPY_AND_ASSIGN(MixinBasedInProcessBrowserTest);
};
#endif // CHROME_TEST_BASE_MIXIN_BASED_IN_PROCESS_BROWSER_TEST_H_
chrome/test/base/mojo_web_ui_browser_test.cc
View file @ 15004768
......@@ -8,7 +8,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/macros.h"
#include "base/path_service.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/chrome_content_browser_client.h"
......@@ -32,7 +31,9 @@ class WebUITestPageHandler : public web_ui_test::mojom::TestRunner,
public WebUITestHandler {
public:
explicit WebUITestPageHandler(content::WebUI* web_ui) : web_ui_(web_ui) {}
~WebUITestPageHandler() override {}
WebUITestPageHandler(const WebUITestPageHandler&) = delete;
WebUITestPageHandler& operator=(const WebUITestPageHandler&) = delete;
~WebUITestPageHandler() override = default;
// Binds the Mojo test interface to this handler.
void BindToTestRunnerReceiver(
......@@ -50,8 +51,6 @@ class WebUITestPageHandler : public web_ui_test::mojom::TestRunner,
private:
content::WebUI* web_ui_;
mojo::Receiver<web_ui_test::mojom::TestRunner> receiver_{this};
DISALLOW_COPY_AND_ASSIGN(WebUITestPageHandler);
};
} // namespace
......
chrome/test/base/process_inspector_win.cc
View file @ 15004768
......@@ -99,6 +99,8 @@ template <class Traits>
class Inspector : public ProcessInspector {
public:
Inspector();
Inspector(const Inspector&) = delete;
Inspector& operator=(const Inspector&) = delete;
// ProcessInspector:
DWORD GetParentPid() const override;
......@@ -112,8 +114,6 @@ class Inspector : public ProcessInspector {
ProcessExecutionBlock<Traits> peb_;
RtlUserProcessParameters<Traits> process_parameters_;
base::string16 command_line_;
DISALLOW_COPY_AND_ASSIGN(Inspector);
};
#if !defined(_WIN64)
......
chrome/test/base/process_inspector_win.h
View file @ 15004768
......@@ -9,7 +9,6 @@
#include <memory>
#include "base/macros.h"
#include "base/strings/string16.h"
namespace base {
......@@ -24,6 +23,8 @@ class ProcessInspector {
// any error.
static std::unique_ptr<ProcessInspector> Create(const base::Process& process);
ProcessInspector(const ProcessInspector&) = delete;
ProcessInspector& operator=(const ProcessInspector&) = delete;
virtual ~ProcessInspector() = default;
// Returns the parent process PID of the process.
......@@ -38,8 +39,6 @@ class ProcessInspector {
private:
// Inspects |process|, returning true if all inspections succeed.
virtual bool Inspect(const base::Process& process) = 0;
DISALLOW_COPY_AND_ASSIGN(ProcessInspector);
};
#endif // CHROME_TEST_BASE_PROCESS_INSPECTOR_WIN_H_
chrome/test/base/save_desktop_snapshot_win.cc
View file @ 15004768
......@@ -10,7 +10,6 @@
#include "base/files/file.h"
#include "base/logging.h"
#include "base/macros.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
......@@ -26,6 +25,8 @@ namespace {
class FrameHolder : public webrtc::DesktopCapturer::Callback {
public:
FrameHolder() = default;
FrameHolder(const FrameHolder&) = delete;
FrameHolder& operator=(const FrameHolder&) = delete;
// Returns the frame that was captured or null in case of failure.
std::unique_ptr<webrtc::DesktopFrame> TakeFrame() {
......@@ -41,7 +42,6 @@ class FrameHolder : public webrtc::DesktopCapturer::Callback {
}
std::unique_ptr<webrtc::DesktopFrame> frame_;
DISALLOW_COPY_AND_ASSIGN(FrameHolder);
};
// Captures and returns a snapshot of the screen, or an empty bitmap in case of
......
chrome/test/base/scoped_browser_locale.h
View file @ 15004768
......@@ -7,18 +7,16 @@
#include <string>
#include "base/macros.h"
// Helper class to temporarily set the locale of the browser process.
class ScopedBrowserLocale {
public:
explicit ScopedBrowserLocale(const std::string& new_locale);
ScopedBrowserLocale(const ScopedBrowserLocale&) = delete;
ScopedBrowserLocale& operator=(const ScopedBrowserLocale&) = delete;
~ScopedBrowserLocale();
private:
const std::string old_locale_;
DISALLOW_COPY_AND_ASSIGN(ScopedBrowserLocale);
};
#endif // CHROME_TEST_BASE_SCOPED_BROWSER_LOCALE_H_
chrome/test/base/scoped_bundle_swizzler_mac.h
View file @ 15004768
......@@ -7,8 +7,6 @@
#include <memory>
#include "base/macros.h"
namespace base {
namespace mac {
class ScopedObjCClassSwizzler;
......@@ -28,11 +26,12 @@ class ScopedObjCClassSwizzler;
class ScopedBundleSwizzlerMac {
public:
ScopedBundleSwizzlerMac();
ScopedBundleSwizzlerMac(const ScopedBundleSwizzlerMac&) = delete;
ScopedBundleSwizzlerMac& operator=(const ScopedBundleSwizzlerMac&) = delete;
~ScopedBundleSwizzlerMac();
private:
std::unique_ptr<base::mac::ScopedObjCClassSwizzler> class_swizzler_;
DISALLOW_COPY_AND_ASSIGN(ScopedBundleSwizzlerMac);
};
#endif // CHROME_TEST_BASE_SCOPED_BUNDLE_SWIZZLER_MAC_H_
chrome/test/base/scoped_testing_local_state.h
View file @ 15004768
......@@ -5,7 +5,6 @@
#ifndef CHROME_TEST_BASE_SCOPED_TESTING_LOCAL_STATE_H_
#define CHROME_TEST_BASE_SCOPED_TESTING_LOCAL_STATE_H_
#include "base/macros.h"
#include "components/prefs/testing_pref_service.h"
class TestingBrowserProcess;
......@@ -15,6 +14,8 @@ class TestingBrowserProcess;
class ScopedTestingLocalState {
public:
explicit ScopedTestingLocalState(TestingBrowserProcess* browser_process);
ScopedTestingLocalState(const ScopedTestingLocalState&) = delete;
ScopedTestingLocalState& operator=(const ScopedTestingLocalState&) = delete;
~ScopedTestingLocalState();
TestingPrefServiceSimple* Get() {
......@@ -24,8 +25,6 @@ class ScopedTestingLocalState {
private:
TestingBrowserProcess* browser_process_;
TestingPrefServiceSimple local_state_;
DISALLOW_COPY_AND_ASSIGN(ScopedTestingLocalState);
};
#endif // CHROME_TEST_BASE_SCOPED_TESTING_LOCAL_STATE_H_
chrome/test/base/test_browser_window.h
View file @ 15004768
......@@ -9,7 +9,6 @@
#include <string>
#include <vector>
#include "base/macros.h"
#include "build/build_config.h"
#include "chrome/browser/download/test_download_shelf.h"
#include "chrome/browser/ui/autofill/test/test_autofill_bubble_handler.h"
......@@ -48,6 +47,8 @@ class SendTabToSelfBubbleView;
class TestBrowserWindow : public BrowserWindow {
public:
TestBrowserWindow();
TestBrowserWindow(const TestBrowserWindow&) = delete;
TestBrowserWindow& operator=(const TestBrowserWindow&) = delete;
~TestBrowserWindow() override;
// BrowserWindow:
......@@ -216,6 +217,8 @@ class TestBrowserWindow : public BrowserWindow {
class TestLocationBar : public LocationBar {
public:
TestLocationBar() = default;
TestLocationBar(const TestLocationBar&) = delete;
TestLocationBar& operator=(const TestLocationBar&) = delete;
~TestLocationBar() override = default;
// LocationBar:
......@@ -233,9 +236,6 @@ class TestBrowserWindow : public BrowserWindow {
const OmniboxView* GetOmniboxView() const override;
OmniboxView* GetOmniboxView() override;
LocationBarTesting* GetLocationBarForTesting() override;
private:
DISALLOW_COPY_AND_ASSIGN(TestLocationBar);
};
autofill::TestAutofillBubbleHandler autofill_bubble_handler_;
......@@ -246,8 +246,6 @@ class TestBrowserWindow : public BrowserWindow {
std::unique_ptr<FeaturePromoController> feature_promo_controller_;
base::OnceClosure close_callback_;
DISALLOW_COPY_AND_ASSIGN(TestBrowserWindow);
};
// Handles destroying a TestBrowserWindow when the Browser it is attached to is
......@@ -255,14 +253,14 @@ class TestBrowserWindow : public BrowserWindow {
class TestBrowserWindowOwner : public BrowserListObserver {
public:
explicit TestBrowserWindowOwner(TestBrowserWindow* window);
TestBrowserWindowOwner(const TestBrowserWindowOwner&) = delete;
TestBrowserWindowOwner& operator=(const TestBrowserWindowOwner&) = delete;
~TestBrowserWindowOwner() override;
private:
// Overridden from BrowserListObserver:
void OnBrowserRemoved(Browser* browser) override;
std::unique_ptr<TestBrowserWindow> window_;
DISALLOW_COPY_AND_ASSIGN(TestBrowserWindowOwner);
};
// Helper that handle the lifetime of TestBrowserWindow instances.
......
chrome/test/base/test_browser_window_aura.cc
View file @ 15004768
......@@ -4,6 +4,8 @@
#include "chrome/test/base/test_browser_window_aura.h"
#include <utility>
#include "base/memory/ptr_util.h"
#include "chrome/browser/ui/browser.h"
#include "ui/aura/window.h"
......
chrome/test/base/test_browser_window_aura.h
View file @ 15004768
......@@ -5,9 +5,10 @@
#ifndef CHROME_TEST_BASE_TEST_BROWSER_WINDOW_AURA_H_
#define CHROME_TEST_BASE_TEST_BROWSER_WINDOW_AURA_H_
#include "base/macros.h"
#include "chrome/test/base/test_browser_window.h"
#include <memory>
namespace aura {
class Window;
}
......@@ -20,6 +21,8 @@ class Widget;
class TestBrowserWindowAura : public TestBrowserWindow {
public:
explicit TestBrowserWindowAura(std::unique_ptr<aura::Window> native_window);
TestBrowserWindowAura(const TestBrowserWindowAura&) = delete;
TestBrowserWindowAura& operator=(const TestBrowserWindowAura&) = delete;
~TestBrowserWindowAura() override;
// TestBrowserWindow overrides:
......@@ -36,13 +39,13 @@ class TestBrowserWindowAura : public TestBrowserWindow {
private:
Browser* browser_; // not owned
std::unique_ptr<aura::Window> native_window_;
DISALLOW_COPY_AND_ASSIGN(TestBrowserWindowAura);
};
class TestBrowserWindowViews : public TestBrowserWindow {
public:
explicit TestBrowserWindowViews(aura::Window* parent = nullptr);
TestBrowserWindowViews(const TestBrowserWindowViews&) = delete;
TestBrowserWindowViews& operator=(const TestBrowserWindowViews&) = delete;
~TestBrowserWindowViews() override;
// TestBrowserWindow overrides:
......@@ -59,8 +62,6 @@ class TestBrowserWindowViews : public TestBrowserWindow {
private:
Browser* browser_; // not owned
std::unique_ptr<views::Widget> widget_;
DISALLOW_COPY_AND_ASSIGN(TestBrowserWindowViews);
};
namespace chrome {
......
chrome/test/base/test_chrome_web_ui_controller_factory.h
View file @ 15004768
......@@ -9,7 +9,6 @@
#include <memory>
#include <string>
#include "base/macros.h"
#include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
#include "content/public/browser/web_ui.h"
......@@ -33,6 +32,10 @@ class TestChromeWebUIControllerFactory : public ChromeWebUIControllerFactory {
using FactoryOverridesMap = std::map<std::string, WebUIProvider*>;
TestChromeWebUIControllerFactory();
TestChromeWebUIControllerFactory(const TestChromeWebUIControllerFactory&) =
delete;
TestChromeWebUIControllerFactory& operator=(
const TestChromeWebUIControllerFactory&) = delete;
~TestChromeWebUIControllerFactory() override;
// Sets the Web UI host.
......@@ -67,8 +70,6 @@ class TestChromeWebUIControllerFactory : public ChromeWebUIControllerFactory {
// Stores the Web UI host to create the correct Web UI controller for
// chrome://test URL requests.
std::string webui_host_;
DISALLOW_COPY_AND_ASSIGN(TestChromeWebUIControllerFactory);
};
#endif // CHROME_TEST_BASE_TEST_CHROME_WEB_UI_CONTROLLER_FACTORY_H_
chrome/test/base/testing_browser_process.h
View file @ 15004768
......@@ -15,7 +15,6 @@
#include <memory>
#include <string>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
......@@ -72,6 +71,9 @@ class TestingBrowserProcess : public BrowserProcess {
// Convenience method to get g_browser_process as a TestingBrowserProcess*.
static TestingBrowserProcess* GetGlobal();
TestingBrowserProcess(const TestingBrowserProcess&) = delete;
TestingBrowserProcess& operator=(const TestingBrowserProcess&) = delete;
// BrowserProcess overrides:
void EndSession() override;
void FlushLocalStateAndReply(base::OnceClosure reply) override;
......@@ -240,8 +242,6 @@ class TestingBrowserProcess : public BrowserProcess {
#if !defined(OS_ANDROID)
BuildState build_state_;
#endif
DISALLOW_COPY_AND_ASSIGN(TestingBrowserProcess);
};
// RAII (resource acquisition is initialization) for TestingBrowserProcess.
......@@ -261,10 +261,11 @@ class TestingBrowserProcess : public BrowserProcess {
class TestingBrowserProcessInitializer {
public:
TestingBrowserProcessInitializer();
TestingBrowserProcessInitializer(const TestingBrowserProcessInitializer&) =
delete;
TestingBrowserProcessInitializer& operator=(
const TestingBrowserProcessInitializer&) = delete;
~TestingBrowserProcessInitializer();
private:
DISALLOW_COPY_AND_ASSIGN(TestingBrowserProcessInitializer);
};
#endif // CHROME_TEST_BASE_TESTING_BROWSER_PROCESS_H_
chrome/test/base/testing_browser_process_platform_part.h
View file @ 15004768
......@@ -5,7 +5,6 @@
#ifndef CHROME_TEST_BASE_TESTING_BROWSER_PROCESS_PLATFORM_PART_H_
#define CHROME_TEST_BASE_TESTING_BROWSER_PROCESS_PLATFORM_PART_H_
#include "base/macros.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process_platform_part.h"
......@@ -15,15 +14,16 @@
class TestingBrowserProcessPlatformPart : public BrowserProcessPlatformPart {
public:
TestingBrowserProcessPlatformPart();
TestingBrowserProcessPlatformPart(const TestingBrowserProcessPlatformPart&) =
delete;
TestingBrowserProcessPlatformPart& operator=(
const TestingBrowserProcessPlatformPart&) = delete;
~TestingBrowserProcessPlatformPart() override;
#if defined(OS_MAC)
void SetLocationPermissionManager(
std::unique_ptr<GeolocationSystemPermissionManager>
location_permission_manager);
#endif
private:
DISALLOW_COPY_AND_ASSIGN(TestingBrowserProcessPlatformPart);
};
#endif // CHROME_TEST_BASE_TESTING_BROWSER_PROCESS_PLATFORM_PART_H_
chrome/test/base/testing_profile_manager.h
View file @ 15004768
......@@ -11,7 +11,6 @@
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
#include "base/macros.h"
#include "base/strings/string16.h"
#include "base/test/scoped_path_override.h"
#include "chrome/test/base/scoped_testing_local_state.h"
......@@ -39,6 +38,8 @@ class TestingProfileManager {
explicit TestingProfileManager(TestingBrowserProcess* browser_process);
TestingProfileManager(TestingBrowserProcess* browser_process,
ScopedTestingLocalState* local_state);
TestingProfileManager(const TestingProfileManager&) = delete;
TestingProfileManager& operator=(const TestingProfileManager&) = delete;
~TestingProfileManager();
// This needs to be called in testing::Test::SetUp() to put the object in a
......@@ -159,8 +160,6 @@ class TestingProfileManager {
// Map of profile_name to TestingProfile* from CreateTestingProfile().
TestingProfilesMap testing_profiles_;
DISALLOW_COPY_AND_ASSIGN(TestingProfileManager);
};
#endif // CHROME_TEST_BASE_TESTING_PROFILE_MANAGER_H_
chrome/test/base/tracing.cc
View file @ 15004768
......@@ -5,11 +5,11 @@
#include "chrome/test/base/tracing.h"
#include <memory>
#include <utility>
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/macros.h"
#include "base/memory/singleton.h"
#include "base/strings/string_util.h"
#include "base/timer/timer.h"
......@@ -31,6 +31,9 @@ class StringTraceEndpoint
const base::RepeatingClosure& callback)
: result_(result), completion_callback_(callback) {}
StringTraceEndpoint(const StringTraceEndpoint&) = delete;
StringTraceEndpoint& operator=(const StringTraceEndpoint&) = delete;
void ReceiveTraceChunk(std::unique_ptr<std::string> chunk) override {
*result_ += result_->empty() ? "[" : "";
DCHECK(chunk);
......@@ -48,8 +51,6 @@ class StringTraceEndpoint
std::string* result_;
base::RepeatingClosure completion_callback_;
DISALLOW_COPY_AND_ASSIGN(StringTraceEndpoint);
};
class InProcessTraceController {
......@@ -58,8 +59,10 @@ class InProcessTraceController {
return base::Singleton<InProcessTraceController>::get();
}
InProcessTraceController() {}
virtual ~InProcessTraceController() {}
InProcessTraceController() = default;
InProcessTraceController(const InProcessTraceController&) = delete;
InProcessTraceController& operator=(const InProcessTraceController&) = delete;
virtual ~InProcessTraceController() = default;
bool BeginTracing(
const base::trace_event::TraceConfig& trace_config,
......@@ -99,8 +102,6 @@ class InProcessTraceController {
scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
base::OneShotTimer timer_;
DISALLOW_COPY_AND_ASSIGN(InProcessTraceController);
};
} // namespace
......
chrome/test/base/ui_test_utils.cc
View file @ 15004768
......@@ -14,7 +14,6 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/path_service.h"
#include "base/run_loop.h"
......@@ -81,7 +80,6 @@
#endif
#if defined(TOOLKIT_VIEWS)
#include "chrome/browser/ui/browser_window.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget.h"
#endif
......@@ -109,6 +107,8 @@ Browser* WaitForBrowserNotInSet(std::set<Browser*> excluded_browsers) {
class AppModalDialogWaiter : public javascript_dialogs::AppModalDialogObserver {
public:
AppModalDialogWaiter() = default;
AppModalDialogWaiter(const AppModalDialogWaiter&) = delete;
AppModalDialogWaiter& operator=(const AppModalDialogWaiter&) = delete;
~AppModalDialogWaiter() override = default;
javascript_dialogs::AppModalDialogController* Wait() {
......@@ -156,8 +156,6 @@ class AppModalDialogWaiter : public javascript_dialogs::AppModalDialogObserver {
private:
javascript_dialogs::AppModalDialogController* dialog_ = nullptr;
scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
DISALLOW_COPY_AND_ASSIGN(AppModalDialogWaiter);
};
......@@ -168,6 +166,9 @@ class AutocompleteChangeObserver : public AutocompleteController::Observer {
OmniboxControllerEmitter::GetForBrowserContext(profile));
}
AutocompleteChangeObserver(const AutocompleteChangeObserver&) = delete;
AutocompleteChangeObserver& operator=(const AutocompleteChangeObserver&) =
delete;
~AutocompleteChangeObserver() override = default;
void Wait() { run_loop_.Run(); }
......@@ -183,8 +184,6 @@ class AutocompleteChangeObserver : public AutocompleteController::Observer {
base::RunLoop run_loop_;
ScopedObserver<OmniboxControllerEmitter, AutocompleteController::Observer>
scoped_observer_{this};
DISALLOW_COPY_AND_ASSIGN(AutocompleteChangeObserver);
};
} // namespace
......
chrome/test/base/ui_test_utils.h
View file @ 15004768
......@@ -11,7 +11,6 @@
#include <string>
#include <vector>
#include "base/macros.h"
#include "base/scoped_observer.h"
#include "base/strings/string16.h"
#include "chrome/browser/ui/browser_list_observer.h"
......@@ -240,6 +239,10 @@ class WindowedNotificationObserverWithDetails
int notification_type,
const content::NotificationSource& source)
: content::WindowedNotificationObserver(notification_type, source) {}
WindowedNotificationObserverWithDetails(
const WindowedNotificationObserverWithDetails&) = delete;
WindowedNotificationObserverWithDetails& operator=(
const WindowedNotificationObserverWithDetails&) = delete;
// Fills |details| with the details of the notification received for |source|.
bool GetDetailsFor(uintptr_t source, U* details) {
......@@ -262,8 +265,6 @@ class WindowedNotificationObserverWithDetails
private:
std::map<uintptr_t, U> details_;
DISALLOW_COPY_AND_ASSIGN(WindowedNotificationObserverWithDetails);
};
// Notification observer which waits for navigation events and blocks until
......@@ -274,6 +275,8 @@ class UrlLoadObserver : public content::WindowedNotificationObserver {
// specific source, or from all sources if |source| is
// NotificationService::AllSources().
UrlLoadObserver(const GURL& url, const content::NotificationSource& source);
UrlLoadObserver(const UrlLoadObserver&) = delete;
UrlLoadObserver& operator=(const UrlLoadObserver&) = delete;
~UrlLoadObserver() override;
// content::NotificationObserver:
......@@ -283,14 +286,14 @@ class UrlLoadObserver : public content::WindowedNotificationObserver {
private:
GURL url_;
DISALLOW_COPY_AND_ASSIGN(UrlLoadObserver);
};
// A helper that will wait until a tab is added to a specific Browser.
class TabAddedWaiter : public TabStripModelObserver {
public:
explicit TabAddedWaiter(Browser* browser);
TabAddedWaiter(const TabAddedWaiter&) = delete;
TabAddedWaiter& operator=(const TabAddedWaiter&) = delete;
~TabAddedWaiter() override = default;
void Wait();
......@@ -303,8 +306,6 @@ class TabAddedWaiter : public TabStripModelObserver {
private:
base::RunLoop run_loop_;
DISALLOW_COPY_AND_ASSIGN(TabAddedWaiter);
};
// Similar to TabAddedWaiter, but will observe tabs added to all Browser
......@@ -313,6 +314,8 @@ class AllBrowserTabAddedWaiter : public TabStripModelObserver,
public BrowserListObserver {
public:
AllBrowserTabAddedWaiter();
AllBrowserTabAddedWaiter(const AllBrowserTabAddedWaiter&) = delete;
AllBrowserTabAddedWaiter& operator=(const AllBrowserTabAddedWaiter&) = delete;
~AllBrowserTabAddedWaiter() override;
content::WebContents* Wait();
......@@ -331,8 +334,6 @@ class AllBrowserTabAddedWaiter : public TabStripModelObserver,
// The last tab that was added.
content::WebContents* web_contents_ = nullptr;
DISALLOW_COPY_AND_ASSIGN(AllBrowserTabAddedWaiter);
};
// Enumerates all history contents on the backend thread. Returns them in
......@@ -340,14 +341,14 @@ class AllBrowserTabAddedWaiter : public TabStripModelObserver,
class HistoryEnumerator {
public:
explicit HistoryEnumerator(Profile* profile);
HistoryEnumerator(const HistoryEnumerator&) = delete;
HistoryEnumerator& operator=(const HistoryEnumerator&) = delete;
~HistoryEnumerator();
std::vector<GURL>& urls() { return urls_; }
private:
std::vector<GURL> urls_;
DISALLOW_COPY_AND_ASSIGN(HistoryEnumerator);
};
// In general, tests should use WaitForBrowserToClose() and
......@@ -360,7 +361,8 @@ class BrowserChangeObserver : public BrowserListObserver {
};
BrowserChangeObserver(Browser* browser, ChangeType type);
BrowserChangeObserver(const BrowserChangeObserver&) = delete;
BrowserChangeObserver& operator=(const BrowserChangeObserver&) = delete;
~BrowserChangeObserver() override;
Browser* Wait();
......@@ -374,8 +376,6 @@ class BrowserChangeObserver : public BrowserListObserver {
Browser* browser_;
ChangeType type_;
base::RunLoop run_loop_;
DISALLOW_COPY_AND_ASSIGN(BrowserChangeObserver);
};
} // namespace ui_test_utils
......
chrome/test/base/web_ui_browser_test.cc
View file @ 15004768
......@@ -11,7 +11,6 @@
#include "base/bind.h"
#include "base/lazy_instance.h"
#include "base/macros.h"
#include "base/memory/ref_counted_memory.h"
#include "base/path_service.h"
#include "base/strings/string_util.h"
......@@ -101,6 +100,8 @@ class WebUITestMessageHandler : public content::WebUIMessageHandler,
public WebUITestHandler {
public:
WebUITestMessageHandler() = default;
WebUITestMessageHandler(const WebUITestMessageHandler&) = delete;
WebUITestMessageHandler& operator=(const WebUITestMessageHandler&) = delete;
~WebUITestMessageHandler() override = default;
// Receives testResult messages.
......@@ -126,9 +127,6 @@ class WebUITestMessageHandler : public content::WebUIMessageHandler,
}
content::WebUI* GetWebUI() override { return web_ui(); }
private:
DISALLOW_COPY_AND_ASSIGN(WebUITestMessageHandler);
};
} // namespace
......@@ -376,6 +374,8 @@ const GURL& DummyUrl() {
class MockWebUIDataSource : public content::URLDataSource {
public:
MockWebUIDataSource() = default;
MockWebUIDataSource(const MockWebUIDataSource&) = delete;
MockWebUIDataSource& operator=(const MockWebUIDataSource&) = delete;
~MockWebUIDataSource() override = default;
private:
......@@ -410,8 +410,6 @@ class MockWebUIDataSource : public content::URLDataSource {
return content::URLDataSource::GetContentSecurityPolicy(directive);
}
DISALLOW_COPY_AND_ASSIGN(MockWebUIDataSource);
};
// WebUIProvider to allow attaching the DataSource for the dummy URL when
......@@ -420,6 +418,8 @@ class MockWebUIProvider
: public TestChromeWebUIControllerFactory::WebUIProvider {
public:
MockWebUIProvider() = default;
MockWebUIProvider(const MockWebUIProvider&) = delete;
MockWebUIProvider& operator=(const MockWebUIProvider&) = delete;
~MockWebUIProvider() override = default;
// Returns a new WebUI
......@@ -429,9 +429,6 @@ class MockWebUIProvider
std::make_unique<MockWebUIDataSource>());
return std::make_unique<content::WebUIController>(web_ui);
}
private:
DISALLOW_COPY_AND_ASSIGN(MockWebUIProvider);
};
base::LazyInstance<MockWebUIProvider>::DestructorAtExit mock_provider_ =
......
chrome/test/base/web_ui_browser_test_browsertest.cc
View file @ 15004768
......@@ -7,7 +7,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/command_line.h"
#include "base/macros.h"
#include "base/values.h"
#include "build/build_config.h"
#include "chrome/common/chrome_switches.h"
......@@ -113,6 +112,8 @@ IN_PROC_BROWSER_TEST_F(WebUIBrowserExpectFailTest, MAYBE_TestFailsAsyncFast) {
// Tests that the async framework works.
class WebUIBrowserAsyncTest : public WebUIBrowserTest {
public:
WebUIBrowserAsyncTest(const WebUIBrowserAsyncTest&) = delete;
WebUIBrowserAsyncTest& operator=(const WebUIBrowserAsyncTest&) = delete;
// Calls the testDone() function from test_api.js
void TestDone() {
RunJavascriptFunction("testDone");
......@@ -134,7 +135,10 @@ class WebUIBrowserAsyncTest : public WebUIBrowserTest {
// Class to synchronize asynchronous javascript activity with the tests.
class AsyncWebUIMessageHandler : public WebUIMessageHandler {
public:
AsyncWebUIMessageHandler() {}
AsyncWebUIMessageHandler() = default;
AsyncWebUIMessageHandler(const AsyncWebUIMessageHandler&) = delete;
AsyncWebUIMessageHandler& operator=(const AsyncWebUIMessageHandler&) =
delete;
MOCK_METHOD1(HandleTestContinues, void(const base::ListValue*));
MOCK_METHOD1(HandleTestFails, void(const base::ListValue*));
......@@ -166,8 +170,6 @@ class WebUIBrowserAsyncTest : public WebUIBrowserTest {
ASSERT_TRUE(list_value->Get(0, &test_name));
web_ui()->CallJavascriptFunctionUnsafe("runAsync", *test_name);
}
DISALLOW_COPY_AND_ASSIGN(AsyncWebUIMessageHandler);
};
// Handler for this object.
......@@ -185,8 +187,6 @@ class WebUIBrowserAsyncTest : public WebUIBrowserTest {
AddLibrary(base::FilePath(FILE_PATH_LITERAL("async.js")));
ui_test_utils::NavigateToURL(browser(), DummyUrl());
}
DISALLOW_COPY_AND_ASSIGN(WebUIBrowserAsyncTest);
};
// Test that assertions fail immediately after assertion fails (no testContinues
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment