Drop all uses of //base except ObserverList from view mgr client lib
This removes all uses of //base from the view manager client C++ library
interface and implementation except for ObserverList. The tests still
use //base fairly extensively to set up message loops and whatnot. Main
changes:
*) use int64_t + <stdint.h> instead of //base/basictypes.h + int64. This
is what //base/basictypes.h recommends doing anyway *) use lambdas to
construct callbacks instead of base::Bind. We were using
base::Unretained() anyway so bind's lifetime stuff didn't help us. *)
Hand-expand the one use of DISALLOW_COPY_AND_ASSIGN *) Remove the one
used of scoped_ptr in the ViewManagerClientFactory variant used by the
window manager. This one is a bit unfortunate in that it needs a raw
pointer but we should be able to update it to std::unique_ptr<>
relatively soon and it's only used in two places (the window manager
common lib and one test).
The ObserverList dependency is a bit bigger.
R=sky@chromium.org
Review URL: https://codereview.chromium.org/911073005
diff --git a/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc b/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc
index bc69464..fd08fab 100644
--- a/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc
+++ b/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc
@@ -7,6 +7,7 @@
#include "base/auto_reset.h"
#include "base/bind.h"
#include "base/logging.h"
+#include "base/memory/scoped_vector.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
@@ -91,7 +92,7 @@
LoadedCallback callback_;
scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_;
- DISALLOW_COPY_AND_ASSIGN(ConnectApplicationLoader);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(ConnectApplicationLoader);
};
class BoundsChangeObserver : public ViewObserver {
@@ -110,7 +111,7 @@
View* view_;
- DISALLOW_COPY_AND_ASSIGN(BoundsChangeObserver);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(BoundsChangeObserver);
};
// Wait until the bounds of the supplied view change.
@@ -152,7 +153,7 @@
View* tree_;
size_t tree_size_;
- DISALLOW_COPY_AND_ASSIGN(TreeSizeMatchesObserver);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(TreeSizeMatchesObserver);
};
void WaitForTreeSizeToMatch(View* view, size_t tree_size) {
@@ -187,7 +188,7 @@
std::set<Id>* views_;
- DISALLOW_COPY_AND_ASSIGN(DestructionObserver);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(DestructionObserver);
};
void WaitForDestruction(ViewManager* view_manager, std::set<Id>* views) {
@@ -220,7 +221,7 @@
View* view_;
- DISALLOW_COPY_AND_ASSIGN(OrderChangeObserver);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(OrderChangeObserver);
};
void WaitForOrderChange(ViewManager* view_manager, View* view) {
@@ -251,7 +252,7 @@
int id_;
View* view_;
- DISALLOW_COPY_AND_ASSIGN(ViewTracker);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(ViewTracker);
};
} // namespace
@@ -337,7 +338,7 @@
ViewManager* window_manager_;
int commit_count_;
- DISALLOW_COPY_AND_ASSIGN(ViewManagerTest);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(ViewManagerTest);
};
// TODO(sky): all of these tests are disabled as each test triggers running
@@ -543,7 +544,7 @@
View* view_;
- DISALLOW_COPY_AND_ASSIGN(VisibilityChangeObserver);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(VisibilityChangeObserver);
};
} // namespace
@@ -606,7 +607,7 @@
View* view_;
- DISALLOW_COPY_AND_ASSIGN(DrawnChangeObserver);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(DrawnChangeObserver);
};
} // namespace
