diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 00:15:41 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 00:15:41 +0000 |
| commit | cd57857578b7b905ee27580d8ca279f6f7642e82 (patch) | |
| tree | 82230a21554f358452b508ee64ef1ea3efcb518b /chrome/browser/web_resource | |
| parent | cc7cde43832b547cdab856fe1bedc9514ca38e13 (diff) | |
| download | chromium_src-cd57857578b7b905ee27580d8ca279f6f7642e82.zip chromium_src-cd57857578b7b905ee27580d8ca279f6f7642e82.tar.gz chromium_src-cd57857578b7b905ee27580d8ca279f6f7642e82.tar.bz2 | |
Modify the base::JSONReader interface to take a set of options rather than a boolean flag.
This is just prep work for a large CL that rewrites the JSON parser. Splitting
out this interface change will make it easier to review the other CL.
BUG=121469
TEST=No functional change.
Review URL: https://chromiumcodereview.appspot.com/9960077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_resource')
| -rw-r--r-- | chrome/browser/web_resource/promo_resource_service_unittest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/web_resource/promo_resource_service_unittest.cc b/chrome/browser/web_resource/promo_resource_service_unittest.cc index 017fb85..ee50587 100644 --- a/chrome/browser/web_resource/promo_resource_service_unittest.cc +++ b/chrome/browser/web_resource/promo_resource_service_unittest.cc @@ -57,7 +57,7 @@ TEST_F(PromoResourceServiceTest, UnpackLogoSignal) { " }" "}"; 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())); @@ -88,7 +88,7 @@ TEST_F(PromoResourceServiceTest, UnpackLogoSignal) { "}"; 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())); @@ -107,7 +107,7 @@ TEST_F(PromoResourceServiceTest, UnpackLogoSignal) { "}"; 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())); @@ -150,7 +150,7 @@ class NotificationPromoTestDelegate : public NotificationPromo::Delegate { notification_promo_ = notification_promo; test_json_.reset(static_cast<DictionaryValue*>( - base::JSONReader::Read(json, false))); + base::JSONReader::Read(json))); start_ = start; end_ = end; @@ -696,7 +696,7 @@ TEST_F(PromoResourceServiceTest, UnpackWebStoreSignal) { " }" "}"; 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")); @@ -732,7 +732,7 @@ TEST_F(PromoResourceServiceTest, UnpackPartialWebStoreSignal) { " }" "}"; 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())); @@ -769,7 +769,7 @@ TEST_F(PromoResourceServiceTest, UnpackWebStoreSignalHttpsLogo) { "}"; 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) { @@ -829,7 +829,7 @@ TEST_F(PromoResourceServiceTest, UnpackWebStoreSignalHttpsLogoError) { "}"; scoped_ptr<DictionaryValue> test_json(static_cast<DictionaryValue*>( - base::JSONReader::Read(json, false))); + base::JSONReader::Read(json))); web_resource_service_->UnpackWebStoreSignal(*(test_json.get())); @@ -880,7 +880,7 @@ TEST_F(PromoResourceServiceTest, UnpackWebStoreSignalHttpLogo) { "}"; scoped_ptr<DictionaryValue> test_json(static_cast<DictionaryValue*>( - base::JSONReader::Read(json, false))); + base::JSONReader::Read(json))); web_resource_service_->UnpackWebStoreSignal(*(test_json.get())); |