summaryrefslogtreecommitdiffstats
path: root/mojo/service_manager
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-29 04:28:31 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-29 04:28:31 +0000
commitb866788fe69dfecbfc8af72d12781c3083ae8b7b (patch)
tree07f461c2da322a7e17e39d7420932256b3d5af6b /mojo/service_manager
parent69fb3d53a0799a578d3564fd3735eb6e8c34d5b8 (diff)
downloadchromium_src-b866788fe69dfecbfc8af72d12781c3083ae8b7b.zip
chromium_src-b866788fe69dfecbfc8af72d12781c3083ae8b7b.tar.gz
chromium_src-b866788fe69dfecbfc8af72d12781c3083ae8b7b.tar.bz2
Mojo: Move public/environment to public/cpp/environment.
R=darin@chromium.org Review URL: https://codereview.chromium.org/218043002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/service_manager')
-rw-r--r--mojo/service_manager/service_manager_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/service_manager/service_manager_unittest.cc b/mojo/service_manager/service_manager_unittest.cc
index 4d467da..18ee25f 100644
--- a/mojo/service_manager/service_manager_unittest.cc
+++ b/mojo/service_manager/service_manager_unittest.cc
@@ -5,7 +5,7 @@
#include "base/message_loop/message_loop.h"
#include "mojo/public/bindings/allocation_scope.h"
#include "mojo/public/bindings/remote_ptr.h"
-#include "mojo/public/environment/environment.h"
+#include "mojo/public/cpp/environment/environment.h"
#include "mojo/public/shell/application.h"
#include "mojo/public/shell/shell.mojom.h"
#include "mojo/service_manager/service_loader.h"