Revert of Allow url::SchemeHostPort to hold non-file scheme without port

content/public/common/content_client.h

 // Copyright (c) 2012 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 CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_
 #define CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
 #include "ui/base/layout.h"
-#include "url/url_util.h"
 
 class GURL;
 
 namespace base {
 class RefCountedStaticMemory;
 }
 
 namespace IPC {
 class Message;
 }
@@ skipping 54 matching lines @@
   // Sets the data on the current gpu.
   virtual void SetGpuInfo(const gpu::GPUInfo& gpu_info) {}
 
   // Gives the embedder a chance to register its own pepper plugins.
   virtual void AddPepperPlugins(
       std::vector<content::PepperPluginInfo>* plugins) {}
 
   // Gives the embedder a chance to register its own standard and saveable
   // url schemes early on in the startup sequence.
   virtual void AddAdditionalSchemes(
-      std::vector<url::SchemeWithType>* standard_schemes,
+      std::vector<std::string>* standard_schemes,
       std::vector<std::string>* savable_schemes) {}
 
   // Returns whether the given message should be sent in a swapped out renderer.
   virtual bool CanSendWhileSwappedOut(const IPC::Message* message);
 
   // Returns a string describing the embedder product name and version,
   // of the form "productname/version", with no other slashes.
   // Used as part of the user agent string.
   virtual std::string GetProduct() const;
 
@@ skipping 53 matching lines @@
   ContentPluginClient* plugin_;
   // The embedder API for participating in renderer logic.
   ContentRendererClient* renderer_;
   // The embedder API for participating in utility logic.
   ContentUtilityClient* utility_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_