Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(512)

Unified Diff: ui/aura/test/aura_test_base.cc

Issue 2488353005: Implement aura::PropertyConverter for mus interop. (Closed)
Patch Set: Remove key name comparison. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/mus/window_tree_client_unittest.cc ('k') | ui/aura/window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/aura_test_base.cc
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index 9588711707f68f6405467cd1ba7fdc5cb72744f5..0dc69a967a336adf06115958ea798a1d988cb67b 100644
--- a/ui/aura/test/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -20,36 +20,6 @@
namespace aura {
namespace test {
-namespace {
-
-class TestPropertyConverter : public PropertyConverter {
- public:
- TestPropertyConverter() {}
- ~TestPropertyConverter() override {}
-
- // PropertyConverter:
- bool ConvertPropertyForTransport(
- Window* window,
- const void* key,
- std::string* server_property_name,
- std::unique_ptr<std::vector<uint8_t>>* server_property_value) override {
- return false;
- }
-
- std::string GetTransportNameForPropertyKey(const void* key) override {
- return std::string();
- }
-
- void SetPropertyFromTransportValue(
- Window* window,
- const std::string& server_property_name,
- const std::vector<uint8_t>* data) override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestPropertyConverter);
-};
-
-} // namespace
AuraTestBase::AuraTestBase()
: window_manager_delegate_(this), window_tree_client_delegate_(this) {}
@@ -65,7 +35,7 @@ void AuraTestBase::SetUp() {
setup_called_ = true;
testing::Test::SetUp();
if (!property_converter_)
- property_converter_ = base::MakeUnique<TestPropertyConverter>();
+ property_converter_ = base::MakeUnique<PropertyConverter>();
// ContentTestSuiteBase might have already initialized
// MaterialDesignController in unit_tests suite.
ui::test::MaterialDesignControllerTestAPI::Uninitialize();
« no previous file with comments | « ui/aura/mus/window_tree_client_unittest.cc ('k') | ui/aura/window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698