chrome/services/util_win/public/{interfaces => mojom}

TBR=dcheng@chromium.org
TBR=jam@chromium.org

Bug: 806965
Change-Id: I6fe6abafbdf5d51b633489440d72ab6073af59aa
Reviewed-on: https://chromium-review.googlesource.com/912771
Commit-Queue: Ken Rockot <rockot@chromium.org>
Reviewed-by: Ken Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#535981}

chrome/browser/BUILD.gn

@@ -2924,7 +2924,7 @@ split_static_library("browser") {
       "//chrome/common:metrics_constants_util_win",
       "//chrome/common:version_header",
       "//chrome/install_static:install_static_util",
-      "//chrome/services/util_win/public/interfaces",
+      "//chrome/services/util_win/public/mojom",
       "//chrome_elf:blacklist",
       "//chrome_elf:constants",
       "//chrome_elf:dll_hash",

chrome/browser/chrome_content_browser_client.cc

@@ -256,7 +256,7 @@
 #include "chrome/browser/chrome_browser_main_win.h"
 #include "chrome/browser/conflicts/module_database_win.h"
 #include "chrome/browser/conflicts/module_event_sink_impl_win.h"
-#include "chrome/services/util_win/public/interfaces/constants.mojom.h"
+#include "chrome/services/util_win/public/mojom/constants.mojom.h"
 #include "chrome/services/wifi_util_win/public/interfaces/constants.mojom.h"
 #include "sandbox/win/src/sandbox_policy.h"
 #elif defined(OS_MACOSX)

chrome/browser/shell_integration_win.cc

@@ -52,8 +52,8 @@
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/scoped_user_protocol_entry.h"
 #include "chrome/installer/util/shell_util.h"
-#include "chrome/services/util_win/public/interfaces/constants.mojom.h"
-#include "chrome/services/util_win/public/interfaces/shell_util_win.mojom.h"
+#include "chrome/services/util_win/public/mojom/constants.mojom.h"
+#include "chrome/services/util_win/public/mojom/shell_util_win.mojom.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/common/service_manager_connection.h"
 #include "services/service_manager/public/cpp/connector.h"

chrome/browser/win/chrome_select_file_dialog_factory.cc

@@ -14,8 +14,8 @@
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/win/win_util.h"
-#include "chrome/services/util_win/public/interfaces/constants.mojom.h"
-#include "chrome/services/util_win/public/interfaces/shell_util_win.mojom.h"
+#include "chrome/services/util_win/public/mojom/constants.mojom.h"
+#include "chrome/services/util_win/public/mojom/shell_util_win.mojom.h"
 #include "content/public/common/service_manager_connection.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/base/win/open_file_name_win.h"

chrome/services/util_win/BUILD.gn

@@ -19,7 +19,7 @@ source_set("lib") {
   ]
 
   public_deps = [
-    "//chrome/services/util_win/public/interfaces",
+    "//chrome/services/util_win/public/mojom",
     "//services/service_manager/public/cpp",
   ]
 }

chrome/services/util_win/public/interfaces/BUILD.gn → chrome/services/util_win/public/mojom/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//mojo/public/tools/bindings/mojom.gni")
 
-mojom("interfaces") {
+mojom("mojom") {
   sources = [
     "shell_util_win.mojom",
   ]

chrome/services/util_win/public/interfaces/shell_util_win.typemap → chrome/services/util_win/public/mojom/shell_util_win.typemap

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-mojom = "//chrome/services/util_win/public/interfaces/shell_util_win.mojom"
+mojom = "//chrome/services/util_win/public/mojom/shell_util_win.mojom"
 
 public_headers = [ "//base/strings/string16.h" ]
 

chrome/services/util_win/shell_util_win_impl.h

@@ -6,7 +6,7 @@
 #define CHROME_SERVICES_UTIL_WIN_SHELL_UTIL_WIN_IMPL_H_
 
 #include "base/macros.h"
-#include "chrome/services/util_win/public/interfaces/shell_util_win.mojom.h"
+#include "chrome/services/util_win/public/mojom/shell_util_win.mojom.h"
 #include "services/service_manager/public/cpp/service_context_ref.h"
 
 class ShellUtilWinImpl : public chrome::mojom::ShellUtilWin {

chrome/services/util_win/util_win_service.cc

@@ -7,7 +7,7 @@
 #include <memory>
 
 #include "build/build_config.h"
-#include "chrome/services/util_win/public/interfaces/shell_util_win.mojom.h"
+#include "chrome/services/util_win/public/mojom/shell_util_win.mojom.h"
 #include "chrome/services/util_win/shell_util_win_impl.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 

chrome/typemaps.gni

@@ -10,5 +10,5 @@ typemaps = [
   "//chrome/services/media_gallery_util/public/mojom/media_parser.typemap",
   "//chrome/services/printing/public/mojom/pdf_render_settings.typemap",
   "//chrome/services/printing/public/mojom/pdf_to_pwg_raster_converter.typemap",
-  "//chrome/services/util_win/public/interfaces/shell_util_win.typemap",
+  "//chrome/services/util_win/public/mojom/shell_util_win.typemap",
 ]

chrome/utility/DEPS

@@ -14,7 +14,7 @@ include_rules = [
   "+chrome/services/removable_storage_writer/removable_storage_writer_service.h",
   "+chrome/services/removable_storage_writer/public/mojom",
   "+chrome/services/util_win/util_win_service.h",
-  "+chrome/services/util_win/public/interfaces",
+  "+chrome/services/util_win/public/mojom",
   "+chrome/services/wifi_util_win/wifi_util_win_service.h",
   "+chrome/services/wifi_util_win/public/interfaces",
   "+components/crash/core/common/crash_keys.h",

chrome/utility/chrome_content_utility_client.cc

@@ -42,7 +42,7 @@
 
 #if defined(OS_WIN)
 #include "chrome/services/printing/pdf_to_emf_converter_factory.h"
-#include "chrome/services/util_win/public/interfaces/constants.mojom.h"
+#include "chrome/services/util_win/public/mojom/constants.mojom.h"
 #include "chrome/services/util_win/util_win_service.h"
 #endif