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

Side by Side Diff: chrome/browser/extensions/api/socket/socket_apitest.cc

Issue 114263005: Convert Extension* to extension id in AppLaunchParams. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile Created 7 years 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
« no previous file with comments | « chrome/browser/apps/app_browsertest.cc ('k') | chrome/browser/extensions/extension_apitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/memory/ref_counted.h" 5 #include "base/memory/ref_counted.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "chrome/browser/extensions/api/dns/host_resolver_wrapper.h" 8 #include "chrome/browser/extensions/api/dns/host_resolver_wrapper.h"
9 #include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h" 9 #include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h"
10 #include "chrome/browser/extensions/api/socket/socket_api.h" 10 #include "chrome/browser/extensions/api/socket/socket_api.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 80
81 protected: 81 protected:
82 void LaunchTestingApp() { 82 void LaunchTestingApp() {
83 const Extension* extension = LoadExtension(app_dir_); 83 const Extension* extension = LoadExtension(app_dir_);
84 ASSERT_TRUE(extension); 84 ASSERT_TRUE(extension);
85 85
86 AppLaunchParams params(browser()->profile(), 86 AppLaunchParams params(browser()->profile(),
87 extension, 87 extension,
88 extensions::LAUNCH_CONTAINER_NONE, 88 extensions::LAUNCH_CONTAINER_NONE,
89 NEW_WINDOW); 89 NEW_WINDOW);
90 params.command_line = CommandLine::ForCurrentProcess(); 90 params.command_line = *CommandLine::ForCurrentProcess();
91 OpenApplication(params); 91 OpenApplication(params);
92 } 92 }
93 93
94 private: 94 private:
95 base::FilePath app_dir_; 95 base::FilePath app_dir_;
96 }; 96 };
97 #endif 97 #endif
98 98
99 } // namespace 99 } // namespace
100 100
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 348
349 LaunchTestingApp(); 349 LaunchTestingApp();
350 350
351 EXPECT_TRUE(listener.WaitUntilSatisfied()); 351 EXPECT_TRUE(listener.WaitUntilSatisfied());
352 listener.Reply( 352 listener.Reply(
353 base::StringPrintf("multicast:%s:%d", kHostname.c_str(), kPort)); 353 base::StringPrintf("multicast:%s:%d", kHostname.c_str(), kPort));
354 354
355 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 355 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
356 } 356 }
357 #endif 357 #endif
OLDNEW
« no previous file with comments | « chrome/browser/apps/app_browsertest.cc ('k') | chrome/browser/extensions/extension_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698