Image Capture: wire setPhotoOptions() for Win

components/content_settings/core/browser/host_content_settings_map.cc

Index: components/content_settings/core/browser/host_content_settings_map.cc
diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
index 358a1bc3689b4151951124f66170c04a9323609b..c24ef94c4c71cce42a37e9bd2a68c91987d1005b 100644
--- a/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -240,8 +240,8 @@ void HostContentSettingsMap::RegisterProvider(
   content_settings_providers_[type] = std::move(provider);
 
 #ifndef NDEBUG
-  DCHECK_NE(used_from_thread_id_, base::kInvalidThreadId)
-      << "Used from multiple threads before initialization complete.";
+//  DCHECK_NE(used_from_thread_id_, base::kInvalidThreadId)

[robliao, 2017/05/11 05:14:07]

Should this code instead be deleted or is this an accidental comment out?

[mcasas, 2017/05/12 18:52:49]

Ooops, unintended upload, this was a workaround for

https://groups.google.com/a/chromium.org/forum/?utm_medium=email&utm_source=f...

+//      << "Used from multiple threads before initialization complete.";
 #endif
 
   OnContentSettingChanged(ContentSettingsPattern(),
@@ -940,4 +940,4 @@ HostContentSettingsMap::GetContentSettingValueAndPatterns(
 void HostContentSettingsMap::SetClockForTesting(
     std::unique_ptr<base::Clock> clock) {
   pref_provider_->SetClockForTesting(std::move(clock));
-}
+}