Bluetooth API: improve discovery

This CL:
- eliminates unnecessary dispatches
- correctly handles devices that are discovered before interest is
registered

TEST=ran api test
BUG=133179

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=150898

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151138 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/renderer/gamepad_shared_memory_reader.h b/content/renderer/gamepad_shared_memory_reader.h
index b1d2eef..9a85025 100644
--- a/content/renderer/gamepad_shared_memory_reader.h
+++ b/content/renderer/gamepad_shared_memory_reader.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 GAMEPAD_UTIL_H_
-#define GAMEPAD_UTIL_H_
+#ifndef CONTENT_RENDERER_GAMEPAD_UTIL_H_
+#define CONTENT_RENDERER_GAMEPAD_UTIL_H_
 
 #include "base/shared_memory.h"
 #include "base/memory/scoped_ptr.h"
@@ -27,6 +27,6 @@
   bool ever_interacted_with_[WebKit::WebGamepads::itemsLengthCap];
 };
 
-} // namespace content
+}  // namespace content
 
-#endif  // GAMEPAD_UTIL_H_
+#endif  // CONTENT_RENDERER_GAMEPAD_UTIL_H_