Removing references to off the record in comments and log messages.

chrome/browser/content_settings/content_settings_base_provider.cc

 // Copyright (c) 2011 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/content_settings/content_settings_base_provider.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 79 matching lines @@
 
   // Check for exact matches first.
   HostContentSettings::const_iterator i(host_content_settings_.find(host));
   if (i != host_content_settings_.end() &&
       i->second.content_settings_for_resources.find(requested_setting) !=
       i->second.content_settings_for_resources.end()) {
     return i->second.content_settings_for_resources.find(
         requested_setting)->second;
   }
 
-  // If this map is not for an off-the-record profile, these searches will never
-  // match. The additional off-the-record exceptions always overwrite the
+  // If this map is not for an incognito profile, these searches will never
+  // match. The additional incognito exceptions always overwrite the
   // regular ones.
   i = off_the_record_settings_.find(host);
   if (i != off_the_record_settings_.end() &&
       i->second.content_settings_for_resources.find(requested_setting) !=
       i->second.content_settings_for_resources.end()) {
     return i->second.content_settings_for_resources.find(
         requested_setting)->second;
   }
 
   // Match patterns starting with the most concrete pattern match.
@@ skipping 70 matching lines @@
   const std::string host(net::GetHostOrSpecFromURL(url));
   ContentSettings output;
   for (int j = 0; j < CONTENT_SETTINGS_NUM_TYPES; ++j)
     output.settings[j] = CONTENT_SETTING_DEFAULT;
 
   // Check for exact matches first.
   HostContentSettings::const_iterator i(host_content_settings_.find(host));
   if (i != host_content_settings_.end())
     output = i->second.content_settings;
 
-  // If this map is not for an off-the-record profile, these searches will never
-  // match. The additional off-the-record exceptions always overwrite the
+  // If this map is not for an incognito profile, these searches will never
+  // match. The additional incognito exceptions always overwrite the
   // regular ones.
   i = off_the_record_settings_.find(host);
   if (i != off_the_record_settings_.end()) {
     for (int j = 0; j < CONTENT_SETTINGS_NUM_TYPES; ++j)
       if (i->second.content_settings.settings[j] != CONTENT_SETTING_DEFAULT)
         output.settings[j] = i->second.content_settings.settings[j];
   }
 
   // Match patterns starting with the most concrete pattern match.
   for (std::string key =
@@ skipping 42 matching lines @@
   if (setting == CONTENT_SETTING_ASK &&
       content_type == CONTENT_SETTINGS_TYPE_PLUGINS &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableClickToPlay)) {
     return CONTENT_SETTING_BLOCK;
   }
   return setting;
 }
 
 }  // namespace content_settings