Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / components / sync_driver / non_ui_data_type_controller_unittest.cc

diff --git a/src/components/sync_driver/non_ui_data_type_controller_unittest.cc b/src/components/sync_driver/non_ui_data_type_controller_unittest.cc
index 6172019..5eef2e3 100644 (file)
--- a/src/components/sync_driver/non_ui_data_type_controller_unittest.cc
+++ b/src/components/sync_driver/non_ui_data_type_controller_unittest.cc
@@ -131,7 +131,7 @@ class NonUIDataTypeControllerFake
   }
 
   virtual SharedChangeProcessor* CreateSharedChangeProcessor() OVERRIDE {
-    return change_processor_;
+    return change_processor_.get();
   }
 
  protected:
@@ -196,7 +196,7 @@ class SyncNonUIDataTypeControllerTest : public testing::Test {
     non_ui_dtc_ =
         new NonUIDataTypeControllerFake(NULL,
                                         dtc_mock_.get(),
-                                        change_processor_,
+                                        change_processor_.get(),
                                         backend_thread_.message_loop_proxy());
   }
 
@@ -486,7 +486,7 @@ TEST_F(SyncNonUIDataTypeControllerTest, OnSingleDataTypeUnrecoverableError) {
   EXPECT_EQ(DataTypeController::RUNNING, non_ui_dtc_->state());
 
   testing::Mock::VerifyAndClearExpectations(&start_callback_);
-  EXPECT_CALL(start_callback_, Run(DataTypeController::RUNTIME_ERROR, _, _));
+  EXPECT_CALL(model_load_callback_, Run(_, _));
   syncer::SyncError error(FROM_HERE,
                           syncer::SyncError::DATATYPE_ERROR,
                           "error",