diff options
Diffstat (limited to 'chromium/chrome/browser/spellchecker')
6 files changed, 29 insertions, 26 deletions
diff --git a/chromium/chrome/browser/spellchecker/spell_check_host_chrome_impl_mac_browsertest.cc b/chromium/chrome/browser/spellchecker/spell_check_host_chrome_impl_mac_browsertest.cc index f78aa4f7593..8bf74d31846 100644 --- a/chromium/chrome/browser/spellchecker/spell_check_host_chrome_impl_mac_browsertest.cc +++ b/chromium/chrome/browser/spellchecker/spell_check_host_chrome_impl_mac_browsertest.cc @@ -12,14 +12,15 @@ #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/browser_context.h" #include "content/public/test/mock_render_process_host.h" +#include "mojo/public/cpp/bindings/remote.h" class SpellCheckHostChromeImplMacBrowserTest : public InProcessBrowserTest { public: void SetUpOnMainThread() override { content::BrowserContext* context = browser()->profile(); renderer_.reset(new content::MockRenderProcessHost(context)); - SpellCheckHostChromeImpl::Create(renderer_->GetID(), - mojo::MakeRequest(&spell_check_host_)); + SpellCheckHostChromeImpl::Create( + renderer_->GetID(), spell_check_host_.BindNewPipeAndPassReceiver()); } void TearDownOnMainThread() override { renderer_.reset(); } @@ -41,7 +42,7 @@ class SpellCheckHostChromeImplMacBrowserTest : public InProcessBrowserTest { protected: std::unique_ptr<content::MockRenderProcessHost> renderer_; - spellcheck::mojom::SpellCheckHostPtr spell_check_host_; + mojo::Remote<spellcheck::mojom::SpellCheckHost> spell_check_host_; bool received_result_ = false; std::vector<SpellCheckResult> result_; diff --git a/chromium/chrome/browser/spellchecker/spell_check_host_chrome_impl_win_browsertest.cc b/chromium/chrome/browser/spellchecker/spell_check_host_chrome_impl_win_browsertest.cc index 9ceeb4deedc..a47d8d9de41 100644 --- a/chromium/chrome/browser/spellchecker/spell_check_host_chrome_impl_win_browsertest.cc +++ b/chromium/chrome/browser/spellchecker/spell_check_host_chrome_impl_win_browsertest.cc @@ -16,18 +16,20 @@ #include "components/spellcheck/common/spellcheck_features.h" #include "content/public/browser/browser_context.h" #include "content/public/test/mock_render_process_host.h" +#include "mojo/public/cpp/bindings/remote.h" class SpellCheckHostChromeImplWinBrowserTest : public InProcessBrowserTest { public: + SpellCheckHostChromeImplWinBrowserTest() { + feature_list_.InitAndEnableFeature(spellcheck::kWinUseBrowserSpellChecker); + } + void SetUpOnMainThread() override { content::BrowserContext* context = browser()->profile(); renderer_.reset(new content::MockRenderProcessHost(context)); - base::test::ScopedFeatureList feature_list; - feature_list.InitAndEnableFeature(spellcheck::kWinUseBrowserSpellChecker); - - SpellCheckHostChromeImpl::Create(renderer_->GetID(), - mojo::MakeRequest(&spell_check_host_)); + SpellCheckHostChromeImpl::Create( + renderer_->GetID(), spell_check_host_.BindNewPipeAndPassReceiver()); } void TearDownOnMainThread() override { renderer_.reset(); } @@ -57,8 +59,9 @@ class SpellCheckHostChromeImplWinBrowserTest : public InProcessBrowserTest { } protected: + base::test::ScopedFeatureList feature_list_; std::unique_ptr<content::MockRenderProcessHost> renderer_; - spellcheck::mojom::SpellCheckHostPtr spell_check_host_; + mojo::Remote<spellcheck::mojom::SpellCheckHost> spell_check_host_; bool received_result_ = false; std::vector<SpellCheckResult> result_; @@ -71,9 +74,6 @@ IN_PROC_BROWSER_TEST_F(SpellCheckHostChromeImplWinBrowserTest, if (base::win::GetVersion() < base::win::Version::WIN8) return; - base::test::ScopedFeatureList feature_list; - feature_list.InitAndEnableFeature(spellcheck::kWinUseBrowserSpellChecker); - spellcheck_platform::SetLanguage( "en-US", base::BindOnce(&SpellCheckHostChromeImplWinBrowserTest:: SetLanguageCompletionCallback, diff --git a/chromium/chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.cc b/chromium/chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.cc index 3c08eeab629..250ccd8e35d 100644 --- a/chromium/chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.cc +++ b/chromium/chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.cc @@ -112,7 +112,7 @@ void SpellcheckLanguageBlacklistPolicyHandler::SortBlacklistedLanguages( // Separate the valid languages from the unknown / unsupported languages and // the languages that also appear in the SpellcheckLanguage policy. - const base::Value::ListStorage& blacklisted_languages = value->GetList(); + base::span<const base::Value> blacklisted_languages = value->GetList(); for (const base::Value& language : blacklisted_languages) { std::string current_language = spellcheck::GetCorrespondingSpellCheckLanguage( diff --git a/chromium/chrome/browser/spellchecker/spellcheck_language_policy_handler.cc b/chromium/chrome/browser/spellchecker/spellcheck_language_policy_handler.cc index c451930d32d..8d968add0e8 100644 --- a/chromium/chrome/browser/spellchecker/spellcheck_language_policy_handler.cc +++ b/chromium/chrome/browser/spellchecker/spellcheck_language_policy_handler.cc @@ -85,7 +85,7 @@ void SpellcheckLanguagePolicyHandler::SortForcedLanguages( return; // Separate the valid languages from the unknown / unsupported languages. - const base::Value::ListStorage& forced_languages = value->GetList(); + base::span<const base::Value> forced_languages = value->GetList(); for (const base::Value& language : forced_languages) { std::string current_language = spellcheck::GetCorrespondingSpellCheckLanguage( diff --git a/chromium/chrome/browser/spellchecker/spellcheck_service_browsertest.cc b/chromium/chrome/browser/spellchecker/spellcheck_service_browsertest.cc index ec0665d4487..f79e976770b 100644 --- a/chromium/chrome/browser/spellchecker/spellcheck_service_browsertest.cc +++ b/chromium/chrome/browser/spellchecker/spellcheck_service_browsertest.cc @@ -38,6 +38,7 @@ #include "content/public/test/test_utils.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" +#include "mojo/public/cpp/bindings/remote.h" using content::BrowserContext; using content::RenderProcessHost; @@ -231,14 +232,14 @@ class SpellcheckServiceHostBrowserTest : public SpellcheckServiceBrowserTest { SpellcheckServiceHostBrowserTest() = default; void RequestDictionary() { - spellcheck::mojom::SpellCheckHostPtr interface; + mojo::Remote<spellcheck::mojom::SpellCheckHost> interface; RequestSpellCheckHost(&interface); interface->RequestDictionary(); } void NotifyChecked() { - spellcheck::mojom::SpellCheckHostPtr interface; + mojo::Remote<spellcheck::mojom::SpellCheckHost> interface; RequestSpellCheckHost(&interface); const bool misspelt = true; @@ -248,7 +249,7 @@ class SpellcheckServiceHostBrowserTest : public SpellcheckServiceBrowserTest { } void CallSpellingService() { - spellcheck::mojom::SpellCheckHostPtr interface; + mojo::Remote<spellcheck::mojom::SpellCheckHost> interface; RequestSpellCheckHost(&interface); base::UTF8ToUTF16("hello", 5, &word_); @@ -265,9 +266,10 @@ class SpellcheckServiceHostBrowserTest : public SpellcheckServiceBrowserTest { } private: - void RequestSpellCheckHost(spellcheck::mojom::SpellCheckHostPtr* interface) { + void RequestSpellCheckHost( + mojo::Remote<spellcheck::mojom::SpellCheckHost>* interface) { SpellCheckHostChromeImpl::Create(GetRenderer()->GetID(), - mojo::MakeRequest(interface)); + interface->BindNewPipeAndPassReceiver()); } void SpellingServiceDone(bool success, diff --git a/chromium/chrome/browser/spellchecker/spelling_service_client_unittest.cc b/chromium/chrome/browser/spellchecker/spelling_service_client_unittest.cc index 5441a4be28d..813bccf79ba 100644 --- a/chromium/chrome/browser/spellchecker/spelling_service_client_unittest.cc +++ b/chromium/chrome/browser/spellchecker/spelling_service_client_unittest.cc @@ -26,7 +26,6 @@ #include "content/public/test/browser_task_environment.h" #include "net/base/load_flags.h" #include "net/http/http_util.h" -#include "services/network/public/cpp/resource_response.h" #include "services/network/public/cpp/shared_url_loader_factory.h" #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" #include "services/network/test/test_url_loader_factory.h" @@ -147,8 +146,8 @@ class SpellingServiceClientTest // misspelled words with ones suggested by the service so this test can compare // the corrected text with the expected results. (If there are not any // misspelled words, |corrected_text| should be equal to |request_text|.) -using Redirects = - std::vector<std::pair<net::RedirectInfo, network::ResourceResponseHead>>; +using Redirects = std::vector< + std::pair<net::RedirectInfo, network::mojom::URLResponseHeadPtr>>; TEST_P(SpellingServiceClientTest, RequestTextCheck) { auto test_case = GetParam(); @@ -169,19 +168,20 @@ TEST_P(SpellingServiceClientTest, RequestTextCheck) { client_.test_url_loader_factory()->ClearResponses(); net::HttpStatusCode http_status = test_case.response_status; - network::ResourceResponseHead head; + auto head = network::mojom::URLResponseHead::New(); std::string headers(base::StringPrintf( "HTTP/1.1 %d %s\nContent-type: application/json\n\n", static_cast<int>(http_status), net::GetHttpReasonPhrase(http_status))); - head.headers = base::MakeRefCounted<net::HttpResponseHeaders>( + head->headers = base::MakeRefCounted<net::HttpResponseHeaders>( net::HttpUtil::AssembleRawHeaders(headers)); - head.mime_type = "application/json"; + head->mime_type = "application/json"; network::URLLoaderCompletionStatus status; status.decoded_body_length = test_case.response_data.size(); GURL expected_request_url = client_.BuildEndpointUrl(test_case.request_type); client_.test_url_loader_factory()->AddResponse( - expected_request_url, head, test_case.response_data, status, Redirects(), + expected_request_url, std::move(head), test_case.response_data, status, + Redirects(), network::TestURLLoaderFactory::ResponseProduceFlags:: kSendHeadersOnNetworkError); |