summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-31 17:11:50 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-31 17:11:50 +0000
commit8e0a03bf3b1aacaa7a2bc2561d8eb1b83eb9c2e5 (patch)
tree07776683324d14b1d3d14f69ce7d14b1beea8a85
parentcadde4a696d15d4d5cb6b61c346d98ac2a8b1993 (diff)
downloadchromium_src-8e0a03bf3b1aacaa7a2bc2561d8eb1b83eb9c2e5.zip
chromium_src-8e0a03bf3b1aacaa7a2bc2561d8eb1b83eb9c2e5.tar.gz
chromium_src-8e0a03bf3b1aacaa7a2bc2561d8eb1b83eb9c2e5.tar.bz2
Fix include order of extension_unittest. This is actually to try to fix some weird line ending issue in this file.
BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54453 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/extensions/extension_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc
index 0512f80..259849b 100644
--- a/chrome/common/extensions/extension_unittest.cc
+++ b/chrome/common/extensions/extension_unittest.cc
@@ -13,8 +13,8 @@
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/i18n/rtl.h"
-#include "base/string_util.h"
#include "base/path_service.h"
+#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/extensions/extension_action.h"
@@ -317,10 +317,10 @@ TEST(ExtensionTest, InitFromValueValid) {
ListValue* permissions = new ListValue;
permissions->Set(0, Value::CreateStringValue("file:///C:/foo.txt"));
input_value.Set(keys::kPermissions, permissions);
- EXPECT_FALSE(extension.InitFromValue(input_value, false, &error));
- EXPECT_TRUE(MatchPatternASCII(error, errors::kInvalidPermission));
- input_value.Remove(keys::kPermissions, NULL);
- error.clear();
+ EXPECT_FALSE(extension.InitFromValue(input_value, false, &error));
+ EXPECT_TRUE(MatchPatternASCII(error, errors::kInvalidPermission));
+ input_value.Remove(keys::kPermissions, NULL);
+ error.clear();
// Test with an options page.
input_value.SetString(keys::kOptionsPage, "options.html");