Convert to std::wstring as late as possible.

Convert to std::wstring as late as possible.

This is the change requested by Will.

BUG=None
TEST=None

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=72254

[sjg, 2011-01-21 17:00:42]

Setting up a new change for the comment received after the code had already been
committed.

[willchan no longer on Chromium, 2011-01-21 17:24:13]

LGTM

On Fri, Jan 21, 2011 at 9:00 AM, <sjg@chromium.org> wrote:

> Reviewers: tfarina, willchan,
>
> Message:
> Setting up a new change for the comment received after the code had already
> been
> committed.
>
>
> Description:
> This is the change requested by Will.
>
> BUG=None
> TEST=None
>
> Please review this at http://codereview.chromium.org/6243010/
>
> SVN Base: http://src.chromium.org/svn/trunk/src/
>
> Affected files:
>  M     chrome/test/url_fetch_test/url_fetch_test.cc
>
>
> Index: chrome/test/url_fetch_test/url_fetch_test.cc
> ===================================================================
> --- chrome/test/url_fetch_test/url_fetch_test.cc        (revision 71802)
> +++ chrome/test/url_fetch_test/url_fetch_test.cc        (working copy)
> @@ -53,8 +53,8 @@
>                const char* wait_cookie_name,
>                const char* wait_cookie_value,
>                const char* var_to_fetch,
> -               const std::wstring& wait_js_expr,
> -               const std::wstring& wait_js_frame_xpath,
> +               const std::string& wait_js_expr,
> +               const std::string& wait_js_frame_xpath,
>                int wait_js_timeout_ms,
>                UrlFetchTestResult* result) {
>     scoped_refptr<TabProxy> tab(GetActiveTab());
> @@ -74,10 +74,11 @@
>         ASSERT_TRUE(result->cookie_value.length());
>       }
>     } else if (!wait_js_expr.empty()) {
> -      bool completed = WaitUntilJavaScriptCondition(tab.get(),
> -                                                    wait_js_frame_xpath,
> -                                                    wait_js_expr,
> -                                                    wait_js_timeout_ms);
> +      bool completed = WaitUntilJavaScriptCondition(
> +          tab.get(),
> +          UTF8ToWide(wait_js_frame_xpath),
> +          UTF8ToWide(wait_js_expr),
> +          wait_js_timeout_ms);
>       ASSERT_TRUE(completed);
>     }
>     if (var_to_fetch) {
> @@ -150,10 +151,10 @@
>       cmd_line->GetSwitchValueASCII("wait_cookie_name");
>   std::string cookie_value =
>       cmd_line->GetSwitchValueASCII("wait_cookie_value");
> -  std::wstring js_expr =
> -      UTF8ToWide(cmd_line->GetSwitchValueASCII("wait_js_expr"));
> -  std::wstring js_frame_xpath =
> -      UTF8ToWide(cmd_line->GetSwitchValueASCII("wait_js_frame_xpath"));
> +  std::string js_expr =
> +      cmd_line->GetSwitchValueASCII("wait_js_expr");
> +  std::string js_frame_xpath =
> +      cmd_line->GetSwitchValueASCII("wait_js_frame_xpath");
>   std::string js_timeout_ms_str =
>       cmd_line->GetSwitchValueASCII("wait_js_timeout");
>
>
>
>

[tfarina, 2011-01-21 17:24:52]

On Fri, Jan 21, 2011 at 3:24 PM, William Chan (陈智昌)
<willchan@chromium.org> wrote:
> LGTM
>
LGTM2!

> On Fri, Jan 21, 2011 at 9:00 AM, <sjg@chromium.org> wrote:
>>
>> Reviewers: tfarina, willchan,
>>
>> Message:
>> Setting up a new change for the comment received after the code had
>> already been
>> committed.
>>
>>
>> Description:
>> This is the change requested by Will.
>>
>> BUG=None
>> TEST=None
>>
>> Please review this at http://codereview.chromium.org/6243010/
>>
>> SVN Base: http://src.chromium.org/svn/trunk/src/
>>
>> Affected files:
>>  M     chrome/test/url_fetch_test/url_fetch_test.cc
>>
>>
>> Index: chrome/test/url_fetch_test/url_fetch_test.cc
>> ===================================================================
>> --- chrome/test/url_fetch_test/url_fetch_test.cc        (revision 71802)
>> +++ chrome/test/url_fetch_test/url_fetch_test.cc        (working copy)
>> @@ -53,8 +53,8 @@
>>                const char* wait_cookie_name,
>>                const char* wait_cookie_value,
>>                const char* var_to_fetch,
>> -               const std::wstring& wait_js_expr,
>> -               const std::wstring& wait_js_frame_xpath,
>> +               const std::string& wait_js_expr,
>> +               const std::string& wait_js_frame_xpath,
>>                int wait_js_timeout_ms,
>>                UrlFetchTestResult* result) {
>>     scoped_refptr<TabProxy> tab(GetActiveTab());
>> @@ -74,10 +74,11 @@
>>         ASSERT_TRUE(result->cookie_value.length());
>>       }
>>     } else if (!wait_js_expr.empty()) {
>> -      bool completed = WaitUntilJavaScriptCondition(tab.get(),
>> -                                                    wait_js_frame_xpath,
>> -                                                    wait_js_expr,
>> -                                                    wait_js_timeout_ms);
>> +      bool completed = WaitUntilJavaScriptCondition(
>> +          tab.get(),
>> +          UTF8ToWide(wait_js_frame_xpath),
>> +          UTF8ToWide(wait_js_expr),
>> +          wait_js_timeout_ms);
>>       ASSERT_TRUE(completed);
>>     }
>>     if (var_to_fetch) {
>> @@ -150,10 +151,10 @@
>>       cmd_line->GetSwitchValueASCII("wait_cookie_name");
>>   std::string cookie_value =
>>       cmd_line->GetSwitchValueASCII("wait_cookie_value");
>> -  std::wstring js_expr =
>> -      UTF8ToWide(cmd_line->GetSwitchValueASCII("wait_js_expr"));
>> -  std::wstring js_frame_xpath =
>> -      UTF8ToWide(cmd_line->GetSwitchValueASCII("wait_js_frame_xpath"));
>> +  std::string js_expr =
>> +      cmd_line->GetSwitchValueASCII("wait_js_expr");
>> +  std::string js_frame_xpath =
>> +      cmd_line->GetSwitchValueASCII("wait_js_frame_xpath");
>>   std::string js_timeout_ms_str =
>>       cmd_line->GetSwitchValueASCII("wait_js_timeout");
>>
>>
>>
>
>



-- 
A: Because it messes up the order in which people normally read text.
 See http://en.wikipedia.org/wiki/Posting_style
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing in e-mail?

-Thiago

[tfarina, 2011-01-21 17:33:22]

Do you need me to land this? If so, let me know, then I'll do this later
tonight.

[sjg1, 2011-01-21 18:00:30]

Yes please! No hurry as it is cosmetic.

On Fri, Jan 21, 2011 at 9:33 AM, <tfarina@chromium.org> wrote:

> Do you need me to land this? If so, let me know, then I'll do this later
> tonight.
>
> http://codereview.chromium.org/6243010/
>

[tfarina, 2011-01-22 00:38:28]

On 2011/01/21 18:00:30, sjg_google.com wrote:
> Yes please! No hurry as it is cosmetic.
> 
I'll be landing it here http://codereview.chromium.org/6299015/, when the
trybots passes.

[tfarina, 2011-01-22 01:45:11]

Landed in r72254.

[sjg, 2011-01-22 02:29:59]

Thanks!

On Fri, Jan 21, 2011 at 5:45 PM, <tfarina@chromium.org> wrote:

> Landed in r72254.
>
>
> http://codereview.chromium.org/6243010/
>