Remove mojo::String.

services/ui/ws/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 "services/ui/ws/test_change_tracker.h"
 
 #include <stddef.h>
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/public/cpp/bindings/map.h"
 #include "services/ui/common/util.h"
 
 using mojo::Array;
-using mojo::String;
 
 namespace ui {
 
 namespace ws {
 
 std::string WindowIdToString(Id id) {
   return (id == 0) ? "null"
                    : base::StringPrintf("%d,%d", HiWord(id), LoWord(id));
 }
 
@@ skipping 342 matching lines @@
 void TestChangeTracker::OnPointerEventObserved(const ui::Event& event,
                                                uint32_t window_id) {
   Change change;
   change.type = CHANGE_TYPE_POINTER_WATCHER_EVENT;
   change.event_action = static_cast<int32_t>(event.type());
   change.window_id = window_id;
   AddChange(change);
 }
 
 void TestChangeTracker::OnWindowSharedPropertyChanged(Id window_id,
-                                                      String name,
+                                                      std::string name,
                                                       Array<uint8_t> data) {
   Change change;
   change.type = CHANGE_TYPE_PROPERTY_CHANGED;
   change.window_id = window_id;
   change.property_key = name;
   if (data.is_null())
     change.property_value = "NULL";
   else
     change.property_value = data.To<std::string>();
   AddChange(change);
@@ skipping 69 matching lines @@
 
 std::string TestWindow::ToString2() const {
   return base::StringPrintf(
       "window=%s parent=%s visible=%s", WindowIdToString(window_id).c_str(),
       WindowIdToString(parent_id).c_str(), visible ? "true" : "false");
 }
 
 }  // namespace ws
 
 }  // namespace ui