Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / sessions / sessions_apitest.cc

diff --git a/src/chrome/browser/extensions/api/sessions/sessions_apitest.cc b/src/chrome/browser/extensions/api/sessions/sessions_apitest.cc
index 15a4819..28cb25e 100644 (file)
--- a/src/chrome/browser/extensions/api/sessions/sessions_apitest.cc
+++ b/src/chrome/browser/extensions/api/sessions/sessions_apitest.cc
@@ -125,7 +125,7 @@ KeyedService* ExtensionSessionsTest::BuildProfileSyncService(
       new ProfileSyncComponentsFactoryMock();
 
   factory->SetLocalDeviceInfoProvider(
-      scoped_ptr<LocalDeviceInfoProvider>(
+      scoped_ptr<sync_driver::LocalDeviceInfoProvider>(
           new browser_sync::LocalDeviceInfoProviderMock(
               kSessionTags[0],
               "machine name",
@@ -158,7 +158,7 @@ void ExtensionSessionsTest::CreateTestProfileSyncService() {
   syncer::ModelTypeSet preferred_types;
   preferred_types.Put(syncer::SESSIONS);
   GoogleServiceAuthError no_error(GoogleServiceAuthError::NONE);
-  ON_CALL(*service, IsSessionsDataTypeControllerRunning())
+  ON_CALL(*service, IsDataTypeControllerRunning(syncer::SESSIONS))
       .WillByDefault(testing::Return(true));
   ON_CALL(*service, GetRegisteredDataTypes())
       .WillByDefault(testing::Return(syncer::UserTypes()));