Restructure public side of window_manager service

services/window_manager/window_manager_api_unittest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "mojo/application_manager/application_manager.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/services/public/cpp/view_manager/types.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
-#include "mojo/services/public/interfaces/window_manager/window_manager.mojom.h"
+#include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
 #include "shell/shell_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using mojo::ApplicationImpl;
 using mojo::Id;
 using mojo::View;
 
 namespace window_manager {
 namespace {
 
@@ skipping 231 matching lines @@
 
   Id second_window = OpenWindow();
   window_manager_->ActivateWindow(second_window,
                                   base::Bind(&EmptyResultCallback));
   ids = WaitForActiveWindowChange();
   EXPECT_EQ(ids.first, first_window);
   EXPECT_EQ(ids.second, second_window);
 }
 
 }  // namespace window_manager