Removes ServiceProviders from ViewManager::Embed

components/view_manager/test_change_tracker.cc

 // 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.
 
 #include "components/view_manager/test_change_tracker.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "components/view_manager/public/cpp/util.h"
 #include "mojo/common/common_type_converters.h"
@@ skipping 17 matching lines @@
                             rect.height);
 }
 
 std::string DirectionToString(mojo::OrderDirection direction) {
   return direction == mojo::ORDER_DIRECTION_ABOVE ? "above" : "below";
 }
 
 std::string ChangeToDescription1(const Change& change) {
   switch (change.type) {
     case CHANGE_TYPE_EMBED:
-      return base::StringPrintf("OnEmbed creator=%s",
-                                change.creator_url.data());
+      return "OnEmbed";
 
     case CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED:
       return base::StringPrintf("OnEmbeddedAppDisconnected view=%s",
                                 ViewIdToString(change.view_id).c_str());
 
-    case CHANGE_TYPE_WILL_EMBED:
-      return base::StringPrintf("OnWillEmbed view=%s",
+    case CHANGE_TYPE_EMBED_FOR_DESCENDANT:
+      return base::StringPrintf("OnEmbedForDescendant view=%s",
                                 ViewIdToString(change.view_id).c_str());
 
     case CHANGE_TYPE_NODE_BOUNDS_CHANGED:
       return base::StringPrintf(
           "BoundsChanged view=%s old_bounds=%s new_bounds=%s",
           ViewIdToString(change.view_id).c_str(),
           RectToString(change.bounds).c_str(),
           RectToString(change.bounds2).c_str());
 
     case CHANGE_TYPE_NODE_VIEWPORT_METRICS_CHANGED:
@@ skipping 112 matching lines @@
 }
 
 TestChangeTracker::TestChangeTracker()
     : delegate_(NULL) {
 }
 
 TestChangeTracker::~TestChangeTracker() {
 }
 
 void TestChangeTracker::OnEmbed(mojo::ConnectionSpecificId connection_id,
-                                const String& creator_url,
                                 ViewDataPtr root) {
   Change change;
   change.type = CHANGE_TYPE_EMBED;
   change.connection_id = connection_id;
-  change.creator_url = creator_url;
   change.views.push_back(ViewDataToTestView(root));
   AddChange(change);
 }
 
-void TestChangeTracker::OnWillEmbed(mojo::Id view_id) {
+void TestChangeTracker::OnEmbedForDescendant(mojo::Id view_id) {
   Change change;
-  change.type = CHANGE_TYPE_WILL_EMBED;
+  change.type = CHANGE_TYPE_EMBED_FOR_DESCENDANT;
   change.view_id = view_id;
   AddChange(change);
 }
 
 void TestChangeTracker::OnEmbeddedAppDisconnected(Id view_id) {
   Change change;
   change.type = CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED;
   change.view_id = view_id;
   AddChange(change);
 }
@@ skipping 125 matching lines @@
 
 std::string TestView::ToString2() const {
   return base::StringPrintf("view=%s parent=%s visible=%s drawn=%s",
                             ViewIdToString(view_id).c_str(),
                             ViewIdToString(parent_id).c_str(),
                             visible ? "true" : "false",
                             drawn ? "true" : "false");
 }
 
 }  // namespace view_manager