diff options
| author | erg <erg@chromium.org> | 2016-03-21 11:55:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-21 18:56:32 +0000 |
| commit | c112794307cc4858616f5aeaa05dbfe0d89b671e (patch) | |
| tree | 4689e4d2c1551f8c1d0f5b261a647633257f4232 /mojo | |
| parent | 9231ba274a1c6525bf06cfc1a214fae2967663b7 (diff) | |
| download | chromium_src-c112794307cc4858616f5aeaa05dbfe0d89b671e.zip chromium_src-c112794307cc4858616f5aeaa05dbfe0d89b671e.tar.gz chromium_src-c112794307cc4858616f5aeaa05dbfe0d89b671e.tar.bz2 | |
mojo leveldb: Get profile and leveldb connected to DOMStorageContext.
Building on the last patch which built mojo:profile and built one
for each BrowserContext, we move the LevelDBService in the profile
application to a dedicated leveldb thread to avoid deadlocks.
(Since applications all run on one thread by default, leveldb would
deadlock while waiting for profile to return data.)
This patch connects to the correct applications in
DOMStorageContextWrapper and then vends a LevelDBService instance to
each LevelDBWrapperImpl, for future use.
BUG=586194
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
Review URL: https://codereview.chromium.org/1737933002
Cr-Commit-Position: refs/heads/master@{#382343}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/mojo_services.gyp | 2 | ||||
| -rw-r--r-- | mojo/shell/public/cpp/message_loop_ref.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mojo/mojo_services.gyp b/mojo/mojo_services.gyp index d071c60..a42243187 100644 --- a/mojo/mojo_services.gyp +++ b/mojo/mojo_services.gyp @@ -76,7 +76,7 @@ }, { # GN version: //mojo/services/tracing/public/interfaces - 'target_name': 'tracing_service_bindings_lib', + 'target_name': 'tracing_service_bindings_lib', 'type': 'static_library', 'dependencies': [ 'tracing_service_bindings_mojom', diff --git a/mojo/shell/public/cpp/message_loop_ref.h b/mojo/shell/public/cpp/message_loop_ref.h index fffb738..f678746 100644 --- a/mojo/shell/public/cpp/message_loop_ref.h +++ b/mojo/shell/public/cpp/message_loop_ref.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SHELL_PUBLIC_CPP_APPLICATION_RUNNER_REFERENCE_H_ -#define MOJO_SHELL_PUBLIC_CPP_APPLICATION_RUNNER_REFERENCE_H_ +#ifndef MOJO_SHELL_PUBLIC_CPP_MESSAGE_LOOP_REF_H_ +#define MOJO_SHELL_PUBLIC_CPP_MESSAGE_LOOP_REF_H_ #include "base/macros.h" #include "base/memory/scoped_ptr.h" @@ -54,4 +54,4 @@ class MessageLoopRefFactory { } // namespace mojo -#endif // MOJO_SHELL_PUBLIC_CPP_APPLICATION_RUNNER_REFERENCE_H_ +#endif // MOJO_SHELL_PUBLIC_CPP_MESSAGE_LOOP_REF_H_ |