[cros] Support global carrier config.

chrome/browser/chromeos/customization_document.h

Index: chrome/browser/chromeos/customization_document.h
diff --git a/chrome/browser/chromeos/customization_document.h b/chrome/browser/chromeos/customization_document.h
index 0882208c7722c64d9bd608fde351f38180aa997f..04d345993faf8af7d16f83316fe53658ba343ec4 100644
--- a/chrome/browser/chromeos/customization_document.h
+++ b/chrome/browser/chromeos/customization_document.h
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_
 #pragma once
 
-#include <map>
 #include <string>
 
 #include "base/gtest_prod_util.h"
@@ -23,7 +22,6 @@ class PrefService;
 namespace base {
 class DictionaryValue;
 class ListValue;
-class Time;
 }
 
 namespace chromeos {
@@ -111,38 +109,6 @@ class StartupCustomizationDocument : public CustomizationDocument {
 class ServicesCustomizationDocument : public CustomizationDocument,
                                       private URLFetcher::Delegate {
  public:
-  // OEM specific carrier deal.
-  class CarrierDeal {
-   public:
-    explicit CarrierDeal(base::DictionaryValue* deal_dict);
-    ~CarrierDeal();
-
-    // Returns string with the specified |locale| and |id|.
-    // If there's no version for |locale|, default one is returned.
-    // If there's no string with specified |id|, empty string is returned.
-    std::string GetLocalizedString(const std::string& locale,
-                                   const std::string& id) const;
-
-    const std::string& deal_locale() const { return deal_locale_; }
-    const std::string& info_url() const { return info_url_; }
-    const std::string& top_up_url() const { return top_up_url_; }
-    int notification_count() const { return notification_count_; }
-    base::Time expire_date() const { return expire_date_; }
-
-   private:
-    std::string deal_locale_;
-    std::string info_url_;
-    std::string top_up_url_;
-    int notification_count_;
-    base::Time expire_date_;
-    base::DictionaryValue* localized_strings_;
-
-    DISALLOW_COPY_AND_ASSIGN(CarrierDeal);
-  };
-
-  // Carrier ID (ex. "Verizon (us)") mapping to carrier deals.
-  typedef std::map<std::string, CarrierDeal*> CarrierDeals;
-
   static ServicesCustomizationDocument* GetInstance();
 
   // Registers preferences.
@@ -162,29 +128,16 @@ class ServicesCustomizationDocument : public CustomizationDocument,
   std::string GetInitialStartPage(const std::string& locale) const;
   std::string GetSupportPage(const std::string& locale) const;
 
-  // Returns carrier deal by specified |carrier_id|.
-  // Also checks deal restrictions, such as deal locale (launch locale) and
-  // deal expiration date if |check_restrictions| is true.
-  const ServicesCustomizationDocument::CarrierDeal* GetCarrierDeal(
-      const std::string& carrier_id, bool check_restrictions) const;
-
- protected:
-  virtual bool LoadManifestFromString(const std::string& manifest) OVERRIDE;
-
  private:
   FRIEND_TEST(ServicesCustomizationDocumentTest, Basic);

[Dmitry Polukhin, 2011/09/05 06:33:11]

Please replace with FRIEND_TEST_ALL_PREFIXES.

[Nikita (slow), 2011/09/05 10:13:44]

Done.

   FRIEND_TEST(ServicesCustomizationDocumentTest, BadManifest);
-  FRIEND_TEST(ServicesCustomizationDocumentTest, DealOtherLocale);
-  FRIEND_TEST(ServicesCustomizationDocumentTest, NoDealRestrictions);
-  FRIEND_TEST(ServicesCustomizationDocumentTest, OldDeal);
   friend struct DefaultSingletonTraits<ServicesCustomizationDocument>;
 
   // C-tor for singleton construction.
   ServicesCustomizationDocument();
 
   // C-tor for test construction.
-  ServicesCustomizationDocument(const std::string& manifest,
-                                const std::string& initial_locale);
+  explicit ServicesCustomizationDocument(const std::string& manifest);
 
   virtual ~ServicesCustomizationDocument();
 
@@ -217,12 +170,6 @@ class ServicesCustomizationDocument : public CustomizationDocument,
   // How many times we already tried to fetch customization manifest file.
   int num_retries_;
 
-  // Carrier-specific deals.
-  CarrierDeals carrier_deals_;
-
-  // Initial locale value.
-  std::string initial_locale_;
-
   DISALLOW_COPY_AND_ASSIGN(ServicesCustomizationDocument);
 };