Skip to content

Commit

Permalink
Revert 250439 "Mojo: Add a public/environment/test_support.h."
Browse files Browse the repository at this point in the history
This isn't quite right. It breaks (on a Linux shared library build)
mojo_shell_unittests at runtime. The stuff in test_support.h also
differs considerably from other stuff in environment/ (it's not
something chosen by the app), so it doesn't belong there. Hmmm.

> Mojo: Add a public/environment/test_support.h.
> 
> Remove public/tests's base dependency.
> 
> R=darin@chromium.org
> 
> Review URL: https://codereview.chromium.org/145073008

TBR=viettrungluu@chromium.org,darin@chromium.org

Review URL: https://codereview.chromium.org/150203008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250454 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
viettrungluu@chromium.org committed Feb 11, 2014
1 parent 81ad15f commit 3ae54ce
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 48 deletions.
17 changes: 0 additions & 17 deletions mojo/environment/test_support.cc

This file was deleted.

3 changes: 0 additions & 3 deletions mojo/mojo.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
'../base/base.gyp:base',
'../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
'mojo_environment_chromium',
'mojo_system',
'mojo_system_impl',
],
Expand All @@ -79,7 +78,6 @@
'type': 'static_library',
'dependencies': [
'../base/base.gyp:test_support_base',
'mojo_environment_chromium',
'mojo_system',
'mojo_system_impl',
],
Expand Down Expand Up @@ -281,7 +279,6 @@
'environment/default_async_waiter.cc',
'environment/buffer_tls.cc',
'environment/environment.cc',
'environment/test_support.cc',
],
'include_dirs': [
'..',
Expand Down
1 change: 0 additions & 1 deletion mojo/mojo_public.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@
'public/environment/buffer_tls.h',
'public/environment/default_async_waiter.h',
'public/environment/environment.h',
'public/environment/test_support.h',
'public/environment/lib/default_async_waiter.cc',
'public/environment/lib/buffer_tls.cc',
'public/environment/lib/buffer_tls_setup.h',
Expand Down
23 changes: 0 additions & 23 deletions mojo/public/environment/test_support.h

This file was deleted.

2 changes: 2 additions & 0 deletions mojo/public/tests/DEPS
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# TODO(darin): Eliminate the base dependency!
include_rules = [
"+base",
"+mojo",
]
8 changes: 4 additions & 4 deletions mojo/public/tests/test_support.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "mojo/public/tests/test_support.h"

#include "mojo/public/environment/test_support.h"
#include "base/test/perf_log.h"
#include "mojo/public/system/core_cpp.h"

namespace mojo {
Expand Down Expand Up @@ -82,9 +82,9 @@ void IterateAndReportPerf(const char* test_name,
end_time = GetTimeTicksNow();
} while (end_time - start_time < kPerftestTimeMicroseconds);

LogPerfResult(test_name,
1000000.0 * iterations / (end_time - start_time),
"iterations/second");
base::LogPerfResult(test_name,
1000000.0 * iterations / (end_time - start_time),
"iterations/second");
}

} // namespace test
Expand Down

0 comments on commit 3ae54ce

Please sign in to comment.