summaryrefslogtreecommitdiffstats
path: root/chrome/browser/local_discovery
diff options
context:
space:
mode:
authortapted <tapted@chromium.org>2015-05-19 06:08:08 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-19 13:08:19 +0000
commit574f09c11f5a366b059d0992c180543697666c8a (patch)
tree37860c85bf7ccd1c0dabdaf3b9482cc483d252d3 /chrome/browser/local_discovery
parent2878cede2eca4465dfd353bd3354e61eaa447844 (diff)
downloadchromium_src-574f09c11f5a366b059d0992c180543697666c8a.zip
chromium_src-574f09c11f5a366b059d0992c180543697666c8a.tar.gz
chromium_src-574f09c11f5a366b059d0992c180543697666c8a.tar.bz2
Subject .mm files to the header sorting presubmit
The presubmit is already robust to handle Objective-C .h files. Not checking .mm files just adds extra review burden. Plus I can't just press F5 in Sublime to sort lines in .mm files due to import vs include, so it actually needs some brainpower when adding something and I keep forgetting to do that. This adds .mm to the list of file extensions the header sorting presubmit checks for, and fixes the current mistakes to avoid annoying people on presubmit with this change. BUG=None TBR=keybuk@chromium.org,jamescook@chromium.org,stuartmorgan@chromium.org,xhwang@chromium.org,rsesek@chromium.org,zea@chromium.org R=thakis@chromium.org,jochen@chromium.org Review URL: https://codereview.chromium.org/1133713009 Cr-Commit-Position: refs/heads/master@{#330509}
Diffstat (limited to 'chrome/browser/local_discovery')
-rw-r--r--chrome/browser/local_discovery/service_discovery_client_mac.mm2
-rw-r--r--chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/local_discovery/service_discovery_client_mac.mm b/chrome/browser/local_discovery/service_discovery_client_mac.mm
index 6047d2f..0510efc 100644
--- a/chrome/browser/local_discovery/service_discovery_client_mac.mm
+++ b/chrome/browser/local_discovery/service_discovery_client_mac.mm
@@ -4,8 +4,8 @@
#include "chrome/browser/local_discovery/service_discovery_client_mac.h"
-#import <Foundation/Foundation.h>
#import <arpa/inet.h>
+#import <Foundation/Foundation.h>
#import <net/if_dl.h>
#include "base/memory/singleton.h"
diff --git a/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm b/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm
index 4cf4557..969fe88 100644
--- a/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm
+++ b/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm
@@ -7,9 +7,9 @@
#include "base/bind.h"
#include "base/mac/scoped_nsobject.h"
#include "base/message_loop/message_loop.h"
-#include "chrome/common/local_discovery/service_discovery_client.h"
#include "chrome/browser/local_discovery/service_discovery_client_mac.h"
#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/common/local_discovery/service_discovery_client.h"
#include "testing/gtest_mac.h"
@interface TestNSNetService : NSNetService {