Move stash_backend into extensions/browser/mojo.

Review URL: https://codereview.chromium.org/638273004

Cr-Commit-Position: refs/heads/master@{#301024}

7 files changed, 13 insertions, 13 deletions

diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn
index 9ba92cf..c56c46a 100644
--- a/extensions/browser/BUILD.gn
+++ b/extensions/browser/BUILD.gn
@@ -406,6 +406,8 @@ source_set("browser") {
       "management_policy.h",
       "mojo/keep_alive_impl.cc",
       "mojo/keep_alive_impl.h",
+      "mojo/stash_backend.cc",
+      "mojo/stash_backend.h",
       "pref_names.cc",
       "pref_names.h",
       "process_manager.cc",
@@ -425,8 +427,6 @@ source_set("browser") {
       "script_execution_observer.h",
       "script_executor.cc",
       "script_executor.h",
-      "stash_backend.cc",
-      "stash_backend.h",
       "state_store.cc",
       "state_store.h",
       "suggest_permission_util.cc",
diff --git a/extensions/browser/stash_backend.cc b/extensions/browser/mojo/stash_backend.cc
index 793f76d..da4842d 100644
--- a/extensions/browser/stash_backend.cc
+++ b/extensions/browser/mojo/stash_backend.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "extensions/browser/stash_backend.h"
+#include "extensions/browser/mojo/stash_backend.h"
 
 namespace extensions {
 
diff --git a/extensions/browser/stash_backend.h b/extensions/browser/mojo/stash_backend.h
index 33d5e5d..b90e43d 100644
--- a/extensions/browser/stash_backend.h
+++ b/extensions/browser/mojo/stash_backend.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef EXTENSIONS_BROWSER_STASH_BACKEND_H_
-#define EXTENSIONS_BROWSER_STASH_BACKEND_H_
+#ifndef EXTENSIONS_BROWSER_MOJO_STASH_BACKEND_H_
+#define EXTENSIONS_BROWSER_MOJO_STASH_BACKEND_H_
 
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "extensions/common/stash.mojom.h"
+#include "extensions/common/mojo/stash.mojom.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 
 namespace extensions {
@@ -42,4 +42,4 @@ class StashBackend {
 
 }  // namespace extensions
 
-#endif  // EXTENSIONS_BROWSER_STASH_BACKEND_H_
+#endif  // EXTENSIONS_BROWSER_MOJO_STASH_BACKEND_H_
diff --git a/extensions/browser/stash_backend_unittest.cc b/extensions/browser/mojo/stash_backend_unittest.cc
index 04c5233..0a0244b 100644
--- a/extensions/browser/stash_backend_unittest.cc
+++ b/extensions/browser/mojo/stash_backend_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "extensions/browser/stash_backend.h"
+#include "extensions/browser/mojo/stash_backend.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
diff --git a/extensions/common/BUILD.gn b/extensions/common/BUILD.gn
index f4d6992..d59b6e9 100644
--- a/extensions/common/BUILD.gn
+++ b/extensions/common/BUILD.gn
@@ -24,7 +24,7 @@ if (enable_extensions) {
 mojom("mojo") {
   sources = [
     "mojo/keep_alive.mojom",
-    "stash.mojom",
+    "mojo/stash.mojom",
   ]
 }
 
diff --git a/extensions/common/stash.mojom b/extensions/common/mojo/stash.mojom
index 734697b..734697b 100644
--- a/extensions/common/stash.mojom
+++ b/extensions/common/mojo/stash.mojom
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index dca4307..9c3d7a2 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -19,7 +19,7 @@
       ],
       'sources': [
         'common/mojo/keep_alive.mojom',
-        'common/stash.mojom',
+        'common/mojo/stash.mojom',
       ],
     },
     {
@@ -709,6 +709,8 @@
         'browser/management_policy.h',
         'browser/mojo/keep_alive_impl.cc',
         'browser/mojo/keep_alive_impl.h',
+        'browser/mojo/stash_backend.cc',
+        'browser/mojo/stash_backend.h',
         'browser/notification_types.h',
         'browser/null_app_sorting.cc',
         'browser/null_app_sorting.h',
@@ -731,8 +733,6 @@
         'browser/script_execution_observer.h',
         'browser/script_executor.cc',
         'browser/script_executor.h',
-        'browser/stash_backend.cc',
-        'browser/stash_backend.h',
         'browser/state_store.cc',
         'browser/state_store.h',
         'browser/suggest_permission_util.cc',
@@ -1163,11 +1163,11 @@
         'browser/lazy_background_task_queue_unittest.cc',
         'browser/management_policy_unittest.cc',
         'browser/mojo/keep_alive_impl_unittest.cc',
+        'browser/mojo/stash_backend_unittest.cc',
         'browser/process_manager_unittest.cc',
         'browser/process_map_unittest.cc',
         'browser/quota_service_unittest.cc',
         'browser/runtime_data_unittest.cc',
-        'browser/stash_backend_unittest.cc',
         'browser/value_store/leveldb_value_store_unittest.cc',
         'browser/value_store/testing_value_store_unittest.cc',
         'browser/value_store/value_store_change_unittest.cc',