Fix some pecularities in my C++ style for achuith@.

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 <utility>
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
@@ skipping 14 matching lines @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "unicode/smpdtfmt.h"
 
 namespace {
 
 const char kDateFormat[] = "dd MMM yyyy HH:mm:ss zzz";
 
-std::pair<double, std::string> YearFromNow() {
+bool YearFromNow(double* date_double, std::string* date_string) {

[achuithb, 2013/01/08 22:44:43]

You still need a function comment. Can we rename date_double to date_epoch or
date_msec instead?

[Dan Beam, 2013/01/08 22:53:06]

Done.

+  *date_double = (base::Time::Now() + base::TimeDelta::FromDays(365)).ToTimeT();
+
   UErrorCode status = U_ZERO_ERROR;
   icu::SimpleDateFormat simple_formatter(icu::UnicodeString(kDateFormat),
                                          icu::Locale("en_US"),
                                          status);
-  DCHECK(U_SUCCESS(status));
-
-  const double year_from_now =
-      (base::Time::Now() + base::TimeDelta::FromDays(365)).ToTimeT();
+  if (!U_SUCCESS(status))
+    return false;
 
   icu::UnicodeString date_unicode_string;
-  simple_formatter.format(static_cast<UDate>(year_from_now * 1000),
+  simple_formatter.format(static_cast<UDate>(*date_double * 1000),
                           date_unicode_string,
                           status);
-  DCHECK(U_SUCCESS(status));
+  if (!U_SUCCESS(status))
+    return false;
 
-  std::string date_string;
-  UTF16ToUTF8(date_unicode_string.getBuffer(),
-              static_cast<size_t>(date_unicode_string.length()),
-              &date_string);
-
-  return std::make_pair(year_from_now, date_string);
+  return UTF16ToUTF8(date_unicode_string.getBuffer(),
+                     static_cast<size_t>(date_unicode_string.length()),
+                     date_string);
 }
 
 }  // namespace
 
 class PromoResourceServiceTest : public testing::Test {
  public:
   // |promo_resource_service_| must be created after |local_state_|.
   PromoResourceServiceTest()
       : local_state_(TestingBrowserProcess::GetGlobal()),
         promo_resource_service_(new PromoResourceService) {}
@@ skipping 16 matching lines @@
         time_slice_(0),
         max_group_(0),
         max_views_(0),
         closed_(false) {}
 
   void Init(const std::string& json,
             const std::string& promo_text,
             double start,
             int num_groups, int initial_segment, int increment,
             int time_slice, int max_group, int max_views) {
-    std::pair<double, std::string> year_from_now = YearFromNow();
+    double year_from_now_double;

[achuithb, 2013/01/08 22:44:43]

year_from_now_epoch or year_from_now_msec?

[Dan Beam, 2013/01/08 22:53:06]

Done.

+    std::string year_from_now_string;
+    ASSERT_TRUE(YearFromNow(&year_from_now_double, &year_from_now_string));
+
     std::vector<std::string> replacements;
-    replacements.push_back(year_from_now.second);
+    replacements.push_back(year_from_now_string);
 
-    std::string json_with_year(
+    std::string json_with_end_date(
         ReplaceStringPlaceholders(json, replacements, NULL));
-    Value* value(base::JSONReader::Read(json_with_year));
+    Value* value(base::JSONReader::Read(json_with_end_date));
     ASSERT_TRUE(value);
 
     DictionaryValue* dict = NULL;
     value->GetAsDictionary(&dict);
     ASSERT_TRUE(dict);
     test_json_.reset(dict);
 
     promo_type_ = NotificationPromo::NTP_NOTIFICATION_PROMO;
     promo_text_ = promo_text;
 
     start_ = start;
-    end_ = year_from_now.first;
+    end_ = year_from_now_double;
 
     num_groups_ = num_groups;
     initial_segment_ = initial_segment;
     increment_ = increment;
     time_slice_ = time_slice;
     max_group_ = max_group;
 
     max_views_ = max_views;
 
     closed_ = false;
@@ skipping 400 matching lines @@
   promo_test.TestInitFromPrefs();
 }
 
 TEST_F(PromoResourceServiceTest, PromoServerURLTest) {
   GURL promo_server_url = NotificationPromo::PromoServerURL();
   EXPECT_FALSE(promo_server_url.is_empty());
   EXPECT_TRUE(promo_server_url.is_valid());
   EXPECT_TRUE(promo_server_url.SchemeIs(chrome::kHttpsScheme));
   // TODO(achuith): Test this better.
 }