| Index: mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc
|
| 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 1c5d46cd8c0f1914ef5e852a2222dd038560853d..044fffccf022fb8b3772fd54b2f805c93e152287 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
|
| @@ -47,7 +47,7 @@ class ConnectApplicationLoader : public ApplicationLoader,
|
| public ApplicationDelegate,
|
| public ViewManagerDelegate {
|
| public:
|
| - typedef base::Callback<void(ViewManager*, View*)> LoadedCallback;
|
| + typedef base::Callback<void(View*)> LoadedCallback;
|
|
|
| explicit ConnectApplicationLoader(const LoadedCallback& callback)
|
| : callback_(callback) {}
|
| @@ -80,11 +80,10 @@ class ConnectApplicationLoader : public ApplicationLoader,
|
| }
|
|
|
| // Overridden from ViewManagerDelegate:
|
| - void OnEmbed(ViewManager* view_manager,
|
| - View* root,
|
| + void OnEmbed(View* root,
|
| ServiceProviderImpl* exported_services,
|
| scoped_ptr<ServiceProvider> imported_services) override {
|
| - callback_.Run(view_manager, root);
|
| + callback_.Run(root);
|
| }
|
| void OnViewManagerDisconnected(ViewManager* view_manager) override {}
|
|
|
| @@ -317,8 +316,8 @@ class ViewManagerTest : public testing::Test {
|
| // TODO(sky): resolve this. Need to establish initial connection.
|
| }
|
|
|
| - void OnViewManagerLoaded(ViewManager* view_manager, View* root) {
|
| - loaded_view_manager_ = view_manager;
|
| + void OnViewManagerLoaded(View* root) {
|
| + loaded_view_manager_ = root->view_manager();
|
| connect_loop_->Quit();
|
| }
|
|
|
|
|