Commit a758564e authored by Jun Cai's avatar Jun Cai Committed by Commit Bot

Network Service: Fix SpellingMenuObserverTest.SuggestionsForceTopSeparator

This CL fixes SpellingMenuObserverTest.SuggestionsForceTopSeparator by
implementing TestingProfile::CreateMainNetworkContext() for network
service.

Bug: 779217
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: Ib5c134c401a66feed97faf41d9e0b17b6ed2badf
Reviewed-on: https://chromium-review.googlesource.com/963402
Commit-Queue: Jun Cai <juncai@chromium.org>
Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545523}
parent 0ea92012
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "base/base_paths.h" #include "base/base_paths.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/feature_list.h"
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/location.h" #include "base/location.h"
#include "base/macros.h" #include "base/macros.h"
...@@ -93,10 +94,12 @@ ...@@ -93,10 +94,12 @@
#include "content/public/test/test_utils.h" #include "content/public/test/test_utils.h"
#include "extensions/buildflags/buildflags.h" #include "extensions/buildflags/buildflags.h"
#include "extensions/common/constants.h" #include "extensions/common/constants.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "net/cookies/cookie_store.h" #include "net/cookies/cookie_store.h"
#include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_context_getter.h"
#include "net/url_request/url_request_test_util.h" #include "net/url_request/url_request_test_util.h"
#include "services/network/public/cpp/features.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
...@@ -985,6 +988,11 @@ Profile::ExitType TestingProfile::GetLastSessionExitType() { ...@@ -985,6 +988,11 @@ Profile::ExitType TestingProfile::GetLastSessionExitType() {
} }
network::mojom::NetworkContextPtr TestingProfile::CreateMainNetworkContext() { network::mojom::NetworkContextPtr TestingProfile::CreateMainNetworkContext() {
if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
network::mojom::NetworkContextPtr network_context;
mojo::MakeRequest(&network_context);
return network_context;
}
return nullptr; return nullptr;
} }
......
...@@ -140,9 +140,6 @@ ...@@ -140,9 +140,6 @@
# crbug.com/778860 SecurityStyleExplanations::info_explanations is empty. # crbug.com/778860 SecurityStyleExplanations::info_explanations is empty.
-BrowserTestNonsecureURLRequest.DidChangeVisibleSecurityStateObserverObsoleteTLSSettings -BrowserTestNonsecureURLRequest.DidChangeVisibleSecurityStateObserverObsoleteTLSSettings
# crbug.com/779217 The NetworkContext is not created when the network service is enabled.
-SpellingMenuObserverTest.SuggestionsForceTopSeparator
# http://crbug.com/783990 # http://crbug.com/783990
# Add support for http auth. # Add support for http auth.
-DownloadExtensionTest.DownloadExtensionTest_Download_AuthBasic_Fail -DownloadExtensionTest.DownloadExtensionTest_Download_AuthBasic_Fail
......
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