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

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

Issue 130573002: Attempt to fix issue 332427 by deleting LoggingImpl in CastEnvironment on the main thread instead o… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added shortcut to destruct logging_ if already on main thread. Created 6 years, 11 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
« no previous file with comments | « no previous file | media/cast/cast_environment.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 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 "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/common/chrome_switches.h" 7 #include "chrome/common/chrome_switches.h"
8 #include "content/public/common/content_switches.h" 8 #include "content/public/common/content_switches.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
(...skipping 17 matching lines...) Expand all
28 // unneeded. 28 // unneeded.
29 // crbug.com/313128 29 // crbug.com/313128
30 #if !defined(OS_CHROMEOS) 30 #if !defined(OS_CHROMEOS)
31 UseRealGLContexts(); 31 UseRealGLContexts();
32 #endif 32 #endif
33 33
34 ExtensionApiTest::SetUp(); 34 ExtensionApiTest::SetUp();
35 } 35 }
36 }; 36 };
37 37
38 // Disabled on OSX due to http://crbug.com/332427
39 #if defined(OS_MACOSX)
40 #define MAYBE_Basics DISABLED_Basics
41 #else
42 #define MAYBE_Basics Basics
43 #endif
44
45 // Test running the test extension for Cast Mirroring API. 38 // Test running the test extension for Cast Mirroring API.
46 IN_PROC_BROWSER_TEST_F(CastStreamingApiTest, MAYBE_Basics) { 39 IN_PROC_BROWSER_TEST_F(CastStreamingApiTest, Basics) {
47 ASSERT_TRUE(RunExtensionSubtest("cast_streaming", "basics.html")); 40 ASSERT_TRUE(RunExtensionSubtest("cast_streaming", "basics.html"));
48 } 41 }
49 42
50 } // namespace extensions 43 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | media/cast/cast_environment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698