[chromoting] Fix crash when generating access code

remoting/host/desktop_environment.cc

 // Copyright (c) 2012 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 "remoting/host/desktop_environment.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "remoting/host/capturer.h"
 #include "remoting/host/chromoting_host.h"
@@ skipping 12 matching lines @@
   scoped_ptr<Capturer> capturer(Capturer::Create());
   scoped_ptr<protocol::HostEventStub> event_executor =
       EventExecutor::Create(context->desktop_message_loop(),
                             capturer.get());
 
   if (capturer.get() == NULL || event_executor.get() == NULL) {
     LOG(ERROR) << "Unable to create DesktopEnvironment";
     return scoped_ptr<DesktopEnvironment>();
   }
 
+  return scoped_ptr<DesktopEnvironment>(
+      new DesktopEnvironment(context,
+                             capturer.Pass(),
+                             event_executor.Pass()));
+}
+
+// static
+scoped_ptr<DesktopEnvironment> DesktopEnvironment::CreateForService(

[alexeypa (please no reviews), 2012/03/21 23:39:12]

Oh, well. I guess it is better to have two copies of this code  than define a
private static method taking a flag and letting Create and CreateForService be
just wrappers. At least there is a better chance that linker will throw one of
them away entirely because only one is used in any given binary.

+    ChromotingHostContext* context) {
+  scoped_ptr<Capturer> capturer(Capturer::Create());
+  scoped_ptr<protocol::HostEventStub> event_executor =
+      EventExecutor::Create(context->desktop_message_loop(),
+                            capturer.get());
+
+  if (capturer.get() == NULL || event_executor.get() == NULL) {
+    LOG(ERROR) << "Unable to create DesktopEnvironment";
+    return scoped_ptr<DesktopEnvironment>();
+  }
+
 #if defined(USE_CHROMOTING_IPC)
   event_executor.reset(new SessionEventExecutorWin(
       context->desktop_message_loop(),
       context->io_message_loop(),
       event_executor.Pass()));
 #endif
 
   return scoped_ptr<DesktopEnvironment>(
       new DesktopEnvironment(context,
                              capturer.Pass(),
@@ skipping 18 matching lines @@
     : host_(NULL),
       context_(context),
       capturer_(capturer.Pass()),
       event_executor_(event_executor.Pass()) {
 }
 
 DesktopEnvironment::~DesktopEnvironment() {
 }
 
 }  // namespace remoting