
Note to QA: This CL is purely mechanical and shouldn't be blamed for future regressions on touched files. This is a follow-up to https://chromium-review.googlesource.com/c/chromium/src/+/2211138 which already removed all usage using content::BrowserThread. Hence this script now matches unqualified BrowserThread:: without risking having "content::" be selected as "traits_before" by the regex (ran on same revision as step #1). content:: is now always added if outside namespace content {} (deleting unused using content::BrowserThread; decls) Script @ https://crbug.com/1026641#c92 (will TBR fdoray@ post-review for mechanical change) TBR=fdoray@hchromium.org AX-Relnotes: n/a. Bug: 1026641 Change-Id: I51ae2f83eb17d19b54563fd9b4fc040d2aa0c948 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2212469 Commit-Queue: Gabriel Charette <gab@chromium.org> Reviewed-by: François Doray <fdoray@chromium.org> Cr-Commit-Position: refs/heads/master@{#772458}
110 lines
3.9 KiB
C++
110 lines
3.9 KiB
C++
// Copyright 2017 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "content/browser/browser_main_loop.h"
|
|
|
|
#include "base/command_line.h"
|
|
#include "base/system/sys_info.h"
|
|
#include "base/task/thread_pool/thread_pool_instance.h"
|
|
#include "base/test/mock_callback.h"
|
|
#include "base/test/scoped_command_line.h"
|
|
#include "content/browser/browser_thread_impl.h"
|
|
#include "content/browser/scheduler/browser_task_executor.h"
|
|
#include "content/browser/startup_data_impl.h"
|
|
#include "content/browser/startup_helper.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "content/public/common/content_switches.h"
|
|
#include "content/public/common/main_function_params.h"
|
|
#include "content/public/test/test_utils.h"
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
|
|
namespace content {
|
|
|
|
using StrickMockTask =
|
|
testing::StrictMock<base::MockCallback<base::RepeatingCallback<void()>>>;
|
|
|
|
class BrowserMainLoopTest : public testing::Test {
|
|
protected:
|
|
BrowserMainLoopTest() {
|
|
base::test::ScopedCommandLine scoped_command_line;
|
|
scoped_command_line.GetProcessCommandLine()->AppendSwitch(
|
|
switches::kSingleProcess);
|
|
base::ThreadPoolInstance::Create("Browser");
|
|
StartBrowserThreadPool();
|
|
BrowserTaskExecutor::Create();
|
|
}
|
|
|
|
~BrowserMainLoopTest() override {
|
|
BrowserTaskExecutor::ResetForTesting();
|
|
for (int id = BrowserThread::UI; id < BrowserThread::ID_COUNT; ++id) {
|
|
BrowserThreadImpl::ResetGlobalsForTesting(
|
|
static_cast<BrowserThread::ID>(id));
|
|
}
|
|
base::ThreadPoolInstance::Get()->JoinForTesting();
|
|
base::ThreadPoolInstance::Set(nullptr);
|
|
}
|
|
|
|
const base::CommandLine& GetProcessCommandLine() {
|
|
return *scoped_command_line_.GetProcessCommandLine();
|
|
}
|
|
|
|
private:
|
|
base::test::ScopedCommandLine scoped_command_line_;
|
|
}; // namespace content
|
|
|
|
// Verify that a single-process browser process has at least as many threads as
|
|
// the number of cores in its foreground pool.
|
|
TEST_F(BrowserMainLoopTest, CreateThreadsInSingleProcess) {
|
|
MainFunctionParams main_function_params(GetProcessCommandLine());
|
|
|
|
StartupDataImpl startup_data;
|
|
startup_data.io_thread = BrowserTaskExecutor::CreateIOThread();
|
|
main_function_params.startup_data = &startup_data;
|
|
|
|
BrowserMainLoop browser_main_loop(
|
|
main_function_params,
|
|
std::make_unique<base::ThreadPoolInstance::ScopedExecutionFence>());
|
|
browser_main_loop.MainMessageLoopStart();
|
|
browser_main_loop.Init();
|
|
browser_main_loop.CreateThreads();
|
|
EXPECT_GE(base::ThreadPoolInstance::Get()
|
|
->GetMaxConcurrentNonBlockedTasksWithTraitsDeprecated(
|
|
{base::TaskPriority::USER_VISIBLE}),
|
|
base::SysInfo::NumberOfProcessors() - 1);
|
|
browser_main_loop.ShutdownThreadsAndCleanUp();
|
|
BrowserTaskExecutor::ResetForTesting();
|
|
}
|
|
|
|
TEST_F(BrowserMainLoopTest,
|
|
PostTaskToIOThreadBeforeThreadCreationDoesNotRunTask) {
|
|
MainFunctionParams main_function_params(GetProcessCommandLine());
|
|
|
|
StartupDataImpl startup_data;
|
|
startup_data.io_thread = BrowserTaskExecutor::CreateIOThread();
|
|
main_function_params.startup_data = &startup_data;
|
|
|
|
BrowserMainLoop browser_main_loop(
|
|
main_function_params,
|
|
std::make_unique<base::ThreadPoolInstance::ScopedExecutionFence>());
|
|
browser_main_loop.MainMessageLoopStart();
|
|
browser_main_loop.Init();
|
|
|
|
StrickMockTask task;
|
|
|
|
// No task should run because IO thread has not been initialized yet.
|
|
GetIOThreadTaskRunner({})->PostTask(FROM_HERE, task.Get());
|
|
GetIOThreadTaskRunner({})->PostTask(FROM_HERE, task.Get());
|
|
|
|
content::RunAllPendingInMessageLoop(BrowserThread::IO);
|
|
|
|
EXPECT_CALL(task, Run).Times(2);
|
|
browser_main_loop.CreateThreads();
|
|
content::RunAllPendingInMessageLoop(BrowserThread::IO);
|
|
|
|
browser_main_loop.ShutdownThreadsAndCleanUp();
|
|
BrowserTaskExecutor::ResetForTesting();
|
|
}
|
|
|
|
} // namespace content
|