Index: chrome/browser/extensions/content_script_apitest.cc |
diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc |
index bbee2a47f5f5820458206a92255e04e60ddf80e0..6ea501deec9feec3ffbf850dffb3e32698eec361 100644 |
--- a/chrome/browser/extensions/content_script_apitest.cc |
+++ b/chrome/browser/extensions/content_script_apitest.cc |
@@ -2,6 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include "base/file_util.h" |
#include "base/utf_string_conversions.h" |
#include "chrome/browser/extensions/api/permissions/permissions_api.h" |
#include "chrome/browser/extensions/extension_apitest.h" |
@@ -174,3 +175,57 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptBypassPageCSP) { |
ASSERT_TRUE(StartTestServer()); |
ASSERT_TRUE(RunExtensionTest("content_scripts/bypass_page_csp")) << message_; |
} |
+ |
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptUpdatei18nMessages) |
+{ |
Devlin
2013/02/22 19:59:07
Bracket on same line as function name.
Patrick Riordan
2013/02/26 05:05:20
Done.
|
+ ASSERT_TRUE(StartTestServer()); |
+ // Create Extension whos messages.json file is to be updated. |
Devlin
2013/02/22 19:59:07
Make comments grammatically correct.
"Create _an_
Patrick Riordan
2013/02/26 05:05:20
Done.
Devlin
2013/02/26 05:57:12
Still need to fix 'whos' to 'whose'. (I might also
Patrick Riordan
2013/02/27 18:30:16
Done.
|
+ base::FilePath extdir; |
Devlin
2013/02/22 19:59:07
As a rule, we try to avoid abbreviating variable n
Patrick Riordan
2013/02/26 05:05:20
Done.
|
+ file_util::CreateNewTempDirectory("",&extdir); |
+ file_util::CopyFile( |
+ test_data_dir_.AppendASCII( |
+ "content_scripts/message_reload1/manifest.json"), |
+ extdir.AppendASCII("manifest.json")); |
+ file_util::CopyFile( |
+ test_data_dir_.AppendASCII( |
+ "content_scripts/message_reload1/contentscript.js"), |
+ extdir.AppendASCII("contentscript.js")); |
+ file_util::CopyDirectory( |
+ test_data_dir_.AppendASCII("content_scripts/message_reload1/_locales"), |
+ extdir.AppendASCII("_locales"), |
+ true); |
+ |
+ const extensions::Extension*extension = LoadExtension(extdir); |
Devlin
2013/02/22 19:59:07
Space between Extension* and extension.
Patrick Riordan
2013/02/26 05:05:20
Done.
|
+ |
+ ResultCatcher catcher; |
+ |
+ //Test messages.json file is loaded and the i18n message is loaded. |
Devlin
2013/02/22 19:59:07
Space after comment beginning (i.e. "// Test...")
Patrick Riordan
2013/02/26 05:05:20
Done.
|
+ ui_test_utils::NavigateToURL( |
+ browser(), test_server()->GetURL("file/extensions/test_file.html")); |
+ |
+ EXPECT_TRUE(catcher.GetNextResult()); |
+ |
+ string16 title; |
+ |
+ ui_test_utils::GetCurrentTabTitle(browser(),&title); |
Devlin
2013/02/22 19:59:07
Space between arguments.
Patrick Riordan
2013/02/26 05:05:20
Done.
|
+ |
+ EXPECT_EQ(std::string("FIRSTMESSAGE"), UTF16ToUTF8(title)); |
+ |
+ //Change messages.json file and reload extension. |
+ file_util::CopyFile( |
+ test_data_dir_.AppendASCII( |
+ "content_scripts/message_reload1/messages.json"), |
+ extdir.AppendASCII("_locales/en/messages.json")); |
+ |
+ ReloadExtension(extension->id()); |
+ |
+ //Check i18n message is also changed. |
Devlin
2013/02/22 19:59:07
"Check _that the_ i18n message..."
Patrick Riordan
2013/02/26 05:05:20
Done.
|
+ ui_test_utils::NavigateToURL( |
+ browser(), test_server()->GetURL("file/extensions/test_file.html")); |
+ |
+ EXPECT_TRUE(catcher.GetNextResult()); |
+ |
+ ui_test_utils::GetCurrentTabTitle(browser(),&title); |
+ |
+ EXPECT_EQ(std::string("SECONDMESSAGE"), UTF16ToUTF8(title)); |
Devlin
2013/02/22 19:59:07
There seems to be too many newlines between 204 an
Patrick Riordan
2013/02/26 05:05:20
Done.
|
+} |