| Index: mojo/application/public/cpp/application_test_base.h
|
| diff --git a/third_party/mojo/src/mojo/public/cpp/application/application_test_base.h b/mojo/application/public/cpp/application_test_base.h
|
| similarity index 85%
|
| rename from third_party/mojo/src/mojo/public/cpp/application/application_test_base.h
|
| rename to mojo/application/public/cpp/application_test_base.h
|
| index 10763be4bf36dcbb561ccb3a162a1f2335cbab4f..9314bda23c1a78262f65812420e102990f1c4c2e 100644
|
| --- a/third_party/mojo/src/mojo/public/cpp/application/application_test_base.h
|
| +++ b/mojo/application/public/cpp/application_test_base.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 MOJO_PUBLIC_CPP_APPLICATION_APPLICATION_TEST_BASE_H_
|
| -#define MOJO_PUBLIC_CPP_APPLICATION_APPLICATION_TEST_BASE_H_
|
| +#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
|
| +#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
|
|
|
| -#include "mojo/public/cpp/application/application_delegate.h"
|
| +#include "mojo/application/public/cpp/application_delegate.h"
|
| +#include "mojo/application/public/interfaces/application.mojom.h"
|
| #include "mojo/public/cpp/bindings/array.h"
|
| #include "mojo/public/cpp/bindings/string.h"
|
| #include "mojo/public/cpp/system/macros.h"
|
| -#include "mojo/public/interfaces/application/application.mojom.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace mojo {
|
| @@ -59,4 +59,4 @@ class ApplicationTestBase : public testing::Test {
|
|
|
| } // namespace mojo
|
|
|
| -#endif // MOJO_PUBLIC_CPP_APPLICATION_APPLICATION_TEST_BASE_H_
|
| +#endif // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
|
|
|