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

Side by Side Diff: content/public/test/browser_test_utils.cc

Issue 24649002: Clean up a few more unused globals. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: thestig comment Created 7 years, 2 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) 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 "content/public/test/browser_test_utils.h" 5 #include "content/public/test/browser_test_utils.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/process/kill.h" 10 #include "base/process/kill.h"
(...skipping 16 matching lines...) Expand all
27 #include "grit/webui_resources.h" 27 #include "grit/webui_resources.h"
28 #include "net/base/net_util.h" 28 #include "net/base/net_util.h"
29 #include "net/cookies/cookie_store.h" 29 #include "net/cookies/cookie_store.h"
30 #include "net/test/python_utils.h" 30 #include "net/test/python_utils.h"
31 #include "net/url_request/url_request_context.h" 31 #include "net/url_request/url_request_context.h"
32 #include "net/url_request/url_request_context_getter.h" 32 #include "net/url_request/url_request_context_getter.h"
33 #include "testing/gtest/include/gtest/gtest.h" 33 #include "testing/gtest/include/gtest/gtest.h"
34 #include "ui/base/keycodes/keycode_converter.h" 34 #include "ui/base/keycodes/keycode_converter.h"
35 #include "ui/base/resource/resource_bundle.h" 35 #include "ui/base/resource/resource_bundle.h"
36 36
37 static const int kDefaultWsPort = 8880;
38
39 namespace content { 37 namespace content {
40 namespace { 38 namespace {
41 39
42 class DOMOperationObserver : public NotificationObserver, 40 class DOMOperationObserver : public NotificationObserver,
43 public WebContentsObserver { 41 public WebContentsObserver {
44 public: 42 public:
45 explicit DOMOperationObserver(RenderViewHost* rvh) 43 explicit DOMOperationObserver(RenderViewHost* rvh)
46 : WebContentsObserver(WebContents::FromRenderViewHost(rvh)), 44 : WebContentsObserver(WebContents::FromRenderViewHost(rvh)),
47 did_respond_(false) { 45 did_respond_(false) {
48 registrar_.Add(this, NOTIFICATION_DOM_OPERATION_RESPONSE, 46 registrar_.Add(this, NOTIFICATION_DOM_OPERATION_RESPONSE,
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 // The queue should not be empty, unless we were quit because of a timeout. 638 // The queue should not be empty, unless we were quit because of a timeout.
641 if (message_queue_.empty()) 639 if (message_queue_.empty())
642 return false; 640 return false;
643 if (message) 641 if (message)
644 *message = message_queue_.front(); 642 *message = message_queue_.front();
645 message_queue_.pop(); 643 message_queue_.pop();
646 return true; 644 return true;
647 } 645 }
648 646
649 } // namespace content 647 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698