diff options
| author | Iain Merrick <husky@google.com> | 2010-11-01 12:19:54 +0000 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-11-03 10:21:10 +0000 |
| commit | 731df977c0511bca2206b5f333555b1205ff1f43 (patch) | |
| tree | 0e750b949b3f00a1ac11fda25d3c2de512f2b465 /chrome/browser/gtk/options/cookies_view_unittest.cc | |
| parent | 5add15e10e7bb80512f2c597ca57221314abe577 (diff) | |
| download | external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2 | |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'chrome/browser/gtk/options/cookies_view_unittest.cc')
| -rw-r--r-- | chrome/browser/gtk/options/cookies_view_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/gtk/options/cookies_view_unittest.cc b/chrome/browser/gtk/options/cookies_view_unittest.cc index 2a71eea..76461a1 100644 --- a/chrome/browser/gtk/options/cookies_view_unittest.cc +++ b/chrome/browser/gtk/options/cookies_view_unittest.cc @@ -22,7 +22,7 @@ class CookiesViewTest : public testing::Test { public: - CookiesViewTest() : io_thread_(ChromeThread::IO, &message_loop_) { + CookiesViewTest() : io_thread_(BrowserThread::IO, &message_loop_) { } virtual ~CookiesViewTest() { @@ -198,7 +198,7 @@ class CookiesViewTest : public testing::Test { protected: MessageLoop message_loop_; - ChromeThread io_thread_; + BrowserThread io_thread_; scoped_ptr<TestingProfile> profile_; scoped_refptr<MockBrowsingDataDatabaseHelper> |