Extract ResultCatcher from ExtensionApiTest. Use it in ShellApiTest.

chrome/browser/extensions/extension_apitest.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_EXTENSIONS_EXTENSION_APITEST_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_
 
 #include <deque>
 #include <string>
 
@@ skipping 51 matching lines @@
 
   ExtensionApiTest();
   virtual ~ExtensionApiTest();
 
  protected:
   // Helper class that observes tests failing or passing. Observation starts
   // when the class is constructed. Get the next result by calling
   // GetNextResult() and message() if GetNextResult() return false. If there
   // are no results, this method will pump the UI message loop until one is
   // received.
+  // DEPRECATED: Use extensions/test/result_catcher.h instead.
   class ResultCatcher : public content::NotificationObserver {
    public:
     ResultCatcher();
     virtual ~ResultCatcher();
 
     // Pumps the UI loop until a notification is received that an API test
     // succeeded or failed. Returns true if the test succeeded, false otherwise.
     bool GetNextResult();
 
     void RestrictToProfile(Profile* profile) { profile_restriction_ = profile; }
@@ skipping 122 matching lines @@
   scoped_ptr<base::DictionaryValue> test_config_;
 
   // Hold the test WebSocket server.
   scoped_ptr<net::SpawnedTestServer> websocket_server_;
 
   // Hold the test FTP server.
   scoped_ptr<net::SpawnedTestServer> ftp_server_;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_