Removes ServiceProviders from ViewManager::Embed

components/view_manager/test_change_tracker.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_VIEW_MANAGER_TEST_CHANGE_TRACKER_H_
 #define COMPONENTS_VIEW_MANAGER_TEST_CHANGE_TRACKER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "components/view_manager/public/cpp/types.h"
 #include "components/view_manager/public/interfaces/view_manager.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
 #include "ui/mojo/geometry/geometry.mojom.h"
 
 namespace view_manager {
 
 enum ChangeType {
   CHANGE_TYPE_EMBED,
   CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED,
-  CHANGE_TYPE_WILL_EMBED,
+  CHANGE_TYPE_EMBED_FOR_DESCENDANT,
   // TODO(sky): nuke NODE.
   CHANGE_TYPE_NODE_BOUNDS_CHANGED,
   CHANGE_TYPE_NODE_VIEWPORT_METRICS_CHANGED,
   CHANGE_TYPE_NODE_HIERARCHY_CHANGED,
   CHANGE_TYPE_NODE_REORDERED,
   CHANGE_TYPE_NODE_VISIBILITY_CHANGED,
   CHANGE_TYPE_NODE_DRAWN_STATE_CHANGED,
   CHANGE_TYPE_NODE_DELETED,
   CHANGE_TYPE_INPUT_EVENT,
   CHANGE_TYPE_PROPERTY_CHANGED,
@@ skipping 27 matching lines @@
 
   ChangeType type;
   mojo::ConnectionSpecificId connection_id;
   std::vector<TestView> views;
   mojo::Id view_id;
   mojo::Id view_id2;
   mojo::Id view_id3;
   mojo::Rect bounds;
   mojo::Rect bounds2;
   int32_t event_action;
-  mojo::String creator_url;
   mojo::String embed_url;
   mojo::OrderDirection direction;
   bool bool_value;
   std::string property_key;
   std::string property_value;
 };
 
 // Converts Changes to string descriptions.
 std::vector<std::string> ChangesToDescription1(
     const std::vector<Change>& changes);
@@ skipping 33 matching lines @@
 
   void set_delegate(Delegate* delegate) {
     delegate_ = delegate;
   }
 
   std::vector<Change>* changes() { return &changes_; }
 
   // Each of these functions generate a Change. There is one per
   // ViewManagerClient function.
   void OnEmbed(mojo::ConnectionSpecificId connection_id,
-               const mojo::String& creator_url,
                mojo::ViewDataPtr root);
-  void OnWillEmbed(mojo::Id view_id);
+  void OnEmbedForDescendant(mojo::Id view_id);
   void OnEmbeddedAppDisconnected(mojo::Id view_id);
   void OnViewBoundsChanged(mojo::Id view_id,
                            mojo::RectPtr old_bounds,
                            mojo::RectPtr new_bounds);
   void OnViewViewportMetricsChanged(mojo::ViewportMetricsPtr old_bounds,
                                     mojo::ViewportMetricsPtr new_bounds);
   void OnViewHierarchyChanged(mojo::Id view_id,
                               mojo::Id new_parent_id,
                               mojo::Id old_parent_id,
                               mojo::Array<mojo::ViewDataPtr> views);
@@ skipping 15 matching lines @@
 
   Delegate* delegate_;
   std::vector<Change> changes_;
 
   DISALLOW_COPY_AND_ASSIGN(TestChangeTracker);
 };
 
 }  // namespace view_manager
 
 #endif  // COMPONENTS_VIEW_MANAGER_TEST_CHANGE_TRACKER_H_