summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-30 00:44:21 +0000
committernick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-30 00:44:21 +0000
commit2d4f7dd2730272ae457e5ef10449a747fdd96a84 (patch)
tree954d2a5a12d21bc130cae7ec0787d29e2229ba44
parentd38c8cb35e8c9860981e2df77a98a43b32c9df8f (diff)
downloadchromium_src-2d4f7dd2730272ae457e5ef10449a747fdd96a84.zip
chromium_src-2d4f7dd2730272ae457e5ef10449a747fdd96a84.tar.gz
chromium_src-2d4f7dd2730272ae457e5ef10449a747fdd96a84.tar.bz2
Remove the syncapi stub.
This was only needed so that we could compile the sync glue code without access to a syncapi binary. Now that syncapi can be built from source, it's obsolete. Review URL: http://codereview.chromium.org/242060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27577 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/sync/engine/syncapi_stub.cc305
-rwxr-xr-xchrome/chrome.gyp51
2 files changed, 15 insertions, 341 deletions
diff --git a/chrome/browser/sync/engine/syncapi_stub.cc b/chrome/browser/sync/engine/syncapi_stub.cc
deleted file mode 100644
index 41ad4a9..0000000
--- a/chrome/browser/sync/engine/syncapi_stub.cc
+++ /dev/null
@@ -1,305 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifdef CHROME_PERSONALIZATION
-
-#include "base/logging.h"
-#include "chrome/browser/sync/engine/syncapi.h"
-
-namespace sync_api {
-
-struct BaseNode::BaseNodeInternal {
-};
-
-struct UserShare {
-};
-
-class SyncInternal {
- DISALLOW_COPY_AND_ASSIGN(SyncInternal);
-};
-
-// BaseNode.
-BaseNode::BaseNode() : data_(NULL) {}
-BaseNode::~BaseNode() {}
-int64 BaseNode::GetParentId() const {
- NOTIMPLEMENTED();
- return 0;
-}
-
-int64 BaseNode::GetId() const {
- NOTIMPLEMENTED();
- return 0;
-}
-
-bool BaseNode::GetIsFolder() const {
- NOTIMPLEMENTED();
- return false;
-}
-
-const sync_char16* BaseNode::GetTitle() const {
- NOTIMPLEMENTED();
- return NULL;
-}
-
-const sync_char16* BaseNode::GetURL() const {
- NOTIMPLEMENTED();
- return NULL;
-}
-
-const int64* BaseNode::GetChildIds(size_t* child_count) const {
- NOTIMPLEMENTED();
- return NULL;
-}
-
-int64 BaseNode::GetPredecessorId() const {
- NOTIMPLEMENTED();
- return 0;
-}
-
-int64 BaseNode::GetSuccessorId() const {
- NOTIMPLEMENTED();
- return 0;
-}
-
-int64 BaseNode::GetFirstChildId() const {
- NOTIMPLEMENTED();
- return 0;
-}
-
-const unsigned char* BaseNode::GetFaviconBytes(size_t* size_in_bytes) {
- NOTIMPLEMENTED();
- return NULL;
-}
-
-int64 BaseNode::GetExternalId() const {
- NOTIMPLEMENTED();
- return 0;
-}
-
-
-////////////////////////////////////
-// WriteNode member definitions
-void WriteNode::SetIsFolder(bool folder) {
- NOTIMPLEMENTED();
-}
-
-void WriteNode::SetTitle(const sync_char16* title) {
- NOTIMPLEMENTED();
-}
-
-void WriteNode::SetURL(const sync_char16* url) {
- NOTIMPLEMENTED();
-}
-
-void WriteNode::SetExternalId(int64 id) {
- NOTIMPLEMENTED();
-}
-
-WriteNode::WriteNode(WriteTransaction* transaction)
- : entry_(NULL), transaction_(NULL) {
- NOTIMPLEMENTED();
-}
-
-WriteNode::~WriteNode() {
- NOTIMPLEMENTED();
-}
-
-bool WriteNode::InitByIdLookup(int64 id) {
- NOTIMPLEMENTED();
- return false;
-}
-
-bool WriteNode::InitByCreation(const BaseNode& parent,
- const BaseNode* predecessor) {
- NOTIMPLEMENTED();
- return false;
-}
-
-bool WriteNode::SetPosition(const BaseNode& new_parent,
- const BaseNode* predecessor) {
- NOTIMPLEMENTED();
- return false;
-}
-
-const syncable::Entry* WriteNode::GetEntry() const {
- NOTIMPLEMENTED();
- return NULL;
-}
-
-const BaseTransaction* WriteNode::GetTransaction() const {
- NOTIMPLEMENTED();
- return NULL;
-}
-
-void WriteNode::Remove() {
- NOTIMPLEMENTED();
-}
-
-void WriteNode::PutPredecessor(const BaseNode* predecessor) {
- NOTIMPLEMENTED();
-}
-
-void WriteNode::SetFaviconBytes(const unsigned char* bytes,
- size_t size_in_bytes) {
- NOTIMPLEMENTED();
-}
-
-void WriteNode::MarkForSyncing() {
- NOTIMPLEMENTED();
-}
-
-//////////////////////////////////////////////////////////////////////////
-// ReadNode member definitions
-ReadNode::ReadNode(const BaseTransaction* transaction)
- : entry_(NULL), transaction_(NULL) {
- NOTIMPLEMENTED();
-}
-
-ReadNode::~ReadNode() {
- NOTIMPLEMENTED();
-}
-
-void ReadNode::InitByRootLookup() {
- NOTIMPLEMENTED();
-}
-
-bool ReadNode::InitByIdLookup(int64 id) {
- NOTIMPLEMENTED();
- return false;
-}
-
-const syncable::Entry* ReadNode::GetEntry() const {
- NOTIMPLEMENTED();
- return NULL;
-}
-
-const BaseTransaction* ReadNode::GetTransaction() const {
- NOTIMPLEMENTED();
- return NULL;
-}
-
-bool ReadNode::InitByTagLookup(const sync_char16* tag) {
- NOTIMPLEMENTED();
- return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// ReadTransaction member definitions
-ReadTransaction::ReadTransaction(UserShare* share) : BaseTransaction(NULL),
- transaction_(NULL) {
- NOTIMPLEMENTED();
-}
-
-ReadTransaction::~ReadTransaction() {
- NOTIMPLEMENTED();
-}
-
-syncable::BaseTransaction* ReadTransaction::GetWrappedTrans() const {
- NOTIMPLEMENTED();
- return NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// WriteTransaction member definitions
-WriteTransaction::WriteTransaction(UserShare* share) : BaseTransaction(NULL),
- transaction_(NULL) {
- NOTIMPLEMENTED();
-}
-
-WriteTransaction::~WriteTransaction() {
- NOTIMPLEMENTED();
-}
-
-syncable::BaseTransaction* WriteTransaction::GetWrappedTrans() const {
- NOTIMPLEMENTED();
- return NULL;
-}
-
-// SyncManager
-
-SyncManager::SyncManager() {
- NOTIMPLEMENTED();
-}
-
-bool SyncManager::Init(const sync_char16* database_location,
- const char* sync_server_and_path,
- int sync_server_port,
- const char* gaia_service_id,
- const char* gaia_source,
- bool use_ssl,
- HttpPostProviderFactory* post_factory,
- HttpPostProviderFactory* auth_post_factory,
- ModelSafeWorkerInterface* model_safe_worker,
- bool attempt_last_user_authentication,
- const char* user_agent) {
- NOTIMPLEMENTED();
- return false;
-}
-
-void SyncManager::Authenticate(const char* username, const char* password) {
- NOTIMPLEMENTED();
-}
-
-const char* SyncManager::GetAuthenticatedUsername() {
- NOTIMPLEMENTED();
- return NULL;
-}
-
-SyncManager::~SyncManager() {
- NOTIMPLEMENTED();
-}
-
-void SyncManager::SetObserver(Observer* observer) {
- NOTIMPLEMENTED();
-}
-
-void SyncManager::RemoveObserver() {
- NOTIMPLEMENTED();
-}
-
-void SyncManager::Shutdown() {
- NOTIMPLEMENTED();
-}
-
-SyncManager::Status::Summary SyncManager::GetStatusSummary() const {
- NOTIMPLEMENTED();
- return SyncManager::Status::INVALID;
-}
-
-SyncManager::Status SyncManager::GetDetailedStatus() const {
- NOTIMPLEMENTED();
- return SyncManager::Status();
-}
-
-SyncManager::SyncInternal* SyncManager::GetImpl() const {
- NOTIMPLEMENTED();
- return NULL;
-}
-
-void SyncManager::SaveChanges() {
- NOTIMPLEMENTED();
-}
-
-void SyncManager::SetupForTestMode(const sync_char16* test_username) {
- NOTIMPLEMENTED();
-}
-
-//////////////////////////////////////////////////////////////////////////
-// BaseTransaction member definitions
-BaseTransaction::BaseTransaction(UserShare* share) : lookup_(NULL) {
- NOTIMPLEMENTED();
-}
-BaseTransaction::~BaseTransaction() {
- NOTIMPLEMENTED();
-}
-
-UserShare* SyncManager::GetUserShare() const {
- NOTIMPLEMENTED();
- return NULL;
-}
-
-} // namespace sync_api
-
-#endif // CHROME_PERSONALIZATION
-
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 6ea5180..0694d8a 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -141,11 +141,8 @@
['OS=="win"', {
# Whether or not browser sync code is built in.
'chrome_personalization%': 1,
- # Used to build a stub (no-op) syncapi engine.
- 'use_syncapi_stub%': 0,
}, {
'chrome_personalization%': 0,
- 'use_syncapi_stub%': 1,
}], # OS=="win"
['target_arch=="ia32"', {
'nacl_defines': [
@@ -4636,7 +4633,7 @@
'test/browser_with_test_window_test.h',
],
}],
- ['use_syncapi_stub==1', { # These tests require a non-stub sync impl.
+ ['chrome_personalization==1', {
'sources!': [
'browser/sync/profile_sync_service_unittest.cc',
]
@@ -4691,24 +4688,8 @@
['chrome_personalization==0', {
# Empty target.
'type': 'none',
- }],
- ['chrome_personalization==1 and use_syncapi_stub==1', {
- # Build a stub library.
- 'type': 'shared_library',
- 'defines': [
- 'COMPILING_SYNCAPI_LIBRARY',
- ],
- 'sources': [
- 'browser/sync/engine/syncapi_stub.cc',
- ],
- 'include_dirs': [
- '..',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- ],
- }],
- ['chrome_personalization==1 and use_syncapi_stub==0', {
+ }, {
+ # Build sync.
'type': 'shared_library',
'sources': [
'browser/sync/engine/syncapi.cc',
@@ -4752,6 +4733,15 @@
'dependencies': [
'../third_party/pthreads-win32/pthreads.gyp:pthreads',
],
+ 'direct_dependent_settings': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'DelayLoadDLLs': [
+ 'syncapi.dll',
+ ],
+ },
+ },
+ },
}],
['OS=="linux"', {
'defines': [
@@ -4760,18 +4750,7 @@
}],
],
}],
- ['chrome_personalization==1 and OS=="win"', {
- 'direct_dependent_settings': { # Shared by stub and non-stub.
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'DelayLoadDLLs': [
- 'syncapi.dll',
- ],
- },
- },
- },
- }],
- ], # chrome_personalization / use_syncapi_stub condition chain.
+ ],
},
{
'target_name': 'page_cycler_tests',
@@ -6421,7 +6400,7 @@
},
]
}],
- ['chrome_personalization==1 and use_syncapi_stub==0', {
+ ['chrome_personalization==1', {
# These targets get built only where sync is supported.
'targets': [
{
@@ -6807,7 +6786,7 @@
}],
],
},
- ], # targets when chrome_personalization==1 and use_syncapi_stub==0
+ ], # targets when chrome_personalization==1
}],
], # 'conditions'
}