base: Fix/add header #ifndef guards.

base: Fix/add header #ifndef guards.

Header guards should be defined based on the path and file name of the
header file. Some headers have it wrong, some are missing the guards,
and some just have the matching comment wrong.

R=Nico
BUG=464816
Committed: https://crrev.com/301b392761fd8f66f3a701ab1dd011c6e7a55e19
Cr-Commit-Position: refs/heads/master@{#319722}

Committed: https://crrev.com/0a44860ef0cce93998ebc97f0631beae418e07ce
Cr-Commit-Position: refs/heads/master@{#319793}

[Nico, 2015-03-06 22:39:38]

lgtm

[tfarina, 2015-03-06 22:40:42]

Have you used Eric's fix-include-guards.py script?
https://code.google.com/p/chromium/issues/detail?id=435361#c7

[danakj, 2015-03-06 22:45:35]

On Fri, Mar 6, 2015 at 2:40 PM, <tfarina@chromium.org> wrote:

> Have you used Eric's fix-include-guards.py script?
> https://code.google.com/p/chromium/issues/detail?id=435361#c7


No, I ran the linter and it pointed these out, there weren't that many.

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[tfarina, 2015-03-06 22:50:59]

On Fri, Mar 6, 2015 at 7:45 PM, Dana Jansens <danakj@chromium.org> wrote:

> On Fri, Mar 6, 2015 at 2:40 PM, <tfarina@chromium.org> wrote:
>
>> Have you used Eric's fix-include-guards.py script?
>> https://code.google.com/p/chromium/issues/detail?id=435361#c7
>
>
> No, I ran the linter and it pointed these out, there weren't that many.
>

This script fixes the errors for you, so you don't have to go and edit it
manually. I doubt you edited all this by hand ;)

-- 
Thiago Farina

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[danakj, 2015-03-07 00:26:02]

The CQ bit was checked by danakj@chromium.org

[commit-bot: I haz the power, 2015-03-07 00:28:25]

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

[commit-bot: I haz the power, 2015-03-07 02:20:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-03-07 02:20:50]

Failed to apply patch for base/test/null_task_runner.h:
While running git apply --index -3 -p1;
  error: patch failed: base/test/null_task_runner.h:31
  Falling back to three-way merge...
  Applied patch to 'base/test/null_task_runner.h' with conflicts.
  U base/test/null_task_runner.h

Patch:       base/test/null_task_runner.h
Index: base/test/null_task_runner.h
diff --git a/base/test/null_task_runner.h b/base/test/null_task_runner.h
index
2cde880f58a611e6ca7bcbf35702c855d407cfab..d50256ca7d6eb2ca8bc8fe50ba37f6c43d09ec18
100644
--- a/base/test/null_task_runner.h
+++ b/base/test/null_task_runner.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef BASE_TEST_NULL_TASK_RUNNER_H_
+#define BASE_TEST_NULL_TASK_RUNNER_H_
+
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/single_thread_task_runner.h"
@@ -31,3 +34,5 @@ class NullTaskRunner : public base::SingleThreadTaskRunner {
 };
 
 }  // namespace
+
+#endif  // BASE_TEST_NULL_TASK_RUNNER_H_

[commit-bot: I haz the power, 2015-03-07 02:21:24]

The CQ bit was unchecked by commit-bot@chromium.org

[danakj, 2015-03-09 16:21:47]

The CQ bit was checked by danakj@chromium.org

[danakj, 2015-03-09 16:21:47]

The patchset sent to the CQ was uploaded after l-g-t-m from thakis@chromium.org
Link to the patchset: https://codereview.chromium.org/985003004/#ps20001 (title:
"headers: rebase")

[commit-bot: I haz the power, 2015-03-09 16:22:08]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/985003004/20001

[commit-bot: I haz the power, 2015-03-09 20:22:17]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2015-03-09 20:23:05]

Patchset 2 (id:??) landed as
https://crrev.com/301b392761fd8f66f3a701ab1dd011c6e7a55e19
Cr-Commit-Position: refs/heads/master@{#319722}

[Bence, 2015-03-09 20:44:01]

A revert of this CL (patchset #2 id:20001) has been created in
https://codereview.chromium.org/989343002/ by bnc@chromium.org.

The reason for reverting is: This seems to be causing tree closing compile
failure
https://build.chromium.org/p/chromium/builders/Android/builds/36135/steps/com....

[danakj, 2015-03-09 20:49:23]

On 2015/03/09 20:44:01, Bence wrote:
> A revert of this CL (patchset #2 id:20001) has been created in
> https://codereview.chromium.org/989343002/ by mailto:bnc@chromium.org.
> 
> The reason for reverting is: This seems to be causing tree closing compile
> failure
>
https://build.chromium.org/p/chromium/builders/Android/builds/36135/steps/com....

The compile failure looks like a failed patch application trying to compile..

[danakj, 2015-03-09 20:52:56]

It seems that jni_generator_tests.py expects a different header guard than
chromium uses for this file.

FAILED: cd ../../base/android/jni_generator; python jni_generator_tests.py
................__main__.TestGenerator.testJniSelfDocumentingExample
*** 

--- 

***************

*** 6,13 ****

  // For
  //     org/chromium/example/jni_generator/SampleForTests
  
! #ifndef BASE_ANDROID_JNI_GENERATOR_GOLDEN_SAMPLE_FOR_TESTS_JNI_H_
! #define BASE_ANDROID_JNI_GENERATOR_GOLDEN_SAMPLE_FOR_TESTS_JNI_H_
  
  #include <jni.h>
  
--- 6,13 ----

  // For
  //     org/chromium/example/jni_generator/SampleForTests
  
! #ifndef org_chromium_example_jni_generator_SampleForTests_JNI
! #define org_chromium_example_jni_generator_SampleForTests_JNI
  
  #include <jni.h>
  
***************

*** 396,400 ****

  }  // namespace android
  }  // namespace base
  
! #endif  // BASE_ANDROID_JNI_GENERATOR_GOLDEN_SAMPLE_FOR_TESTS_JNI_H_
! 
--- 396,400 ----

  }  // namespace android
  }  // namespace base
  
! #endif  // org_chromium_example_jni_generator_SampleForTests_JNI
!

[danakj, 2015-03-09 20:54:09]

danakj@chromium.org changed reviewers:
+ bulach@chromium.org

[danakj, 2015-03-09 22:02:06]

The CQ bit was checked by danakj@chromium.org

[danakj, 2015-03-09 22:02:06]

The patchset sent to the CQ was uploaded after l-g-t-m from thakis@chromium.org
Link to the patchset: https://codereview.chromium.org/985003004/#ps40001 (title:
"headers: .")

[danakj, 2015-03-09 22:03:09]

So the jni_generator takes a java class and generates a header file from it.

Most of these headers are in a path like:
../out_android/Release/gen/base/jni/LibraryLoader_jni.h

We could try give them a guard like BASE_JNI_LIBRARY_LOADER_JNI_H_ or something,
but I'm not sure it's worth it. The golden sample for tests that was failing on
the waterfall is one of these such generated files. So I've just reverted that
change for now.

[commit-bot: I haz the power, 2015-03-09 22:03:17]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/985003004/40001

[commit-bot: I haz the power, 2015-03-10 00:31:44]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-03-10 00:32:39]

Patchset 3 (id:??) landed as
https://crrev.com/0a44860ef0cce93998ebc97f0631beae418e07ce
Cr-Commit-Position: refs/heads/master@{#319793}