Revert[6] "move some public headers into private"

Revert[6] "move some public headers into private"

This reverts commit cc1229c9d5e57b45305ba8f99ae33e92db0032bc.

BUG=skia:
TBR=

Committed: https://skia.googlesource.com/skia/+/e02716908fe82c7c4ae9b415793277620a22bcd6

[reed2, 2015-08-15 14:21:34]

The CQ bit was checked by reed@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-08-15 14:21:41]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1295003002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1295003002/1

[reed2, 2015-08-15 14:22:44]

The CQ bit was unchecked by reed@chromium.org

[reed2, 2015-08-15 14:22:56]

The CQ bit was checked by reed@chromium.org

[commit-bot: I haz the power, 2015-08-15 14:23:01]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1295003002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1295003002/1

[commit-bot: I haz the power, 2015-08-15 14:28:38]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/e02716908fe82c7c4ae9b415793277620a22bcd6

[reed2, 2015-08-15 15:37:52]

Need to revert:

[7247/7365] CXX
obj/content/shell/renderer/content_shell_lib.shell_content_renderer_client.o
FAILED: /b/build/goma/gomacc
../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF
obj/chromecast/browser/test/cast_shell_test_support.chromecast_browser_test.o.d
-DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_FILE_OFFSET_BITS=64
-DCHROMIUM_BUILD -DCR_CLANG_REVISION=242792-1 -DUI_COMPOSITOR_IMAGE_TRANSPORT
-DUSE_AURA=1 -DUSE_OZONE=1 -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_LIBJPEG_TURBO=1
-DENABLE_ONE_CLICK_SIGNIN -DENABLE_PRE_SYNC_BACKUP -DENABLE_WEBRTC=1
-DENABLE_MEDIA_ROUTER=1 -DUSE_PROPRIETARY_CODECS -DENABLE_MPEG2TS_STREAM_PARSER
-DENABLE_BROWSER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_NOTIFICATIONS
-DENABLE_HIDPI=1 -DENABLE_TOPCHROME_MD=1 -DDONT_EMBED_BUILD_METADATA
-DDCHECK_ALWAYS_ON=1 -DFIELDTRIAL_TESTING_ENABLED -DLOG_DISABLED=0
-DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGINS=1
-DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1
-DENABLE_BACKGROUND=1 -DENABLE_GOOGLE_NOW=1 -DENABLE_SPELLCHECK=1
-DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1
-DENABLE_SUPERVISED_USERS=1 -DENABLE_MDNS=1 -DENABLE_SERVICE_DISCOVERY=1
-DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD
-DSAFE_BROWSING_DB_LOCAL -DSAFE_BROWSING_SERVICE -DHAS_OUT_OF_PROC_TEST_RUNNER
-DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DUNIT_TEST
-DGTEST_HAS_RTTI=0 -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -DUSE_NSS_CERTS=1
-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND
-DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../.. -Igen -I../../third_party/khronos
-I../../gpu -I../../skia/config -Igen/angle -I../../third_party/WebKit/Source
-I../../testing/gtest/include -I../../third_party/mojo/src -fstack-protector
--param=ssp-buffer-size=4 -Werror -pthread -fno-strict-aliasing -Wall
-Wno-unused-parameter -Wno-missing-field-initializers -fvisibility=hidden -pipe
-fPIC -Wno-reserved-user-defined-literal -Xclang -load -Xclang
/b/build/slave/cast_shell_linux/build/src/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so
-Xclang -add-plugin -Xclang find-bad-constructs -Xclang
-plugin-arg-find-bad-constructs -Xclang check-templates -fcolor-diagnostics
-B/b/build/slave/cast_shell_linux/build/src/third_party/binutils/Linux_x64/Release/bin
-Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration
-Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing
-Wno-deprecated-register -Wno-inconsistent-missing-override
-Wno-shift-negative-value -m64 -march=x86-64 -O2 -fno-ident -fdata-sections
-ffunction-sections -funwind-tables -fno-exceptions -fno-rtti
-fno-threadsafe-statics -fvisibility-inlines-hidden -Wsign-compare -std=gnu++11 
-c ../../chromecast/browser/test/chromecast_browser_test.cc -o
obj/chromecast/browser/test/cast_shell_test_support.chromecast_browser_test.o
In file included from
../../chromecast/browser/test/chromecast_browser_test.cc:12:
In file included from ../../chromecast/browser/cast_content_window.h:10:
In file included from ../../content/public/browser/web_contents_observer.h:16:
In file included from ../../third_party/skia/include/core/SkColor.h:11:
In file included from ../../third_party/skia/include/core/SkScalar.h:12:
../../third_party/skia/include/core/../private/SkFloatingPoint.h:13:10: fatal
error: 'SkTypes.h' file not found
#include "SkTypes.h"