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

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

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

chrome/browser/chrome_content_browser_client.cc

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

chrome/browser/extensions/BUILD.gn

@@ -1087,7 +1087,7 @@ static_library("extensions") {
 
   if (is_win) {
     deps += [
-      "//chrome/services/wifi_util_win/public/interfaces",
+      "//chrome/services/wifi_util_win/public/mojom",
       "//third_party/iaccessible2",
       "//third_party/isimpledom",
     ]

chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_browsertest.cc

@@ -8,7 +8,7 @@
 #include "base/run_loop.h"
 #include "base/task_scheduler/post_task.h"
 #include "chrome/browser/extensions/api/networking_private/networking_private_credentials_getter.h"
-#include "chrome/services/wifi_util_win/public/interfaces/wifi_credentials_getter.mojom.h"
+#include "chrome/services/wifi_util_win/public/mojom/wifi_credentials_getter.mojom.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/browser_thread.h"
 

chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_win.cc

@@ -11,8 +11,8 @@
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
 #include "chrome/browser/extensions/api/networking_private/networking_private_crypto.h"
-#include "chrome/services/wifi_util_win/public/interfaces/constants.mojom.h"
-#include "chrome/services/wifi_util_win/public/interfaces/wifi_credentials_getter.mojom.h"
+#include "chrome/services/wifi_util_win/public/mojom/constants.mojom.h"
+#include "chrome/services/wifi_util_win/public/mojom/wifi_credentials_getter.mojom.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/service_manager_connection.h"
 #include "services/service_manager/public/cpp/connector.h"

chrome/services/wifi_util_win/BUILD.gn

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

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

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

chrome/services/wifi_util_win/wifi_credentials_getter.h

@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "chrome/services/wifi_util_win/public/interfaces/wifi_credentials_getter.mojom.h"
+#include "chrome/services/wifi_util_win/public/mojom/wifi_credentials_getter.mojom.h"
 #include "services/service_manager/public/cpp/service_context_ref.h"
 
 class WiFiCredentialsGetter : public chrome::mojom::WiFiCredentialsGetter {

chrome/utility/DEPS

@@ -16,7 +16,7 @@ include_rules = [
   "+chrome/services/util_win/util_win_service.h",
   "+chrome/services/util_win/public/mojom",
   "+chrome/services/wifi_util_win/wifi_util_win_service.h",
-  "+chrome/services/wifi_util_win/public/interfaces",
+  "+chrome/services/wifi_util_win/public/mojom",
   "+components/crash/core/common/crash_keys.h",
   "+components/font_service/font_service_app.h",
   "+components/patch_service",

chrome/utility/chrome_content_utility_client.cc

@@ -54,7 +54,7 @@
 #include "chrome/utility/extensions/extensions_handler.h"
 #include "extensions/utility/utility_handler.h"
 #if defined(OS_WIN)
-#include "chrome/services/wifi_util_win/public/interfaces/constants.mojom.h"
+#include "chrome/services/wifi_util_win/public/mojom/constants.mojom.h"
 #include "chrome/services/wifi_util_win/wifi_util_win_service.h"
 #endif
 #endif