Index: chrome/browser/android/contextualsearch/contextual_search_delegate.cc |
diff --git a/chrome/browser/android/contextualsearch/contextual_search_delegate.cc b/chrome/browser/android/contextualsearch/contextual_search_delegate.cc |
index c00aa10772e1c58d35188ba6fb0dcfe3016d441a..34705b36b0140b868708eb7ac40b8c645d7b1803 100644 |
--- a/chrome/browser/android/contextualsearch/contextual_search_delegate.cc |
+++ b/chrome/browser/android/contextualsearch/contextual_search_delegate.cc |
@@ -5,6 +5,7 @@ |
#include "chrome/browser/android/contextualsearch/contextual_search_delegate.h" |
#include <algorithm> |
+#include <utility> |
#include "base/base64.h" |
#include "base/command_line.h" |
@@ -60,7 +61,7 @@ const int kSurroundingSizeForUI = 60; |
// The version of the Contextual Cards API that we want to invoke. |
const int kContextualCardsVersion = 1; |
-} // namespace |
+} // namespace |
// URLFetcher ID, only used for tests: we only have one kind of fetcher. |
const int ContextualSearchDelegate::kContextualSearchURLFetcherID = 1; |
@@ -409,7 +410,7 @@ bool ContextualSearchDelegate::CanSendPageURL( |
// History. |
browser_sync::ProfileSyncService* service = |
ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile); |
- sync_driver::SyncPrefs sync_prefs(profile->GetPrefs()); |
+ syncer::SyncPrefs sync_prefs(profile->GetPrefs()); |
if (service == NULL || !service->CanSyncStart() || |
!sync_prefs.GetPreferredDataTypes(syncer::UserTypes()) |
.Has(syncer::PROXY_TABS) || |