1 files changed, 9 insertions, 5 deletions
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 5e7df6f..2e68ab1 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -42,14 +42,16 @@ class DictionaryValue;
 class ListValue;
 }
 
-namespace extensions {
-class Manifest;
-}
-
 namespace webkit_glue {
 struct WebIntentServiceData;
 }
 
+FORWARD_DECLARE_TEST(TabStripModelTest, Apps);
+
+namespace extensions {
+
+class Manifest;
+
 // Represents a Chrome extension.
 class Extension : public base::RefCountedThreadSafe<Extension> {
  public:
@@ -1062,7 +1064,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   std::string content_security_policy_;
 
   FRIEND_TEST_ALL_PREFIXES(ExtensionTest, LoadPageActionHelper);
-  FRIEND_TEST_ALL_PREFIXES(TabStripModelTest, Apps);
+  FRIEND_TEST_ALL_PREFIXES(::TabStripModelTest, Apps);
 
   DISALLOW_COPY_AND_ASSIGN(Extension);
 };
@@ -1124,4 +1126,6 @@ struct UpdatedExtensionPermissionsInfo {
       Reason reason);
 };
 
+} // namespace extensions
+
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_