Commit 5e298654 authored by David Dorwin's avatar David Dorwin Committed by Commit Bot

[Fuchsia] Fix outdated comments & includes

Change-Id: I4c363e5895e8a434c8a550ccd9f6e7473dca2b36
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1846820
Auto-Submit: David Dorwin <ddorwin@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Reviewed-by: default avatarWez <wez@chromium.org>
Reviewed-by: default avatarSergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705311}
parent f5041207
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
namespace base { namespace base {
namespace fuchsia { namespace fuchsia {
// ServiceDirectory that uses the supplied ServiceDirectoryClient to satisfy // ServiceDirectory that uses the supplied sys::ServiceDirectory to satisfy
// requests for only a restricted set of services. // requests for only a restricted set of services.
class BASE_EXPORT FilteredServiceDirectory { class BASE_EXPORT FilteredServiceDirectory {
public: public:
......
...@@ -37,10 +37,6 @@ ...@@ -37,10 +37,6 @@
#include "base/mac/foundation_util.h" #include "base/mac/foundation_util.h"
#endif #endif
#if defined(OS_FUCHSIA)
#include "base/base_paths_fuchsia.h"
#endif
namespace base { namespace base {
namespace i18n { namespace i18n {
......
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
#include <fuchsia/net/oldhttp/cpp/fidl.h> #include <fuchsia/net/oldhttp/cpp/fidl.h>
#include <lib/fidl/cpp/binding.h> #include <lib/fidl/cpp/binding.h>
#include "base/fuchsia/scoped_service_binding.h"
#include "base/fuchsia/service_directory.h"
#include "base/message_loop/message_loop_current.h" #include "base/message_loop/message_loop_current.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/test/task_environment.h" #include "base/test/task_environment.h"
......
...@@ -167,16 +167,13 @@ class CastRunnerIntegrationTest : public testing::Test { ...@@ -167,16 +167,13 @@ class CastRunnerIntegrationTest : public testing::Test {
: run_timeout_( : run_timeout_(
TestTimeouts::action_timeout(), TestTimeouts::action_timeout(),
base::MakeExpectedNotRunClosure(FROM_HERE, "Run() timed out.")) { base::MakeExpectedNotRunClosure(FROM_HERE, "Run() timed out.")) {
// Create the CastRunner, published into |test_services_|. // Create the CastRunner, published into |outgoing_directory_|.
constexpr fuchsia::web::ContextFeatureFlags kFeatures = {}; constexpr fuchsia::web::ContextFeatureFlags kFeatures = {};
fuchsia::web::CreateContextParams create_context_params = fuchsia::web::CreateContextParams create_context_params =
WebContentRunner::BuildCreateContextParams( WebContentRunner::BuildCreateContextParams(
fidl::InterfaceHandle<fuchsia::io::Directory>(), kFeatures); fidl::InterfaceHandle<fuchsia::io::Directory>(), kFeatures);
const uint16_t kRemoteDebuggingAnyPort = 0; const uint16_t kRemoteDebuggingAnyPort = 0;
create_context_params.set_remote_debugging_port(kRemoteDebuggingAnyPort); create_context_params.set_remote_debugging_port(kRemoteDebuggingAnyPort);
cast_runner_ = std::make_unique<CastRunner>( cast_runner_ = std::make_unique<CastRunner>(
&outgoing_directory_, &outgoing_directory_,
WebContentRunner::CreateWebContext(std::move(create_context_params))); WebContentRunner::CreateWebContext(std::move(create_context_params)));
...@@ -210,7 +207,7 @@ class CastRunnerIntegrationTest : public testing::Test { ...@@ -210,7 +207,7 @@ class CastRunnerIntegrationTest : public testing::Test {
base::StringPiece component_url) { base::StringPiece component_url) {
DCHECK(!component_state_); DCHECK(!component_state_);
// Create an OutgoingDirectory and publish the ComponentContext into it. // Create a FakeComponentContext and publish it into component_services_.
component_context_ = std::make_unique<cr_fuchsia::FakeComponentContext>( component_context_ = std::make_unique<cr_fuchsia::FakeComponentContext>(
base::BindRepeating(&CastRunnerIntegrationTest::OnComponentConnect, base::BindRepeating(&CastRunnerIntegrationTest::OnComponentConnect,
base::Unretained(this)), base::Unretained(this)),
......
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