diff options
author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-14 20:51:14 +0000 |
---|---|---|
committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-14 20:51:14 +0000 |
commit | 0fb4abfcaea7a139f2429b09aa5fcb114a65d33a (patch) | |
tree | 4bc749493217cc399356e4e5855082572033afdc /mojo/shell | |
parent | 539c1022ad2837b2171d510252afa575f89d9dcb (diff) | |
download | chromium_src-0fb4abfcaea7a139f2429b09aa5fcb114a65d33a.zip chromium_src-0fb4abfcaea7a139f2429b09aa5fcb114a65d33a.tar.gz chromium_src-0fb4abfcaea7a139f2429b09aa5fcb114a65d33a.tar.bz2 |
Revert 263717 "Make mojo_system static and mojo_system_impl a co..."
Reason for revert: broke Win x64 Builder:
http://build.chromium.org/p/chromium.win/builders/Win%20x64%20Builder/builds/17235/
> Make mojo_system static and mojo_system_impl a component, never use both
>
> BUG=
> R=viettrungluu@chromium.org
>
> Review URL: https://codereview.chromium.org/231353002
TBR=davemoore@chromium.org
Review URL: https://codereview.chromium.org/237703002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell')
-rw-r--r-- | mojo/shell/in_process_dynamic_service_runner.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/mojo/shell/in_process_dynamic_service_runner.cc b/mojo/shell/in_process_dynamic_service_runner.cc index 6604180..9030d59 100644 --- a/mojo/shell/in_process_dynamic_service_runner.cc +++ b/mojo/shell/in_process_dynamic_service_runner.cc @@ -11,7 +11,6 @@ #include "base/logging.h" #include "base/message_loop/message_loop_proxy.h" #include "base/scoped_native_library.h" -#include "mojo/public/platform/native/system_thunks.h" namespace mojo { namespace shell { @@ -64,20 +63,6 @@ void InProcessDynamicServiceRunner::Run() { break; } - MojoSetSystemThunksFn mojo_set_system_thunks_fn = - reinterpret_cast<MojoSetSystemThunksFn>(app_library.GetFunctionPointer( - "MojoSetSystemThunks")); - if (mojo_set_system_thunks_fn) { - MojoSystemThunks system_thunks = MojoMakeSystemThunks(); - size_t expected_size = mojo_set_system_thunks_fn(&system_thunks); - if (expected_size > sizeof(MojoSystemThunks)) { - LOG(ERROR) - << "Invalid DSO. Expected MojoSystemThunks size: " - << expected_size; - break; - } - } - typedef MojoResult (*MojoMainFunction)(MojoHandle); MojoMainFunction main_function = reinterpret_cast<MojoMainFunction>( app_library.GetFunctionPointer("MojoMain")); |