Improve <adview> implementation and add tests.

content/test/net/url_request_prepackaged_interceptor.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 CHROME_BROWSER_COMPONENT_UPDATER_COMPONENT_UPDATER_INTERCEPTOR_H_
 #define CHROME_BROWSER_COMPONENT_UPDATER_COMPONENT_UPDATER_INTERCEPTOR_H_
 
+#include <string>
+
 #include "base/basictypes.h"
 
 class GURL;
 
 namespace base {
 class FilePath;
 }
 
 namespace content {
 
 // Intercepts HTTP requests and gives pre-defined responses to specified URLs.
 // The pre-defined responses are loaded from files on disk.  The interception
 // occurs while the URLRequestPrepackagedInterceptor is alive.
 class URLRequestPrepackagedInterceptor {
  public:
-  URLRequestPrepackagedInterceptor();
+  URLRequestPrepackagedInterceptor(const std::string& scheme,

[agl, 2013/03/26 22:27:16]

This constructor needs a comment.

[rpaquay, 2013/03/27 22:57:25]

Done.

+                                   const std::string& hostname);
   virtual ~URLRequestPrepackagedInterceptor();
 
   // When requests for |url| arrive, respond with the contents of |path|. The
-  // hostname of |url| must be "localhost" to avoid DNS lookups, and the scheme
-  // must be "http".
+  // hostname and scheme of |url| must match the corresponding parameters
+  // passed as constructor arguments.
   void SetResponse(const GURL& url, const base::FilePath& path);
 
   // Identical to SetResponse except that query parameters are ignored on
   // incoming URLs when comparing against |url|.
   void SetResponseIgnoreQuery(const GURL& url, const base::FilePath& path);
 
   // Returns how many requests have been issued that have a stored reply.
   int GetHitCount();
 
  private:
   class Delegate;
 
+  std::string scheme_;

[agl, 2013/03/26 22:27:16]

can be const I think.

[rpaquay, 2013/03/27 22:57:25]

Done.

+  std::string hostname_;
+
   // After creation, |delegate_| lives on the IO thread, and a task to delete
   // it is posted from ~URLRequestPrepackagedInterceptor().
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestPrepackagedInterceptor);
 };
 
+// Intercepts HTTP requests and gives pre-defined responses to specified URLs.

[agl, 2013/03/26 22:27:16]

Is this actually useful? It seems that just using
URLRequestPrepackagedInterceptor directly would be clearer, although I don't
object if you judge that it is.

[rpaquay, 2013/03/27 22:57:25]

I don't have a strong opinion on this. The common case is "http://localhost", so
I thought it would be useful to leave a shortcut for that case.

+// The hostname of urls must be "localhost", and the scheme must be "http".
+class URLLocalHostRequestPrepackagedInterceptor
+    : public URLRequestPrepackagedInterceptor {
+ public:
+  URLLocalHostRequestPrepackagedInterceptor();
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(URLLocalHostRequestPrepackagedInterceptor);
+};
+
 }  // namespace content
 
 #endif  // CHROME_BROWSER_COMPONENT_UPDATER_COMPONENT_UPDATER_INTERCEPTOR_H_