diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-13 13:24:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-14 10:57:25 +0000 |
| commit | af3d4809763ef308f08ced947a73b624729ac7ea (patch) | |
| tree | 4402b911e30383f6c6dace1e8cf3b8e85355db3a /chromium/net/test/scoped_disable_exit_on_dfatal.h | |
| parent | 0e8ff63a407fe323e215bb1a2c423c09a4747c8a (diff) | |
| download | qtwebengine-chromium-af3d4809763ef308f08ced947a73b624729ac7ea.tar.gz | |
BASELINE: Update Chromium to 47.0.2526.14
Also adding in sources needed for spellchecking.
Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/net/test/scoped_disable_exit_on_dfatal.h')
| -rw-r--r-- | chromium/net/test/scoped_disable_exit_on_dfatal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/net/test/scoped_disable_exit_on_dfatal.h b/chromium/net/test/scoped_disable_exit_on_dfatal.h index 5df8ff75b97..d536fbcce63 100644 --- a/chromium/net/test/scoped_disable_exit_on_dfatal.h +++ b/chromium/net/test/scoped_disable_exit_on_dfatal.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_QUIC_TEST_TOOLS_SCOPED_DISABLE_EXIT_ON_DFATAL_H_ -#define NET_QUIC_TEST_TOOLS_SCOPED_DISABLE_EXIT_ON_DFATAL_H_ +#ifndef NET_TEST_SCOPED_DISABLE_EXIT_ON_DFATAL_H_ +#define NET_TEST_SCOPED_DISABLE_EXIT_ON_DFATAL_H_ #include "base/logging.h" #include "testing/gmock/include/gmock/gmock.h" @@ -36,4 +36,4 @@ class ScopedDisableExitOnDFatal { } // namespace test } // namespace net -#endif // NET_QUIC_TEST_TOOLS_SCOPED_DISABLE_EXIT_ON_DFATAL_H_ +#endif // NET_TEST_SCOPED_DISABLE_EXIT_ON_DFATAL_H_ |