Replace "enable-encrypted-media" flag with "disable-encrypted-media".

mojo/services/html_viewer/html_viewer.cc

 // Copyright 2014 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 "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
@@ skipping 34 matching lines @@
 
 namespace html_viewer {
 
 // Switches for html_viewer to be used with "--args-for". For example:
 // --args-for='mojo:html_viewer --enable-mojo-media-renderer'
 
 // Enable MediaRenderer in media pipeline instead of using the internal
 // media::Renderer implementation.
 const char kEnableMojoMediaRenderer[] = "enable-mojo-media-renderer";
 
 // Enables support for Encrypted Media Extensions (e.g. MediaKeys).

[xhwang, 2015/01/22 22:25:42]

update this comment

[ddorwin, 2015/01/22 22:37:20]

Done.

-const char kEnableEncryptedMedia[] = "enable-encrypted-media";
+const char kDisableEncryptedMedia[] = "disable-encrypted-media";
 
 class HTMLViewer;
 
 class HTMLViewerApplication : public mojo::Application {
  public:
   HTMLViewerApplication(ShellPtr shell,
                         URLResponsePtr response,
                         scoped_refptr<base::MessageLoopProxy> compositor_thread,
                         WebMediaPlayerFactory* web_media_player_factory)
       : url_(response->url),
@@ skipping 110 matching lines @@
 
     logging::LoggingSettings settings;
     settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
     logging::InitLogging(settings);
     // Display process ID, thread ID and timestamp in logs.
     logging::SetLogItems(true, true, true, false);
 
     bool enable_mojo_media_renderer =
         command_line->HasSwitch(kEnableMojoMediaRenderer);
 
-    if (command_line->HasSwitch(kEnableEncryptedMedia))
-      blink::WebRuntimeFeatures::enableEncryptedMedia(true);
+    if (command_line->HasSwitch(kDisableEncryptedMedia))
+      blink::WebRuntimeFeatures::enableEncryptedMedia(false);
 
     compositor_thread_.Start();
     web_media_player_factory_.reset(new WebMediaPlayerFactory(
         compositor_thread_.message_loop_proxy(), enable_mojo_media_renderer));
   }
 
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     connection->AddService(this);
     return true;
   }
@@ skipping 13 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(HTMLViewer);
 };
 
 }  // namespace html_viewer
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new html_viewer::HTMLViewer);
   return runner.Run(shell_handle);
 }