Moving extensions inside chrome/browser/extensions/

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

 // 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.
 
 #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;
 const int kUrl = ACMatchClassification::URL;
 const int kMatch = ACMatchClassification::MATCH;
 const int kDim = ACMatchClassification::DIM;
 
 void AppendStyle(const std::string& type,
                  int offset, int length,
                  ListValue* styles) {
@@ skipping 27 matching lines @@
   AppendStyle("match", 1, 4, &styles_value);
   AppendStyle("dim", 6, 3, &styles_value);
 
   ACMatchClassifications styles_expected;
   styles_expected.push_back(ACMatchClassification(0, kNone));
   styles_expected.push_back(ACMatchClassification(1, kMatch));
   styles_expected.push_back(ACMatchClassification(5, kNone));
   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);
 
   // Same input, but swap the order. Ensure it still works.
   styles_value.Clear();
   AppendStyle("dim", 6, 3, &styles_value);
   AppendStyle("match", 1, 4, &styles_value);
   EXPECT_TRUE(suggestions.ReadStylesFromValue(styles_value));
   CompareClassification(styles_expected, suggestions.description_styles);
@@ skipping 15 matching lines @@
   AppendStyle("dim", 1, 2, &styles_value);
 
   ACMatchClassifications styles_expected;
   styles_expected.push_back(ACMatchClassification(0, kUrl | kMatch));
   styles_expected.push_back(ACMatchClassification(1, kUrl | kMatch | kDim));
   styles_expected.push_back(ACMatchClassification(3, kUrl | kMatch));
   styles_expected.push_back(ACMatchClassification(4, kUrl));
   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);
 
   // Try moving the "dim/match" style pair at offset 9. Output should be the
   // same.
   styles_value.Clear();
   AppendStyle("url", 0, 5, &styles_value);
   AppendStyle("match", 0, 4, &styles_value);
   AppendStyle("dim", 9, 2, &styles_value);
@@ skipping 15 matching lines @@
   AppendStyle("url", 0, 5, &styles_value);
   AppendStyle("match", 0, 5, &styles_value);
   AppendStyle("match", 0, 3, &styles_value);
   AppendStyle("dim", 2, 3, &styles_value);
   AppendStyle("dim", 0, 3, &styles_value);
 
   ACMatchClassifications styles_expected;
   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