Removes ServiceProviders from ViewManager::Embed

components/html_viewer/setup.cc

 // Copyright 2015 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 "components/html_viewer/setup.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 57 matching lines @@
 Setup::Setup(mojo::ApplicationImpl* app)
     : app_(app),
       resource_loader_(app->shell(), GetResourcePaths()),
       is_headless_(
           base::CommandLine::ForCurrentProcess()->HasSwitch(kIsHeadless)),
       did_init_(false),
       device_pixel_ratio_(1.f),
       discardable_memory_allocator_(kDesiredMaxMemory),
       compositor_thread_("compositor thread") {
   if (is_headless_)
-    InitHeadless();
+    InitIfNecessary(gfx::Size(1024, 1024), 1.f);
 }
 
 Setup::~Setup() {
   if (blink_platform_) {
     renderer_scheduler_->Shutdown();
     blink::shutdown();
   }
 }
 
-void Setup::InitHeadless() {
-  DCHECK(!did_init_);
-  is_headless_ = true;
-  InitIfNecessary(gfx::Size(1024, 1024), 1.f);
-}
-
 void Setup::InitIfNecessary(const gfx::Size& screen_size_in_pixels,
                             float device_pixel_ratio) {
   if (did_init_)
     return;
 
   DCHECK_NE(0.f, device_pixel_ratio);
 
   did_init_ = true;
   device_pixel_ratio_ = device_pixel_ratio;
   screen_size_in_pixels_ = screen_size_in_pixels;
@@ skipping 49 matching lines @@
   media_factory_.reset(
       new MediaFactory(compositor_thread_.message_loop_proxy(), app_->shell()));
 
   if (command_line->HasSwitch(kJavaScriptFlags)) {
     std::string flags(command_line->GetSwitchValueASCII(kJavaScriptFlags));
     v8::V8::SetFlagsFromString(flags.c_str(), static_cast<int>(flags.size()));
   }
 }
 
 }  // namespace html_viewer