Remove / clarify references to iOS in chrome/.
Change-Id: I45224f299e5ac7fcff88241c7a5e0689603717cf
Reviewed-on: https://chromium-review.googlesource.com/1189545
Reviewed-by: Ramin Halavati <[email protected]>
Commit-Queue: Lei Zhang <[email protected]>
Cr-Commit-Position: refs/heads/master@{#586380}diff --git a/chrome/browser/prefs/pref_service_syncable_util.cc b/chrome/browser/prefs/pref_service_syncable_util.cc
index 855391c..6d86f89 100644
--- a/chrome/browser/prefs/pref_service_syncable_util.cc
+++ b/chrome/browser/prefs/pref_service_syncable_util.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/prefs/pref_service_syncable_util.h"
-#include <vector>
+#include <utility>
#include "chrome/browser/prefs/pref_service_incognito_whitelist.h"
#include "chrome/browser/profiles/profile.h"
@@ -28,9 +28,9 @@
sync_preferences::PrefServiceSyncable* pref_service,
PrefStore* incognito_extension_pref_store,
std::unique_ptr<PrefValueStore::Delegate> delegate) {
-
// TODO(https://crbug.com/861722): Current implementation does not cover
- // preferences from iOS. The code should be refactored to cover it.
+ // preferences from iOS. The code should be refactored to cover it. e.g. Moved
+ // to components/ so it can be used on iOS.
return pref_service->CreateIncognitoPrefService(
incognito_extension_pref_store,
diff --git a/chrome/browser/prefs/pref_service_syncable_util.h b/chrome/browser/prefs/pref_service_syncable_util.h
index 4799fd9..0456814 100644
--- a/chrome/browser/prefs/pref_service_syncable_util.h
+++ b/chrome/browser/prefs/pref_service_syncable_util.h
@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_UTIL_H_
#define CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_UTIL_H_
-#include <set>
+#include <memory>
#include "components/prefs/pref_value_store.h"
@@ -34,9 +34,6 @@
// a fresh non-persistent overlay for the user pref store and an individual
// extension pref store (to cache the effective extension prefs for incognito
// windows).
-//
-// If the Mojo pref service is in use |incognito_connector| and |user_connector|
-// must be non-null.
std::unique_ptr<sync_preferences::PrefServiceSyncable>
CreateIncognitoPrefServiceSyncable(
sync_preferences::PrefServiceSyncable* pref_service,
diff --git a/chrome/browser/ui/omnibox/DEPS b/chrome/browser/ui/omnibox/DEPS
deleted file mode 100644
index 091b7f8..0000000
--- a/chrome/browser/ui/omnibox/DEPS
+++ /dev/null
@@ -1,8 +0,0 @@
-specific_include_rules = {
- # OmniboxEditModel can't use WebContents, since it is used by iOS.
- # If WebContents functionality is needed, add it to
- # OmniboxCurrentPageDelegateImpl.
- 'omnibox_edit_model\.': [
- "-content/public/browser/web_contents.h",
- ],
-}
