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

Side by Side Diff: chrome/browser/policy/policy_browsertest.cc

Issue 19697013: Move NPAPI test plugin to content/test/plugin. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 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
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('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) 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 <algorithm> 5 #include <algorithm>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 #include "net/http/http_stream_factory.h" 109 #include "net/http/http_stream_factory.h"
110 #include "net/url_request/url_request.h" 110 #include "net/url_request/url_request.h"
111 #include "net/url_request/url_request_filter.h" 111 #include "net/url_request/url_request_filter.h"
112 #include "policy/policy_constants.h" 112 #include "policy/policy_constants.h"
113 #include "testing/gmock/include/gmock/gmock.h" 113 #include "testing/gmock/include/gmock/gmock.h"
114 #include "testing/gtest/include/gtest/gtest.h" 114 #include "testing/gtest/include/gtest/gtest.h"
115 #include "third_party/WebKit/public/web/WebInputEvent.h" 115 #include "third_party/WebKit/public/web/WebInputEvent.h"
116 #include "ui/base/l10n/l10n_util.h" 116 #include "ui/base/l10n/l10n_util.h"
117 #include "ui/base/resource/resource_bundle.h" 117 #include "ui/base/resource/resource_bundle.h"
118 #include "url/gurl.h" 118 #include "url/gurl.h"
119 #include "webkit/plugins/npapi/plugin_utils.h"
120 #include "webkit/plugins/plugin_constants.h" 119 #include "webkit/plugins/plugin_constants.h"
121 #include "webkit/plugins/webplugininfo.h" 120 #include "webkit/plugins/webplugininfo.h"
122 121
123 #if defined(OS_CHROMEOS) 122 #if defined(OS_CHROMEOS)
124 #include "ash/accelerators/accelerator_controller.h" 123 #include "ash/accelerators/accelerator_controller.h"
125 #include "ash/accelerators/accelerator_table.h" 124 #include "ash/accelerators/accelerator_table.h"
126 #include "ash/magnifier/magnifier_constants.h" 125 #include "ash/magnifier/magnifier_constants.h"
127 #include "ash/shell.h" 126 #include "ash/shell.h"
128 #include "ash/shell_delegate.h" 127 #include "ash/shell_delegate.h"
129 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 128 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
(...skipping 2355 matching lines...) Expand 10 before | Expand all | Expand 10 after
2485 chrome_variations::VariationsService::GetVariationsServerURL( 2484 chrome_variations::VariationsService::GetVariationsServerURL(
2486 g_browser_process->local_state()); 2485 g_browser_process->local_state());
2487 EXPECT_TRUE(StartsWithASCII(url.spec(), default_variations_url, true)); 2486 EXPECT_TRUE(StartsWithASCII(url.spec(), default_variations_url, true));
2488 std::string value; 2487 std::string value;
2489 EXPECT_TRUE(net::GetValueForKeyInQuery(url, "restrict", &value)); 2488 EXPECT_TRUE(net::GetValueForKeyInQuery(url, "restrict", &value));
2490 EXPECT_EQ("restricted", value); 2489 EXPECT_EQ("restricted", value);
2491 } 2490 }
2492 #endif 2491 #endif
2493 2492
2494 } // namespace policy 2493 } // namespace policy
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698