Do some plumbing.

shell/native_runner_unittest.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/files/scoped_temp_dir.h"
 #include "shell/application_manager/application_manager.h"
+#include "shell/application_manager/native_application_options.h"
 #include "shell/context.h"
 #include "shell/filename_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace shell {
 namespace {
 
 struct TestState {
   TestState()
       : runner_was_created(false),
@@ skipping 21 matching lines @@
   }
 
  private:
   TestState* state_;
 };
 
 class TestNativeRunnerFactory : public NativeRunnerFactory {
  public:
   explicit TestNativeRunnerFactory(TestState* state) : state_(state) {}
   ~TestNativeRunnerFactory() override {}
-  scoped_ptr<NativeRunner> Create(const Options& options) override {
+  scoped_ptr<NativeRunner> Create(
+      const NativeApplicationOptions& /*options*/) override {
     return scoped_ptr<NativeRunner>(new TestNativeRunner(state_));
   }
 
  private:
   TestState* state_;
 };
 
 class NativeApplicationLoaderTest : public testing::Test,
                                     public ApplicationManager::Delegate {
  public:
@@ skipping 31 matching lines @@
   mojo::ServiceProviderPtr service_provider;
   application_manager_.ConnectToApplication(
       url, GURL(), services.Pass(), service_provider.Pass(), base::Closure());
   EXPECT_FALSE(state_.runner_was_created);
   EXPECT_FALSE(state_.runner_was_started);
   EXPECT_FALSE(state_.runner_was_destroyed);
 }
 
 }  // namespace
 }  // namespace shell