SPDY - Small bug fix for user after free. Will revert the
change asap.

The change adds a scoped_refptr to SpdySession in DoLoop
to clean up the state and to finish pending reads, in case
 SpdyFramer receives GOAway and closes all streams.

DoReadComplete was holding the last reference before and
DoLoop was accessing the object after DoReadComplete deleted
the object at the end of the function.

R=willchan@chromium.org
BUG=175069
TEST=network unit tests
Review URL: https://codereview.chromium.org/12212102

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181637 0039d316-1c4b-4281-b951-d872f2087c98
Merge branch 'master' into file_path_browser

version control markers

Merge branch 'master' into file_path_browser

remove version control

Fix typo

Merge branch 'master' into file_path_browser

Conflicts:
	chrome/browser/intents/native_services_browsertest.cc
	chrome/browser/ui/intents/native_file_picker_service.cc

Merge branch 'master' into file_path_browser

Conflicts:
	chrome/browser/chromeos/drive/drive_file_system.cc
	chrome/browser/chromeos/drive/drive_file_system.h
	chrome/browser/chromeos/drive/drive_file_system_interface.h
	chrome/browser/chromeos/drive/drive_file_system_unittest.cc
	chrome/browser/chromeos/drive/file_system/drive_operations.cc
	chrome/browser/chromeos/login/wallpaper_manager.cc
	chrome/browser/chromeos/login/wallpaper_manager.h
	chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
	chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
	chrome/browser/google_apis/gdata_wapi_operations.cc
	chrome/browser/google_apis/gdata_wapi_operations.h
	chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
	chrome/browser/profiles/off_the_record_profile_impl.cc
	chrome/browser/profiles/off_the_record_profile_impl.h
	chrome/browser/profiles/profile_impl.cc
	chrome/browser/profiles/profile_impl.h
	chrome/browser/profiles/profile_impl_io_data.cc
	chrome/browser/profiles/profile_impl_io_data.h
	chrome/browser/sync_file_system/drive_file_sync_client_unittest.cc
	chrome/browser/ui/webui/options/manage_profile_handler.cc

Long lines

long lines

some long lines.

long lines

long lines

Beginning of lines.

Rename FilePath -> base::FilePath in chrome/browser

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181638 0039d316-1c4b-4281-b951-d872f2087c98
Rename FilePath -> base::FilePath in various toplevel directories

Review URL: https://codereview.chromium.org/12211108

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181639 0039d316-1c4b-4281-b951-d872f2087c98
Replace FilePath with base::FilePath in some more top level directories.

Review URL: https://codereview.chromium.org/12217101

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181640 0039d316-1c4b-4281-b951-d872f2087c98
Make TestWebIDBFactory allocate a separate WebIDBFactory per thread.

This allows the main WebKit thread and web worker threads to each get their own
WebIDBFactory instance, which mimics the behavior when we let the WebIDBFactory
be instantiated via the WebKitPlatformSupport::idbFactory() method.

This is a second attempt at:
https://chromiumcodereview.appspot.com/12181010

TBR=alecflett@chromium.org

Review URL: https://codereview.chromium.org/12213102

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181641 0039d316-1c4b-4281-b951-d872f2087c98
Avoid creating new TestingPrefServiceSyncable

Allow the unittest to use Profile::GetPref() instead of 
creating its own Pref.

This also helps to solve the unit test crash in 
https://codereview.chromium.org/11968032/.
Context: With https://codereview.chromium.org/11968032/, 
GTKThemeService will be started at Profile creation which 
creates Profile's Pref. Later the new 
TestingPrefServiceSyncable that is created in 
ProtocolHandlerRegistryTest::SetUp overwrites Profile's Pref 
and leads to a crash in GTKThemeService's d'tor due to 
invalid pointer.

TBR=ben@chromium.org 
BUG=none
TEST=ProtocolHandlerRegistryTest.*

Review URL: https://chromiumcodereview.appspot.com/12211026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181642 0039d316-1c4b-4281-b951-d872f2087c98
Roll angle r1810:r1825

Picking up Win64 fix.


Review URL: https://chromiumcodereview.appspot.com/12217063

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181644 0039d316-1c4b-4281-b951-d872f2087c98
Add implementations of WebKit::Platform testing APIs to TestWebKitPlatformSupport

This enables running nearly all webkit_unit_tests (in conjunction with https://bugs.webkit.org/show_bug.cgi?id=109369).

BUG=


Review URL: https://chromiumcodereview.appspot.com/12220091

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181645 0039d316-1c4b-4281-b951-d872f2087c98
WebKit roll 142323:142359

BUG=none
TEST=none
TBR=falken


Review URL: https://chromiumcodereview.appspot.com/12226084

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181646 0039d316-1c4b-4281-b951-d872f2087c98
Update .DEPS.git

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181647 0039d316-1c4b-4281-b951-d872f2087c98
Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

Minimize usage of PrefServiceSyncable. It is mostly an implementation detail of ProfileImpl and the sync integration.

TBR=ben@chromium.org
BUG=155525

Review URL: https://codereview.chromium.org/12079097

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181648 0039d316-1c4b-4281-b951-d872f2087c98
Disable/enable echo for enterprise device.

Create a new policy to controll disable/enable Echo and make the policy value
avaialbe to Echo extension.

BUG=chromium-os:38500
TEST=unittest and manually check the flow is working.


Review URL: https://chromiumcodereview.appspot.com/12147004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181649 0039d316-1c4b-4281-b951-d872f2087c98
Make remoting_unittests build on Win64 

Two simple compilation fixes and some c4267 build suppressions. 

BUG=166496
BUG=167187
R=wez@chromium.org
Review URL: https://codereview.chromium.org/12225111

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181650 0039d316-1c4b-4281-b951-d872f2087c98
Add content settings page action for Pepper broker authorization.

BUG=159199


Review URL: https://chromiumcodereview.appspot.com/11488009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181651 0039d316-1c4b-4281-b951-d872f2087c98
Added messages for wrong HWID screen.

BUG=137121


Review URL: https://chromiumcodereview.appspot.com/12207013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181652 0039d316-1c4b-4281-b951-d872f2087c98
WebKit roll 142359:142403

BUG=none
TEST=none
TBR=falken


Review URL: https://chromiumcodereview.appspot.com/12221110

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181653 0039d316-1c4b-4281-b951-d872f2087c98
Update .DEPS.git

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181654 0039d316-1c4b-4281-b951-d872f2087c98
More FilePath -> base::FilePath replacement.

Review URL: https://codereview.chromium.org/12225112

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181655 0039d316-1c4b-4281-b951-d872f2087c98
Reland 181499 - Allow Terms of Service to be specified for Public Accounts

This CL allows Terms of Service to be specified for a Public Account. The
terms are set by specifying a URL through policy. Chrome downloads the
terms and presents them to the user. Only if the user accepts the terms
can the Public Account be entered.

This CL also fixes the regression described in issue 174314.

TEST=Manual
BUG=chromium-os:32780, 174314
TBR=nkostylev,mnissler

Review URL: https://codereview.chromium.org/12221097

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181656 0039d316-1c4b-4281-b951-d872f2087c98
Allow support for CENC and the AVC1 and AAC codecs in the Widevine CDM to be enabled independently.

With just CENC enabled, v.canPlayType('video/mp4', 'com.widevine.alpha'); returns "maybe" but v.canPlayType('video/mp4; Codecs="avc1"', 'com.widevine.alpha'); returns "".

I also changed the way that MIME type-only (no codec) calls are supported.

TEST=content_unittests

Review URL: https://chromiumcodereview.appspot.com/12226003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181657 0039d316-1c4b-4281-b951-d872f2087c98