Fetch incremental updates. Store new state in V4Store.

chrome/browser/safe_browsing/services_delegate_impl.cc

Index: chrome/browser/safe_browsing/services_delegate_impl.cc
diff --git a/chrome/browser/safe_browsing/services_delegate_impl.cc b/chrome/browser/safe_browsing/services_delegate_impl.cc
index 5eba56f7716539bb0d9f7b032affc34352cf31fe..cb72d0e9c2e21db59e7644e3f7512139943c3a27 100644
--- a/chrome/browser/safe_browsing/services_delegate_impl.cc
+++ b/chrome/browser/safe_browsing/services_delegate_impl.cc
@@ -17,12 +17,14 @@
 
 namespace safe_browsing {
 
+#ifdef NDEBUG
 namespace {
 const base::Feature kSafeBrowsingV4LocalDatabaseManagerEnabled {
     "SafeBrowsingV4LocalDatabaseManagerEnabled",
     base::FEATURE_DISABLED_BY_DEFAULT
 };
 }  // namespace
+#endif
 
 // static
 std::unique_ptr<ServicesDelegate> ServicesDelegate::Create(
@@ -184,8 +186,12 @@ V4LocalDatabaseManager* ServicesDelegateImpl::CreateV4LocalDatabaseManager() {
 }
 
 bool ServicesDelegateImpl::IsV4LocalDatabaseManagerEnabled() {
+#ifndef NDEBUG
+  return true;
+#else
   return base::FeatureList::IsEnabled(
       kSafeBrowsingV4LocalDatabaseManagerEnabled);

[Scott Hess - ex-Googler, 2016/06/24 23:01:19]

Is this clang-format?  If not, prefer to keep it the same as the previous
format.  Yes, OCD, I like diffs to be minimal, until they become maximal.

I wonder if you changed it to:
#ifndef NDEBUG
  return true;
#endif
  return ...;

if that would allow removing the #ifdef above?

[vakh (use Gerrit instead), 2016/06/27 19:38:27]

That's a compile error because the compiler sees statements after an
unconditional return in DEBUG mode.

[Scott Hess - ex-Googler, 2016/06/27 22:19:17]

Really?  I hate compilers.  I know for sure that at various points I've put
"return true;" at the top of a function to mock out that functionality to let me
get through that code.

At this point, I kind of dislike all of the options.  So I guess whatever works
for you is probably where it will end.

I wonder how this feels:
  if (IsEnabled(kKey)) {
    return true;
  }
#ifdef NDEBUG
  return false;
#else
  return true;
#endif

The compiler can't complain about IsEnabled() being unnecessary because it could
have a side effect, so I think that would at least get rid of the need to
bracket the constant's declaration (which is gross).

[vakh (use Gerrit instead), 2016/06/27 23:58:52]

I feel like this is 6 of one and half-a-dozen of the other. Let me leave it
as-is. We'll be removing it sooner rather than later anyway.

+#endif
 }
 
 }  // namespace safe_browsing