Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(745)

Unified Diff: shell/shell_test_base.h

Issue 775343004: Move //mojo/shell to //shell (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « shell/out_of_process_dynamic_service_runner.cc ('k') | shell/shell_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/shell_test_base.h
diff --git a/mojo/shell/shell_test_base.h b/shell/shell_test_base.h
similarity index 81%
rename from mojo/shell/shell_test_base.h
rename to shell/shell_test_base.h
index fd70c2dec589237d1c3add560fed18852a6c5f2e..7b0b5bbb4531e2024be4261e4e24f006c9629329 100644
--- a/mojo/shell/shell_test_base.h
+++ b/shell/shell_test_base.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SHELL_SHELL_TEST_BASE_H_
-#define MOJO_SHELL_SHELL_TEST_BASE_H_
+#ifndef SHELL_SHELL_TEST_BASE_H_
+#define SHELL_SHELL_TEST_BASE_H_
#include <string>
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "mojo/public/cpp/system/core.h"
-#include "mojo/shell/context.h"
+#include "shell/context.h"
#include "testing/gtest/include/gtest/gtest.h"
class GURL;
@@ -29,9 +29,8 @@ class ShellTestBase : public testing::Test {
// |application_url| should typically be a mojo: URL (the origin will be set
// to an "appropriate" file: URL).
// TODO(tim): Should the test base be a ServiceProvider?
- ScopedMessagePipeHandle ConnectToService(
- const GURL& application_url,
- const std::string& service_name);
+ ScopedMessagePipeHandle ConnectToService(const GURL& application_url,
+ const std::string& service_name);
ScopedMessagePipeHandle ConnectToServiceViaNetwork(
const GURL& application_url,
@@ -45,7 +44,7 @@ class ShellTestBase : public testing::Test {
template <typename Interface>
void ConnectToServiceViaNetwork(const GURL& application_url,
- InterfacePtr<Interface>* ptr) {
+ InterfacePtr<Interface>* ptr) {
ptr->Bind(
ConnectToServiceViaNetwork(application_url, Interface::Name_).Pass());
}
@@ -64,4 +63,4 @@ class ShellTestBase : public testing::Test {
} // namespace shell
} // namespace mojo
-#endif // MOJO_SHELL_SHELL_TEST_BASE_H_
+#endif // SHELL_SHELL_TEST_BASE_H_
« no previous file with comments | « shell/out_of_process_dynamic_service_runner.cc ('k') | shell/shell_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698