Subject .mm files to the header sorting presubmit

testing/gtest_mac.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "gtest_mac.h"
 
 #include <string>
 
+#include <gtest/gtest.h>

[Nico, 2015/05/19 04:31:47]

(should these be "testing/gtest/include/gtest.h" etc includes?)

[tapted, 2015/05/19 05:32:58]

Hm. testing/gtest.gyp is missing 'include_dirs' += [ '..' ] to pick up includes
rooted at src/ . So it would be a build error to change it (output follows).

testing/platform_test_mac.mm relies on a relative include (#include
"platform_test.h").

From what I remember about #include <> vs #include "" using <> here should
actually be bad, since it would prefer a system include (e.g.
/usr/include/gtest/gtest.h) over a relative one, but I think that preference is
getting overridden by -I../../testing/gtest/include in the compile line (I tried
putting a gtest.h in various places and couldn't break things).

And I think it's impossible to take out the 'include_dirs': = [ 'gtest/include'
] to enforce this, otherwise the gtest headers wouldn't find themselves (they
use ""-style, but all start with gtest/ so are not relative :|).

<>-style currently matches stuff in gtest_mac.h, so we should change them
together. So.. to fix, I think it should be a follow-up to this. i.e.
 1) replace 'gtest' in gtest.gyp's include_dirs with '..' (keep 'gtest/include'
since its needed for gtest headers to find themselves),
 2) change all the <> to "", and
 3) fix relative includes, e.g., in platform_test_mac.mm

[1/103] OBJCXX obj/testing/gtest.gtest_mac.o
FAILED: ../../third_party/llvm-build/Release+Asserts/bin/clang++ /*snip*/ -Igen
-I../../testing/gtest -I../../testing/gtest/include -isysroot
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk
/*snip*/ -c ../../testing/gtest_mac.mm -o obj/testing/gtest.gtest_mac.o
../../testing/gtest_mac.mm:9:10: fatal error:
'testing/gtest/include/gtest/gtest.h' file not found
#include "testing/gtest/include/gtest/gtest.h"

 #include <gtest/internal/gtest-port.h>
 #include <gtest/internal/gtest-string.h>
-#include <gtest/gtest.h>
 
 #ifdef GTEST_OS_MAC
 
 #import <Foundation/Foundation.h>
 
 namespace testing {
 namespace internal {
 
 // Handles nil values for |obj| properly by using safe printing of %@ in
 // -stringWithFormat:.
@@ skipping 30 matching lines @@
   msg << "Expected: (" << expected_expression << ") != (" << actual_expression
       << "), actual: " << StringDescription(expected)
       << " vs " << StringDescription(actual);
   return AssertionFailure(msg);
 }
 
 }  // namespace internal
 }  // namespace testing
 
 #endif  // GTEST_OS_MAC