Fix metrics test to no longer include the cpp.

Fix metrics test to no longer include the cpp.

The inclusion of the cpp caused linker errors when building skia
components as shared libaries for inclusion in an Android app.
Committed: https://code.google.com/p/skia/source/detail?r=4323

[reed1, 2012-06-25 16:19:08]

adding vandeboo

[epoger, 2012-06-25 16:22:30]

changing vandebo to vandebo@chromium.org

[Steve VanDeBogart, 2012-06-25 16:43:38]

LGTM w/ nit

http://codereview.appspot.com/6338063/diff/1/tests/WArrayTest.cpp
File tests/WArrayTest.cpp (right):

http://codereview.appspot.com/6338063/diff/1/tests/WArrayTest.cpp#newcode173
tests/WArrayTest.cpp:173: result.reset(getAdvanceData((void*)this, fAdvancesLen,
fSubset, fSubsetLen,
nit: 80col

[epoger, 2012-06-25 16:45:27]

http://codereview.appspot.com/6338063/diff/1/tests/WArrayTest.cpp
File tests/WArrayTest.cpp (right):

http://codereview.appspot.com/6338063/diff/1/tests/WArrayTest.cpp#newcode173
tests/WArrayTest.cpp:173: result.reset(getAdvanceData((void*)this, fAdvancesLen,
fSubset, fSubsetLen,
On 2012/06/25 16:43:38, Steve VanDeBogart wrote:
> nit: 80col

Our columns go up to 100!

https://sites.google.com/site/skiadocs/developer-documentation/contributing-c...

[Steve VanDeBogart, 2012-06-25 16:48:05]

On 2012/06/25 16:45:27, epoger wrote:
> http://codereview.appspot.com/6338063/diff/1/tests/WArrayTest.cpp
> File tests/WArrayTest.cpp (right):
> 
> http://codereview.appspot.com/6338063/diff/1/tests/WArrayTest.cpp#newcode173
> tests/WArrayTest.cpp:173: result.reset(getAdvanceData((void*)this,
fAdvancesLen,
> fSubset, fSubsetLen,
> On 2012/06/25 16:43:38, Steve VanDeBogart wrote:
> > nit: 80col
> 
> Our columns go up to 100!
> 
>
https://sites.google.com/site/skiadocs/developer-documentation/contributing-c...

From the guide "Please don't willy-nilly insert longer lines in 80 column
wrapped files. Either be consistent with the surrounding code or, if you really
feel the need, promote the surrounding code to 100 column wrapping."

[DerekS, 2012-06-25 17:00:49]

On 2012/06/25 16:48:05, Steve VanDeBogart wrote:
> On 2012/06/25 16:45:27, epoger wrote:
> > http://codereview.appspot.com/6338063/diff/1/tests/WArrayTest.cpp
> > File tests/WArrayTest.cpp (right):
> > 
> > http://codereview.appspot.com/6338063/diff/1/tests/WArrayTest.cpp#newcode173
> > tests/WArrayTest.cpp:173: result.reset(getAdvanceData((void*)this,
> fAdvancesLen,
> > fSubset, fSubsetLen,
> > On 2012/06/25 16:43:38, Steve VanDeBogart wrote:
> > > nit: 80col
> > 
> > Our columns go up to 100!
> > 
> >
>
https://sites.google.com/site/skiadocs/developer-documentation/contributing-c...
> 
> From the guide "Please don't willy-nilly insert longer lines in 80 column
> wrapped files. Either be consistent with the surrounding code or, if you
really
> feel the need, promote the surrounding code to 100 column wrapping."

I updated the entire file to use the 100 character limit as there were only a
few places that required the change.

[EricB, 2012-06-25 17:13:16]

Verified that this allows the shared libraries to link.