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

Side by Side Diff: chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc

Issue 22293003: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanupcompositor: UseRealGLBindings in NetInternalsTest Created 7 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 // Browser test for basic Chrome OS file manager functionality: 5 // Browser test for basic Chrome OS file manager functionality:
6 // - The file list is updated when a file is added externally to the Downloads 6 // - The file list is updated when a file is added externally to the Downloads
7 // folder. 7 // folder.
8 // - Selecting a file and copy-pasting it with the keyboard copies the file. 8 // - Selecting a file and copy-pasting it with the keyboard copies the file.
9 // - Selecting a file and pressing delete deletes it. 9 // - Selecting a file and pressing delete deletes it.
10 10
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 // The base test class. 340 // The base test class.
341 class FileManagerBrowserTest : 341 class FileManagerBrowserTest :
342 public ExtensionApiTest, 342 public ExtensionApiTest,
343 public ::testing::WithParamInterface<TestParameter> { 343 public ::testing::WithParamInterface<TestParameter> {
344 protected: 344 protected:
345 FileManagerBrowserTest() : 345 FileManagerBrowserTest() :
346 local_volume_(new LocalTestVolume), 346 local_volume_(new LocalTestVolume),
347 drive_volume_(std::tr1::get<0>(GetParam()) != IN_GUEST_MODE ? 347 drive_volume_(std::tr1::get<0>(GetParam()) != IN_GUEST_MODE ?
348 new DriveTestVolume() : NULL) {} 348 new DriveTestVolume() : NULL) {}
349 349
350 virtual void SetUp() OVERRIDE {
351 // TODO(danakj): The GPU Video Decoder needs real GL bindings.
352 // crbug.com/269087
353 UseRealGLBindings();
354
355 ExtensionApiTest::SetUp();
356 }
357
350 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; 358 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
351 359
352 virtual void SetUpOnMainThread() OVERRIDE; 360 virtual void SetUpOnMainThread() OVERRIDE;
353 361
354 // Adds an incognito and guest-mode flags for tests in the guest mode. 362 // Adds an incognito and guest-mode flags for tests in the guest mode.
355 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; 363 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
356 364
357 // Loads our testing extension and sends it a string identifying the current 365 // Loads our testing extension and sends it a string identifying the current
358 // test. 366 // test.
359 void StartTest(); 367 void StartTest();
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 TestParameter(NOT_IN_GUEST_MODE, "restoreCurrentView"))); 531 TestParameter(NOT_IN_GUEST_MODE, "restoreCurrentView")));
524 532
525 INSTANTIATE_TEST_CASE_P( 533 INSTANTIATE_TEST_CASE_P(
526 ShareDialog, 534 ShareDialog,
527 FileManagerBrowserTest, 535 FileManagerBrowserTest,
528 ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "shareFile"), 536 ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "shareFile"),
529 TestParameter(NOT_IN_GUEST_MODE, "shareDirectory"))); 537 TestParameter(NOT_IN_GUEST_MODE, "shareDirectory")));
530 538
531 } // namespace 539 } // namespace
532 } // namespace file_manager 540 } // namespace file_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698