diff options
Diffstat (limited to 'components')
11 files changed, 10 insertions, 31 deletions
diff --git a/components/autofill/content/renderer/password_autofill_agent.h b/components/autofill/content/renderer/password_autofill_agent.h index 0b6865f..69d28c1 100644 --- a/components/autofill/content/renderer/password_autofill_agent.h +++ b/components/autofill/content/renderer/password_autofill_agent.h @@ -20,7 +20,6 @@ namespace blink { class WebInputElement; class WebKeyboardEvent; class WebSecurityOrigin; -class WebView; } namespace autofill { @@ -239,9 +238,6 @@ class PasswordAutofillAgent : public content::RenderFrameObserver { // Used for UMA stats. OtherPossibleUsernamesUsage usernames_usage_; - // Pointer to the WebView. Used to access page scale factor. - blink::WebView* web_view_; - // Set if the user might be submitting a password form on the current page, // but the submit may still fail (i.e. doesn't pass JavaScript validation). scoped_ptr<PasswordForm> provisionally_saved_form_; diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.cc index 0283163..5c8655c 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.cc @@ -21,11 +21,10 @@ DataReductionProxyInterceptor::DataReductionProxyInterceptor( DataReductionProxyParams* params, DataReductionProxyUsageStats* stats, DataReductionProxyEventStore* event_store) - : params_(params), - usage_stats_(stats), - event_store_(event_store), + : usage_stats_(stats), bypass_protocol_( - new DataReductionProxyBypassProtocol(params, event_store)) {} + new DataReductionProxyBypassProtocol(params, event_store)) { +} DataReductionProxyInterceptor::~DataReductionProxyInterceptor() { } diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.h index a0cb781..b82c94c 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.h +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.h @@ -43,15 +43,9 @@ class DataReductionProxyInterceptor : public net::URLRequestInterceptor { net::NetworkDelegate* network_delegate) const override; private: - // Must outlive |this|. - DataReductionProxyParams* params_; - // Must outlive |this| if non-NULL. DataReductionProxyUsageStats* usage_stats_; - // Must outlive |this|. - DataReductionProxyEventStore* event_store_; - // Object responsible for identifying cases when a response should cause the // data reduction proxy to be bypassed, and for triggering proxy bypasses in // these cases. diff --git a/components/pairing/bluetooth_host_pairing_controller.cc b/components/pairing/bluetooth_host_pairing_controller.cc index 5a8c8aa..5ffd2f5 100644 --- a/components/pairing/bluetooth_host_pairing_controller.cc +++ b/components/pairing/bluetooth_host_pairing_controller.cc @@ -59,7 +59,6 @@ BluetoothHostPairingController::BluetoothHostPairingController() : current_stage_(STAGE_NONE), update_status_(UPDATE_STATUS_UNKNOWN), enrollment_status_(ENROLLMENT_STATUS_UNKNOWN), - device_(NULL), proto_decoder_(new ProtoDecoder(this)), ptr_factory_(this) { } diff --git a/components/pairing/bluetooth_host_pairing_controller.h b/components/pairing/bluetooth_host_pairing_controller.h index 9c50f5c..b99af24 100644 --- a/components/pairing/bluetooth_host_pairing_controller.h +++ b/components/pairing/bluetooth_host_pairing_controller.h @@ -103,7 +103,6 @@ class BluetoothHostPairingController EnrollmentStatus enrollment_status_; scoped_refptr<device::BluetoothAdapter> adapter_; - device::BluetoothDevice* device_; scoped_refptr<device::BluetoothSocket> service_socket_; scoped_refptr<device::BluetoothSocket> controller_socket_; scoped_ptr<ProtoDecoder> proto_decoder_; diff --git a/components/password_manager/content/browser/content_password_manager_driver.cc b/components/password_manager/content/browser/content_password_manager_driver.cc index 5f70c80d..80b53b2 100644 --- a/components/password_manager/content/browser/content_password_manager_driver.cc +++ b/components/password_manager/content/browser/content_password_manager_driver.cc @@ -29,7 +29,7 @@ ContentPasswordManagerDriver::ContentPasswordManagerDriver( : render_frame_host_(render_frame_host), client_(client), password_generation_manager_(client, this), - password_autofill_manager_(client, this, autofill_client), + password_autofill_manager_(this, autofill_client), next_free_key_(0) { } diff --git a/components/password_manager/core/browser/password_autofill_manager.cc b/components/password_manager/core/browser/password_autofill_manager.cc index c67bd8d..3095dd3 100644 --- a/components/password_manager/core/browser/password_autofill_manager.cc +++ b/components/password_manager/core/browser/password_autofill_manager.cc @@ -15,7 +15,6 @@ #include "components/autofill/core/browser/suggestion.h" #include "components/autofill/core/common/autofill_constants.h" #include "components/autofill/core/common/autofill_data_validation.h" -#include "components/password_manager/core/browser/password_manager_client.h" #include "components/password_manager/core/browser/password_manager_driver.h" #include "components/strings/grit/components_strings.h" #include "grit/components_strings.h" @@ -91,11 +90,9 @@ void GetSuggestions(const autofill::PasswordFormFillData& fill_data, // PasswordAutofillManager, public: PasswordAutofillManager::PasswordAutofillManager( - PasswordManagerClient* password_manager_client, PasswordManagerDriver* password_manager_driver, autofill::AutofillClient* autofill_client) - : password_manager_client_(password_manager_client), - password_manager_driver_(password_manager_driver), + : password_manager_driver_(password_manager_driver), autofill_client_(autofill_client), weak_ptr_factory_(this) { } diff --git a/components/password_manager/core/browser/password_autofill_manager.h b/components/password_manager/core/browser/password_autofill_manager.h index a699d54..dfe0400 100644 --- a/components/password_manager/core/browser/password_autofill_manager.h +++ b/components/password_manager/core/browser/password_autofill_manager.h @@ -19,14 +19,12 @@ class RectF; namespace password_manager { -class PasswordManagerClient; class PasswordManagerDriver; // This class is responsible for filling password forms. class PasswordAutofillManager : public autofill::AutofillPopupDelegate { public: - PasswordAutofillManager(PasswordManagerClient* password_manager_client, - PasswordManagerDriver* password_manager_driver, + PasswordAutofillManager(PasswordManagerDriver* password_manager_driver, autofill::AutofillClient* autofill_client); virtual ~PasswordAutofillManager(); @@ -91,9 +89,6 @@ class PasswordAutofillManager : public autofill::AutofillPopupDelegate { // right password info in |login_to_password_info_|. int form_data_key_; - // Provides embedder-level operations on passwords. Must outlive |this|. - PasswordManagerClient* const password_manager_client_; // weak - // The driver that owns |this|. PasswordManagerDriver* password_manager_driver_; diff --git a/components/password_manager/core/browser/password_autofill_manager_unittest.cc b/components/password_manager/core/browser/password_autofill_manager_unittest.cc index 81235d6..2e9df20 100644 --- a/components/password_manager/core/browser/password_autofill_manager_unittest.cc +++ b/components/password_manager/core/browser/password_autofill_manager_unittest.cc @@ -94,8 +94,8 @@ class PasswordAutofillManagerTest : public testing::Test { void InitializePasswordAutofillManager( TestPasswordManagerClient* client, autofill::AutofillClient* autofill_client) { - password_autofill_manager_.reset(new PasswordAutofillManager( - client, client->mock_driver(), autofill_client)); + password_autofill_manager_.reset( + new PasswordAutofillManager(client->mock_driver(), autofill_client)); password_autofill_manager_->OnAddPasswordFormMapping(fill_data_id_, fill_data_); } diff --git a/components/password_manager/core/browser/password_generation_manager_unittest.cc b/components/password_manager/core/browser/password_generation_manager_unittest.cc index 01bb377..6f34c40 100644 --- a/components/password_manager/core/browser/password_generation_manager_unittest.cc +++ b/components/password_manager/core/browser/password_generation_manager_unittest.cc @@ -34,7 +34,7 @@ class TestPasswordManagerDriver : public StubPasswordManagerDriver { TestPasswordManagerDriver(PasswordManagerClient* client) : password_manager_(client), password_generation_manager_(client, this), - password_autofill_manager_(client, this, NULL) {} + password_autofill_manager_(this, NULL) {} ~TestPasswordManagerDriver() override {} // PasswordManagerDriver implementation. diff --git a/components/password_manager/core/browser/password_manager_unittest.cc b/components/password_manager/core/browser/password_manager_unittest.cc index c85940a..36ef7af 100644 --- a/components/password_manager/core/browser/password_manager_unittest.cc +++ b/components/password_manager/core/browser/password_manager_unittest.cc @@ -111,7 +111,7 @@ class PasswordManagerTest : public testing::Test { manager_.reset(new TestPasswordManager(&client_)); password_autofill_manager_.reset( - new PasswordAutofillManager(&client_, client_.GetDriver(), NULL)); + new PasswordAutofillManager(client_.GetDriver(), NULL)); EXPECT_CALL(driver_, GetPasswordManager()) .WillRepeatedly(Return(manager_.get())); |