Renaming is_off_the_record to is_incognito. Contributed by vipul.bhasin@gmail.com

BUG=3333
TEST=NONE

Review URL: http://codereview.chromium.org/6714031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79756 0039d316-1c4b-4281-b951-d872f2087c98

47 files changed, 90 insertions, 86 deletions

diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc
index 1159dbb..7749de3 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -44,7 +44,8 @@ CloudPrintSetupSource::CloudPrintSetupSource()
 }
 
 void CloudPrintSetupSource::StartDataRequest(const std::string& path_raw,
-    bool is_off_the_record, int request_id) {
+                                             bool is_incognito,
+                                             int request_id) {
   const char kCloudPrintSetupPath[] = "cloudprintsetup";
   const char kCloudPrintGaiaLoginPath[] = "gaialogin";
   const char kCloudPrintSetupFlowPath[] = "setupflow";
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source.h b/chrome/browser/printing/cloud_print/cloud_print_setup_source.h
index 2284be7..3703762 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_source.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source.h
@@ -15,7 +15,7 @@ class CloudPrintSetupSource : public ChromeURLDataManager::DataSource {
  public:
   CloudPrintSetupSource();
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
 
   virtual std::string GetMimeType(const std::string& path) const;
diff --git a/chrome/browser/remoting/remoting_resources_source.cc b/chrome/browser/remoting/remoting_resources_source.cc
index fdf5ba1..32a8f8b 100644
--- a/chrome/browser/remoting/remoting_resources_source.cc
+++ b/chrome/browser/remoting/remoting_resources_source.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -35,7 +35,8 @@ RemotingResourcesSource::RemotingResourcesSource()
 }
 
 void RemotingResourcesSource::StartDataRequest(const std::string& path_raw,
-    bool is_off_the_record, int request_id) {
+                                               bool is_incognito,
+                                               int request_id) {
   const char kRemotingGaiaLoginPath[] = "gaialogin";
   const char kRemotingSetupFlowPath[] = "setup";
   const char kRemotingSetupDonePath[] = "setupdone";
diff --git a/chrome/browser/remoting/remoting_resources_source.h b/chrome/browser/remoting/remoting_resources_source.h
index 83d8943..0a42bce 100644
--- a/chrome/browser/remoting/remoting_resources_source.h
+++ b/chrome/browser/remoting/remoting_resources_source.h
@@ -13,7 +13,7 @@ class RemotingResourcesSource : public ChromeURLDataManager::DataSource {
  public:
   RemotingResourcesSource();
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
 
   virtual std::string GetMimeType(const std::string& path) const;
diff --git a/chrome/browser/sync/sync_setup_wizard.cc b/chrome/browser/sync/sync_setup_wizard.cc
index 74d4623..0a1b7db 100644
--- a/chrome/browser/sync/sync_setup_wizard.cc
+++ b/chrome/browser/sync/sync_setup_wizard.cc
@@ -42,7 +42,7 @@ class SyncResourcesSource : public ChromeURLDataManager::DataSource {
   }
 
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
 
   virtual std::string GetMimeType(const std::string& path) const {
@@ -80,7 +80,8 @@ const char* SyncResourcesSource::kCreateNewAccountUrl =
     "https://www.google.com/accounts/NewAccount?service=chromiumsync";
 
 void SyncResourcesSource::StartDataRequest(const std::string& path_raw,
-    bool is_off_the_record, int request_id) {
+                                           bool is_incognito,
+                                           int request_id) {
   using l10n_util::GetStringUTF16;
   using l10n_util::GetStringFUTF16;
 
diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc
index de7ae39..935b69f 100644
--- a/chrome/browser/task_manager/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc
@@ -56,13 +56,13 @@ namespace {
 // Returns the appropriate message prefix ID for tabs and extensions,
 // reflecting whether they are apps or in incognito mode.
 int GetMessagePrefixID(bool is_app, bool is_extension,
-    bool is_off_the_record) {
+                       bool is_incognito) {
   return is_app ?
-      (is_off_the_record ?
+      (is_incognito ?
           IDS_TASK_MANAGER_APP_INCOGNITO_PREFIX :
           IDS_TASK_MANAGER_APP_PREFIX) :
       (is_extension ?
-          (is_off_the_record ?
+          (is_incognito ?
               IDS_TASK_MANAGER_EXTENSION_INCOGNITO_PREFIX :
               IDS_TASK_MANAGER_EXTENSION_PREFIX) :
           IDS_TASK_MANAGER_TAB_PREFIX);
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index 29237c8..3fb7a61 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -571,20 +571,20 @@ void OpaqueBrowserFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) {
   if (!browser_view_->IsBrowserTypeNormal()) {
     // Never theme app and popup windows.
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    bool is_off_the_record = browser_view_->IsOffTheRecord();
+    bool is_incognito = browser_view_->IsOffTheRecord();
     if (ShouldPaintAsActive()) {
-      theme_frame = rb.GetBitmapNamed(is_off_the_record ?
+      theme_frame = rb.GetBitmapNamed(is_incognito ?
                                       IDR_THEME_FRAME_INCOGNITO : IDR_FRAME);
-      frame_color = is_off_the_record ?
-          ResourceBundle::frame_color_incognito :
-          ResourceBundle::frame_color;
+      frame_color = is_incognito ?
+                    ResourceBundle::frame_color_incognito :
+                    ResourceBundle::frame_color;
     } else {
-      theme_frame = rb.GetBitmapNamed(is_off_the_record ?
+      theme_frame = rb.GetBitmapNamed(is_incognito ?
                                       IDR_THEME_FRAME_INCOGNITO_INACTIVE :
                                       IDR_THEME_FRAME_INACTIVE);
-      frame_color = is_off_the_record ?
-          ResourceBundle::frame_color_incognito_inactive :
-          ResourceBundle::frame_color_inactive;
+      frame_color = is_incognito ?
+                    ResourceBundle::frame_color_incognito_inactive :
+                    ResourceBundle::frame_color_inactive;
     }
   } else if (!browser_view_->IsOffTheRecord()) {
     if (ShouldPaintAsActive()) {
diff --git a/chrome/browser/ui/webui/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks_ui.cc
index 8c10da2..e72e51d 100644
--- a/chrome/browser/ui/webui/bookmarks_ui.cc
+++ b/chrome/browser/ui/webui/bookmarks_ui.cc
@@ -26,7 +26,7 @@ BookmarksUIHTMLSource::BookmarksUIHTMLSource()
 }
 
 void BookmarksUIHTMLSource::StartDataRequest(const std::string& path,
-                                             bool is_off_the_record,
+                                             bool is_incognito,
                                              int request_id) {
   NOTREACHED() << "We should never get here since the extension should have"
                << "been triggered";
diff --git a/chrome/browser/ui/webui/bookmarks_ui.h b/chrome/browser/ui/webui/bookmarks_ui.h
index c304dce..0d4c042 100644
--- a/chrome/browser/ui/webui/bookmarks_ui.h
+++ b/chrome/browser/ui/webui/bookmarks_ui.h
@@ -22,7 +22,7 @@ class BookmarksUIHTMLSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string& path) const;
 
diff --git a/chrome/browser/ui/webui/bug_report_ui.cc b/chrome/browser/ui/webui/bug_report_ui.cc
index 52c164a..5f1e742 100644
--- a/chrome/browser/ui/webui/bug_report_ui.cc
+++ b/chrome/browser/ui/webui/bug_report_ui.cc
@@ -170,7 +170,7 @@ class BugReportUIHTMLSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const {
     return "text/html";
@@ -239,8 +239,8 @@ BugReportUIHTMLSource::BugReportUIHTMLSource(base::StringPiece html)
 }
 
 void BugReportUIHTMLSource::StartDataRequest(const std::string& path,
-                                              bool is_off_the_record,
-                                              int request_id) {
+                                             bool is_incognito,
+                                             int request_id) {
   DictionaryValue localized_strings;
   localized_strings.SetString(std::string("title"),
       l10n_util::GetStringUTF8(IDS_BUGREPORT_TITLE));
diff --git a/chrome/browser/ui/webui/chrome_url_data_manager.h b/chrome/browser/ui/webui/chrome_url_data_manager.h
index f5eb3d2..bed84d7 100644
--- a/chrome/browser/ui/webui/chrome_url_data_manager.h
+++ b/chrome/browser/ui/webui/chrome_url_data_manager.h
@@ -67,7 +67,7 @@ class ChromeURLDataManager {
     // call SendResponse() when the data is available or if the request could
     // not be satisfied.
     virtual void StartDataRequest(const std::string& path,
-                                  bool is_off_the_record,
+                                  bool is_incognito,
                                   int request_id) = 0;
 
     // Return the mimetype that should be sent with this response, or empty
diff --git a/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc b/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc
index 6909769..b2063fc 100644
--- a/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc
+++ b/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc
@@ -70,7 +70,7 @@ class CollectedCookiesSource : public ChromeURLDataManager::DataSource {
   }
 
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
 
   virtual std::string GetMimeType(const std::string& path) const {
@@ -86,7 +86,7 @@ class CollectedCookiesSource : public ChromeURLDataManager::DataSource {
 };
 
 void CollectedCookiesSource::StartDataRequest(const std::string& path,
-                                              bool is_off_the_record,
+                                              bool is_incognito,
                                               int request_id) {
   DictionaryValue localized_strings;
   localized_strings.SetString("title",
diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc
index fdb3fe2..f39456b 100644
--- a/chrome/browser/ui/webui/conflicts_ui.cc
+++ b/chrome/browser/ui/webui/conflicts_ui.cc
@@ -44,7 +44,7 @@ class ConflictsUIHTMLSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
 
   virtual std::string GetMimeType(const std::string&) const {
@@ -56,7 +56,7 @@ class ConflictsUIHTMLSource : public ChromeURLDataManager::DataSource {
 };
 
 void ConflictsUIHTMLSource::StartDataRequest(const std::string& path,
-                                             bool is_off_the_record,
+                                             bool is_incognito,
                                              int request_id) {
   // Strings used in the JsTemplate file.
   DictionaryValue localized_strings;
diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc
index f3126ea..0758652 100644
--- a/chrome/browser/ui/webui/crashes_ui.cc
+++ b/chrome/browser/ui/webui/crashes_ui.cc
@@ -40,7 +40,7 @@ class CrashesUIHTMLSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const {
     return "text/html";
@@ -53,7 +53,7 @@ class CrashesUIHTMLSource : public ChromeURLDataManager::DataSource {
 };
 
 void CrashesUIHTMLSource::StartDataRequest(const std::string& path,
-                                           bool is_off_the_record,
+                                           bool is_incognito,
                                            int request_id) {
   DictionaryValue localized_strings;
   localized_strings.SetString("crashesTitle",
diff --git a/chrome/browser/ui/webui/downloads_ui.cc b/chrome/browser/ui/webui/downloads_ui.cc
index 034ef36..6266ef2 100644
--- a/chrome/browser/ui/webui/downloads_ui.cc
+++ b/chrome/browser/ui/webui/downloads_ui.cc
@@ -38,7 +38,7 @@ class DownloadsUIHTMLSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const {
     return "text/html";
@@ -55,7 +55,7 @@ DownloadsUIHTMLSource::DownloadsUIHTMLSource()
 }
 
 void DownloadsUIHTMLSource::StartDataRequest(const std::string& path,
-                                             bool is_off_the_record,
+                                             bool is_incognito,
                                              int request_id) {
   DictionaryValue localized_strings;
   localized_strings.SetString("title",
diff --git a/chrome/browser/ui/webui/extension_icon_source.cc b/chrome/browser/ui/webui/extension_icon_source.cc
index ec3fa91..0e355b8 100644
--- a/chrome/browser/ui/webui/extension_icon_source.cc
+++ b/chrome/browser/ui/webui/extension_icon_source.cc
@@ -107,7 +107,7 @@ std::string ExtensionIconSource::GetMimeType(const std::string&) const {
 }
 
 void ExtensionIconSource::StartDataRequest(const std::string& path,
-                                           bool is_off_the_record,
+                                           bool is_incognito,
                                            int request_id) {
   // This is where everything gets started. First, parse the request and make
   // the request data available for later.
diff --git a/chrome/browser/ui/webui/extension_icon_source.h b/chrome/browser/ui/webui/extension_icon_source.h
index add0d51..ca1338a 100644
--- a/chrome/browser/ui/webui/extension_icon_source.h
+++ b/chrome/browser/ui/webui/extension_icon_source.h
@@ -68,7 +68,7 @@ class ExtensionIconSource : public ChromeURLDataManager::DataSource,
   virtual std::string GetMimeType(const std::string&) const;
 
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
 
 
diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
index a4e085f..058d226 100644
--- a/chrome/browser/ui/webui/favicon_source.cc
+++ b/chrome/browser/ui/webui/favicon_source.cc
@@ -19,7 +19,7 @@ FaviconSource::~FaviconSource() {
 }
 
 void FaviconSource::StartDataRequest(const std::string& path,
-                                     bool is_off_the_record,
+                                     bool is_incognito,
                                      int request_id) {
   FaviconService* favicon_service =
       profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
diff --git a/chrome/browser/ui/webui/favicon_source.h b/chrome/browser/ui/webui/favicon_source.h
index a361d8d..8aebc2f 100644
--- a/chrome/browser/ui/webui/favicon_source.h
+++ b/chrome/browser/ui/webui/favicon_source.h
@@ -25,7 +25,7 @@ class FaviconSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
 
   virtual std::string GetMimeType(const std::string&) const;
diff --git a/chrome/browser/ui/webui/filebrowse_ui.cc b/chrome/browser/ui/webui/filebrowse_ui.cc
index 6876d0d..f01db8a 100644
--- a/chrome/browser/ui/webui/filebrowse_ui.cc
+++ b/chrome/browser/ui/webui/filebrowse_ui.cc
@@ -76,7 +76,7 @@ class FileBrowseUIHTMLSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const {
     return "text/html";
@@ -292,7 +292,7 @@ FileBrowseUIHTMLSource::FileBrowseUIHTMLSource()
 }
 
 void FileBrowseUIHTMLSource::StartDataRequest(const std::string& path,
-                                              bool is_off_the_record,
+                                              bool is_incognito,
                                               int request_id) {
   DictionaryValue localized_strings;
   // TODO(dhg): Add stirings to localized strings, also add more strings
diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc
index af62f46..cf4bffc 100644
--- a/chrome/browser/ui/webui/fileicon_source.cc
+++ b/chrome/browser/ui/webui/fileicon_source.cc
@@ -27,7 +27,7 @@ FileIconSource::~FileIconSource() {
 }
 
 void FileIconSource::StartDataRequest(const std::string& path,
-                                      bool is_off_the_record,
+                                      bool is_incognito,
                                       int request_id) {
   std::string escaped_path = UnescapeURLComponent(path, UnescapeRule::SPACES);
 #if defined(OS_WIN)
diff --git a/chrome/browser/ui/webui/fileicon_source.h b/chrome/browser/ui/webui/fileicon_source.h
index 81dae47..31c1071 100644
--- a/chrome/browser/ui/webui/fileicon_source.h
+++ b/chrome/browser/ui/webui/fileicon_source.h
@@ -27,7 +27,7 @@ class FileIconSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
 
   virtual std::string GetMimeType(const std::string&) const;
diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc
index 9c312b4..e040b09 100644
--- a/chrome/browser/ui/webui/flags_ui.cc
+++ b/chrome/browser/ui/webui/flags_ui.cc
@@ -42,7 +42,7 @@ class FlagsUIHTMLSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const {
     return "text/html";
@@ -55,7 +55,7 @@ class FlagsUIHTMLSource : public ChromeURLDataManager::DataSource {
 };
 
 void FlagsUIHTMLSource::StartDataRequest(const std::string& path,
-                                        bool is_off_the_record,
+                                        bool is_incognito,
                                         int request_id) {
   // Strings used in the JsTemplate file.
   DictionaryValue localized_strings;
diff --git a/chrome/browser/ui/webui/gpu_internals_ui.cc b/chrome/browser/ui/webui/gpu_internals_ui.cc
index 12e50b8..5c26927 100644
--- a/chrome/browser/ui/webui/gpu_internals_ui.cc
+++ b/chrome/browser/ui/webui/gpu_internals_ui.cc
@@ -53,7 +53,7 @@ class GpuHTMLSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const;
 
@@ -121,8 +121,8 @@ GpuHTMLSource::GpuHTMLSource()
 }
 
 void GpuHTMLSource::StartDataRequest(const std::string& path,
-    bool is_off_the_record,
-    int request_id) {
+                                     bool is_incognito,
+                                     int request_id) {
   DictionaryValue localized_strings;
   SetFontAndTextDirection(&localized_strings);
 
diff --git a/chrome/browser/ui/webui/history2_ui.cc b/chrome/browser/ui/webui/history2_ui.cc
index 36833b0..ffe7cac 100644
--- a/chrome/browser/ui/webui/history2_ui.cc
+++ b/chrome/browser/ui/webui/history2_ui.cc
@@ -56,8 +56,8 @@ HistoryUIHTMLSource2::HistoryUIHTMLSource2()
 }
 
 void HistoryUIHTMLSource2::StartDataRequest(const std::string& path,
-                                           bool is_off_the_record,
-                                           int request_id) {
+                                            bool is_incognito,
+                                            int request_id) {
   DictionaryValue localized_strings;
   localized_strings.SetString("loading",
       l10n_util::GetStringUTF16(IDS_HISTORY_LOADING));
diff --git a/chrome/browser/ui/webui/history2_ui.h b/chrome/browser/ui/webui/history2_ui.h
index 95c6900..15904b1 100644
--- a/chrome/browser/ui/webui/history2_ui.h
+++ b/chrome/browser/ui/webui/history2_ui.h
@@ -27,7 +27,7 @@ class HistoryUIHTMLSource2 : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
 
   virtual std::string GetMimeType(const std::string&) const;
diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc
index 85ebf78..5b9b54b 100644
--- a/chrome/browser/ui/webui/history_ui.cc
+++ b/chrome/browser/ui/webui/history_ui.cc
@@ -56,7 +56,7 @@ HistoryUIHTMLSource::HistoryUIHTMLSource()
 }
 
 void HistoryUIHTMLSource::StartDataRequest(const std::string& path,
-                                           bool is_off_the_record,
+                                           bool is_incognito,
                                            int request_id) {
   DictionaryValue localized_strings;
   localized_strings.SetString("loading",
diff --git a/chrome/browser/ui/webui/history_ui.h b/chrome/browser/ui/webui/history_ui.h
index 7e65189..1dfeb59 100644
--- a/chrome/browser/ui/webui/history_ui.h
+++ b/chrome/browser/ui/webui/history_ui.h
@@ -24,7 +24,7 @@ class HistoryUIHTMLSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const;
 
diff --git a/chrome/browser/ui/webui/keyboard_ui.cc b/chrome/browser/ui/webui/keyboard_ui.cc
index 869a6f1..83c23f7 100644
--- a/chrome/browser/ui/webui/keyboard_ui.cc
+++ b/chrome/browser/ui/webui/keyboard_ui.cc
@@ -34,7 +34,7 @@ KeyboardUI::KeyboardHTMLSource::KeyboardHTMLSource()
 }
 
 void KeyboardUI::KeyboardHTMLSource::StartDataRequest(const std::string& path,
-                                                      bool is_off_the_record,
+                                                      bool is_incognito,
                                                       int request_id) {
   NOTREACHED() << "We should never get here since the extension should have"
                << "been triggered";
diff --git a/chrome/browser/ui/webui/keyboard_ui.h b/chrome/browser/ui/webui/keyboard_ui.h
index 896dd09..d7c24c9 100644
--- a/chrome/browser/ui/webui/keyboard_ui.h
+++ b/chrome/browser/ui/webui/keyboard_ui.h
@@ -25,7 +25,7 @@ class KeyboardUI : public WebUI {
 
     // Overrides from DataSource
     virtual void StartDataRequest(const std::string& path,
-                                  bool is_off_the_record,
+                                  bool is_incognito,
                                   int request_id);
     virtual std::string GetMimeType(const std::string&) const;
 
diff --git a/chrome/browser/ui/webui/mediaplayer_ui.cc b/chrome/browser/ui/webui/mediaplayer_ui.cc
index b8ebcfa..5bb6707 100644
--- a/chrome/browser/ui/webui/mediaplayer_ui.cc
+++ b/chrome/browser/ui/webui/mediaplayer_ui.cc
@@ -66,7 +66,7 @@ class MediaplayerUIHTMLSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const {
     return "text/html";
@@ -160,7 +160,7 @@ MediaplayerUIHTMLSource::MediaplayerUIHTMLSource(bool is_playlist)
 }
 
 void MediaplayerUIHTMLSource::StartDataRequest(const std::string& path,
-                                               bool is_off_the_record,
+                                               bool is_incognito,
                                                int request_id) {
   DictionaryValue localized_strings;
   // TODO(dhg): Fix the strings that are currently hardcoded so they
diff --git a/chrome/browser/ui/webui/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals_ui.cc
index 6c91ff1..e6d034c 100644
--- a/chrome/browser/ui/webui/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals_ui.cc
@@ -125,7 +125,7 @@ class NetInternalsHTMLSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const;
 
@@ -406,7 +406,7 @@ NetInternalsHTMLSource::NetInternalsHTMLSource()
 }
 
 void NetInternalsHTMLSource::StartDataRequest(const std::string& path,
-                                              bool is_off_the_record,
+                                              bool is_incognito,
                                               int request_id) {
   DictionaryValue localized_strings;
   SetFontAndTextDirection(&localized_strings);
diff --git a/chrome/browser/ui/webui/new_tab_ui.cc b/chrome/browser/ui/webui/new_tab_ui.cc
index a3e9585..7ecdcc8 100644
--- a/chrome/browser/ui/webui/new_tab_ui.cc
+++ b/chrome/browser/ui/webui/new_tab_ui.cc
@@ -570,7 +570,7 @@ NewTabUI::NewTabHTMLSource::NewTabHTMLSource(Profile* profile)
 }
 
 void NewTabUI::NewTabHTMLSource::StartDataRequest(const std::string& path,
-                                                  bool is_off_the_record,
+                                                  bool is_incognito,
                                                   int request_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ -584,7 +584,7 @@ void NewTabUI::NewTabHTMLSource::StartDataRequest(const std::string& path,
   }
 
   scoped_refptr<RefCountedBytes> html_bytes(
-      profile_->GetNTPResourceCache()->GetNewTabHTML(is_off_the_record));
+      profile_->GetNTPResourceCache()->GetNewTabHTML(is_incognito));
 
   SendResponse(request_id, html_bytes);
 }
diff --git a/chrome/browser/ui/webui/new_tab_ui.h b/chrome/browser/ui/webui/new_tab_ui.h
index b545223..2f1954e 100644
--- a/chrome/browser/ui/webui/new_tab_ui.h
+++ b/chrome/browser/ui/webui/new_tab_ui.h
@@ -63,7 +63,7 @@ class NewTabUI : public WebUI,
     // Called when the network layer has requested a resource underneath
     // the path we registered.
     virtual void StartDataRequest(const std::string& path,
-                                  bool is_off_the_record,
+                                  bool is_incognito,
                                   int request_id);
 
     virtual std::string GetMimeType(const std::string&) const;
diff --git a/chrome/browser/ui/webui/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp_resource_cache.cc
index d31818f..438cb64 100644
--- a/chrome/browser/ui/webui/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp_resource_cache.cc
@@ -162,30 +162,30 @@ NTPResourceCache::NTPResourceCache(Profile* profile) : profile_(profile) {
 
 NTPResourceCache::~NTPResourceCache() {}
 
-RefCountedBytes* NTPResourceCache::GetNewTabHTML(bool is_off_the_record) {
+RefCountedBytes* NTPResourceCache::GetNewTabHTML(bool is_incognito) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (is_off_the_record) {
+  if (is_incognito) {
     if (!new_tab_incognito_html_.get())
       CreateNewTabIncognitoHTML();
   } else {
     if (!new_tab_html_.get())
       CreateNewTabHTML();
   }
-  return is_off_the_record ? new_tab_incognito_html_.get()
-                           : new_tab_html_.get();
+  return is_incognito ? new_tab_incognito_html_.get()
+                      : new_tab_html_.get();
 }
 
-RefCountedBytes* NTPResourceCache::GetNewTabCSS(bool is_off_the_record) {
+RefCountedBytes* NTPResourceCache::GetNewTabCSS(bool is_incognito) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (is_off_the_record) {
+  if (is_incognito) {
     if (!new_tab_incognito_css_.get())
       CreateNewTabIncognitoCSS();
   } else {
     if (!new_tab_css_.get())
       CreateNewTabCSS();
   }
-  return is_off_the_record ? new_tab_incognito_css_.get()
-                           : new_tab_css_.get();
+  return is_incognito ? new_tab_incognito_css_.get()
+                      : new_tab_css_.get();
 }
 
 void NTPResourceCache::Observe(NotificationType type,
diff --git a/chrome/browser/ui/webui/ntp_resource_cache.h b/chrome/browser/ui/webui/ntp_resource_cache.h
index a50c98f..02ea7c53 100644
--- a/chrome/browser/ui/webui/ntp_resource_cache.h
+++ b/chrome/browser/ui/webui/ntp_resource_cache.h
@@ -22,8 +22,8 @@ class NTPResourceCache : public NotificationObserver {
   explicit NTPResourceCache(Profile* profile);
   virtual ~NTPResourceCache();
 
-  RefCountedBytes* GetNewTabHTML(bool is_off_the_record);
-  RefCountedBytes* GetNewTabCSS(bool is_off_the_record);
+  RefCountedBytes* GetNewTabHTML(bool is_incognito);
+  RefCountedBytes* GetNewTabCSS(bool is_incognito);
 
   // NotificationObserver interface.
   virtual void Observe(NotificationType type,
diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc
index f7f323a..0525206 100644
--- a/chrome/browser/ui/webui/options/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc
@@ -92,7 +92,8 @@ ExtensionsUIHTMLSource::ExtensionsUIHTMLSource()
 }
 
 void ExtensionsUIHTMLSource::StartDataRequest(const std::string& path,
-    bool is_off_the_record, int request_id) {
+                                              bool is_incognito,
+                                              int request_id) {
   DictionaryValue localized_strings;
   localized_strings.SetString("title",
       l10n_util::GetStringUTF16(IDS_EXTENSIONS_TITLE));
diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.h b/chrome/browser/ui/webui/options/extension_settings_handler.h
index c0d8f24..9dbb170 100644
--- a/chrome/browser/ui/webui/options/extension_settings_handler.h
+++ b/chrome/browser/ui/webui/options/extension_settings_handler.h
@@ -51,7 +51,7 @@ class ExtensionsUIHTMLSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const;
 
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
index a823940..00058e4 100644
--- a/chrome/browser/ui/webui/options/options_ui.cc
+++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -86,7 +86,7 @@ class OptionsUIHTMLSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const;
 
@@ -106,7 +106,7 @@ OptionsUIHTMLSource::OptionsUIHTMLSource(DictionaryValue* localized_strings)
 OptionsUIHTMLSource::~OptionsUIHTMLSource() {}
 
 void OptionsUIHTMLSource::StartDataRequest(const std::string& path,
-                                           bool is_off_the_record,
+                                           bool is_incognito,
                                            int request_id) {
   SetFontAndTextDirection(localized_strings_.get());
 
diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc
index 51b6d05..ea128eb 100644
--- a/chrome/browser/ui/webui/plugins_ui.cc
+++ b/chrome/browser/ui/webui/plugins_ui.cc
@@ -51,7 +51,7 @@ class PluginsUIHTMLSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const {
     return "text/html";
@@ -64,7 +64,7 @@ class PluginsUIHTMLSource : public ChromeURLDataManager::DataSource {
 };
 
 void PluginsUIHTMLSource::StartDataRequest(const std::string& path,
-                                           bool is_off_the_record,
+                                           bool is_incognito,
                                            int request_id) {
   // Strings used in the JsTemplate file.
   DictionaryValue localized_strings;
diff --git a/chrome/browser/ui/webui/print_preview_ui_html_source.cc b/chrome/browser/ui/webui/print_preview_ui_html_source.cc
index a764270..ed761ee 100644
--- a/chrome/browser/ui/webui/print_preview_ui_html_source.cc
+++ b/chrome/browser/ui/webui/print_preview_ui_html_source.cc
@@ -91,7 +91,7 @@ void PrintPreviewUIHTMLSource::SetPrintPreviewData(
 }
 
 void PrintPreviewUIHTMLSource::StartDataRequest(const std::string& path,
-                                                bool is_off_the_record,
+                                                bool is_incognito,
                                                 int request_id) {
   if (path.empty()) {
     // Print Preview Index page.
diff --git a/chrome/browser/ui/webui/print_preview_ui_html_source.h b/chrome/browser/ui/webui/print_preview_ui_html_source.h
index ce92773..da17532 100644
--- a/chrome/browser/ui/webui/print_preview_ui_html_source.h
+++ b/chrome/browser/ui/webui/print_preview_ui_html_source.h
@@ -36,7 +36,7 @@ class PrintPreviewUIHTMLSource : public ChromeURLDataManager::DataSource {
 
   // ChromeURLDataManager::DataSource implementation.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const;
 
diff --git a/chrome/browser/ui/webui/remoting_ui.cc b/chrome/browser/ui/webui/remoting_ui.cc
index cd6b348..87fb56c 100644
--- a/chrome/browser/ui/webui/remoting_ui.cc
+++ b/chrome/browser/ui/webui/remoting_ui.cc
@@ -29,7 +29,7 @@ class RemotingUIHTMLSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const {
     return "pepper-application/x-chromoting";
@@ -42,8 +42,8 @@ class RemotingUIHTMLSource : public ChromeURLDataManager::DataSource {
 };
 
 void RemotingUIHTMLSource::StartDataRequest(const std::string& path,
-                                           bool is_off_the_record,
-                                           int request_id) {
+                                            bool is_incognito,
+                                            int request_id) {
   // Dummy data. Not used, but we need to send something back in the response.
   std::string full_html = "remoting";
 
diff --git a/chrome/browser/ui/webui/screenshot_source.cc b/chrome/browser/ui/webui/screenshot_source.cc
index 9d92f98..b8a21bb 100644
--- a/chrome/browser/ui/webui/screenshot_source.cc
+++ b/chrome/browser/ui/webui/screenshot_source.cc
@@ -106,7 +106,7 @@ ScreenshotSource::ScreenshotSource(
 ScreenshotSource::~ScreenshotSource() {}
 
 void ScreenshotSource::StartDataRequest(const std::string& path,
-                                            bool is_off_the_record,
+                                            bool is_incognito,
                                             int request_id) {
   SendResponse(request_id, new RefCountedBytes(GetScreenshot(path)));
 }
diff --git a/chrome/browser/ui/webui/screenshot_source.h b/chrome/browser/ui/webui/screenshot_source.h
index e4f77a4..4b071d3 100644
--- a/chrome/browser/ui/webui/screenshot_source.h
+++ b/chrome/browser/ui/webui/screenshot_source.h
@@ -21,7 +21,7 @@ class ScreenshotSource : public ChromeURLDataManager::DataSource {
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
 
   virtual std::string GetMimeType(const std::string&) const;
diff --git a/chrome/browser/ui/webui/shared_resources_data_source.cc b/chrome/browser/ui/webui/shared_resources_data_source.cc
index 7b9e4a1..5a4c979 100644
--- a/chrome/browser/ui/webui/shared_resources_data_source.cc
+++ b/chrome/browser/ui/webui/shared_resources_data_source.cc
@@ -61,7 +61,7 @@ SharedResourcesDataSource::~SharedResourcesDataSource() {
 }
 
 void SharedResourcesDataSource::StartDataRequest(const std::string& path,
-                                                 bool is_off_the_record,
+                                                 bool is_incognito,
                                                  int request_id) {
   int idr = PathToIDR(path);
   DCHECK_NE(-1, idr);
diff --git a/chrome/browser/ui/webui/shared_resources_data_source.h b/chrome/browser/ui/webui/shared_resources_data_source.h
index f70d0e9..8976192 100644
--- a/chrome/browser/ui/webui/shared_resources_data_source.h
+++ b/chrome/browser/ui/webui/shared_resources_data_source.h
@@ -22,7 +22,7 @@ class SharedResourcesDataSource : public ChromeURLDataManager::DataSource {
 
   // Overridden from ChromeURLDataManager::DataSource:
   virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
+                                bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const;