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

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

Issue 2499933003: Expand aura::PropertyConverter support. (Closed)
Patch Set: Fix the other new unit test. 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/test/aura_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/aura_test_base.h
diff --git a/ui/aura/test/aura_test_base.h b/ui/aura/test/aura_test_base.h
index 1d665ed66e5102b36e177de8b8f8e490d443cab6..aff074e85fd49019a9adbba497814731d798e065 100644
--- a/ui/aura/test/aura_test_base.h
+++ b/ui/aura/test/aura_test_base.h
@@ -9,6 +9,7 @@
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/aura/mus/property_converter.h"
#include "ui/aura/mus/window_manager_delegate.h"
#include "ui/aura/mus/window_tree_client_delegate.h"
#include "ui/aura/test/aura_test_helper.h"
@@ -83,9 +84,6 @@ class AuraTestBase : public testing::Test,
}
ui::mojom::WindowTreeClient* window_tree_client();
- // Resets the PropertyConverter.
- void SetPropertyConverter(std::unique_ptr<PropertyConverter> helper);
-
// WindowTreeClientDelegate:
void OnEmbed(std::unique_ptr<WindowTreeHostMus> window_tree_host) override;
void OnUnembed(Window* root) override;
@@ -128,7 +126,7 @@ class AuraTestBase : public testing::Test,
bool setup_called_ = false;
bool teardown_called_ = false;
base::MessageLoopForUI message_loop_;
- std::unique_ptr<PropertyConverter> property_converter_;
+ PropertyConverter property_converter_;
std::unique_ptr<AuraTestHelper> helper_;
std::unique_ptr<WindowTreeHostMus> window_tree_host_mus_;
« no previous file with comments | « ui/aura/mus/window_tree_client_unittest.cc ('k') | ui/aura/test/aura_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698