diff options
Diffstat (limited to 'chromium/components/signin/ios/browser')
7 files changed, 19 insertions, 18 deletions
diff --git a/chromium/components/signin/ios/browser/BUILD.gn b/chromium/components/signin/ios/browser/BUILD.gn index c0a9f35c7ed..9a736cc272a 100644 --- a/chromium/components/signin/ios/browser/BUILD.gn +++ b/chromium/components/signin/ios/browser/BUILD.gn @@ -55,11 +55,11 @@ source_set("unit_tests") { deps = [ ":test_support", - "//components/pref_registry:test_support", "//components/prefs:test_support", "//components/signin/core/browser", "//components/signin/core/browser:test_support", "//components/signin/core/common", + "//components/sync_preferences:test_support", "//ios/web", "//ios/web:test_support", "//third_party/ocmock", diff --git a/chromium/components/signin/ios/browser/account_consistency_service.h b/chromium/components/signin/ios/browser/account_consistency_service.h index cc61d8fe64a..1f7a1e6eb3f 100644 --- a/chromium/components/signin/ios/browser/account_consistency_service.h +++ b/chromium/components/signin/ios/browser/account_consistency_service.h @@ -116,7 +116,7 @@ class AccountConsistencyService : public KeyedService, // Can return nil if the browser state is not active. WKWebView* GetWKWebView(); // Actually creates a WKWebView. Virtual for testing. - virtual WKWebView* CreateWKWebView() NS_RETURNS_RETAINED; + virtual WKWebView* BuildWKWebView(); // Stops any page loading in the WKWebView currently in use and releases it. void ResetWKWebView(); diff --git a/chromium/components/signin/ios/browser/account_consistency_service.mm b/chromium/components/signin/ios/browser/account_consistency_service.mm index 1ce0e2e2cc4..5f15df39e15 100644 --- a/chromium/components/signin/ios/browser/account_consistency_service.mm +++ b/chromium/components/signin/ios/browser/account_consistency_service.mm @@ -4,7 +4,7 @@ #include "components/signin/ios/browser/account_consistency_service.h" -#include <WebKit/WebKit.h> +#import <WebKit/WebKit.h> #import "base/ios/weak_nsobject.h" #include "base/logging.h" @@ -390,7 +390,7 @@ WKWebView* AccountConsistencyService::GetWKWebView() { return nil; } if (!web_view_) { - web_view_.reset(CreateWKWebView()); + web_view_.reset([BuildWKWebView() retain]); navigation_delegate_.reset([[AccountConsistencyNavigationDelegate alloc] initWithCallback:base::Bind(&AccountConsistencyService:: FinishedApplyingCookieRequest, @@ -400,8 +400,8 @@ WKWebView* AccountConsistencyService::GetWKWebView() { return web_view_.get(); } -WKWebView* AccountConsistencyService::CreateWKWebView() { - return web::CreateWKWebView(CGRectZero, browser_state_); +WKWebView* AccountConsistencyService::BuildWKWebView() { + return web::BuildWKWebView(CGRectZero, browser_state_); } void AccountConsistencyService::ResetWKWebView() { diff --git a/chromium/components/signin/ios/browser/account_consistency_service_unittest.mm b/chromium/components/signin/ios/browser/account_consistency_service_unittest.mm index 984a802ead7..ba160b6bf69 100644 --- a/chromium/components/signin/ios/browser/account_consistency_service_unittest.mm +++ b/chromium/components/signin/ios/browser/account_consistency_service_unittest.mm @@ -9,16 +9,16 @@ #include <memory> #import "base/mac/scoped_nsobject.h" -#include "components/pref_registry/testing_pref_service_syncable.h" #include "components/signin/core/browser/account_reconcilor.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/fake_signin_manager.h" #include "components/signin/core/browser/gaia_cookie_manager_service.h" #include "components/signin/core/browser/test_signin_client.h" #include "components/signin/core/common/signin_pref_names.h" +#include "components/sync_preferences/testing_pref_service_syncable.h" #include "google_apis/gaia/gaia_constants.h" -#include "ios/web/public/test/test_browser_state.h" -#include "ios/web/public/test/test_web_state.h" +#include "ios/web/public/test/fakes/test_browser_state.h" +#import "ios/web/public/test/fakes/test_web_state.h" #include "ios/web/public/test/test_web_thread_bundle.h" #include "ios/web/public/web_state/web_state_policy_decider.h" #include "testing/gmock/include/gmock/gmock.h" @@ -58,17 +58,17 @@ class FakeAccountConsistencyService : public AccountConsistencyService { cookie_settings, gaia_cookie_manager_service, signin_client, - signin_manager), - mock_web_view_(nil) {} + signin_manager) {} private: - WKWebView* CreateWKWebView() override { + WKWebView* BuildWKWebView() override { if (!mock_web_view_) { - mock_web_view_ = [OCMockObject niceMockForClass:[WKWebView class]]; + mock_web_view_.reset( + [[OCMockObject niceMockForClass:[WKWebView class]] retain]); } - return [mock_web_view_ retain]; + return mock_web_view_; } - id mock_web_view_; + base::scoped_nsobject<id> mock_web_view_; }; // Mock AccountReconcilor to catch call to OnReceivedManageAccountsResponse. @@ -202,7 +202,7 @@ class AccountConsistencyServiceTest : public PlatformTest { MockAccountReconcilor account_reconcilor_; AccountTrackerService account_tracker_service_; web::TestBrowserState browser_state_; - user_prefs::TestingPrefServiceSyncable prefs_; + sync_preferences::TestingPrefServiceSyncable prefs_; TestWebState web_state_; // AccountConsistencyService being tested. Actually a // FakeAccountConsistencyService to be able to use a mock web view. diff --git a/chromium/components/signin/ios/browser/fake_profile_oauth2_token_service_ios_provider.mm b/chromium/components/signin/ios/browser/fake_profile_oauth2_token_service_ios_provider.mm index 763fa823542..50cb0f853b0 100644 --- a/chromium/components/signin/ios/browser/fake_profile_oauth2_token_service_ios_provider.mm +++ b/chromium/components/signin/ios/browser/fake_profile_oauth2_token_service_ios_provider.mm @@ -4,7 +4,7 @@ #include "components/signin/ios/browser/fake_profile_oauth2_token_service_ios_provider.h" -#include <Foundation/Foundation.h> +#import <Foundation/Foundation.h> #include "base/logging.h" #include "base/strings/sys_string_conversions.h" diff --git a/chromium/components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.h b/chromium/components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.h index 10ea6c9d379..d437a8b44a7 100644 --- a/chromium/components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.h +++ b/chromium/components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.h @@ -15,6 +15,7 @@ class AccountTrackerService; class ProfileOAuth2TokenServiceIOSProvider; +class SigninClient; class ProfileOAuth2TokenServiceIOSDelegate : public OAuth2TokenServiceDelegate { public: diff --git a/chromium/components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.mm b/chromium/components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.mm index 6577c507280..49606f24e79 100644 --- a/chromium/components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.mm +++ b/chromium/components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.mm @@ -4,7 +4,7 @@ #include "components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.h" -#include <Foundation/Foundation.h> +#import <Foundation/Foundation.h> #include <memory> #include <set> |