Removes some unnecessary preprocessor directives

The removed conditions are already satisfied through their respective
enclosing conditions.

Review URL: https://codereview.chromium.org/138213004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245003 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 0 insertions, 19 deletions

diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 03ac050..2fe5ad8 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -1516,8 +1516,6 @@ void BrowserOptionsHandler::VirtualKeyboardChangeCallback(
   chromeos::accessibility::EnableVirtualKeyboard(enabled);
 }
 
-#if defined(OS_CHROMEOS)
-
 void BrowserOptionsHandler::PerformFactoryResetRestart(
     const base::ListValue* args) {
   if (g_browser_process->browser_policy_connector()->IsEnterpriseManaged())
@@ -1532,8 +1530,6 @@ void BrowserOptionsHandler::PerformFactoryResetRestart(
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
 }
 
-#endif
-
 void BrowserOptionsHandler::SetupAccessibilityFeatures() {
   PrefService* pref_service = g_browser_process->local_state();
   base::FundamentalValue virtual_keyboard_enabled(
diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
index 6977a8f..07a2f30 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -769,9 +769,7 @@ void SyncSetupHandler::HandleStartSignin(const base::ListValue* args) {
 void SyncSetupHandler::HandleStopSyncing(const base::ListValue* args) {
   if (GetSyncService())
     ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
-#if !defined(OS_CHROMEOS)
   SigninManagerFactory::GetForProfile(GetProfile())->SignOut();
-#endif
 }
 #endif
 
diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc
index 6122017..4866e06 100644
--- a/content/plugin/webplugin_delegate_stub.cc
+++ b/content/plugin/webplugin_delegate_stub.cc
@@ -345,9 +345,7 @@ void WebPluginDelegateStub::OnImeCompositionUpdated(
     int cursor_position) {
   if (delegate_)
     delegate_->ImeCompositionUpdated(text, clauses, target, cursor_position);
-#if defined(OS_WIN) && !defined(USE_AURA)
   webplugin_->UpdateIMEStatus();
-#endif
 }
 
 void WebPluginDelegateStub::OnImeCompositionCompleted(
diff --git a/content/renderer/pepper/content_renderer_pepper_host_factory.cc b/content/renderer/pepper/content_renderer_pepper_host_factory.cc
index 0bd3fdf..6d06e75 100644
--- a/content/renderer/pepper/content_renderer_pepper_host_factory.cc
+++ b/content/renderer/pepper/content_renderer_pepper_host_factory.cc
@@ -40,7 +40,6 @@ namespace content {
 #if defined(ENABLE_WEBRTC)
 namespace {
 
-#if defined(ENABLE_WEBRTC)
 bool CanUseMediaStreamAPI(const RendererPpapiHost* host,
                           PP_Instance instance) {
   blink::WebPluginContainer* container =
@@ -53,7 +52,6 @@ bool CanUseMediaStreamAPI(const RendererPpapiHost* host,
       GetContentClient()->renderer();
   return content_renderer_client->AllowPepperMediaStreamAPI(document_url);
 }
-#endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace
 #endif  // defined(ENABLE_WEBRTC)
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index cc09924..a511413 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -5962,12 +5962,10 @@ bool RenderViewImpl::openDateTimeChooser(
   return date_time_picker_client_->Open();
 }
 
-#if defined(OS_ANDROID)
 void RenderViewImpl::DismissDateTimeDialog() {
   DCHECK(date_time_picker_client_);
   date_time_picker_client_.reset(NULL);
 }
-#endif
 
 WebMediaPlayer* RenderViewImpl::CreateAndroidWebMediaPlayer(
       WebFrame* frame,
diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
index 9c596a4..a5990a2 100644
--- a/rlz/lib/financial_ping.cc
+++ b/rlz/lib/financial_ping.cc
@@ -211,15 +211,10 @@ void FinancialPingUrlFetcherDelegate::OnURLFetchComplete(
   callback_.Run();
 }
 
-#if defined(RLZ_NETWORK_IMPLEMENTATION_CHROME_NET)
 bool send_financial_ping_interrupted_for_test = false;
-#endif
 
 }  // namespace
 
-#endif
-
-#if defined(RLZ_NETWORK_IMPLEMENTATION_CHROME_NET)
 void ShutdownCheck(base::WeakPtr<base::RunLoop> weak) {
   if (!weak.get())
     return;
diff --git a/ui/views/controls/textfield/textfield_unittest.cc b/ui/views/controls/textfield/textfield_unittest.cc
index 71d815f..d2c8b7a 100644
--- a/ui/views/controls/textfield/textfield_unittest.cc
+++ b/ui/views/controls/textfield/textfield_unittest.cc
@@ -902,14 +902,12 @@ TEST_F(TextfieldTest, DragAndDrop_AcceptDrop) {
   // Ensure that textfields do not accept non-OSExchangeData::STRING types.
   ui::OSExchangeData bad_data;
   bad_data.SetFilename(base::FilePath(FILE_PATH_LITERAL("x")));
-#if defined(OS_WIN)
   ui::OSExchangeData::CustomFormat fmt = ui::Clipboard::GetBitmapFormatType();
   bad_data.SetPickledData(fmt, Pickle());
   bad_data.SetFileContents(base::FilePath(L"x"), "x");
   bad_data.SetHtml(base::string16(ASCIIToUTF16("x")), GURL("x.org"));
   ui::OSExchangeData::DownloadFileInfo download(base::FilePath(), NULL);
   bad_data.SetDownloadFileInfo(download);
-#endif
   EXPECT_FALSE(textfield_->CanDrop(bad_data));
 }
 #endif