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

Side by Side Diff: chrome/browser/sync/profile_sync_service_unittest.cc

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/file_util.h" 5 #include "base/file_util.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/net/gaia/token_service.h" 9 #include "chrome/browser/net/gaia/token_service.h"
10 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h" 10 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h"
(...skipping 15 matching lines...) Expand all
26 #include "webkit/glue/webkit_glue.h" 26 #include "webkit/glue/webkit_glue.h"
27 27
28 // TODO(akalin): Add tests here that exercise the whole 28 // TODO(akalin): Add tests here that exercise the whole
29 // ProfileSyncService/SyncBackendHost stack while mocking out as 29 // ProfileSyncService/SyncBackendHost stack while mocking out as
30 // little as possible. 30 // little as possible.
31 31
32 namespace browser_sync { 32 namespace browser_sync {
33 33
34 namespace { 34 namespace {
35 35
36 using content::BrowserThread;
36 using testing::_; 37 using testing::_;
37 using testing::AtLeast; 38 using testing::AtLeast;
38 using testing::AtMost; 39 using testing::AtMost;
39 using testing::Return; 40 using testing::Return;
40 using testing::StrictMock; 41 using testing::StrictMock;
41 42
42 class ProfileSyncServiceTest : public testing::Test { 43 class ProfileSyncServiceTest : public testing::Test {
43 protected: 44 protected:
44 ProfileSyncServiceTest() 45 ProfileSyncServiceTest()
45 : ui_thread_(BrowserThread::UI, &ui_loop_), 46 : ui_thread_(BrowserThread::UI, &ui_loop_),
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 // This will still exist, but the text should have changed. 273 // This will still exist, but the text should have changed.
273 ASSERT_TRUE(file_util::PathExists(sync_file2)); 274 ASSERT_TRUE(file_util::PathExists(sync_file2));
274 std::string file2text; 275 std::string file2text;
275 ASSERT_TRUE(file_util::ReadFileToString(sync_file2, &file2text)); 276 ASSERT_TRUE(file_util::ReadFileToString(sync_file2, &file2text));
276 ASSERT_NE(file2text.compare(nonsense2), 0); 277 ASSERT_NE(file2text.compare(nonsense2), 0);
277 } 278 }
278 279
279 } // namespace 280 } // namespace
280 281
281 } // namespace browser_sync 282 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service_startup_unittest.cc ('k') | chrome/browser/sync/profile_sync_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698