Merge M45: Remove NPAPI command line flags entirely.

content/shell/browser/shell_content_browser_client.cc

 // Copyright 2013 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/shell/browser/shell_content_browser_client.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file.h"
 #include "base/files/file_util.h"
@@ skipping 183 matching lines @@
       url::kDataScheme,
       url::kFileScheme,
   };
   for (size_t i = 0; i < arraysize(kProtocolList); ++i) {
     if (url.scheme() == kProtocolList[i])
       return true;
   }
   return false;
 }
 
+bool ShellContentBrowserClient::IsNPAPIEnabled() {
+#if defined(OS_WIN) || defined(OS_MACOSX)
+  return true;
+#else
+  return false;
+#endif
+}
+
 void ShellContentBrowserClient::AppendExtraCommandLineSwitches(
     base::CommandLine* command_line,
     int child_process_id) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kRunLayoutTest)) {
     command_line->AppendSwitch(switches::kRunLayoutTest);
   }
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDumpLineBoxTrees)) {
     command_line->AppendSwitch(switches::kDumpLineBoxTrees);
@@ skipping 186 matching lines @@
 ShellBrowserContext*
 ShellContentBrowserClient::ShellBrowserContextForBrowserContext(
     BrowserContext* content_browser_context) {
   if (content_browser_context == browser_context())
     return browser_context();
   DCHECK_EQ(content_browser_context, off_the_record_browser_context());
   return off_the_record_browser_context();
 }
 
 }  // namespace content