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

Side by Side Diff: chrome/browser/media/chrome_webrtc_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/process/launch.h" 8 #include "base/process/launch.h"
9 #include "base/strings/string_split.h" 9 #include "base/strings/string_split.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 bool* message_was_ok) OVERRIDE { 62 bool* message_was_ok) OVERRIDE {
63 return false; 63 return false;
64 } 64 }
65 65
66 private: 66 private:
67 virtual ~BrowserMessageFilter() {} 67 virtual ~BrowserMessageFilter() {}
68 68
69 base::Closure on_channel_closing_; 69 base::Closure on_channel_closing_;
70 }; 70 };
71 71
72 virtual void SetUp() OVERRIDE {
73 // TODO(phoglund): Remove this when the bots enable real GPU with the
74 // command line. crbug.com/271504
75 UseRealGLBindings();
76
77 WebRtcTestBase::SetUp();
78 }
79
72 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 80 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
73 PeerConnectionServerRunner::KillAllPeerConnectionServersOnCurrentSystem(); 81 PeerConnectionServerRunner::KillAllPeerConnectionServersOnCurrentSystem();
74 peerconnection_server_.Start(); 82 peerconnection_server_.Start();
75 } 83 }
76 84
77 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { 85 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
78 peerconnection_server_.Stop(); 86 peerconnection_server_.Stop();
79 } 87 }
80 88
81 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 89 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 multipart_lines[25].c_str()); 440 multipart_lines[25].c_str());
433 EXPECT_STREQ("Content-Type: application/gzip", 441 EXPECT_STREQ("Content-Type: application/gzip",
434 multipart_lines[26].c_str()); 442 multipart_lines[26].c_str());
435 EXPECT_TRUE(multipart_lines[27].empty()); 443 EXPECT_TRUE(multipart_lines[27].empty());
436 EXPECT_TRUE(multipart_lines[28].empty()); // The removed zip part. 444 EXPECT_TRUE(multipart_lines[28].empty()); // The removed zip part.
437 std::string final_delimiter = boundary; 445 std::string final_delimiter = boundary;
438 final_delimiter += "--"; 446 final_delimiter += "--";
439 EXPECT_STREQ(final_delimiter.c_str(), multipart_lines[29].c_str()); 447 EXPECT_STREQ(final_delimiter.c_str(), multipart_lines[29].c_str());
440 EXPECT_TRUE(multipart_lines[30].empty()); 448 EXPECT_TRUE(multipart_lines[30].empty());
441 } 449 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698