Remove the chrome namespace around ChromeContent[Renderer]Client.

chrome/common/chrome_content_client.cc

Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index a054b8d55cd9210f47e1b9d273401126617bc928..3df42ecf9d15ab49a78ddeecd145f2c9595e9eaa 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -148,7 +148,7 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
     if (skip_pdf_file_check || base::PathExists(path)) {
       content::PepperPluginInfo pdf;
       pdf.path = path;
-      pdf.name = chrome::ChromeContentClient::kPDFPluginName;
+      pdf.name = ChromeContentClient::kPDFPluginName;
       content::WebPluginMimeType pdf_mime_type(kPDFPluginMimeType,
                                                kPDFPluginExtension,
                                                kPDFPluginDescription);
@@ -176,7 +176,7 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
     if (skip_nacl_file_check || base::PathExists(path)) {
       content::PepperPluginInfo nacl;
       nacl.path = path;
-      nacl.name = chrome::ChromeContentClient::kNaClPluginName;
+      nacl.name = ChromeContentClient::kNaClPluginName;
       content::WebPluginMimeType nacl_mime_type(kNaClPluginMimeType,
                                                 kNaClPluginExtension,
                                                 kNaClPluginDescription);
@@ -330,7 +330,7 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
   info.name = kRemotingViewerPluginName;
   info.description = kRemotingViewerPluginDescription;
   info.path = base::FilePath::FromUTF8Unsafe(
-      chrome::ChromeContentClient::kRemotingViewerPluginPath);
+      ChromeContentClient::kRemotingViewerPluginPath);
   content::WebPluginMimeType remoting_mime_type(
       kRemotingViewerPluginMimeType,
       kRemotingViewerPluginMimeExtension,
@@ -438,8 +438,6 @@ bool GetBundledPepperFlash(content::PepperPluginInfo* plugin) {
 
 }  // namespace
 
-namespace chrome {
-
 void ChromeContentClient::SetActiveURL(const GURL& url) {
   base::debug::SetCrashKeyValue(crash_keys::kActiveURL,
                                 url.possibly_invalid_spec());
@@ -481,12 +479,12 @@ void ChromeContentClient::AddAdditionalSchemes(
     std::vector<std::string>* savable_schemes) {
   standard_schemes->push_back(extensions::kExtensionScheme);
   savable_schemes->push_back(extensions::kExtensionScheme);
-  standard_schemes->push_back(kExtensionResourceScheme);
-  savable_schemes->push_back(kExtensionResourceScheme);
+  standard_schemes->push_back(chrome::kExtensionResourceScheme);
+  savable_schemes->push_back(chrome::kExtensionResourceScheme);
   standard_schemes->push_back(chrome::kChromeSearchScheme);
   savable_schemes->push_back(chrome::kChromeSearchScheme);
 #if defined(OS_CHROMEOS)
-  standard_schemes->push_back(kCrosScheme);
+  standard_schemes->push_back(chrome::kCrosScheme);
 #endif
 }
 
@@ -562,5 +560,3 @@ std::string ChromeContentClient::GetCarbonInterposePath() const {
   return std::string(kInterposeLibraryPath);
 }
 #endif
-
-}  // namespace chrome