Commit 4b266fb5 authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

Suppress some more -Wunreachable-warnings.

Bug: 346399
Change-Id: Iec2bb9ce58f3a5dcc2e0b5f2ba55ad6448b3203c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2104552
Commit-Queue: Nico Weber <thakis@chromium.org>
Commit-Queue: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: default avatarJochen Eisinger <jochen@chromium.org>
Auto-Submit: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#750549}
parent 17243e54
...@@ -46,6 +46,7 @@ namespace { ...@@ -46,6 +46,7 @@ namespace {
// This constant controls how many tests are run in a single batch by default. // This constant controls how many tests are run in a single batch by default.
const size_t kDefaultTestBatchLimit = 10; const size_t kDefaultTestBatchLimit = 10;
#if !defined(OS_ANDROID)
void PrintUsage() { void PrintUsage() {
fprintf(stdout, fprintf(stdout,
"Runs tests using the gtest framework, each batch of tests being\n" "Runs tests using the gtest framework, each batch of tests being\n"
...@@ -125,6 +126,7 @@ bool GetSwitchValueAsInt(const std::string& switch_name, int* result) { ...@@ -125,6 +126,7 @@ bool GetSwitchValueAsInt(const std::string& switch_name, int* result) {
return true; return true;
} }
#endif
int LaunchUnitTestsInternal(RunTestSuiteCallback run_test_suite, int LaunchUnitTestsInternal(RunTestSuiteCallback run_test_suite,
size_t parallel_jobs, size_t parallel_jobs,
...@@ -161,7 +163,6 @@ int LaunchUnitTestsInternal(RunTestSuiteCallback run_test_suite, ...@@ -161,7 +163,6 @@ int LaunchUnitTestsInternal(RunTestSuiteCallback run_test_suite,
force_single_process) { force_single_process) {
return std::move(run_test_suite).Run(); return std::move(run_test_suite).Run();
} }
#endif
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kHelpFlag)) { if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kHelpFlag)) {
PrintUsage(); PrintUsage();
...@@ -203,6 +204,7 @@ int LaunchUnitTestsInternal(RunTestSuiteCallback run_test_suite, ...@@ -203,6 +204,7 @@ int LaunchUnitTestsInternal(RunTestSuiteCallback run_test_suite,
fflush(stdout); fflush(stdout);
return (success ? 0 : 1); return (success ? 0 : 1);
#endif
} }
void InitGoogleTestChar(int* argc, char** argv) { void InitGoogleTestChar(int* argc, char** argv) {
......
...@@ -1897,9 +1897,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOption() const { ...@@ -1897,9 +1897,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOption() const {
#if (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX)) || \ #if (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX)) || \
defined(OS_CHROMEOS) defined(OS_CHROMEOS)
return false; return false;
#endif // (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX)) || #else
// defined(OS_CHROMEOS)
// This option should only be shown for users that have not enabled the Sync // This option should only be shown for users that have not enabled the Sync
// Feature and that have server credit cards available. // Feature and that have server credit cards available.
if (!sync_service_ || sync_service_->IsSyncFeatureEnabled() || if (!sync_service_ || sync_service_->IsSyncFeatureEnabled() ||
...@@ -1920,6 +1918,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOption() const { ...@@ -1920,6 +1918,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOption() const {
// The option should only be shown if the user has not already opted-in. // The option should only be shown if the user has not already opted-in.
return !is_opted_in; return !is_opted_in;
#endif // (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX)) ||
// defined(OS_CHROMEOS)
} }
void PersonalDataManager::OnUserAcceptedCardsFromAccountOption() { void PersonalDataManager::OnUserAcceptedCardsFromAccountOption() {
......
...@@ -350,13 +350,14 @@ BrowserGpuChannelHostFactory::EstablishGpuChannelSync() { ...@@ -350,13 +350,14 @@ BrowserGpuChannelHostFactory::EstablishGpuChannelSync() {
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
NOTREACHED(); NOTREACHED();
return nullptr; return nullptr;
#endif #else
EstablishGpuChannel(gpu::GpuChannelEstablishedCallback()); EstablishGpuChannel(gpu::GpuChannelEstablishedCallback());
if (pending_request_.get()) if (pending_request_.get())
pending_request_->Wait(); pending_request_->Wait();
return gpu_channel_; return gpu_channel_;
#endif
} }
gpu::GpuMemoryBufferManager* gpu::GpuMemoryBufferManager*
......
...@@ -224,13 +224,14 @@ std::string GetWifiSSID() { ...@@ -224,13 +224,14 @@ std::string GetWifiSSID() {
// On Android, obtain the SSID using the Android-specific APIs. // On Android, obtain the SSID using the Android-specific APIs.
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
return android::GetWifiSSID(); return android::GetWifiSSID();
#endif #else
NetworkInterfaceList networks; NetworkInterfaceList networks;
if (GetNetworkList(&networks, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES)) { if (GetNetworkList(&networks, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES)) {
return internal::GetWifiSSIDFromInterfaceListInternal( return internal::GetWifiSSIDFromInterfaceListInternal(
networks, internal::GetInterfaceSSID); networks, internal::GetInterfaceSSID);
} }
return std::string(); return std::string();
#endif
} }
} // namespace net } // namespace net
...@@ -82,8 +82,7 @@ void WakeLock::ChangeType(mojom::WakeLockType type, ...@@ -82,8 +82,7 @@ void WakeLock::ChangeType(mojom::WakeLockType type,
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
LOG(ERROR) << "WakeLock::ChangeType() has no effect on Android."; LOG(ERROR) << "WakeLock::ChangeType() has no effect on Android.";
std::move(callback).Run(false); std::move(callback).Run(false);
return; #else
#endif
if (receiver_set_.size() > 1) { if (receiver_set_.size() > 1) {
LOG(ERROR) << "WakeLock::ChangeType() is not allowed when the current wake " LOG(ERROR) << "WakeLock::ChangeType() is not allowed when the current wake "
"lock is shared by more than one clients."; "lock is shared by more than one clients.";
...@@ -100,6 +99,7 @@ void WakeLock::ChangeType(mojom::WakeLockType type, ...@@ -100,6 +99,7 @@ void WakeLock::ChangeType(mojom::WakeLockType type,
} }
std::move(callback).Run(true); std::move(callback).Run(true);
#endif
} }
void WakeLock::HasWakeLockForTests(HasWakeLockForTestsCallback callback) { void WakeLock::HasWakeLockForTests(HasWakeLockForTestsCallback callback) {
......
...@@ -114,10 +114,8 @@ class TestContextMenuController : public ContextMenuController { ...@@ -114,10 +114,8 @@ class TestContextMenuController : public ContextMenuController {
// Tests that context menus are shown for certain key events (Shift+F10 // Tests that context menus are shown for certain key events (Shift+F10
// and VKEY_APPS) by the pre-target handler installed on RootView. // and VKEY_APPS) by the pre-target handler installed on RootView.
TEST_F(RootViewTest, ContextMenuFromKeyEvent) { TEST_F(RootViewTest, ContextMenuFromKeyEvent) {
#if defined(OS_MACOSX)
// This behavior is intentionally unsupported on macOS. // This behavior is intentionally unsupported on macOS.
return; #if !defined(OS_MACOSX)
#endif
Widget widget; Widget widget;
Widget::InitParams init_params = Widget::InitParams init_params =
CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS); CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS);
...@@ -166,6 +164,7 @@ TEST_F(RootViewTest, ContextMenuFromKeyEvent) { ...@@ -166,6 +164,7 @@ TEST_F(RootViewTest, ContextMenuFromKeyEvent) {
EXPECT_EQ(focused_view, controller.menu_source_view()); EXPECT_EQ(focused_view, controller.menu_source_view());
EXPECT_EQ(ui::MENU_SOURCE_KEYBOARD, controller.menu_source_type()); EXPECT_EQ(ui::MENU_SOURCE_KEYBOARD, controller.menu_source_type());
controller.Reset(); controller.Reset();
#endif
} }
// View which handles all gesture events. // View which handles all gesture events.
......
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