[NOT FOR REVIEW] Copy of Max's CL with conflicts fixed

components/sync_driver/glue/sync_backend_host_mock.cc

Index: components/sync_driver/glue/sync_backend_host_mock.cc
diff --git a/chrome/browser/sync/glue/sync_backend_host_mock.cc b/components/sync_driver/glue/sync_backend_host_mock.cc
similarity index 98%
rename from chrome/browser/sync/glue/sync_backend_host_mock.cc
rename to components/sync_driver/glue/sync_backend_host_mock.cc
index 59c015d5fd82c16e06f2cb7cf7670b169485efc2..dd7a4dd997d017e805eb663bbc894c4536925a45 100644
--- a/chrome/browser/sync/glue/sync_backend_host_mock.cc
+++ b/components/sync_driver/glue/sync_backend_host_mock.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/sync/glue/sync_backend_host_mock.h"
+#include "components/sync_driver/glue/sync_backend_host_mock.h"
 
 #include "components/sync_driver/sync_frontend.h"
 #include "sync/internal_api/public/activation_context.h"
@@ -104,7 +104,7 @@ bool SyncBackendHostMock::HasUnsyncedItems() const {
 }
 
 bool SyncBackendHostMock::IsNigoriEnabled() const {
- return true;
+  return true;
 }
 
 syncer::PassphraseType SyncBackendHostMock::GetPassphraseType() const {