diff options
author | mlamouri <mlamouri@chromium.org> | 2016-01-16 07:49:10 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-16 15:50:20 +0000 |
commit | 5c174785589ff4d446671eae01bbeb3a045b04c8 (patch) | |
tree | 0f121653d12ad53ce7e1d07772f9fe55fcfd53a4 | |
parent | ba00ad126606ef0d27410e40025ed3fcaad9f89c (diff) | |
download | chromium_src-5c174785589ff4d446671eae01bbeb3a045b04c8.zip chromium_src-5c174785589ff4d446671eae01bbeb3a045b04c8.tar.gz chromium_src-5c174785589ff4d446671eae01bbeb3a045b04c8.tar.bz2 |
Make major tests target build without unused data members on Linux.
The test targets have been picked from a linux builder.
This allows these targets to build with the following CL applied:
https://codereview.chromium.org/1222403002
BUG=447445
Review URL: https://codereview.chromium.org/1578653002
Cr-Commit-Position: refs/heads/master@{#369953}
14 files changed, 7 insertions, 36 deletions
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index 08c7219..ed468dc 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -85,9 +85,7 @@ class MediaDelegateImpl : public MediaDelegate { TestShellDelegate::TestShellDelegate() : num_exit_requests_(0), multi_profiles_enabled_(false), - force_maximize_on_first_run_(false), - test_session_state_delegate_(NULL) { -} + force_maximize_on_first_run_(false) {} TestShellDelegate::~TestShellDelegate() { } diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h index 2985ff1..f6872fa 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h @@ -79,8 +79,6 @@ class TestShellDelegate : public ShellDelegate { base::ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_; - TestSessionStateDelegate* test_session_state_delegate_; // Not owned. - DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); }; diff --git a/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc b/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc index 8c361f7..2013712 100644 --- a/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc +++ b/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc @@ -369,7 +369,6 @@ class WebViewInteractiveTest size_t initial_widget_count_; content::RenderWidgetHost* last_render_widget_host_; scoped_refptr<content::MessageLoopRunner> message_loop_; - bool seen_new_widget_; DISALLOW_COPY_AND_ASSIGN(PopupCreatedObserver); }; diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc index f257865..b1095e2 100644 --- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc +++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc @@ -58,9 +58,7 @@ class SyncFileSystemTest : public extensions::PlatformAppBrowserTest, public drive::FakeDriveService::ChangeObserver { public: SyncFileSystemTest() - : fake_drive_service_(NULL), - local_service_(NULL), - remote_service_(NULL) { + : remote_service_(NULL) { } void SetUpInProcessBrowserTestFixture() override { @@ -156,8 +154,6 @@ class SyncFileSystemTest : public extensions::PlatformAppBrowserTest, scoped_ptr<FakeSigninManagerForTesting> fake_signin_manager_; - drive::FakeDriveService* fake_drive_service_; - LocalFileSyncService* local_service_; drive_backend::SyncEngine* remote_service_; int64_t real_minimum_preserved_space_; diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc index 31469f6..8e20dc07 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc @@ -101,7 +101,6 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl { base::Bind(&MockCallback)), message_loop_runner_(runner), use_validation_(false), - sign_in_user_index_(0U), weak_ptr_factory_(this) { Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); @@ -200,9 +199,6 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl { // This is used to control what |CurrentNotifications()| returns for testing. std::vector<DialogNotification> notifications_; - // The user index that is assigned in IsSignInContinueUrl(). - size_t sign_in_user_index_; - // Allows generation of WeakPtrs, so controller liveness can be tested. base::WeakPtrFactory<TestAutofillDialogController> weak_ptr_factory_; diff --git a/components/autofill/core/browser/autofill_manager_unittest.cc b/components/autofill/core/browser/autofill_manager_unittest.cc index dd4d0f1..4a10a88 100644 --- a/components/autofill/core/browser/autofill_manager_unittest.cc +++ b/components/autofill/core/browser/autofill_manager_unittest.cc @@ -479,7 +479,6 @@ class TestAutofillManager : public AutofillManager { autofill_enabled_(true), credit_card_upload_enabled_(false), credit_card_was_uploaded_(false), - expect_all_unknown_possible_types_(false), expected_observed_submission_(true) { set_payments_client( new TestPaymentsClient(driver->GetURLRequestContext(), this)); @@ -605,7 +604,6 @@ class TestAutofillManager : public AutofillManager { bool autofill_enabled_; bool credit_card_upload_enabled_; bool credit_card_was_uploaded_; - bool expect_all_unknown_possible_types_; bool expected_observed_submission_; scoped_ptr<base::RunLoop> run_loop_; diff --git a/components/policy/core/common/remote_commands/remote_commands_service_unittest.cc b/components/policy/core/common/remote_commands/remote_commands_service_unittest.cc index 24ffd9f..e3756f1 100644 --- a/components/policy/core/common/remote_commands/remote_commands_service_unittest.cc +++ b/components/policy/core/common/remote_commands/remote_commands_service_unittest.cc @@ -276,8 +276,6 @@ class RemoteCommandsServiceTest : public testing::Test { scoped_refptr<ScopedMockTimeTaskRunner> task_runner_; private: - bool service_started_ = false; - base::ThreadTaskRunnerHandle runner_handle_; DISALLOW_COPY_AND_ASSIGN(RemoteCommandsServiceTest); diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc index d9a30a2..925778d 100644 --- a/content/shell/browser/shell_content_browser_client.cc +++ b/content/shell/browser/shell_content_browser_client.cc @@ -348,7 +348,7 @@ bool ShellContentBrowserClient::ShouldSwapProcessesForRedirect( DevToolsManagerDelegate* ShellContentBrowserClient::GetDevToolsManagerDelegate() { - return new ShellDevToolsManagerDelegate(browser_context()); + return new ShellDevToolsManagerDelegate(); } void ShellContentBrowserClient::OpenURL( diff --git a/content/shell/browser/shell_devtools_manager_delegate.cc b/content/shell/browser/shell_devtools_manager_delegate.cc index 39e290f..cfc09c7 100644 --- a/content/shell/browser/shell_devtools_manager_delegate.cc +++ b/content/shell/browser/shell_devtools_manager_delegate.cc @@ -161,13 +161,10 @@ class ShellDevToolsDelegate : HandleWebSocketConnection(const std::string& path) override; private: - BrowserContext* browser_context_; - DISALLOW_COPY_AND_ASSIGN(ShellDevToolsDelegate); }; -ShellDevToolsDelegate::ShellDevToolsDelegate(BrowserContext* browser_context) - : browser_context_(browser_context) { +ShellDevToolsDelegate::ShellDevToolsDelegate(BrowserContext* browser_context) { devtools_discovery::DevToolsDiscoveryManager::GetInstance()-> SetCreateCallback(base::Bind(&CreateNewShellTarget, base::Unretained(browser_context))); @@ -224,9 +221,7 @@ ShellDevToolsManagerDelegate::CreateHttpHandler( GetShellUserAgent()); } -ShellDevToolsManagerDelegate::ShellDevToolsManagerDelegate( - BrowserContext* browser_context) - : browser_context_(browser_context) { +ShellDevToolsManagerDelegate::ShellDevToolsManagerDelegate() { } ShellDevToolsManagerDelegate::~ShellDevToolsManagerDelegate() { diff --git a/content/shell/browser/shell_devtools_manager_delegate.h b/content/shell/browser/shell_devtools_manager_delegate.h index 1c9a462..840be68 100644 --- a/content/shell/browser/shell_devtools_manager_delegate.h +++ b/content/shell/browser/shell_devtools_manager_delegate.h @@ -23,7 +23,7 @@ class ShellDevToolsManagerDelegate : public DevToolsManagerDelegate { static devtools_http_handler::DevToolsHttpHandler* CreateHttpHandler( BrowserContext* browser_context); - explicit ShellDevToolsManagerDelegate(BrowserContext* browser_context); + ShellDevToolsManagerDelegate(); ~ShellDevToolsManagerDelegate() override; // DevToolsManagerDelegate implementation. @@ -35,8 +35,6 @@ class ShellDevToolsManagerDelegate : public DevToolsManagerDelegate { base::DictionaryValue* command) override; private: - BrowserContext* browser_context_; - DISALLOW_COPY_AND_ASSIGN(ShellDevToolsManagerDelegate); }; diff --git a/content/shell/renderer/layout_test/blink_test_runner.h b/content/shell/renderer/layout_test/blink_test_runner.h index 55d0d3a..4b62441 100644 --- a/content/shell/renderer/layout_test/blink_test_runner.h +++ b/content/shell/renderer/layout_test/blink_test_runner.h @@ -200,7 +200,6 @@ class BlinkTestRunner : public RenderViewObserver, bool focus_on_next_commit_; scoped_ptr<LeakDetector> leak_detector_; - bool needs_leak_detector_; DISALLOW_COPY_AND_ASSIGN(BlinkTestRunner); }; diff --git a/extensions/shell/browser/shell_content_browser_client.cc b/extensions/shell/browser/shell_content_browser_client.cc index 52ebc5b..9f2441d 100644 --- a/extensions/shell/browser/shell_content_browser_client.cc +++ b/extensions/shell/browser/shell_content_browser_client.cc @@ -241,7 +241,7 @@ void ShellContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( content::DevToolsManagerDelegate* ShellContentBrowserClient::GetDevToolsManagerDelegate() { - return new content::ShellDevToolsManagerDelegate(GetBrowserContext()); + return new content::ShellDevToolsManagerDelegate(); } ShellBrowserMainParts* ShellContentBrowserClient::CreateShellBrowserMainParts( diff --git a/media/blink/multibuffer_data_source_unittest.cc b/media/blink/multibuffer_data_source_unittest.cc index cdeeff6..ead1269 100644 --- a/media/blink/multibuffer_data_source_unittest.cc +++ b/media/blink/multibuffer_data_source_unittest.cc @@ -201,9 +201,6 @@ class MockMultibufferDataSource : public MultibufferDataSource { // Whether the resource is downloading or deferred. bool downloading_; - // Whether the resource load has starting loading but yet to been cancelled. - bool loading_; - DISALLOW_COPY_AND_ASSIGN(MockMultibufferDataSource); }; diff --git a/ui/message_center/fake_message_center_tray_delegate.h b/ui/message_center/fake_message_center_tray_delegate.h index cee0c79..d0e9579 100644 --- a/ui/message_center/fake_message_center_tray_delegate.h +++ b/ui/message_center/fake_message_center_tray_delegate.h @@ -34,7 +34,6 @@ class FakeMessageCenterTrayDelegate : public MessageCenterTrayDelegate { private: scoped_ptr<MessageCenterTray> tray_; base::Closure quit_closure_; - bool displayed_first_run_balloon_; DISALLOW_COPY_AND_ASSIGN(FakeMessageCenterTrayDelegate); }; |