WebUI: Change DOMUI to WebUI in more two class names.

BUG=59945
TEST=trybots

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

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

14 files changed, 66 insertions, 66 deletions

diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc
index 9524bb3..c5c38c7 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.cc
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc
@@ -194,7 +194,7 @@ ChromeURLDataManager* ChromeURLDataManager::GetInstance() {
 
 void ChromeURLDataManager::AddDataSource(scoped_refptr<DataSource> source) {
   // Some |DataSource|-derived classes, notably |FileIconSource| and
-  // |DOMUIFavIconSource|, have members that will DCHECK if they are not
+  // |WebUIFavIconSource|, have members that will DCHECK if they are not
   // destructed in the same thread as they are constructed (the UI thread).
   //
   // If |AddDataSource| is called more than once, it will destruct the object
diff --git a/chrome/browser/dom_ui/filebrowse_ui.cc b/chrome/browser/dom_ui/filebrowse_ui.cc
index 473bb37..2136996 100644
--- a/chrome/browser/dom_ui/filebrowse_ui.cc
+++ b/chrome/browser/dom_ui/filebrowse_ui.cc
@@ -20,8 +20,8 @@
 #include "base/weak_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
 #include "chrome/browser/dom_ui/mediaplayer_ui.h"
+#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_util.h"
@@ -427,7 +427,7 @@ DOMMessageHandler* FilebrowseHandler::Attach(DOMUI* dom_ui) {
       NewRunnableMethod(
           ChromeURLDataManager::GetInstance(),
           &ChromeURLDataManager::AddDataSource,
-          make_scoped_refptr(new DOMUIFavIconSource(dom_ui->GetProfile()))));
+          make_scoped_refptr(new WebUIFavIconSource(dom_ui->GetProfile()))));
   profile_ = dom_ui->GetProfile();
   tab_contents_ = dom_ui->tab_contents();
   return DOMMessageHandler::Attach(dom_ui);
diff --git a/chrome/browser/dom_ui/history2_ui.cc b/chrome/browser/dom_ui/history2_ui.cc
index 8d33325..cca5607 100644
--- a/chrome/browser/dom_ui/history2_ui.cc
+++ b/chrome/browser/dom_ui/history2_ui.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.
 
@@ -20,7 +20,7 @@
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
+#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profiles/profile.h"
@@ -134,7 +134,7 @@ DOMMessageHandler* BrowsingHistoryHandler2::Attach(DOMUI* dom_ui) {
       NewRunnableMethod(
           ChromeURLDataManager::GetInstance(),
           &ChromeURLDataManager::AddDataSource,
-          make_scoped_refptr(new DOMUIFavIconSource(dom_ui->GetProfile()))));
+          make_scoped_refptr(new WebUIFavIconSource(dom_ui->GetProfile()))));
 
   // Get notifications when history is cleared.
   registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED,
diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc
index b0ad9f3..f48df67 100644
--- a/chrome/browser/dom_ui/history_ui.cc
+++ b/chrome/browser/dom_ui/history_ui.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.
 
@@ -20,7 +20,7 @@
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
+#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profiles/profile.h"
@@ -134,7 +134,7 @@ DOMMessageHandler* BrowsingHistoryHandler::Attach(DOMUI* dom_ui) {
       NewRunnableMethod(
           ChromeURLDataManager::GetInstance(),
           &ChromeURLDataManager::AddDataSource,
-          make_scoped_refptr(new DOMUIFavIconSource(dom_ui->GetProfile()))));
+          make_scoped_refptr(new WebUIFavIconSource(dom_ui->GetProfile()))));
 
   // Get notifications when history is cleared.
   registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED,
diff --git a/chrome/browser/dom_ui/mediaplayer_ui.cc b/chrome/browser/dom_ui/mediaplayer_ui.cc
index ee83467..c640917 100644
--- a/chrome/browser/dom_ui/mediaplayer_ui.cc
+++ b/chrome/browser/dom_ui/mediaplayer_ui.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.
 
@@ -17,7 +17,7 @@
 #include "base/weak_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
+#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/history/history_types.h"
@@ -214,7 +214,7 @@ DOMMessageHandler* MediaplayerHandler::Attach(DOMUI* dom_ui) {
       NewRunnableMethod(
           ChromeURLDataManager::GetInstance(),
           &ChromeURLDataManager::AddDataSource,
-          make_scoped_refptr(new DOMUIFavIconSource(dom_ui->GetProfile()))));
+          make_scoped_refptr(new WebUIFavIconSource(dom_ui->GetProfile()))));
 
   return DOMMessageHandler::Attach(dom_ui);
 }
diff --git a/chrome/browser/dom_ui/most_visited_handler.cc b/chrome/browser/dom_ui/most_visited_handler.cc
index 880e318..484eedc 100644
--- a/chrome/browser/dom_ui/most_visited_handler.cc
+++ b/chrome/browser/dom_ui/most_visited_handler.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.
 
@@ -18,9 +18,9 @@
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
-#include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
-#include "chrome/browser/dom_ui/dom_ui_thumbnail_source.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
+#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
+#include "chrome/browser/dom_ui/web_ui_thumbnail_source.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ -69,16 +69,16 @@ DOMMessageHandler* MostVisitedHandler::Attach(DOMUI* dom_ui) {
   pinned_urls_ = dom_ui->GetProfile()->GetPrefs()->
       GetMutableDictionary(prefs::kNTPMostVisitedPinnedURLs);
   // Set up our sources for thumbnail and favicon data.
-  DOMUIThumbnailSource* thumbnail_src =
-      new DOMUIThumbnailSource(dom_ui->GetProfile());
+  WebUIThumbnailSource* thumbnail_src =
+      new WebUIThumbnailSource(dom_ui->GetProfile());
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(ChromeURLDataManager::GetInstance(),
                         &ChromeURLDataManager::AddDataSource,
                         make_scoped_refptr(thumbnail_src)));
 
-  DOMUIFavIconSource* favicon_src =
-      new DOMUIFavIconSource(dom_ui->GetProfile());
+  WebUIFavIconSource* favicon_src =
+      new WebUIFavIconSource(dom_ui->GetProfile());
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(ChromeURLDataManager::GetInstance(),
diff --git a/chrome/browser/dom_ui/options/browser_options_handler.cc b/chrome/browser/dom_ui/options/browser_options_handler.cc
index bb8a1e4..83d5223 100644
--- a/chrome/browser/dom_ui/options/browser_options_handler.cc
+++ b/chrome/browser/dom_ui/options/browser_options_handler.cc
@@ -13,9 +13,9 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
-#include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
 #include "chrome/browser/dom_ui/options/dom_options_util.h"
 #include "chrome/browser/dom_ui/options/options_managed_banner_handler.h"
+#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
 #include "chrome/browser/instant/instant_confirm_dialog.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
@@ -131,7 +131,7 @@ void BrowserOptionsHandler::Initialize() {
       NewRunnableMethod(
           ChromeURLDataManager::GetInstance(),
           &ChromeURLDataManager::AddDataSource,
-          make_scoped_refptr(new DOMUIFavIconSource(profile))));
+          make_scoped_refptr(new WebUIFavIconSource(profile))));
 
   homepage_.Init(prefs::kHomePage, profile->GetPrefs(), NULL);
   default_browser_policy_.Init(prefs::kDefaultBrowserSettingEnabled,
diff --git a/chrome/browser/dom_ui/slideshow_ui.cc b/chrome/browser/dom_ui/slideshow_ui.cc
index 73aed3d..020a45e5 100644
--- a/chrome/browser/dom_ui/slideshow_ui.cc
+++ b/chrome/browser/dom_ui/slideshow_ui.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.
 
@@ -16,7 +16,7 @@
 #include "base/values.h"
 #include "base/weak_ptr.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
+#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
@@ -154,7 +154,7 @@ DOMMessageHandler* SlideshowHandler::Attach(DOMUI* dom_ui) {
       NewRunnableMethod(
           ChromeURLDataManager::GetInstance(),
           &ChromeURLDataManager::AddDataSource,
-          make_scoped_refptr(new DOMUIFavIconSource(dom_ui->GetProfile()))));
+          make_scoped_refptr(new WebUIFavIconSource(dom_ui->GetProfile()))));
   profile_ = dom_ui->GetProfile();
   return DOMMessageHandler::Attach(dom_ui);
 }
diff --git a/chrome/browser/dom_ui/dom_ui_favicon_source.cc b/chrome/browser/dom_ui/web_ui_favicon_source.cc
index b3c8a39..f2d7128 100644
--- a/chrome/browser/dom_ui/dom_ui_favicon_source.cc
+++ b/chrome/browser/dom_ui/web_ui_favicon_source.cc
@@ -1,8 +1,8 @@
-// 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.
 
-#include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
+#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
 
 #include "base/callback.h"
 #include "chrome/browser/profiles/profile.h"
@@ -10,15 +10,15 @@
 #include "grit/app_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
-DOMUIFavIconSource::DOMUIFavIconSource(Profile* profile)
+WebUIFavIconSource::WebUIFavIconSource(Profile* profile)
     : DataSource(chrome::kChromeUIFavIconHost, MessageLoop::current()),
       profile_(profile->GetOriginalProfile()) {
 }
 
-DOMUIFavIconSource::~DOMUIFavIconSource() {
+WebUIFavIconSource::~WebUIFavIconSource() {
 }
 
-void DOMUIFavIconSource::StartDataRequest(const std::string& path,
+void WebUIFavIconSource::StartDataRequest(const std::string& path,
                                           bool is_off_the_record,
                                           int request_id) {
   FaviconService* favicon_service =
@@ -34,12 +34,12 @@ void DOMUIFavIconSource::StartDataRequest(const std::string& path,
       handle = favicon_service->GetFavicon(
           GURL(path.substr(8)),
           &cancelable_consumer_,
-          NewCallback(this, &DOMUIFavIconSource::OnFavIconDataAvailable));
+          NewCallback(this, &WebUIFavIconSource::OnFavIconDataAvailable));
     } else {
       handle = favicon_service->GetFaviconForURL(
           GURL(path),
           &cancelable_consumer_,
-          NewCallback(this, &DOMUIFavIconSource::OnFavIconDataAvailable));
+          NewCallback(this, &WebUIFavIconSource::OnFavIconDataAvailable));
     }
     // Attach the ChromeURLDataManager request ID to the history request.
     cancelable_consumer_.SetClientData(favicon_service, handle, request_id);
@@ -48,13 +48,13 @@ void DOMUIFavIconSource::StartDataRequest(const std::string& path,
   }
 }
 
-std::string DOMUIFavIconSource::GetMimeType(const std::string&) const {
+std::string WebUIFavIconSource::GetMimeType(const std::string&) const {
   // We need to explicitly return a mime type, otherwise if the user tries to
   // drag the image they get no extension.
   return "image/png";
 }
 
-void DOMUIFavIconSource::OnFavIconDataAvailable(
+void WebUIFavIconSource::OnFavIconDataAvailable(
     FaviconService::Handle request_handle,
     bool know_favicon,
     scoped_refptr<RefCountedMemory> data,
@@ -73,7 +73,7 @@ void DOMUIFavIconSource::OnFavIconDataAvailable(
   }
 }
 
-void DOMUIFavIconSource::SendDefaultResponse(int request_id) {
+void WebUIFavIconSource::SendDefaultResponse(int request_id) {
   if (!default_favicon_.get()) {
     default_favicon_ =
         ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
diff --git a/chrome/browser/dom_ui/dom_ui_favicon_source.h b/chrome/browser/dom_ui/web_ui_favicon_source.h
index 84c29fc..71f8cde 100644
--- a/chrome/browser/dom_ui/dom_ui_favicon_source.h
+++ b/chrome/browser/dom_ui/web_ui_favicon_source.h
@@ -1,9 +1,9 @@
-// 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.
 
-#ifndef CHROME_BROWSER_DOM_UI_DOM_UI_FAVICON_SOURCE_H_
-#define CHROME_BROWSER_DOM_UI_DOM_UI_FAVICON_SOURCE_H_
+#ifndef CHROME_BROWSER_DOM_UI_WEB_UI_FAVICON_SOURCE_H_
+#define CHROME_BROWSER_DOM_UI_WEB_UI_FAVICON_SOURCE_H_
 #pragma once
 
 #include <string>
@@ -18,9 +18,9 @@ class Profile;
 
 // FavIconSource is the gateway between network-level chrome:
 // requests for favicons and the history backend that serves these.
-class DOMUIFavIconSource : public ChromeURLDataManager::DataSource {
+class WebUIFavIconSource : public ChromeURLDataManager::DataSource {
  public:
-  explicit DOMUIFavIconSource(Profile* profile);
+  explicit WebUIFavIconSource(Profile* profile);
 
   // Called when the network layer has requested a resource underneath
   // the path we registered.
@@ -41,7 +41,7 @@ class DOMUIFavIconSource : public ChromeURLDataManager::DataSource {
   // Sends the default favicon.
   void SendDefaultResponse(int request_id);
 
-  virtual ~DOMUIFavIconSource();
+  virtual ~WebUIFavIconSource();
 
   Profile* profile_;
   CancelableRequestConsumerT<int, 0> cancelable_consumer_;
@@ -50,7 +50,7 @@ class DOMUIFavIconSource : public ChromeURLDataManager::DataSource {
   // database doesn't have a favicon for a webpage.
   scoped_refptr<RefCountedMemory> default_favicon_;
 
-  DISALLOW_COPY_AND_ASSIGN(DOMUIFavIconSource);
+  DISALLOW_COPY_AND_ASSIGN(WebUIFavIconSource);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_DOM_UI_FAVICON_SOURCE_H_
+#endif  // CHROME_BROWSER_DOM_UI_WEB_UI_FAVICON_SOURCE_H_
diff --git a/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc b/chrome/browser/dom_ui/web_ui_thumbnail_source.cc
index 91ce8c9..9f8789c 100644
--- a/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc
+++ b/chrome/browser/dom_ui/web_ui_thumbnail_source.cc
@@ -1,8 +1,8 @@
-// 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.
 
-#include "chrome/browser/dom_ui/dom_ui_thumbnail_source.h"
+#include "chrome/browser/dom_ui/web_ui_thumbnail_source.h"
 
 #include "base/callback.h"
 #include "chrome/browser/profiles/profile.h"
@@ -12,17 +12,17 @@
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
-DOMUIThumbnailSource::DOMUIThumbnailSource(Profile* profile)
+WebUIThumbnailSource::WebUIThumbnailSource(Profile* profile)
     : DataSource(chrome::kChromeUIThumbnailPath, MessageLoop::current()),
       profile_(profile) {
   // Set TopSites now as Profile isn't thread safe.
   top_sites_ = profile_->GetTopSites();
 }
 
-DOMUIThumbnailSource::~DOMUIThumbnailSource() {
+WebUIThumbnailSource::~WebUIThumbnailSource() {
 }
 
-void DOMUIThumbnailSource::StartDataRequest(const std::string& path,
+void WebUIThumbnailSource::StartDataRequest(const std::string& path,
                                             bool is_off_the_record,
                                             int request_id) {
   scoped_refptr<RefCountedBytes> data;
@@ -34,19 +34,19 @@ void DOMUIThumbnailSource::StartDataRequest(const std::string& path,
   }
 }
 
-std::string DOMUIThumbnailSource::GetMimeType(const std::string&) const {
+std::string WebUIThumbnailSource::GetMimeType(const std::string&) const {
   // We need to explicitly return a mime type, otherwise if the user tries to
   // drag the image they get no extension.
   return "image/png";
 }
 
-MessageLoop* DOMUIThumbnailSource::MessageLoopForRequestPath(
+MessageLoop* WebUIThumbnailSource::MessageLoopForRequestPath(
     const std::string& path) const {
   // TopSites can be accessed from the IO thread.
   return top_sites_.get() ? NULL : DataSource::MessageLoopForRequestPath(path);
 }
 
-void DOMUIThumbnailSource::SendDefaultThumbnail(int request_id) {
+void WebUIThumbnailSource::SendDefaultThumbnail(int request_id) {
   // Use placeholder thumbnail.
   if (!default_thumbnail_.get()) {
     default_thumbnail_ =
diff --git a/chrome/browser/dom_ui/dom_ui_thumbnail_source.h b/chrome/browser/dom_ui/web_ui_thumbnail_source.h
index 57a1187..71c1ccc 100644
--- a/chrome/browser/dom_ui/dom_ui_thumbnail_source.h
+++ b/chrome/browser/dom_ui/web_ui_thumbnail_source.h
@@ -1,9 +1,9 @@
-// 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.
 
-#ifndef CHROME_BROWSER_DOM_UI_DOM_UI_THUMBNAIL_SOURCE_H_
-#define CHROME_BROWSER_DOM_UI_DOM_UI_THUMBNAIL_SOURCE_H_
+#ifndef CHROME_BROWSER_DOM_UI_WEB_UI_THUMBNAIL_SOURCE_H_
+#define CHROME_BROWSER_DOM_UI_WEB_UI_THUMBNAIL_SOURCE_H_
 #pragma once
 
 #include <string>
@@ -21,9 +21,9 @@ class TopSites;
 
 // ThumbnailSource is the gateway between network-level chrome: requests for
 // thumbnails and the history/top-sites backend that serves these.
-class DOMUIThumbnailSource : public ChromeURLDataManager::DataSource {
+class WebUIThumbnailSource : public ChromeURLDataManager::DataSource {
  public:
-  explicit DOMUIThumbnailSource(Profile* profile);
+  explicit WebUIThumbnailSource(Profile* profile);
 
   // Called when the network layer has requested a resource underneath
   // the path we registered.
@@ -36,7 +36,7 @@ class DOMUIThumbnailSource : public ChromeURLDataManager::DataSource {
   virtual MessageLoop* MessageLoopForRequestPath(const std::string& path) const;
 
  private:
-  virtual ~DOMUIThumbnailSource();
+  virtual ~WebUIThumbnailSource();
 
   // Send the default thumbnail when we are missing a real one.
   void SendDefaultThumbnail(int request_id);
@@ -50,7 +50,7 @@ class DOMUIThumbnailSource : public ChromeURLDataManager::DataSource {
   // TopSites.
   scoped_refptr<history::TopSites> top_sites_;
 
-  DISALLOW_COPY_AND_ASSIGN(DOMUIThumbnailSource);
+  DISALLOW_COPY_AND_ASSIGN(WebUIThumbnailSource);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_DOM_UI_THUMBNAIL_SOURCE_H_
+#endif  // CHROME_BROWSER_DOM_UI_WEB_UI_THUMBNAIL_SOURCE_H_
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index 5ff10a2..718640c 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.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.
 
@@ -14,7 +14,7 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
-#include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
+#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
 #include "chrome/browser/external_protocol_handler.h"
 #include "chrome/browser/extensions/execute_code_in_tab_function.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
@@ -386,10 +386,10 @@ ExtensionFunctionDispatcher::ExtensionFunctionDispatcher(
                                 render_view_host->process()->id());
 
   // If the extension has permission to load chrome://favicon/ resources we need
-  // to make sure that the DOMUIFavIconSource is registered with the
+  // to make sure that the WebUIFavIconSource is registered with the
   // ChromeURLDataManager.
   if (extension->HasHostPermission(GURL(chrome::kChromeUIFavIconURL))) {
-    DOMUIFavIconSource* favicon_source = new DOMUIFavIconSource(profile_);
+    WebUIFavIconSource* favicon_source = new WebUIFavIconSource(profile_);
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         NewRunnableMethod(ChromeURLDataManager::GetInstance(),
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index fa91007..80fbb02 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -869,12 +869,8 @@
         'browser/dom_ui/devtools_ui.h',
         'browser/dom_ui/dom_ui.cc',
         'browser/dom_ui/dom_ui.h',
-        'browser/dom_ui/dom_ui_favicon_source.cc',
-        'browser/dom_ui/dom_ui_favicon_source.h',
         'browser/dom_ui/dom_ui_theme_source.cc',
         'browser/dom_ui/dom_ui_theme_source.h',
-        'browser/dom_ui/dom_ui_thumbnail_source.cc',
-        'browser/dom_ui/dom_ui_thumbnail_source.h',
         'browser/dom_ui/downloads_dom_handler.cc',
         'browser/dom_ui/downloads_dom_handler.h',
         'browser/dom_ui/downloads_ui.cc',
@@ -989,8 +985,12 @@
         'browser/dom_ui/value_helper.h',
         'browser/dom_ui/web_ui_factory.cc',
         'browser/dom_ui/web_ui_factory.h',
+        'browser/dom_ui/web_ui_favicon_source.cc',
+        'browser/dom_ui/web_ui_favicon_source.h',
         'browser/dom_ui/web_ui_screenshot_source.cc',
         'browser/dom_ui/web_ui_screenshot_source.h',
+        'browser/dom_ui/web_ui_thumbnail_source.cc',
+        'browser/dom_ui/web_ui_thumbnail_source.h',
         'browser/dom_ui/web_ui_util.cc',
         'browser/dom_ui/web_ui_util.h',
         'browser/download/base_file.cc',