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

Side by Side Diff: chrome/browser/device_orientation/device_orientation_browsertest.cc

Issue 3136038: Enable device orientation by default. (Closed)
Patch Set: Rebase and address Pawel's comment Created 10 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
« no previous file with comments | « no previous file | chrome/browser/device_orientation/enable_switch_browsertest.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_path.h" 6 #include "base/file_path.h"
7 #include "base/ref_counted.h" 7 #include "base/ref_counted.h"
8 #include "chrome/browser/browser.h" 8 #include "chrome/browser/browser.h"
9 #include "chrome/browser/device_orientation/orientation.h" 9 #include "chrome/browser/device_orientation/orientation.h"
10 #include "chrome/browser/device_orientation/provider.h" 10 #include "chrome/browser/device_orientation/provider.h"
(...skipping 20 matching lines...) Expand all
31 } 31 }
32 Orientation orientation_; 32 Orientation orientation_;
33 bool added_observer_; 33 bool added_observer_;
34 bool removed_observer_; 34 bool removed_observer_;
35 }; 35 };
36 36
37 class DeviceOrientationBrowserTest : public InProcessBrowserTest { 37 class DeviceOrientationBrowserTest : public InProcessBrowserTest {
38 public: 38 public:
39 // From InProcessBrowserTest. 39 // From InProcessBrowserTest.
40 virtual void SetUpCommandLine(CommandLine* command_line) { 40 virtual void SetUpCommandLine(CommandLine* command_line) {
41 command_line->AppendSwitch(switches::kEnableDeviceOrientation); 41 EXPECT_TRUE(!command_line->HasSwitch(switches::kDisableDeviceOrientation));
42 } 42 }
43 43
44 GURL testUrl(const FilePath::CharType* filename) { 44 GURL testUrl(const FilePath::CharType* filename) {
45 const FilePath kTestDir(FILE_PATH_LITERAL("device_orientation")); 45 const FilePath kTestDir(FILE_PATH_LITERAL("device_orientation"));
46 return ui_test_utils::GetTestUrl(kTestDir, FilePath(filename)); 46 return ui_test_utils::GetTestUrl(kTestDir, FilePath(filename));
47 } 47 }
48 }; 48 };
49 49
50 IN_PROC_BROWSER_TEST_F(DeviceOrientationBrowserTest, BasicTest) { 50 IN_PROC_BROWSER_TEST_F(DeviceOrientationBrowserTest, BasicTest) {
51 const Orientation kTestOrientation(true, 1, true, 2, true, 3); 51 const Orientation kTestOrientation(true, 1, true, 2, true, 3);
52 scoped_refptr<MockProvider> provider = new MockProvider(kTestOrientation); 52 scoped_refptr<MockProvider> provider = new MockProvider(kTestOrientation);
53 Provider::SetInstanceForTests(provider.get()); 53 Provider::SetInstanceForTests(provider.get());
54 54
55 // The test page will register an event handler for orientation events, 55 // The test page will register an event handler for orientation events,
56 // expects to get an event with kTestOrientation orientation, 56 // expects to get an event with kTestOrientation orientation,
57 // then removes the event handler and navigates to #pass. 57 // then removes the event handler and navigates to #pass.
58 GURL test_url = testUrl(FILE_PATH_LITERAL("device_orientation_test.html")); 58 GURL test_url = testUrl(FILE_PATH_LITERAL("device_orientation_test.html"));
59 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), 59 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(),
60 test_url, 60 test_url,
61 2); 61 2);
62 62
63 // Check that the page got the event it expected and that the provider 63 // Check that the page got the event it expected and that the provider
64 // saw requests for adding and removing an observer. 64 // saw requests for adding and removing an observer.
65 EXPECT_EQ("pass", browser()->GetSelectedTabContents()->GetURL().ref()); 65 EXPECT_EQ("pass", browser()->GetSelectedTabContents()->GetURL().ref());
66 EXPECT_TRUE(provider->added_observer_); 66 EXPECT_TRUE(provider->added_observer_);
67 EXPECT_TRUE(provider->removed_observer_); 67 EXPECT_TRUE(provider->removed_observer_);
68 } 68 }
69 69
70 } // namespace device_orientation 70 } // namespace device_orientation
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/device_orientation/enable_switch_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698