Remove unnamed namespace usage from tests/

tests/ImageDecodingTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #include "TestClassDef.h"
 #include "SkBitmap.h"
@@ skipping 223 matching lines @@
 #endif  // SK_DEBUG
 
 DEF_TEST(ImageDecoding, reporter) {
     test_unpremul(reporter);
 #ifdef SK_DEBUG
     test_stream_life();
     test_row_proc_choice();
 #endif
 }
 
-////////////////////////////////////////////////////////////////////////////////
-namespace {
 // expected output for 8x8 bitmap
-const int kExpectedWidth = 8;
-const int kExpectedHeight = 8;
-const SkColor kExpectedPixels[] = {
+static const int kExpectedWidth = 8;
+static const int kExpectedHeight = 8;
+static const SkColor kExpectedPixels[] = {
     0xffbba570, 0xff395f5d, 0xffe25c39, 0xff197666,
     0xff3cba27, 0xffdefcb0, 0xffc13874, 0xfffa0093,
     0xffbda60e, 0xffc01db6, 0xff2bd688, 0xff9362d4,
     0xffc641b2, 0xffa5cede, 0xff606eba, 0xff8f4bf3,
     0xff3bf742, 0xff8f02a8, 0xff5509df, 0xffc7027e,
     0xff24aa8a, 0xff886c96, 0xff625481, 0xff403689,
     0xffc52152, 0xff78ccd6, 0xffdcb4ab, 0xff09d27d,
     0xffca00f3, 0xff605d47, 0xff446fb2, 0xff576e46,
     0xff273df9, 0xffb41a83, 0xfff812c3, 0xffccab67,
     0xff034218, 0xff7db9a7, 0xff821048, 0xfffe4ab4,
     0xff6fac98, 0xff941d27, 0xff5fe411, 0xfffbb283,
     0xffd86e99, 0xff169162, 0xff71128c, 0xff39cab4,
     0xffa7fe63, 0xff4c956b, 0xffbc22e0, 0xffb272e4,
     0xff129f4a, 0xffe34513, 0xff3d3742, 0xffbd190a,
     0xffb07222, 0xff2e23f8, 0xfff089d9, 0xffb35738,
     0xffa86022, 0xff3340fe, 0xff95fe71, 0xff6a71df
 };
 SK_COMPILE_ASSERT((kExpectedWidth * kExpectedHeight)
                   == SK_ARRAY_COUNT(kExpectedPixels), array_size_mismatch);
-}  // namespace
 
 DEF_TEST(WebP, reporter) {
     const unsigned char encodedWebP[] = {
         0x52, 0x49, 0x46, 0x46, 0x2c, 0x01, 0x00, 0x00, 0x57, 0x45, 0x42, 0x50,
         0x56, 0x50, 0x38, 0x4c, 0x20, 0x01, 0x00, 0x00, 0x2f, 0x07, 0xc0, 0x01,
         0x00, 0xff, 0x01, 0x45, 0x03, 0x00, 0xe2, 0xd5, 0xae, 0x60, 0x2b, 0xad,
         0xd9, 0x68, 0x76, 0xb6, 0x8d, 0x6a, 0x1d, 0xc0, 0xe6, 0x19, 0xd6, 0x16,
         0xb7, 0xb4, 0xef, 0xcf, 0xc3, 0x15, 0x6c, 0xb3, 0xbd, 0x77, 0x0d, 0x85,
         0x6d, 0x1b, 0xa9, 0xb1, 0x2b, 0xdc, 0x3d, 0x83, 0xdb, 0x00, 0x00, 0xc8,
         0x26, 0xe5, 0x01, 0x99, 0x8a, 0xd5, 0xdd, 0xfc, 0x82, 0xcd, 0xcd, 0x9a,
@@ skipping 296 matching lines @@
                     }
                     SkDecodingImageGenerator::Options options(scaleList[i],
                                                               ditherList[j]);
                     test_options(reporter, options, encodedStream, encodedData,
                                  useDataList[m], path);
                 }
             }
         }
     }
 }
-////////////////////////////////////////////////////////////////////////////////