Add creation of ServiceManager to Content (2nd try)

content/common/mojo/mojo_channel_init.h

 // Copyright (c) 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.
 
 #ifndef CONTENT_COMMON_MOJO_MOJO_CHANNEL_INIT_H_
 #define CONTENT_COMMON_MOJO_MOJO_CHANNEL_INIT_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/platform_file.h"
@@ skipping 13 matching lines @@
 
 namespace content {
 
 // MojoChannelInit handle creation (and destruction) of the mojo channel. It is
 // expected that this class is created and destroyed on the main thread.
 class CONTENT_EXPORT MojoChannelInit {
  public:
   MojoChannelInit();
   ~MojoChannelInit();
 
-  // Initializes mojo. This is done implicitly when creating a MojoChannelInit,
-  // but can be done explicitly as necessary.
-  static void InitMojo();
-
   // Inits the channel. This takes ownership of |file|.
   void Init(base::PlatformFile file,
             scoped_refptr<base::TaskRunner> io_thread_task_runner);
 
   bool is_handle_valid() const { return bootstrap_message_pipe_.is_valid(); }
 
   mojo::ScopedMessagePipeHandle bootstrap_message_pipe() {
     return bootstrap_message_pipe_.Pass();
   }
 
@@ skipping 13 matching lines @@
   mojo::ScopedMessagePipeHandle bootstrap_message_pipe_;
 
   base::WeakPtrFactory<MojoChannelInit> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoChannelInit);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_MOJO_MOJO_CHANNEL_INIT_H_