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

Unified Diff: third_party/mojo_services/src/view_manager/public/cpp/tests/view_unittest.cc

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use run_renderer_in_process() Created 5 years, 10 months 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
Index: third_party/mojo_services/src/view_manager/public/cpp/tests/view_unittest.cc
diff --git a/third_party/mojo_services/src/view_manager/public/cpp/tests/view_unittest.cc b/third_party/mojo_services/src/view_manager/public/cpp/tests/view_unittest.cc
index 149eb3a039e99bc79af8a582305fb5aeb8ff4c50..abbd71255c2cc41f23c76a5b4d1f40d65f84e9a0 100644
--- a/third_party/mojo_services/src/view_manager/public/cpp/tests/view_unittest.cc
+++ b/third_party/mojo_services/src/view_manager/public/cpp/tests/view_unittest.cc
@@ -27,7 +27,7 @@ class TestView : public View {
~TestView() {}
private:
- DISALLOW_COPY_AND_ASSIGN(TestView);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(TestView);
};
TEST_F(ViewTest, AddChild) {
@@ -148,7 +148,7 @@ class TestProperty {
private:
static TestProperty* last_deleted_;
- DISALLOW_COPY_AND_ASSIGN(TestProperty);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(TestProperty);
};
TestProperty* TestProperty::last_deleted_ = NULL;
@@ -222,7 +222,7 @@ class TreeChangeObserver : public ViewObserver {
View* observee_;
std::vector<TreeChangeParams> received_params_;
- DISALLOW_COPY_AND_ASSIGN(TreeChangeObserver);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(TreeChangeObserver);
};
// Adds/Removes v11 to v1.
@@ -463,7 +463,7 @@ class OrderChangeObserver : public ViewObserver {
View* observee_;
Changes changes_;
- DISALLOW_COPY_AND_ASSIGN(OrderChangeObserver);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(OrderChangeObserver);
};
} // namespace
@@ -613,7 +613,7 @@ class BoundsChangeObserver : public ViewObserver {
View* view_;
Changes changes_;
- DISALLOW_COPY_AND_ASSIGN(BoundsChangeObserver);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(BoundsChangeObserver);
};
} // namespace
@@ -669,7 +669,7 @@ class VisibilityChangeObserver : public ViewObserver {
View* view_;
Changes changes_;
- DISALLOW_COPY_AND_ASSIGN(VisibilityChangeObserver);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(VisibilityChangeObserver);
};
} // namespace
@@ -775,7 +775,7 @@ class SharedPropertyChangeObserver : public ViewObserver {
View* view_;
Changes changes_;
- DISALLOW_COPY_AND_ASSIGN(SharedPropertyChangeObserver);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(SharedPropertyChangeObserver);
};
} // namespace
@@ -856,7 +856,7 @@ class LocalPropertyChangeObserver : public ViewObserver {
const void* property_key_;
intptr_t old_property_value_;
- DISALLOW_COPY_AND_ASSIGN(LocalPropertyChangeObserver);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(LocalPropertyChangeObserver);
};
} // namespace

Powered by Google App Engine
This is Rietveld 408576698