| Index: components/sync/test/fake_server/fake_server.h
|
| diff --git a/sync/test/fake_server/fake_server.h b/components/sync/test/fake_server/fake_server.h
|
| similarity index 93%
|
| rename from sync/test/fake_server/fake_server.h
|
| rename to components/sync/test/fake_server/fake_server.h
|
| index 03b3c324c006bcb21c71573b9c663b7a5145026a..66bb7da496dd397084d2a271c6b7340b82f229a8 100644
|
| --- a/sync/test/fake_server/fake_server.h
|
| +++ b/components/sync/test/fake_server/fake_server.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SYNC_TEST_FAKE_SERVER_FAKE_SERVER_H_
|
| -#define SYNC_TEST_FAKE_SERVER_FAKE_SERVER_H_
|
| +#ifndef COMPONENTS_SYNC_TEST_FAKE_SERVER_FAKE_SERVER_H_
|
| +#define COMPONENTS_SYNC_TEST_FAKE_SERVER_FAKE_SERVER_H_
|
|
|
| #include <stdint.h>
|
|
|
| @@ -16,9 +16,9 @@
|
| #include "base/observer_list.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "base/values.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/protocol/sync.pb.h"
|
| -#include "sync/test/fake_server/fake_server_entity.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/protocol/sync.pb.h"
|
| +#include "components/sync/test/fake_server/fake_server_entity.h"
|
|
|
| namespace fake_server {
|
|
|
| @@ -32,9 +32,8 @@ class FakeServer {
|
|
|
| // Called after FakeServer has processed a successful commit. The types
|
| // updated as part of the commit are passed in |committed_model_types|.
|
| - virtual void OnCommit(
|
| - const std::string& committer_id,
|
| - syncer::ModelTypeSet committed_model_types) = 0;
|
| + virtual void OnCommit(const std::string& committer_id,
|
| + syncer::ModelTypeSet committed_model_types) = 0;
|
| };
|
|
|
| FakeServer();
|
| @@ -113,11 +112,10 @@ class FakeServer {
|
| // ClientToServerResponse on all subsequent sync requests. This method should
|
| // not be called if TriggerError has previously been called. Returns true if
|
| // error triggering was successfully configured.
|
| - bool TriggerActionableError(
|
| - const sync_pb::SyncEnums::ErrorType& error_type,
|
| - const std::string& description,
|
| - const std::string& url,
|
| - const sync_pb::SyncEnums::Action& action);
|
| + bool TriggerActionableError(const sync_pb::SyncEnums::ErrorType& error_type,
|
| + const std::string& description,
|
| + const std::string& url,
|
| + const sync_pb::SyncEnums::Action& action);
|
|
|
| // Instructs the server to send triggered errors on every other request
|
| // (starting with the first one after this call). This feature can be used to
|
| @@ -267,4 +265,4 @@ class FakeServer {
|
|
|
| } // namespace fake_server
|
|
|
| -#endif // SYNC_TEST_FAKE_SERVER_FAKE_SERVER_H_
|
| +#endif // COMPONENTS_SYNC_TEST_FAKE_SERVER_FAKE_SERVER_H_
|
|
|