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

Side by Side Diff: chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 }; 297 };
298 298
299 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppPpapiTest, SendFilesystem) { 299 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppPpapiTest, SendFilesystem) {
300 RemoveAllGalleries(); 300 RemoveAllGalleries();
301 MakeSingleFakeGallery(NULL); 301 MakeSingleFakeGallery(NULL);
302 302
303 const extensions::Extension* extension = LoadExtension(app_dir()); 303 const extensions::Extension* extension = LoadExtension(app_dir());
304 ASSERT_TRUE(extension); 304 ASSERT_TRUE(extension);
305 305
306 extensions::ResultCatcher catcher; 306 extensions::ResultCatcher catcher;
307 AppLaunchParams params(browser()->profile(), extension, 307 AppLaunchParams params(
308 extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW, 308 browser()->profile(), extension, extensions::LAUNCH_CONTAINER_NONE,
309 extensions::SOURCE_TEST); 309 WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST);
310 params.command_line = *base::CommandLine::ForCurrentProcess(); 310 params.command_line = *base::CommandLine::ForCurrentProcess();
311 OpenApplication(params); 311 OpenApplication(params);
312 312
313 bool result = true; 313 bool result = true;
314 if (!catcher.GetNextResult()) { 314 if (!catcher.GetNextResult()) {
315 message_ = catcher.message(); 315 message_ = catcher.message();
316 result = false; 316 result = false;
317 } 317 }
318 content::RunAllPendingInMessageLoop(); // avoid race on exit in registry. 318 content::RunAllPendingInMessageLoop(); // avoid race on exit in registry.
319 ASSERT_TRUE(result) << message_; 319 ASSERT_TRUE(result) << message_;
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 457
458 base::ListValue custom_args; 458 base::ListValue custom_args;
459 #if defined(USE_PROPRIETARY_CODECS) 459 #if defined(USE_PROPRIETARY_CODECS)
460 custom_args.AppendBoolean(true); 460 custom_args.AppendBoolean(true);
461 #else 461 #else
462 custom_args.AppendBoolean(false); 462 custom_args.AppendBoolean(false);
463 #endif 463 #endif
464 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) 464 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args))
465 << message_; 465 << message_;
466 } 466 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698