Set the search provider polling to 100 ms since the last autocomplete request.

In addition, clean up autocomplete_trial.{h,cc} by removing obsolete code.

BUG=136850
TEST=hand tested

Review URL: https://chromiumcodereview.appspot.com/11420057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169714 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 26 insertions, 6 deletions

diff --git a/net/url_request/test_url_fetcher_factory.cc b/net/url_request/test_url_fetcher_factory.cc
index ace90f9..967b810 100644
--- a/net/url_request/test_url_fetcher_factory.cc
+++ b/net/url_request/test_url_fetcher_factory.cc
@@ -32,7 +32,8 @@ ScopedURLFetcherFactory::~ScopedURLFetcherFactory() {
 TestURLFetcher::TestURLFetcher(int id,
                                const GURL& url,
                                URLFetcherDelegate* d)
-    : id_(id),
+    : owner_(NULL),
+      id_(id),
       original_url_(url),
       delegate_(d),
       delegate_for_tests_(NULL),
@@ -47,6 +48,8 @@ TestURLFetcher::TestURLFetcher(int id,
 TestURLFetcher::~TestURLFetcher() {
   if (delegate_for_tests_)
     delegate_for_tests_->OnRequestEnd(id_);
+  if (owner_)
+    owner_->RemoveFetcherFromMap(id_);
 }
 
 void TestURLFetcher::SetUploadData(const std::string& upload_content_type,
@@ -231,7 +234,8 @@ void TestURLFetcher::SetResponseFilePath(const FilePath& path) {
 
 TestURLFetcherFactory::TestURLFetcherFactory()
     : ScopedURLFetcherFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
-      delegate_for_tests_(NULL) {
+      delegate_for_tests_(NULL),
+      remove_fetcher_on_delete_(false) {
 }
 
 TestURLFetcherFactory::~TestURLFetcherFactory() {}
@@ -242,6 +246,8 @@ URLFetcher* TestURLFetcherFactory::CreateURLFetcher(
     URLFetcher::RequestType request_type,
     URLFetcherDelegate* d) {
   TestURLFetcher* fetcher = new TestURLFetcher(id, url, d);
+  if (remove_fetcher_on_delete_)
+    fetcher->set_owner(this);
   fetcher->SetDelegateForTests(delegate_for_tests_);
   fetchers_[id] = fetcher;
   return fetcher;
@@ -270,11 +276,10 @@ class FakeURLFetcher : public TestURLFetcher {
   FakeURLFetcher(const GURL& url,
                  URLFetcherDelegate* d,
                  const std::string& response_data, bool success)
-    : TestURLFetcher(0, url, d),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      : TestURLFetcher(0, url, d),
+        ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
     set_status(URLRequestStatus(
-        success ? URLRequestStatus::SUCCESS :
-            URLRequestStatus::FAILED,
+        success ? URLRequestStatus::SUCCESS : URLRequestStatus::FAILED,
         0));
     set_response_code(success ? 200 : 500);
     SetResponseString(response_data);
diff --git a/net/url_request/test_url_fetcher_factory.h b/net/url_request/test_url_fetcher_factory.h
index 4d452eb..b1e9e78 100644
--- a/net/url_request/test_url_fetcher_factory.h
+++ b/net/url_request/test_url_fetcher_factory.h
@@ -56,6 +56,7 @@ class ScopedURLFetcherFactory : public base::NonThreadSafe {
 // might want to use the FakeURLFetcher and FakeURLFetcherFactory classes
 // below.
 
+class TestURLFetcherFactory;
 class TestURLFetcher : public URLFetcher {
  public:
   // Interface for tests to intercept production code classes using URLFetcher.
@@ -135,6 +136,11 @@ class TestURLFetcher : public URLFetcher {
   virtual bool GetResponseAsFilePath(
       bool take_ownership, FilePath* out_response_path) const OVERRIDE;
 
+  // Sets owner of this class.  Set it to a non-NULL value if you want
+  // to automatically unregister this fetcher from the owning factory
+  // upon destruction.
+  void set_owner(TestURLFetcherFactory* owner) { owner_ = owner; }
+
   // Unique ID in our factory.
   int id() const { return id_; }
 
@@ -173,6 +179,7 @@ class TestURLFetcher : public URLFetcher {
     TEMP_FILE  // Write to a temp file
   };
 
+  TestURLFetcherFactory* owner_;
   const int id_;
   const GURL original_url_;
   URLFetcherDelegate* delegate_;
@@ -206,6 +213,8 @@ typedef TestURLFetcher::DelegateForTests TestURLFetcherDelegateForTests;
 
 // Simple URLFetcherFactory method that creates TestURLFetchers. All fetchers
 // are registered in a map by the id passed to the create method.
+// Optionally, a fetcher may be automatically unregistered from the map upon
+// its destruction.
 class TestURLFetcherFactory : public URLFetcherFactory,
                               public ScopedURLFetcherFactory {
  public:
@@ -220,12 +229,18 @@ class TestURLFetcherFactory : public URLFetcherFactory,
   TestURLFetcher* GetFetcherByID(int id) const;
   void RemoveFetcherFromMap(int id);
   void SetDelegateForTests(TestURLFetcherDelegateForTests* delegate_for_tests);
+  void set_remove_fetcher_on_delete(bool remove_fetcher_on_delete) {
+    remove_fetcher_on_delete_ = remove_fetcher_on_delete;
+  }
 
  private:
   // Maps from id passed to create to the returned URLFetcher.
   typedef std::map<int, TestURLFetcher*> Fetchers;
   Fetchers fetchers_;
   TestURLFetcherDelegateForTests* delegate_for_tests_;
+  // Whether to automatically unregister a fetcher from this factory upon its
+  // destruction, false by default.
+  bool remove_fetcher_on_delete_;
 
   DISALLOW_COPY_AND_ASSIGN(TestURLFetcherFactory);
 };