Correctly integrate StoragePartition into TestingProfile.

components/autofill/core/browser/autofill_download_unittest.cc

 // Copyright 2013 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 <list>
 
 #include "base/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/core/browser/autofill_download.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/common/form_data.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebInputElement.h"
 
-using content::BrowserThread;
 using WebKit::WebInputElement;
 
 namespace autofill {
 
 namespace {
 
 class MockAutofillMetrics : public AutofillMetrics {
  public:
   MockAutofillMetrics() {}
   MOCK_CONST_METHOD1(LogServerQueryMetric, void(ServerQueryMetric metric));
@@ skipping 22 matching lines @@
 // AutofillDownloadManager. Then it records responses to different initiated
 // requests, which are verified later. To mock network requests
 // TestURLFetcherFactory is used, which creates URLFetchers that do not
 // go over the wire, but allow calling back HTTP responses directly.
 // The responses in test are out of order and verify: successful query request,
 // successful upload request, failed upload request.
 class AutofillDownloadTest : public AutofillDownloadManager::Observer,
                              public testing::Test {
  public:
   AutofillDownloadTest()
-      : download_manager_(&profile_, this),
-        io_thread_(BrowserThread::IO) {
-  }
-
-  virtual void SetUp() {
-    io_thread_.StartIOThread();
-    profile_.CreateRequestContext();
-  }
-
-  virtual void TearDown() {
-    profile_.ResetRequestContext();
-    io_thread_.Stop();
+      : download_manager_(&profile_, this) {
   }
 
   void LimitCache(size_t cache_size) {
     download_manager_.set_max_form_cache_size(cache_size);
   }
 
   // AutofillDownloadManager::Observer implementation.
   virtual void OnLoadedServerPredictions(
       const std::string& response_xml) OVERRIDE {
     ResponseData response;
@@ skipping 31 matching lines @@
   struct ResponseData {
     ResponseType type_of_response;
     int error;
     std::string signature;
     std::string response;
 
     ResponseData() : type_of_response(REQUEST_QUERY_FAILED), error(0) {}
   };
   std::list<ResponseData> responses_;
 
+  content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;

[tfarina, 2013/07/11 01:35:45]

do you still need profile_?

[awong, 2013/07/11 21:04:15]

Seems to be used by download_manager_.

   AutofillDownloadManager download_manager_;
-
- private:
-  // The profile's request context must be released on the IO thread.
-  content::TestBrowserThread io_thread_;
 };
 
 TEST_F(AutofillDownloadTest, QueryAndUploadTest) {
-  base::MessageLoopForUI message_loop;
   // Create and register factory.
   net::TestURLFetcherFactory factory;
 
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
   field.label = ASCIIToUTF16("username");
   field.name = ASCIIToUTF16("username");
   field.form_control_type = "text";
@@ skipping 191 matching lines @@
   responses_.pop_front();
 
   // Upload requests should be ignored for the next 10 seconds.
   EXPECT_FALSE(download_manager_.StartUploadRequest(
       *(form_structures[0]), true, FieldTypeSet()));
   fetcher = factory.GetFetcherByID(5);
   EXPECT_EQ(NULL, fetcher);
 }
 
 TEST_F(AutofillDownloadTest, CacheQueryTest) {
-  base::MessageLoopForUI message_loop;
   // Create and register factory.
   net::TestURLFetcherFactory factory;
 
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("username");
@@ skipping 136 matching lines @@
   EXPECT_EQ(static_cast<size_t>(0), responses_.size());
 
   fetcher = factory.GetFetcherByID(3);
   ASSERT_TRUE(fetcher);
   FakeOnURLFetchComplete(fetcher, 200, std::string(responses[0]));
   ASSERT_EQ(static_cast<size_t>(1), responses_.size());
   EXPECT_EQ(responses[0], responses_.front().response);
 }
 
 }  // namespace autofill