Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5684)

Unified Diff: chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc

Issue 9809009: Fix failures from GDataFileSystemTest unit tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc b/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc
index 32b7b134c81ea4fed2207cff7276fed555b2998e..a3c7a871e0e1850e7fff6a28ab2b652eb71f412b 100644
--- a/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc
+++ b/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc
@@ -99,8 +99,8 @@ class GDataFileSystemTest : public testing::Test {
protected:
GDataFileSystemTest()
: ui_thread_(content::BrowserThread::UI, &message_loop_),
- io_thread_(content::BrowserThread::IO, &message_loop_),
file_thread_(content::BrowserThread::FILE),
+ io_thread_(content::BrowserThread::IO, &message_loop_),
file_system_(NULL),
mock_doc_service_(NULL),
mock_sync_client_(NULL),
@@ -775,9 +775,11 @@ class GDataFileSystemTest : public testing::Test {
};
MessageLoopForUI message_loop_;
+ // The order of the test threads is important, do not change the order.
+ // See also content/browser/browser_thread_imple.cc.
content::TestBrowserThread ui_thread_;
- content::TestBrowserThread io_thread_;
content::TestBrowserThread file_thread_;
+ content::TestBrowserThread io_thread_;
scoped_ptr<TestingProfile> profile_;
scoped_refptr<CallbackHelper> callback_helper_;
GDataFileSystem* file_system_;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698