Add extra data to BrowserContext so that content layer and other embedders can stash data with it t…

content/browser/renderer_host/resource_dispatcher_host_unittest.cc

 // 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.
 
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 252 matching lines @@
   }
 
   static URLRequestTestDelayedStartJob* list_head_;
   URLRequestTestDelayedStartJob* next_;
 };
 
 URLRequestTestDelayedStartJob*
 URLRequestTestDelayedStartJob::list_head_ = NULL;
 
 // Associated with an URLRequest to determine if the URLRequest gets deleted.
-class TestUserData : public net::URLRequest::UserData {
+class TestUserData : public base::SupportsUserData::Data {
  public:
   explicit TestUserData(bool* was_deleted)
       : was_deleted_(was_deleted) {
   }
 
   ~TestUserData() {
     *was_deleted_ = true;
   }
 
  private:
   bool* was_deleted_;
 };
 
 class TestResourceDispatcherHostDelegate
     : public content::ResourceDispatcherHostDelegate {
  public:
   TestResourceDispatcherHostDelegate()
       : defer_start_(false) {
   }
 
-  void set_url_request_user_data(net::URLRequest::UserData* user_data) {

[darin (slow to review), 2012/02/15 06:19:05]

shouldn't net::URLRequest::UserData still work even if UserData is defined on
the base class of URLRequest?

[jam, 2012/02/15 15:44:43]

I removed the net::URLRequest::UserData class, since there's no need for it.

+  void set_url_request_user_data(base::SupportsUserData::Data* user_data) {
     user_data_.reset(user_data);
   }
 
   void set_defer_start(bool value) {
     defer_start_ = value;
   }
 
   // ResourceDispatcherHostDelegate implementation:
 
   virtual void RequestBeginning(
       net::URLRequest* request,
       content::ResourceContext* resource_context,
       ResourceType::Type resource_type,
       int child_id,
       int route_id,
       bool is_continuation_of_transferred_request,
       ScopedVector<content::ResourceThrottle>* throttles) OVERRIDE {
     const void* key = user_data_.get();
     request->SetUserData(key, user_data_.release());
   }
 
   virtual bool ShouldDeferStart(
       net::URLRequest* request,
       content::ResourceContext* resource_context) OVERRIDE {
     return defer_start_;
   }
 
  private:
   bool defer_start_;
-  scoped_ptr<net::URLRequest::UserData> user_data_;
+  scoped_ptr<base::SupportsUserData::Data> user_data_;
 };
 
 class ResourceDispatcherHostTest : public testing::Test,
                                    public IPC::Message::Sender {
  public:
   ResourceDispatcherHostTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         io_thread_(BrowserThread::IO, &message_loop_),
         ALLOW_THIS_IN_INITIALIZER_LIST(filter_(new ForwardingFilter(this))),
         old_factory_(NULL),
@@ skipping 1036 matching lines @@
   net::URLRequestStatus status;
 
   void* iter = NULL;
   EXPECT_TRUE(IPC::ReadParam(&msgs[0][0], &iter, &request_id));
   EXPECT_TRUE(IPC::ReadParam(&msgs[0][0], &iter, &status));
 
   EXPECT_EQ(1, request_id);
   EXPECT_EQ(net::URLRequestStatus::FAILED, status.status());
   EXPECT_EQ(net::ERR_UNKNOWN_URL_SCHEME, status.error());
 }