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

Unified Diff: ipc/mojo/ipc_mojo_perftest.cc

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 months 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 | « ipc/mojo/ipc_mojo_handle_attachment.cc ('k') | ipc/mojo/run_all_unittests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/mojo/ipc_mojo_perftest.cc
diff --git a/ipc/mojo/ipc_mojo_perftest.cc b/ipc/mojo/ipc_mojo_perftest.cc
index d782c77ee59a51f8711fa803f3b8db2b9c829196..44788f6f17199d5618a47c9e170518f0d40ee40e 100644
--- a/ipc/mojo/ipc_mojo_perftest.cc
+++ b/ipc/mojo/ipc_mojo_perftest.cc
@@ -9,8 +9,8 @@
#include "build/build_config.h"
#include "ipc/ipc_perftest_support.h"
#include "ipc/mojo/ipc_channel_mojo.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
-#include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/platform_channel_pair.h"
namespace {
@@ -19,7 +19,7 @@ namespace {
// some way to call Init() only once before using Mojo.
struct MojoInitialier {
MojoInitialier() {
- mojo::embedder::Init();
+ mojo::edk::Init();
}
};
@@ -38,7 +38,7 @@ public:
scoped_ptr<IPC::ChannelFactory> CreateChannelFactory(
const IPC::ChannelHandle& handle,
- base::SequencedTaskRunner* runner) override {
+ base::TaskRunner* runner) override {
return IPC::ChannelMojo::CreateServerFactory(runner, handle);
}
@@ -75,10 +75,10 @@ TEST_F(MojoChannelPerfTest, DISABLED_MaxChannelCount) {
base::SetFdLimit(20000);
#endif
- std::vector<mojo::embedder::PlatformChannelPair*> channels;
+ std::vector<mojo::edk::PlatformChannelPair*> channels;
for (size_t i = 0; i < 10000; ++i) {
LOG(INFO) << "channels size: " << channels.size();
- channels.push_back(new mojo::embedder::PlatformChannelPair());
+ channels.push_back(new mojo::edk::PlatformChannelPair());
}
}
« no previous file with comments | « ipc/mojo/ipc_mojo_handle_attachment.cc ('k') | ipc/mojo/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698