Modify the base::JSONReader interface to take a set of options rather than a boolean flag.

chrome/browser/web_resource/promo_resource_service_unittest.cc

 // 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.
 
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 39 matching lines @@
                      "        \"inproduct\": \"31/01/10 01:00 GMT\""
                      "       },"
                      "       {"
                      "        \"name\": \"custom_logo_end\","
                      "        \"inproduct\": \"31/01/12 01:00 GMT\""
                      "       }"
                      "    ]"
                      "  }"
                      "}";
   scoped_ptr<DictionaryValue> test_json(
-      static_cast<DictionaryValue*>(base::JSONReader::Read(json, false)));
+      static_cast<DictionaryValue*>(base::JSONReader::Read(json)));
 
   // Check that prefs are set correctly.
   web_resource_service_->UnpackLogoSignal(*(test_json.get()));
   PrefService* prefs = profile_.GetPrefs();
   ASSERT_TRUE(prefs != NULL);
 
   double logo_start =
       prefs->GetDouble(prefs::kNtpCustomLogoStart);
   EXPECT_EQ(logo_start, 1264899600);  // unix epoch for Jan 31 2010 0100 GMT.
   double logo_end =
@@ skipping 10 matching lines @@
          "       },"
          "       {"
          "        \"name\": \"custom_logo_end\","
          "        \"inproduct\": \"31/01/12 01:00 GMT\""
          "       }"
          "    ]"
          "  }"
          "}";
   test_json->Clear();
   test_json.reset(static_cast<DictionaryValue*>(
-      base::JSONReader::Read(json, false)));
+      base::JSONReader::Read(json)));
 
   // Check that prefs are set correctly.
   web_resource_service_->UnpackLogoSignal(*(test_json.get()));
 
   logo_start = prefs->GetDouble(prefs::kNtpCustomLogoStart);
   EXPECT_EQ(logo_start, 1267365600);  // date changes to Feb 28 2010 1400 GMT.
 
   // If no date is included in the prefs, reset custom logo dates to 0.
   json = "{ "
          "  \"topic\": {"
          "    \"answers\": ["
          "       {"
          "       }"
          "    ]"
          "  }"
          "}";
   test_json->Clear();
   test_json.reset(static_cast<DictionaryValue*>(
-      base::JSONReader::Read(json, false)));
+      base::JSONReader::Read(json)));
 
   // Check that prefs are set correctly.
   web_resource_service_->UnpackLogoSignal(*(test_json.get()));
   logo_start = prefs->GetDouble(prefs::kNtpCustomLogoStart);
   EXPECT_EQ(logo_start, 0);  // date value reset to 0;
   logo_end = prefs->GetDouble(prefs::kNtpCustomLogoEnd);
   EXPECT_EQ(logo_end, 0);  // date value reset to 0;
 }
 
 class NotificationPromoTestDelegate : public NotificationPromo::Delegate {
@@ skipping 22 matching lines @@
   void Init(NotificationPromo* notification_promo,
             const std::string& json,
             double start, double end,
             int build, int time_slice,
             int max_group, int max_views, int platform,
             int feature_mask, const std::string& text, bool closed,
             bool gplus) {
     notification_promo_ = notification_promo;
 
     test_json_.reset(static_cast<DictionaryValue*>(
-        base::JSONReader::Read(json, false)));
+        base::JSONReader::Read(json)));
 
     start_ = start;
     end_ = end;
 
     build_ = build;
     time_slice_ = time_slice;
     max_group_ = max_group;
     max_views_ = max_views;
     platform_ = platform;
 
@@ skipping 525 matching lines @@
                      "        \"name\": \"webstore_promo:15:1:\","
                      "        \"question\": \"The header!\","
                      "        \"inproduct_target\": \"The button label!\","
                      "        \"inproduct\": \"http://link.com\","
                      "        \"tooltip\": \"No thanks, hide this.\""
                      "       }"
                      "    ]"
                      "  }"
                      "}";
   scoped_ptr<DictionaryValue> test_json(static_cast<DictionaryValue*>(
-      base::JSONReader::Read(json, false)));
+      base::JSONReader::Read(json)));
 
   // Set the source logo URL to verify that it gets cleared.
   AppsPromo::SetSourcePromoLogoURL(GURL("https://www.google.com/test.png"));
 
   // Check that prefs are set correctly.
   web_resource_service_->UnpackWebStoreSignal(*(test_json.get()));
 
   AppsPromo::PromoData actual_data = AppsPromo::GetPromo();
   EXPECT_EQ("341252", actual_data.id);
   EXPECT_EQ("The header!", actual_data.header);
@@ skipping 15 matching lines @@
                      "  \"topic\": {"
                      "    \"answers\": ["
                      "       {"
                      "        \"answer_id\": \"sdlfj32\","
                      "        \"name\": \"webstore_promo:#klsdjlfSD\""
                      "       }"
                      "    ]"
                      "  }"
                      "}";
   scoped_ptr<DictionaryValue> test_json(static_cast<DictionaryValue*>(
-      base::JSONReader::Read(json, false)));
+      base::JSONReader::Read(json)));
 
   // Check that prefs are set correctly.
   web_resource_service_->UnpackWebStoreSignal(*(test_json.get()));
   EXPECT_FALSE(AppsPromo::IsPromoSupportedForLocale());
   EXPECT_TRUE(AppsPromo::IsWebStoreSupportedForLocale());
 }
 
 // Tests that we can successfully unpack web store signals with HTTPS
 // logos.
 TEST_F(PromoResourceServiceTest, UnpackWebStoreSignalHttpsLogo) {
@@ skipping 16 matching lines @@
       "        \"question\": \"Header!\","
       "        \"inproduct_target\": \"The button label!\","
       "        \"inproduct\": \"http://link.com\","
       "        \"tooltip\": \"No thanks, hide this.\""
       "       }"
       "    ]"
       "  }"
       "}";
 
   scoped_ptr<DictionaryValue> test_json(static_cast<DictionaryValue*>(
-      base::JSONReader::Read(json, false)));
+      base::JSONReader::Read(json)));
 
   // Update the promo multiple times to verify the logo is cached correctly.
   for (size_t i = 0; i < 2; ++i) {
     web_resource_service_->UnpackWebStoreSignal(*(test_json.get()));
 
     // We should only need to run the message loop the first time since the
     // image is then cached.
     if (i == 0)
       loop_.RunAllPending();
 
@@ skipping 39 matching lines @@
       "        \"question\": \"Header!\","
       "        \"inproduct_target\": \"The button label!\","
       "        \"inproduct\": \"http://link.com\","
       "        \"tooltip\": \"No thanks, hide this.\""
       "       }"
       "    ]"
       "  }"
       "}";
 
   scoped_ptr<DictionaryValue> test_json(static_cast<DictionaryValue*>(
-      base::JSONReader::Read(json, false)));
+      base::JSONReader::Read(json)));
 
   web_resource_service_->UnpackWebStoreSignal(*(test_json.get()));
 
   loop_.RunAllPending();
 
   // Reset this scoped_ptr to prevent a DCHECK.
   web_resource_service_->apps_promo_logo_fetcher_.reset();
 
   AppsPromo::PromoData actual_data = AppsPromo::GetPromo();
   EXPECT_EQ("340252", actual_data.id);
@@ skipping 30 matching lines @@
       "        \"question\": \"Header!\","
       "        \"inproduct_target\": \"The button label!\","
       "        \"inproduct\": \"http://link.com\","
       "        \"tooltip\": \"No thanks, hide this.\""
       "       }"
       "    ]"
       "  }"
       "}";
 
   scoped_ptr<DictionaryValue> test_json(static_cast<DictionaryValue*>(
-      base::JSONReader::Read(json, false)));
+      base::JSONReader::Read(json)));
 
   web_resource_service_->UnpackWebStoreSignal(*(test_json.get()));
 
   loop_.RunAllPending();
 
   // Reset this scoped_ptr to prevent a DCHECK.
   web_resource_service_->apps_promo_logo_fetcher_.reset();
 
   AppsPromo::PromoData actual_data = AppsPromo::GetPromo();
   EXPECT_EQ("340252", actual_data.id);
@@ skipping 47 matching lines @@
   EXPECT_TRUE(PromoResourceService::IsBuildTargeted(stable, 7));
   EXPECT_TRUE(PromoResourceService::IsBuildTargeted(stable, 15));
   EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, 8));
   EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, 11));
   EXPECT_TRUE(PromoResourceService::IsBuildTargeted(stable, 12));
 
   // invalid
   EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, -1));
   EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, INT_MAX));
 }