Moving extensions inside chrome/browser/extensions/

chrome/browser/extensions/api/omnibox/omnibox_unittest.cc

Index: chrome/browser/extensions/api/omnibox/omnibox_unittest.cc
diff --git a/chrome/browser/extensions/extension_omnibox_unittest.cc b/chrome/browser/extensions/api/omnibox/omnibox_unittest.cc
similarity index 94%
rename from chrome/browser/extensions/extension_omnibox_unittest.cc
rename to chrome/browser/extensions/api/omnibox/omnibox_unittest.cc
index a358b18c4dfdd88e0b944fa69dda10c7dd2aa546..99f99efa0b8ee419cc22d69188d9d821c2cd5c1e 100644
--- a/chrome/browser/extensions/extension_omnibox_unittest.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_unittest.cc
@@ -3,10 +3,12 @@
 // found in the LICENSE file.
 
 #include "base/values.h"
-#include "chrome/browser/extensions/extension_omnibox_api.h"
+#include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
+namespace extensions {
+
 namespace {
 
 const int kNone = ACMatchClassification::NONE;
@@ -54,7 +56,7 @@ TEST(ExtensionOmniboxTest, DescriptionStylesSimple) {
   styles_expected.push_back(ACMatchClassification(6, kDim));
   styles_expected.push_back(ACMatchClassification(9, kNone));
 
-  ExtensionOmniboxSuggestion suggestions;
+  extensions::ExtensionOmniboxSuggestion suggestions;

[Matt Perry, 2012/05/01 01:23:21]

This should be unnecessary since this file is in the extensions namespace.

[vabr (Chromium), 2012/05/01 02:06:50]

Done.

   suggestions.description.resize(10);
   EXPECT_TRUE(suggestions.ReadStylesFromValue(styles_value));
   CompareClassification(styles_expected, suggestions.description_styles);
@@ -90,7 +92,7 @@ TEST(ExtensionOmniboxTest, DescriptionStylesCombine) {
   styles_expected.push_back(ACMatchClassification(5, kNone));
   styles_expected.push_back(ACMatchClassification(9, kMatch | kDim));
 
-  ExtensionOmniboxSuggestion suggestions;
+  extensions::ExtensionOmniboxSuggestion suggestions;
   suggestions.description.resize(10);
   EXPECT_TRUE(suggestions.ReadStylesFromValue(styles_value));
   CompareClassification(styles_expected, suggestions.description_styles);
@@ -126,8 +128,10 @@ TEST(ExtensionOmniboxTest, DescriptionStylesCombine2) {
   styles_expected.push_back(ACMatchClassification(0, kUrl | kMatch | kDim));
   styles_expected.push_back(ACMatchClassification(5, kNone));
 
-  ExtensionOmniboxSuggestion suggestions;
+  extensions::ExtensionOmniboxSuggestion suggestions;
   suggestions.description.resize(10);
   EXPECT_TRUE(suggestions.ReadStylesFromValue(styles_value));
   CompareClassification(styles_expected, suggestions.description_styles);
 }
+
+}  // namespace extensions