[Activity log] Strip incognito URLs entirely from the database

chrome/browser/extensions/activity_log/activity_log_policy.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/activity_log/activity_log_policy.h"
 
 #include <stdint.h>
 
 #include "base/files/file_path.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 68 matching lines @@
   return value_as_text;
 }
 
 // static
 void ActivityLogPolicy::Util::StripPrivacySensitiveFields(
     scoped_refptr<Action> action) {
   // Clear incognito URLs/titles.
   if (action->page_incognito()) {
     action->set_page_url(GURL());
     action->set_page_title("");
+    action->set_page_incognito(false);
   }
   if (action->arg_incognito()) {
     action->set_arg_url(GURL());
+    action->set_arg_incognito(false);
   }
 
   // Strip query parameters, username/password, etc., from URLs.
   if (action->page_url().is_valid() || action->arg_url().is_valid()) {
     url_canon::Replacements<char> url_sanitizer;
     url_sanitizer.ClearUsername();
     url_sanitizer.ClearPassword();
     url_sanitizer.ClearQuery();
     url_sanitizer.ClearRef();
 
@@ skipping 66 matching lines @@
           base::StringPrintf("DROP TABLE %s", table_name);
       if (!db->Execute(drop_statement.c_str())) {
         return false;
       }
     }
   }
   return true;
 }
 
 }  // namespace extensions