Move DownloadTestObserver and friends down into content.

content/public/test/download_test_observer.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_DOWNLOAD_DOWNLOAD_TEST_OBSERVER_H_
-#define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TEST_OBSERVER_H_
+#ifndef CONTENT_TEST_DOWNLOAD_TEST_OBSERVER_H_
+#define CONTENT_TEST_DOWNLOAD_TEST_OBSERVER_H_
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/download_url_parameters.h"
 #include "net/base/net_errors.h"
 
-namespace internal {
-class MockFileChooserDownloadManagerDelegate;
-}
-
-class Profile;
+namespace content {
 
 // Detects changes to the downloads after construction.
 // Finishes when one of the following happens:
 //   - A specified number of downloads change to a terminal state (defined
 //     in derived classes).
 //   - Specific events, such as a select file dialog.
 // Callers may either probe for the finished state, or wait on it.
 //
 // TODO(rdsmith): Detect manager going down, remove pointer to
 // DownloadManager, transition to finished.  (For right now we
 // just use a scoped_refptr<> to keep it around, but that may cause
 // timeouts on waiting if a DownloadManager::Shutdown() occurs which
 // cancels our in-progress downloads.)
 class DownloadTestObserver : public content::DownloadManager::Observer,

[jam, 2012/08/13 16:00:21]

nit: get rid of content:: everywhere

[Randy Smith (Not in Mondays), 2012/08/13 18:57:49]

Done.

                              public content::DownloadItem::Observer {
  public:
   // Action an observer should take if a dangerous download is encountered.
   enum DangerousDownloadAction {
     ON_DANGEROUS_DOWNLOAD_ACCEPT,  // Accept the download
     ON_DANGEROUS_DOWNLOAD_DENY,  // Deny the download
     ON_DANGEROUS_DOWNLOAD_FAIL  // Fail if a dangerous download is seen
   };
 
   // Create an object that will be considered finished when |wait_count|
@@ skipping 212 matching lines @@
 
   // Count of callbacks.
   size_t called_back_count_;
 
   // We are in the message loop.
   bool waiting_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadTestItemCreationObserver);
 };
 
-// Observes and overrides file chooser activity for a profile. By default, once
-// attached to a profile, this class overrides the default file chooser by
-// replacing the ChromeDownloadManagerDelegate associated with |profile|.
-// NOTE: Again, this overrides the ChromeDownloadManagerDelegate for |profile|.
-class DownloadTestFileChooserObserver {
- public:
-  // Attaches to |profile|. By default file chooser dialogs will be disabled
-  // once attached. Call EnableFileChooser() to re-enable.
-  explicit DownloadTestFileChooserObserver(Profile* profile);
-  ~DownloadTestFileChooserObserver();
+}  // namespace content`
 
-  // Sets whether the file chooser dialog is enabled. If |enable| is false, any
-  // attempt to display a file chooser dialog will cause the download to be
-  // canceled. Otherwise, attempting to display a file chooser dialog will
-  // result in the download continuing with the suggested path.
-  void EnableFileChooser(bool enable);
-
-  // Returns true if a file chooser dialog was displayed since the last time
-  // this method was called.
-  bool TestAndResetDidShowFileChooser();
-
- private:
-  scoped_refptr<internal::MockFileChooserDownloadManagerDelegate>
-      test_delegate_;
-};
-
-#endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TEST_OBSERVER_H_
+#endif  // CONTENT_TEST_DOWNLOAD_TEST_OBSERVER_H_