Fix build for expanded sources

Change-Id: I8e0d1e2bd13cc1d530f65ea9f33653660bf345b1
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

2 files changed, 15 insertions, 6 deletions

diff --git a/chromium/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chromium/chrome/browser/prefs/chrome_command_line_pref_store.cc
index 60cd72cedbb..e632eaec4c5 100644
--- a/chromium/chrome/browser/prefs/chrome_command_line_pref_store.cc
+++ b/chromium/chrome/browser/prefs/chrome_command_line_pref_store.cc
@@ -11,7 +11,6 @@
 #include <utility>
 #include <vector>
 
-#include "ash/public/cpp/ash_switches.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ -21,18 +20,21 @@
 #include "build/build_config.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "components/browser_sync/browser_sync_switches.h"
-#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
-#include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
 #include "components/language/core/browser/pref_names.h"
 #include "components/proxy_config/proxy_config_dictionary.h"
 #include "components/proxy_config/proxy_config_pref_names.h"
-#include "components/sync/base/pref_names.h"
 #include "content/public/common/content_switches.h"
 #include "services/network/public/cpp/network_switches.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/display/display_switches.h"
 
+#if !defined(TOOLKIT_QT)
+#include "components/browser_sync/browser_sync_switches.h"
+#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
+#include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
+#include "components/sync/base/pref_names.h"
+#endif
+
 #if defined(OS_CHROMEOS)
 #include "chromeos/constants/chromeos_switches.h"
 #endif
@@ -40,8 +42,10 @@
 const CommandLinePrefStore::SwitchToPreferenceMapEntry
     ChromeCommandLinePrefStore::string_switch_map_[] = {
         {switches::kLang, language::prefs::kApplicationLocale},
+#if !defined(TOOLKIT_QT)
         {data_reduction_proxy::switches::kDataReductionProxy,
          data_reduction_proxy::prefs::kDataReductionProxy},
+#endif
         {switches::kAuthServerWhitelist, prefs::kAuthServerWhitelist},
         {switches::kSSLVersionMin, prefs::kSSLVersionMin},
         {switches::kSSLVersionMax, prefs::kSSLVersionMax},
@@ -57,7 +61,9 @@ const CommandLinePrefStore::SwitchToPreferenceMapEntry
 const CommandLinePrefStore::SwitchToPreferenceMapEntry
     ChromeCommandLinePrefStore::path_switch_map_[] = {
       { switches::kDiskCacheDir, prefs::kDiskCacheDir },
+#if !defined(TOOLKIT_QT)
       { switches::kLocalSyncBackendDir, syncer::prefs::kLocalSyncBackendDir },
+#endif
 };
 
 const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry
@@ -80,8 +86,10 @@ const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry
         {chromeos::switches::kEnableCastReceiver, prefs::kCastReceiverEnabled,
          true},
 #endif
+#if !defined(TOOLKIT_QT)
         {switches::kEnableLocalSyncBackend,
          syncer::prefs::kEnableLocalSyncBackend, true},
+#endif
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
         {switches::kUseSystemDefaultPrinter,
          prefs::kPrintPreviewUseSystemDefaultPrinter, true},
diff --git a/chromium/rlz/buildflags/buildflags.gni b/chromium/rlz/buildflags/buildflags.gni
index d90c6e18335..559fb03d9d8 100644
--- a/chromium/rlz/buildflags/buildflags.gni
+++ b/chromium/rlz/buildflags/buildflags.gni
@@ -3,9 +3,10 @@
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
+import("//build/config/features.gni")
 
 # Whether we are using the rlz library or not.  Platforms like Android send
 # rlz codes for searches but do not use the library.
-enable_rlz_support = is_win || is_mac || is_ios || is_chromeos
+enable_rlz_support = (is_win || is_mac || is_ios || is_chromeos) && !use_qt
 
 enable_rlz = is_chrome_branded && enable_rlz_support