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/browsing_data_database_helper_browsertest.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/browsing_data_database_helper_browsertest.cc')
| -rw-r--r-- | chrome/browser/browsing_data_database_helper_browsertest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browsing_data_database_helper_browsertest.cc b/chrome/browser/browsing_data_database_helper_browsertest.cc index 081d5a0..82b47fb 100644 --- a/chrome/browser/browsing_data_database_helper_browsertest.cc +++ b/chrome/browser/browsing_data_database_helper_browsertest.cc @@ -5,7 +5,7 @@ #include "base/file_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browsing_data_database_helper.h" -#include "chrome/browser/chrome_thread.h" +#include "chrome/browser/browser_thread.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/testing_profile.h" #include "chrome/test/ui_test_utils.h" @@ -60,7 +60,7 @@ class StopTestOnCallback { void Callback(const std::vector<BrowsingDataDatabaseHelper::DatabaseInfo>& database_info_list) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); ASSERT_EQ(1UL, database_info_list.size()); EXPECT_EQ(std::string(kTestIdentifier1), database_info_list.at(0).origin_identifier); |