diff options
Diffstat (limited to 'ceee/ie')
| -rw-r--r-- | ceee/ie/broker/cookie_api_module.cc | 2 | ||||
| -rw-r--r-- | ceee/ie/broker/tab_api_module_unittest.cc | 2 | ||||
| -rw-r--r-- | ceee/ie/broker/window_events_funnel_unittest.cc | 2 | ||||
| -rw-r--r-- | ceee/ie/plugin/bho/events_funnel_unittest.cc | 2 | ||||
| -rw-r--r-- | ceee/ie/plugin/bho/webnavigation_events_funnel.cc | 12 | ||||
| -rw-r--r-- | ceee/ie/plugin/bho/webnavigation_events_funnel_unittest.cc | 24 | ||||
| -rw-r--r-- | ceee/ie/plugin/bho/webrequest_events_funnel.cc | 12 | ||||
| -rw-r--r-- | ceee/ie/plugin/bho/webrequest_events_funnel_unittest.cc | 24 |
8 files changed, 40 insertions, 40 deletions
diff --git a/ceee/ie/broker/cookie_api_module.cc b/ceee/ie/broker/cookie_api_module.cc index 56b28d4..5ab7442 100644 --- a/ceee/ie/broker/cookie_api_module.cc +++ b/ceee/ie/broker/cookie_api_module.cc @@ -55,7 +55,7 @@ bool CookieApiResult::CreateCookieValue(const CookieInfo& cookie_info) { cookie->SetBoolean(keys::kHttpOnlyKey, cookie_info.http_only == TRUE); cookie->SetBoolean(keys::kSessionKey, cookie_info.session == TRUE); if (cookie_info.session == FALSE) - cookie->SetReal(keys::kExpirationDateKey, cookie_info.expiration_date); + cookie->SetDouble(keys::kExpirationDateKey, cookie_info.expiration_date); cookie->SetString(keys::kStoreIdKey, com::ToString(cookie_info.store_id)); DCHECK(value() == NULL); set_value(cookie.release()); diff --git a/ceee/ie/broker/tab_api_module_unittest.cc b/ceee/ie/broker/tab_api_module_unittest.cc index 30878ee..e44a914 100644 --- a/ceee/ie/broker/tab_api_module_unittest.cc +++ b/ceee/ie/broker/tab_api_module_unittest.cc @@ -433,7 +433,7 @@ TEST(TabApi, GetSpecifiedOrCurrentFrameWindow) { testing::LogDisabler no_dchecks; StrictMock<testing::MockWindowUtils> window_utils; - scoped_ptr<Value> bad_args(Value::CreateRealValue(4.7)); + scoped_ptr<Value> bad_args(Value::CreateDoubleValue(4.7)); DictionaryValue bad_dict_args; // no window ID key. DictionaryValue good_dict_args; int window1_id = 77; diff --git a/ceee/ie/broker/window_events_funnel_unittest.cc b/ceee/ie/broker/window_events_funnel_unittest.cc index 6e74348..0965d2a 100644 --- a/ceee/ie/broker/window_events_funnel_unittest.cc +++ b/ceee/ie/broker/window_events_funnel_unittest.cc @@ -55,7 +55,7 @@ TEST(WindowEventsFunnelTest, SendEvent) { event_args.SetInteger("Answer to the Ultimate Question of Life," "the Universe, and Everything", 42); event_args.SetString("AYBABTU", "All your base are belong to us"); - event_args.SetReal("www.unrealtournament.com", 3.0); + event_args.SetDouble("www.unrealtournament.com", 3.0); ListValue args_list; args_list.Append(event_args.DeepCopy()); diff --git a/ceee/ie/plugin/bho/events_funnel_unittest.cc b/ceee/ie/plugin/bho/events_funnel_unittest.cc index 2e0248e..877d44d 100644 --- a/ceee/ie/plugin/bho/events_funnel_unittest.cc +++ b/ceee/ie/plugin/bho/events_funnel_unittest.cc @@ -35,7 +35,7 @@ TEST(EventsFunnelTest, SendEvent) { event_args.SetInteger("Answer to the Ultimate Question of Life," "the Universe, and Everything", 42); event_args.SetString("AYBABTU", "All your base are belong to us"); - event_args.SetReal("www.unrealtournament.com", 3.0); + event_args.SetDouble("www.unrealtournament.com", 3.0); ListValue args_list; args_list.Append(event_args.DeepCopy()); diff --git a/ceee/ie/plugin/bho/webnavigation_events_funnel.cc b/ceee/ie/plugin/bho/webnavigation_events_funnel.cc index 2717131..22b8e0a 100644 --- a/ceee/ie/plugin/bho/webnavigation_events_funnel.cc +++ b/ceee/ie/plugin/bho/webnavigation_events_funnel.cc @@ -31,7 +31,7 @@ HRESULT WebNavigationEventsFunnel::OnBeforeNavigate( args.SetString(keys::kUrlKey, url); args.SetInteger(keys::kFrameIdKey, frame_id); args.SetInteger(keys::kRequestIdKey, request_id); - args.SetReal(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); + args.SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); return SendEvent(keys::kOnBeforeNavigate, args); } @@ -45,7 +45,7 @@ HRESULT WebNavigationEventsFunnel::OnBeforeRetarget( args.SetInteger(keys::kSourceTabIdKey, static_cast<int>(source_tab_handle)); args.SetString(keys::kSourceUrlKey, source_url); args.SetString(keys::kTargetUrlKey, target_url); - args.SetReal(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); + args.SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); return SendEvent(keys::kOnBeforeRetarget, args); } @@ -63,7 +63,7 @@ HRESULT WebNavigationEventsFunnel::OnCommitted( args.SetInteger(keys::kFrameIdKey, frame_id); args.SetString(keys::kTransitionTypeKey, transition_type); args.SetString(keys::kTransitionQualifiersKey, transition_qualifiers); - args.SetReal(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); + args.SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); return SendEvent(keys::kOnCommitted, args); } @@ -77,7 +77,7 @@ HRESULT WebNavigationEventsFunnel::OnCompleted( args.SetInteger(keys::kTabIdKey, static_cast<int>(tab_handle)); args.SetString(keys::kUrlKey, url); args.SetInteger(keys::kFrameIdKey, frame_id); - args.SetReal(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); + args.SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); return SendEvent(keys::kOnCompleted, args); } @@ -91,7 +91,7 @@ HRESULT WebNavigationEventsFunnel::OnDOMContentLoaded( args.SetInteger(keys::kTabIdKey, static_cast<int>(tab_handle)); args.SetString(keys::kUrlKey, url); args.SetInteger(keys::kFrameIdKey, frame_id); - args.SetReal(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); + args.SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); return SendEvent(keys::kOnDOMContentLoaded, args); } @@ -107,7 +107,7 @@ HRESULT WebNavigationEventsFunnel::OnErrorOccurred( args.SetString(keys::kUrlKey, url); args.SetInteger(keys::kFrameIdKey, frame_id); args.SetString(keys::kErrorKey, error); - args.SetReal(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); + args.SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); return SendEvent(keys::kOnErrorOccurred, args); } diff --git a/ceee/ie/plugin/bho/webnavigation_events_funnel_unittest.cc b/ceee/ie/plugin/bho/webnavigation_events_funnel_unittest.cc index 87d307a..351c58c 100644 --- a/ceee/ie/plugin/bho/webnavigation_events_funnel_unittest.cc +++ b/ceee/ie/plugin/bho/webnavigation_events_funnel_unittest.cc @@ -45,8 +45,8 @@ TEST(WebNavigationEventsFunnelTest, OnBeforeNavigate) { args.SetString(keys::kUrlKey, url); args.SetInteger(keys::kFrameIdKey, frame_id); args.SetInteger(keys::kRequestIdKey, request_id); - args.SetReal(keys::kTimeStampKey, - base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); + args.SetDouble(keys::kTimeStampKey, + base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); EXPECT_CALL(webnavigation_events_funnel, SendEvent(StrEq(keys::kOnBeforeNavigate), ValuesEqual(&args))) @@ -68,8 +68,8 @@ TEST(WebNavigationEventsFunnelTest, OnBeforeRetarget) { args.SetInteger(keys::kSourceTabIdKey, source_tab_handle); args.SetString(keys::kSourceUrlKey, source_url); args.SetString(keys::kTargetUrlKey, target_url); - args.SetReal(keys::kTimeStampKey, - base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); + args.SetDouble(keys::kTimeStampKey, + base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); EXPECT_CALL(webnavigation_events_funnel, SendEvent(StrEq(keys::kOnBeforeRetarget), ValuesEqual(&args))) @@ -95,8 +95,8 @@ TEST(WebNavigationEventsFunnelTest, OnCommitted) { args.SetInteger(keys::kFrameIdKey, frame_id); args.SetString(keys::kTransitionTypeKey, transition_type); args.SetString(keys::kTransitionQualifiersKey, transition_qualifiers); - args.SetReal(keys::kTimeStampKey, - base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); + args.SetDouble(keys::kTimeStampKey, + base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); EXPECT_CALL(webnavigation_events_funnel, SendEvent(StrEq(keys::kOnCommitted), ValuesEqual(&args))) @@ -119,8 +119,8 @@ TEST(WebNavigationEventsFunnelTest, OnCompleted) { args.SetInteger(keys::kTabIdKey, tab_handle); args.SetString(keys::kUrlKey, url); args.SetInteger(keys::kFrameIdKey, frame_id); - args.SetReal(keys::kTimeStampKey, - base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); + args.SetDouble(keys::kTimeStampKey, + base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); EXPECT_CALL(webnavigation_events_funnel, SendEvent(StrEq(keys::kOnCompleted), ValuesEqual(&args))) @@ -142,8 +142,8 @@ TEST(WebNavigationEventsFunnelTest, OnDOMContentLoaded) { args.SetInteger(keys::kTabIdKey, tab_handle); args.SetString(keys::kUrlKey, url); args.SetInteger(keys::kFrameIdKey, frame_id); - args.SetReal(keys::kTimeStampKey, - base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); + args.SetDouble(keys::kTimeStampKey, + base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); EXPECT_CALL(webnavigation_events_funnel, SendEvent(StrEq(keys::kOnDOMContentLoaded), ValuesEqual(&args))) @@ -167,8 +167,8 @@ TEST(WebNavigationEventsFunnelTest, OnErrorOccurred) { args.SetString(keys::kUrlKey, url); args.SetInteger(keys::kFrameIdKey, frame_id); args.SetString(keys::kErrorKey, error); - args.SetReal(keys::kTimeStampKey, - base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); + args.SetDouble(keys::kTimeStampKey, + base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); EXPECT_CALL(webnavigation_events_funnel, SendEvent(StrEq(keys::kOnErrorOccurred), ValuesEqual(&args))) diff --git a/ceee/ie/plugin/bho/webrequest_events_funnel.cc b/ceee/ie/plugin/bho/webrequest_events_funnel.cc index c0d5b1e..fa86941 100644 --- a/ceee/ie/plugin/bho/webrequest_events_funnel.cc +++ b/ceee/ie/plugin/bho/webrequest_events_funnel.cc @@ -30,7 +30,7 @@ HRESULT WebRequestEventsFunnel::OnBeforeRedirect(int request_id, args.SetString(keys::kUrlKey, url); args.SetInteger(keys::kStatusCodeKey, status_code); args.SetString(keys::kRedirectUrlKey, redirect_url); - args.SetReal(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); + args.SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); return SendEvent(keys::kOnBeforeRedirect, args); } @@ -47,7 +47,7 @@ HRESULT WebRequestEventsFunnel::OnBeforeRequest(int request_id, args.SetString(keys::kMethodKey, method); args.SetInteger(keys::kTabIdKey, static_cast<int>(tab_handle)); args.SetString(keys::kTypeKey, type); - args.SetReal(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); + args.SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); return SendEvent(keys::kOnBeforeRequest, args); } @@ -60,7 +60,7 @@ HRESULT WebRequestEventsFunnel::OnCompleted(int request_id, args.SetInteger(keys::kRequestIdKey, request_id); args.SetString(keys::kUrlKey, url); args.SetInteger(keys::kStatusCodeKey, status_code); - args.SetReal(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); + args.SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); return SendEvent(keys::kOnCompleted, args); } @@ -73,7 +73,7 @@ HRESULT WebRequestEventsFunnel::OnErrorOccurred(int request_id, args.SetInteger(keys::kRequestIdKey, request_id); args.SetString(keys::kUrlKey, url); args.SetString(keys::kErrorKey, error); - args.SetReal(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); + args.SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); return SendEvent(keys::kOnErrorOccurred, args); } @@ -87,7 +87,7 @@ HRESULT WebRequestEventsFunnel::OnHeadersReceived( args.SetInteger(keys::kRequestIdKey, request_id); args.SetString(keys::kUrlKey, url); args.SetInteger(keys::kStatusCodeKey, status_code); - args.SetReal(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); + args.SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); return SendEvent(keys::kOnHeadersReceived, args); } @@ -100,7 +100,7 @@ HRESULT WebRequestEventsFunnel::OnRequestSent(int request_id, args.SetInteger(keys::kRequestIdKey, request_id); args.SetString(keys::kUrlKey, url); args.SetString(keys::kIpKey, ip); - args.SetReal(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); + args.SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(time_stamp)); return SendEvent(keys::kOnRequestSent, args); } diff --git a/ceee/ie/plugin/bho/webrequest_events_funnel_unittest.cc b/ceee/ie/plugin/bho/webrequest_events_funnel_unittest.cc index b56a35c..82e7df1 100644 --- a/ceee/ie/plugin/bho/webrequest_events_funnel_unittest.cc +++ b/ceee/ie/plugin/bho/webrequest_events_funnel_unittest.cc @@ -43,8 +43,8 @@ TEST(WebRequestEventsFunnelTest, OnBeforeRedirect) { args.SetString(keys::kUrlKey, url); args.SetInteger(keys::kStatusCodeKey, status_code); args.SetString(keys::kRedirectUrlKey, redirect_url); - args.SetReal(keys::kTimeStampKey, - base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); + args.SetDouble(keys::kTimeStampKey, + base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); EXPECT_CALL(webrequest_events_funnel, SendEvent(StrEq(keys::kOnBeforeRedirect), ValuesEqual(&args))) @@ -69,8 +69,8 @@ TEST(WebRequestEventsFunnelTest, OnBeforeRequest) { args.SetString(keys::kMethodKey, method); args.SetInteger(keys::kTabIdKey, tab_handle); args.SetString(keys::kTypeKey, type); - args.SetReal(keys::kTimeStampKey, - base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); + args.SetDouble(keys::kTimeStampKey, + base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); EXPECT_CALL(webrequest_events_funnel, SendEvent(StrEq(keys::kOnBeforeRequest), ValuesEqual(&args))) @@ -92,8 +92,8 @@ TEST(WebRequestEventsFunnelTest, OnCompleted) { args.SetInteger(keys::kRequestIdKey, request_id); args.SetString(keys::kUrlKey, url); args.SetInteger(keys::kStatusCodeKey, status_code); - args.SetReal(keys::kTimeStampKey, - base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); + args.SetDouble(keys::kTimeStampKey, + base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); EXPECT_CALL(webrequest_events_funnel, SendEvent(StrEq(keys::kOnCompleted), ValuesEqual(&args))) @@ -114,8 +114,8 @@ TEST(WebRequestEventsFunnelTest, OnErrorOccurred) { args.SetInteger(keys::kRequestIdKey, request_id); args.SetString(keys::kUrlKey, url); args.SetString(keys::kErrorKey, error); - args.SetReal(keys::kTimeStampKey, - base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); + args.SetDouble(keys::kTimeStampKey, + base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); EXPECT_CALL(webrequest_events_funnel, SendEvent(StrEq(keys::kOnErrorOccurred), ValuesEqual(&args))) @@ -136,8 +136,8 @@ TEST(WebRequestEventsFunnelTest, OnHeadersReceived) { args.SetInteger(keys::kRequestIdKey, request_id); args.SetString(keys::kUrlKey, url); args.SetInteger(keys::kStatusCodeKey, status_code); - args.SetReal(keys::kTimeStampKey, - base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); + args.SetDouble(keys::kTimeStampKey, + base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); EXPECT_CALL(webrequest_events_funnel, SendEvent(StrEq(keys::kOnHeadersReceived), ValuesEqual(&args))) @@ -158,8 +158,8 @@ TEST(WebRequestEventsFunnelTest, OnRequestSent) { args.SetInteger(keys::kRequestIdKey, request_id); args.SetString(keys::kUrlKey, url); args.SetString(keys::kIpKey, ip); - args.SetReal(keys::kTimeStampKey, - base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); + args.SetDouble(keys::kTimeStampKey, + base::Time::kMillisecondsPerSecond * time_stamp.ToDoubleT()); EXPECT_CALL(webrequest_events_funnel, SendEvent(StrEq(keys::kOnRequestSent), ValuesEqual(&args))) |
