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.h | |
| 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.h')
| -rw-r--r-- | components/arc/test/fake_arc_bridge_bootstrap.h | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/components/arc/test/fake_arc_bridge_bootstrap.h b/components/arc/test/fake_arc_bridge_bootstrap.h deleted file mode 100644 index feb7d6c..0000000 --- a/components/arc/test/fake_arc_bridge_bootstrap.h +++ /dev/null @@ -1,34 +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. - -#ifndef COMPONENTS_ARC_TEST_FAKE_ARC_BRIDGE_BOOTSTRAP_H_ -#define COMPONENTS_ARC_TEST_FAKE_ARC_BRIDGE_BOOTSTRAP_H_ - -#include "base/macros.h" -#include "components/arc/arc_bridge_bootstrap.h" - -namespace arc { - -class FakeArcBridgeInstance; - -// A fake ArcBridgeBootstrap that creates a local connection. -class FakeArcBridgeBootstrap : public ArcBridgeBootstrap { - public: - explicit FakeArcBridgeBootstrap(FakeArcBridgeInstance* instance); - ~FakeArcBridgeBootstrap() override {} - - // ArcBridgeBootstrap: - void Start() override; - void Stop() override; - - private: - // Owned by the caller. - FakeArcBridgeInstance* instance_; - - DISALLOW_COPY_AND_ASSIGN(FakeArcBridgeBootstrap); -}; - -} // namespace arc - -#endif // COMPONENTS_ARC_TEST_FAKE_ARC_BRIDGE_BOOTSTRAP_H_ |
