diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 06:45:11 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 06:45:11 +0000 |
| commit | 0a7e0e6f6a29325f68db1c65b6088b039392fe6a (patch) | |
| tree | 83fe9654c8d670c7d3f11ade65da85beb01b12eb /chrome/test | |
| parent | 76a1baf544ca969c27282d3a0b882646b1626794 (diff) | |
| download | chromium_src-0a7e0e6f6a29325f68db1c65b6088b039392fe6a.zip chromium_src-0a7e0e6f6a29325f68db1c65b6088b039392fe6a.tar.gz chromium_src-0a7e0e6f6a29325f68db1c65b6088b039392fe6a.tar.bz2 | |
Move ScopedStubCrosEnabler to cros_library.h and use it in Chrome OS tests.
BUG=chromium-os:9872
TEST=run all chrome os tests with try
Review URL: http://codereview.chromium.org/5529002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/in_process_browser_test.cc | 6 | ||||
| -rw-r--r-- | chrome/test/in_process_browser_test.h | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index 1451a19..c0711d2 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -41,10 +41,6 @@ #include "net/test/test_server.h" #include "sandbox/src/dep.h" -#if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/cros/cros_library.h" -#endif // defined(OS_CHROMEOS) - #if defined(OS_MACOSX) #include "base/mac_util.h" #endif @@ -150,8 +146,6 @@ void InProcessBrowserTest::SetUp() { RenderProcessHost::set_run_renderer_in_process(true); #if defined(OS_CHROMEOS) - chromeos::CrosLibrary::Get()->GetTestApi()->SetUseStubImpl(); - // Make sure that the log directory exists. FilePath log_dir = logging::GetSessionLogFile(*command_line).DirName(); file_util::CreateDirectory(log_dir); diff --git a/chrome/test/in_process_browser_test.h b/chrome/test/in_process_browser_test.h index b71ca5c..fc7d34f 100644 --- a/chrome/test/in_process_browser_test.h +++ b/chrome/test/in_process_browser_test.h @@ -14,6 +14,10 @@ #include "net/test/test_server.h" #include "testing/gtest/include/gtest/gtest.h" +#if defined(OS_CHROMEOS) +#include "chrome/browser/chromeos/cros/cros_library.h" +#endif // defined(OS_CHROMEOS) + class Browser; class CommandLine; class Profile; @@ -185,6 +189,10 @@ class InProcessBrowserTest : public testing::Test { // specified in the command line. ScopedTempDir temp_user_data_dir_; +#if defined(OS_CHROMEOS) + chromeos::ScopedStubCrosEnabler stub_cros_enabler_; +#endif // defined(OS_CHROMEOS) + DISALLOW_COPY_AND_ASSIGN(InProcessBrowserTest); }; |