diff options
| author | nya <nya@chromium.org> | 2016-03-23 03:12:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-23 10:13:46 +0000 |
| commit | 1b5973d3a7a70a3446502035ef5431c7fda56518 (patch) | |
| tree | 71ffc3e755a02b918d1d0382c96a04a88e1d7356 /components/arc/test/fake_arc_bridge_bootstrap.cc | |
| parent | 26d91d2108a891ad9e0cfed8d15fbb312381fda1 (diff) | |
| download | chromium_src-1b5973d3a7a70a3446502035ef5431c7fda56518.zip chromium_src-1b5973d3a7a70a3446502035ef5431c7fda56518.tar.gz chromium_src-1b5973d3a7a70a3446502035ef5431c7fda56518.tar.bz2 | |
Revert of Add ArcEnabled policy implementation
Reason for revert:
This change broke --disable-arc-opt-in-verification used for
autotests.
> Add ArcEnabled policy implementation
>
> Hide "ARC OptIn" control from Chrome:Settings for enterprise users,
> map ArcEnabled policy to ArcEnabled pref.
>
> BUG=582440
>
> Review URL: https://codereview.chromium.org/1684063002
>
> Cr-Commit-Position: refs/heads/master@{#382266}
TBR=pbond@chromium.org,bartfab@chromium.org,jochen@chromium.org,dbeam@chromium.org,tnagel@chromium.org,hidehiko@chromium.org,hashimoto@chromium.org
BUG=582440
Review URL: https://codereview.chromium.org/1825143003
Cr-Commit-Position: refs/heads/master@{#382819}
Diffstat (limited to 'components/arc/test/fake_arc_bridge_bootstrap.cc')
| -rw-r--r-- | components/arc/test/fake_arc_bridge_bootstrap.cc | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/components/arc/test/fake_arc_bridge_bootstrap.cc b/components/arc/test/fake_arc_bridge_bootstrap.cc deleted file mode 100644 index d2d80bd..0000000 --- a/components/arc/test/fake_arc_bridge_bootstrap.cc +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2016 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/arc/test/fake_arc_bridge_bootstrap.h" - -#include <utility> - -#include "base/logging.h" -#include "components/arc/common/arc_bridge.mojom.h" -#include "components/arc/test/fake_arc_bridge_instance.h" -#include "mojo/public/cpp/bindings/interface_request.h" - -namespace arc { - -FakeArcBridgeBootstrap::FakeArcBridgeBootstrap(FakeArcBridgeInstance* instance) - : instance_(instance) { -} - -void FakeArcBridgeBootstrap::Start() { - DCHECK(delegate_); - ArcBridgeInstancePtr instance; - instance_->Bind(mojo::GetProxy(&instance)); - delegate_->OnConnectionEstablished(std::move(instance)); -} - -void FakeArcBridgeBootstrap::Stop() { - DCHECK(delegate_); - instance_->Unbind(); - delegate_->OnStopped(); -} - -} // namespace arc |
