Correctly integrate StoragePartition into TestingProfile.

chrome/browser/search_engines/template_url_service_test_util.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_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_TEST_UTIL_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_TEST_UTIL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/search_engines/template_url_service_observer.h"
 #include "chrome/test/base/testing_browser_process.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 
 class GURL;
 class TemplateURLService;
 class TestingProfile;
 class TestingTemplateURLService;
 class TestingProfile;
 class WebDataService;
 
 // TemplateURLServiceTestUtilBase contains basic API to ease testing of
 // TemplateURLService. User should take care of the infrastructure separately.
 class TemplateURLServiceTestUtilBase : public TemplateURLServiceObserver {
  public:
   TemplateURLServiceTestUtilBase();
   virtual ~TemplateURLServiceTestUtilBase();
 
   void CreateTemplateUrlService();
 
   // TemplateURLServiceObserver implemementation.
   virtual void OnTemplateURLServiceChanged() OVERRIDE;
 
   // Gets the observer count.
   int GetObserverCount();
 
   // Sets the observer count to 0.
   void ResetObserverCount();
 
-  // Blocks the caller until the service has finished servicing all pending
-  // requests.
-  static void BlockTillServiceProcessesRequests();
-
-  // Blocks the caller until the I/O thread has finished servicing all pending
-  // requests.
-  static void BlockTillIOThreadProcessesRequests();
-
   // Makes sure the load was successful and sent the correct notification.
   void VerifyLoad();
 
   // Makes the model believe it has been loaded (without actually doing the
   // load). Since this avoids setting the built-in keyword version, the next
   // load will do a merge from prepopulated data.
   void ChangeModelToLoadState();
 
   // Deletes the current model (and doesn't create a new one).
   void ClearModel();
@@ skipping 49 matching lines @@
   // methods).
   void SetUp();
 
   // Cleans up data structures for this class  (mirroring gtest standard
   // methods).
   void TearDown();
 
   // Returns the TestingProfile.
   virtual TestingProfile* profile() const OVERRIDE;
 
-  // Starts an I/O thread.
-  void StartIOThread();
-
-  // Runs all pending tasks on the UI loop.
-  void PumpLoop();
-
  private:
-  base::MessageLoopForUI message_loop_;
   // Needed to make the DeleteOnUIThread trait of WebDataService work
   // properly.
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread db_thread_;
-  content::TestBrowserThread io_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<TestingProfile> profile_;
   base::ScopedTempDir temp_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLServiceTestUtil);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_TEST_UTIL_H_