Commit d90ce576 authored by Joe Downing's avatar Joe Downing Committed by Commit Bot

Fixing additional binaries which require Mojo initialization

I've found two more binaries which require Mojo init so I've updated
them.  I decided not to update every binary as we can easily add the
init call later if we find something else which needs it.

Change-Id: I7eec1ef23842d8247975edb2f0d9fccc67cdab33
Reviewed-on: https://chromium-review.googlesource.com/1182011Reviewed-by: default avatarGary Kacmarcik <garykac@chromium.org>
Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Commit-Queue: Joe Downing <joedow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584747}
parent 69c42479
......@@ -598,6 +598,7 @@ if (enable_remoting_host) {
deps += [
"//google_apis",
"//mojo/core/embedder",
"//net",
"//remoting/host/setup",
]
......
......@@ -16,6 +16,7 @@
#include "base/task/task_scheduler/task_scheduler.h"
#include "base/threading/thread.h"
#include "build/build_config.h"
#include "mojo/core/embedder/embedder.h"
#include "net/url_request/url_fetcher.h"
#include "net/url_request/url_request_context_getter.h"
#include "remoting/base/logging.h"
......@@ -139,6 +140,8 @@ int StartHostMain(int argc, char** argv) {
base::TaskScheduler::CreateAndStartWithDefaultParams("RemotingHostSetup");
mojo::core::Init();
std::string host_name = command_line->GetSwitchValueASCII("name");
std::string host_pin = command_line->GetSwitchValueASCII("pin");
std::string auth_code = command_line->GetSwitchValueASCII("code");
......
......@@ -70,6 +70,7 @@ static_library("test_support") {
public_deps = [
"//base",
"//mojo/core/embedder",
"//net",
"//remoting/base",
"//remoting/client",
......
include_rules = [
"+google_apis",
"+jingle/glue",
"+mojo/core/embedder",
"+net",
"+remoting/client",
"+remoting/codec",
......
......@@ -14,6 +14,7 @@
#include "base/test/test_suite.h"
#include "base/test/test_switches.h"
#include "google_apis/google_api_keys.h"
#include "mojo/core/embedder/embedder.h"
#include "net/base/escape.h"
#include "remoting/test/chromoting_test_driver_environment.h"
#include "testing/gtest/include/gtest/gtest.h"
......@@ -190,6 +191,8 @@ int main(int argc, char* argv[]) {
base::TaskScheduler::CreateAndStartWithDefaultParams("ChromotingTestDriver");
mojo::core::Init();
// Update the logging verbosity level if user specified one.
std::string verbosity_level(
command_line->GetSwitchValueASCII(switches::kLoggingLevelSwitchName));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment