Split part of about_handler into chrome/common to break the browser-renderer ...

chrome/browser/browser_about_handler.cc

 // Copyright (c) 2010 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/browser_about_handler.h"
 
+#include <algorithm>
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/file_version_info.h"
 #include "base/histogram.h"
 #include "base/i18n/number_formatting.h"
 #include "base/path_service.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/memory_details.h"
 #include "chrome/browser/metrics/histogram_synchronizer.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/common/about_handler.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/renderer/about_handler.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "webkit/glue/webkit_glue.h"
 #ifdef CHROME_V8
 #include "v8/include/v8.h"
 #endif
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros/syslogs_library.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#endif
-
 #if defined(OS_WIN)
 #include "chrome/browser/views/about_ipc_dialog.h"
 #include "chrome/browser/views/about_network_dialog.h"
 #elif defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
+#include "chrome/browser/chromeos/cros/syslogs_library.h"
 #include "chrome/browser/chromeos/version_loader.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/cocoa/about_ipc_dialog.h"
 #endif
 
 #if defined(USE_TCMALLOC)
 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
 #endif
 
 using sync_api::SyncManager;
@@ skipping 116 matching lines @@
   // Where the results are fed to.
   scoped_refptr<AboutSource> source_;
 
   // ID identifying the request.
   int request_id_;
 
   // Handles asynchronously loading the version.
   chromeos::VersionLoader loader_;
 
   // Used to request the version.
- CancelableRequestConsumer consumer_;
+  CancelableRequestConsumer consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeOSAboutVersionHandler);
 };
 #endif
 
 // Individual about handlers ---------------------------------------------------
 
 #if defined(OS_CHROMEOS)
 std::string AboutNetwork(const std::string& query) {
   int refresh;
@@ skipping 147 matching lines @@
     timers = new ListValue();
     root.Set(L"timers", timers);
   }
 
   // NOTE: Counters start at index 1.
   for (int index = 1; index <= table->GetMaxCounters(); index++) {
     // Get the counter's full name
     std::string full_name = table->GetRowName(index);
     if (full_name.length() == 0)
       break;
-    DCHECK(full_name[1] == ':');
+    DCHECK_EQ(':', full_name[1]);
     char counter_type = full_name[0];
     std::string name = full_name.substr(2);
 
     // JSON doesn't allow '.' in names.
     size_t pos;
     while ((pos = name.find(".")) != std::string::npos)
       name.replace(pos, 1, ":");
 
     // Try to see if this name already exists.
     DictionaryValue* counter = NULL;
@@ skipping 607 matching lines @@
   // Handle URL to crash the browser process.
   if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutBrowserCrash)) {
     // Induce an intentional crash in the browser process.
     int* bad_pointer = NULL;
     *bad_pointer = 42;
     return true;
   }
 
   // There are a few about: URLs that we hand over to the renderer. If the
   // renderer wants them, don't do any rewriting.
-  if (AboutHandler::WillHandle(*url))
+  if (chrome_about_handler::WillHandle(*url))
     return false;
 
   // Anything else requires our special handler, make sure its initialized.
   // We only need to register the AboutSource once and it is kept globally.
   // There is currently no way to remove a data source.
   static bool initialized = false;
   if (!initialized) {
     about_source = new AboutSource();
     initialized = true;
   }
@@ skipping 34 matching lines @@
     // Run the dialog. This will re-use the existing one if it's already up.
     AboutIPCDialog::RunDialog();
     return true;
   }
 #endif
 
 #endif  // OFFICIAL_BUILD
 
   return false;
 }