Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Side by Side Diff: chrome/browser/extensions/extension_messages_apitest.cc

Issue 2314363002: extensions: Change ScopedTempDir::path() to GetPath() (Closed)
Patch Set: Comment addressed Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 " port.onMessage.addListener(function(message) {\n" 457 " port.onMessage.addListener(function(message) {\n"
458 " port.postMessage({ message: message, sender: port.sender " 458 " port.postMessage({ message: message, sender: port.sender "
459 "});\n" 459 "});\n"
460 " maybeClose(message);\n" 460 " maybeClose(message);\n"
461 " });\n" 461 " });\n"
462 "});\n", 462 "});\n",
463 close_background_message())); 463 close_background_message()));
464 } else { 464 } else {
465 dir->WriteFile(FILE_PATH_LITERAL("background.js"), ""); 465 dir->WriteFile(FILE_PATH_LITERAL("background.js"), "");
466 } 466 }
467 return LoadExtension(dir->unpacked_path()); 467 return LoadExtension(dir->UnpackedPath());
468 } 468 }
469 469
470 const char* common_manifest() { 470 const char* common_manifest() {
471 return "\"version\": \"1.0\"," 471 return "\"version\": \"1.0\","
472 "\"background\": {" 472 "\"background\": {"
473 " \"scripts\": [\"background.js\"]," 473 " \"scripts\": [\"background.js\"],"
474 " \"persistent\": false" 474 " \"persistent\": false"
475 "}," 475 "},"
476 "\"manifest_version\": 2"; 476 "\"manifest_version\": 2";
477 } 477 }
(...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after
1201 " \"manifest_version\": 2" 1201 " \"manifest_version\": 2"
1202 "}"; 1202 "}";
1203 1203
1204 TestExtensionDir receiver_dir; 1204 TestExtensionDir receiver_dir;
1205 receiver_dir.WriteManifest(kManifest); 1205 receiver_dir.WriteManifest(kManifest);
1206 receiver_dir.WriteFile(FILE_PATH_LITERAL("background.js"), 1206 receiver_dir.WriteFile(FILE_PATH_LITERAL("background.js"),
1207 "chrome.runtime.onMessageExternal.addListener(\n" 1207 "chrome.runtime.onMessageExternal.addListener(\n"
1208 " function(msg, sender, reply) {\n" 1208 " function(msg, sender, reply) {\n"
1209 " reply({result:chrome.test.isProcessingUserGesture()});\n" 1209 " reply({result:chrome.test.isProcessingUserGesture()});\n"
1210 " });"); 1210 " });");
1211 const Extension* receiver = LoadExtension(receiver_dir.unpacked_path()); 1211 const Extension* receiver = LoadExtension(receiver_dir.UnpackedPath());
1212 ASSERT_TRUE(receiver); 1212 ASSERT_TRUE(receiver);
1213 1213
1214 TestExtensionDir sender_dir; 1214 TestExtensionDir sender_dir;
1215 sender_dir.WriteManifest(kManifest); 1215 sender_dir.WriteManifest(kManifest);
1216 sender_dir.WriteFile(FILE_PATH_LITERAL("background.js"), ""); 1216 sender_dir.WriteFile(FILE_PATH_LITERAL("background.js"), "");
1217 const Extension* sender = LoadExtension(sender_dir.unpacked_path()); 1217 const Extension* sender = LoadExtension(sender_dir.UnpackedPath());
1218 ASSERT_TRUE(sender); 1218 ASSERT_TRUE(sender);
1219 1219
1220 EXPECT_EQ("false", 1220 EXPECT_EQ("false",
1221 ExecuteScriptInBackgroundPage(sender->id(), 1221 ExecuteScriptInBackgroundPage(sender->id(),
1222 base::StringPrintf( 1222 base::StringPrintf(
1223 "chrome.test.runWithoutUserGesture(function() {\n" 1223 "chrome.test.runWithoutUserGesture(function() {\n"
1224 " chrome.runtime.sendMessage('%s', {}, function(response) {\n" 1224 " chrome.runtime.sendMessage('%s', {}, function(response) {\n"
1225 " window.domAutomationController.send('' + response.result);\n" 1225 " window.domAutomationController.send('' + response.result);\n"
1226 " });\n" 1226 " });\n"
1227 "});", receiver->id().c_str()))); 1227 "});", receiver->id().c_str())));
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
1282 ui_test_utils::NavigateToURL(browser(), chromium_org_url()); 1282 ui_test_utils::NavigateToURL(browser(), chromium_org_url());
1283 EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR, 1283 EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR,
1284 CanConnectAndSendMessagesToMainFrame(invalid.get())); 1284 CanConnectAndSendMessagesToMainFrame(invalid.get()));
1285 } 1285 }
1286 1286
1287 #endif // !defined(OS_WIN) - http://crbug.com/350517. 1287 #endif // !defined(OS_WIN) - http://crbug.com/350517.
1288 1288
1289 } // namespace 1289 } // namespace
1290 1290
1291 }; // namespace extensions 1291 }; // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698