Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(332)

Unified Diff: chrome/browser/search_engines/template_url_service_sync_unittest.cc

Issue 9460047: sync: remove use of protobuf extensions in protocol to reduce static init overhead. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fred's review Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/search_engines/template_url_service_sync_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
index c784175d25756437f201a8ab933caaeef9dd6504..b425a276681bed298243a47b27b303b7599f4086 100644
--- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
@@ -10,6 +10,7 @@
#include "chrome/browser/search_engines/template_url_service.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/sync/protocol/search_engine_specifics.pb.h"
+#include "chrome/browser/sync/protocol/sync.pb.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_pref_service.h"
@@ -23,20 +24,17 @@ namespace {
// Extract the GUID from a search engine SyncData.
std::string GetGUID(const SyncData& sync_data) {
- return sync_data.GetSpecifics().GetExtension(
- sync_pb::search_engine).sync_guid();
+ return sync_data.GetSpecifics().search_engine().sync_guid();
}
// Extract the URL from a search engine SyncData.
std::string GetURL(const SyncData& sync_data) {
- return sync_data.GetSpecifics().GetExtension(
- sync_pb::search_engine).url();
+ return sync_data.GetSpecifics().search_engine().url();
}
// Extract the keyword from a search engine SyncData.
std::string GetKeyword(const SyncData& sync_data) {
- return sync_data.GetSpecifics().GetExtension(
- sync_pb::search_engine).keyword();
+ return sync_data.GetSpecifics().search_engine().keyword();
}
// TODO(stevet): Share these with template_url_service_unittest.
« no previous file with comments | « chrome/browser/search_engines/template_url_service.cc ('k') | chrome/browser/sync/abstract_profile_sync_service_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698