Rename ServiceProvider to InterfaceProvider.

components/mus/public/cpp/window.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_MUS_PUBLIC_CPP_WINDOW_H_
 #define COMPONENTS_MUS_PUBLIC_CPP_WINDOW_H_
 
 #include <stdint.h>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/interfaces/mus_constants.mojom.h"
 #include "components/mus/public/interfaces/surface_id.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/system/macros.h"
-#include "mojo/shell/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/interface_provider.mojom.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace gfx {
 class Size;
 }
 
 namespace mus {
 
 class InputEventHandler;
@@ skipping 292 matching lines @@
   };
 
   std::map<const void*, Value> prop_map_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_PUBLIC_CPP_WINDOW_H_