Revert 148720 - [Web Intents] Localization of intent titles for CWS suggestions

chrome/browser/intents/cws_intents_registry.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_INTENTS_CWS_INTENTS_REGISTRY_H_
 #define CHROME_BROWSER_INTENTS_CWS_INTENTS_REGISTRY_H_
 
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 namespace net {
 class URLRequestContextGetter;
 }
 
-class CWSIntentsRegistryForTest;
-
 // Handles storing and retrieving of web intents in the web database.
 // The registry provides filtering logic to retrieve specific types of intents.
 class CWSIntentsRegistry : public ProfileKeyedService,
                            public net::URLFetcherDelegate {
  public:
   // Data returned from CWS for a single service.
   struct IntentExtensionInfo {
     IntentExtensionInfo();
     ~IntentExtensionInfo();
 
@@ skipping 19 matching lines @@
                          const string16& mimetype,
                          const ResultsCallback& callback);
 
   // Build a REST query URL to retrieve intent info from CWS.
   static GURL BuildQueryURL(const string16& action, const string16& type);
 
  private:
   // Make sure that only CWSIntentsRegistryFactory can create an instance of
   // CWSIntentsRegistry.
   friend class CWSIntentsRegistryFactory;
-  friend class ::CWSIntentsRegistryForTest;
+  FRIEND_TEST_ALL_PREFIXES(CWSIntentsRegistryTest, ValidQuery);
+  FRIEND_TEST_ALL_PREFIXES(CWSIntentsRegistryTest, InvalidQuery);
 
   struct IntentsQuery;
 
   // This is an opaque version of URLFetcher*, so we can use it as a hash key.
   typedef intptr_t URLFetcherHandle;
 
   // Maps URL fetchers to queries. IntentsQuery objects are owned by the map.
   typedef base::hash_map<URLFetcherHandle, IntentsQuery*> QueryMap;
 
   // |context| is a profile-dependent URL request context. Must not be NULL.
   explicit CWSIntentsRegistry(net::URLRequestContextGetter* context);
   virtual ~CWSIntentsRegistry();
 
   // net::URLFetcherDelegate implementation.
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // Map for all in-flight web data requests/intent queries.
   QueryMap queries_;
 
   // Request context for any CWS requests.
   scoped_refptr<net::URLRequestContextGetter> request_context_;
 
   DISALLOW_COPY_AND_ASSIGN(CWSIntentsRegistry);
 };
 
 #endif  // CHROME_BROWSER_INTENTS_CWS_INTENTS_REGISTRY_H_