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

Unified Diff: chrome/browser/sync/profile_sync_service_session_unittest.cc

Issue 8596017: sync: rename ProfileSyncFactory to ProfileSyncComponentsFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/profile_sync_service_session_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc
index f5aac7b7f71432e506fb084609903b94dc66a0bc..ad9ddf88a821cc3cce423215698c8bfdb6e6575d 100644
--- a/chrome/browser/sync/profile_sync_service_session_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc
@@ -24,7 +24,7 @@
#include "chrome/browser/sync/internal_api/read_node.h"
#include "chrome/browser/sync/internal_api/read_transaction.h"
#include "chrome/browser/sync/internal_api/write_transaction.h"
-#include "chrome/browser/sync/profile_sync_factory_mock.h"
+#include "chrome/browser/sync/profile_sync_components_factory_mock.h"
#include "chrome/browser/sync/profile_sync_test_util.h"
#include "chrome/browser/sync/protocol/session_specifics.pb.h"
#include "chrome/browser/sync/protocol/sync.pb.h"
@@ -230,7 +230,7 @@ class ProfileSyncServiceSessionTest
sync_service_.get(), model_associator_,
true /* setup_for_test */);
EXPECT_CALL(factory_, CreateSessionSyncComponents(_, _)).
- WillOnce(Return(ProfileSyncFactory::SyncComponents(
+ WillOnce(Return(ProfileSyncComponentsFactory::SyncComponents(
model_associator_, change_processor_)));
EXPECT_CALL(factory_, CreateDataTypeManager(_, _)).
WillOnce(ReturnNewDataTypeManager());
@@ -252,7 +252,7 @@ class ProfileSyncServiceSessionTest
SessionModelAssociator* model_associator_;
SessionChangeProcessor* change_processor_;
SessionID window_id_;
- ProfileSyncFactoryMock factory_;
+ ProfileSyncComponentsFactoryMock factory_;
scoped_ptr<TestProfileSyncService> sync_service_;
const gfx::Rect window_bounds_;
bool notified_of_update_;

Powered by Google App Engine
This is Rietveld 408576698