diff options
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 4 | ||||
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.h | 10 | ||||
| -rw-r--r-- | chrome_frame/test/reliability/page_load_test.cc | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 48ed3ee..7129c91 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -304,8 +304,8 @@ CFUrlRequestUnittestRunner::CFUrlRequestUnittestRunner(int argc, char** argv) registrar_(chrome_frame_test::GetTestBedType()), test_result_(0) { // Register the main thread by instantiating it, but don't call any methods. - main_thread_.reset(new BrowserThread(BrowserThread::UI, - MessageLoop::current())); + main_thread_.reset(new DeprecatedBrowserThread(BrowserThread::UI, + MessageLoop::current())); DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); fake_chrome_.Initialize(); pss_subclass_.reset(new ProcessSingletonSubclass(this)); diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h index f804bb2..ea72a7b 100644 --- a/chrome_frame/test/net/fake_external_tab.h +++ b/chrome_frame/test/net/fake_external_tab.h @@ -13,11 +13,11 @@ #include "base/win/scoped_handle.h" #include "chrome/app/scoped_ole_initializer.h" #include "chrome/browser/browser_process_impl.h" -#include "chrome_frame/test_utils.h" -#include "chrome_frame/test/test_server.h" -#include "chrome_frame/test/net/test_automation_provider.h" #include "chrome_frame/test/net/process_singleton_subclass.h" -#include "content/browser/browser_thread.h" +#include "chrome_frame/test/net/test_automation_provider.h" +#include "chrome_frame/test/test_server.h" +#include "chrome_frame/test_utils.h" +#include "content/public/browser/browser_thread.h" #include "net/base/net_test_suite.h" class ProcessSingleton; @@ -105,7 +105,7 @@ class CFUrlRequestUnittestRunner // on the main thread. FakeExternalTab fake_chrome_; scoped_ptr<ProcessSingletonSubclass> pss_subclass_; - scoped_ptr<BrowserThread> main_thread_; + scoped_ptr<DeprecatedBrowserThread> main_thread_; ScopedChromeFrameRegistrar registrar_; int test_result_; }; diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index 760bb79..7dd88e6 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -54,7 +54,7 @@ #include "chrome_frame/test/ie_event_sink.h" #include "chrome_frame/test/reliability/page_load_test.h" #include "chrome_frame/utils.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "net/base/net_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" |