summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-30 23:47:49 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-30 23:47:49 +0000
commitf3112a530100f9361f98c81aea8d9483a133a980 (patch)
treea6766b321c65636cfe96621ff54163e6fc1199f0 /content/browser
parent08202909defd4f7890548dc73f1ec4e58fd0aec7 (diff)
downloadchromium_src-f3112a530100f9361f98c81aea8d9483a133a980.zip
chromium_src-f3112a530100f9361f98c81aea8d9483a133a980.tar.gz
chromium_src-f3112a530100f9361f98c81aea8d9483a133a980.tar.bz2
more content exports needed for unit_tests and browser_tests.
R=jam@chromium.org BUG=90442 TEST= Review URL: http://codereview.chromium.org/8082019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/accessibility/browser_accessibility.h3
-rw-r--r--content/browser/accessibility/browser_accessibility_manager.h4
-rw-r--r--content/browser/browser_main.h2
-rw-r--r--content/browser/download/download_file_manager.h4
-rw-r--r--content/browser/download/download_item.h5
-rw-r--r--content/browser/download/download_types.h2
-rw-r--r--content/browser/geolocation/access_token_store.h5
-rw-r--r--content/browser/in_process_webkit/dom_storage_browsertest.cc3
-rw-r--r--content/browser/in_process_webkit/dom_storage_context.h7
-rw-r--r--content/browser/in_process_webkit/indexed_db_browsertest.cc4
-rw-r--r--content/browser/in_process_webkit/indexed_db_context.h6
-rw-r--r--content/browser/in_process_webkit/indexed_db_quota_client.h5
-rw-r--r--content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc2
-rw-r--r--content/browser/intents/intent_injector.h3
-rw-r--r--content/browser/net/url_request_failed_dns_job.h2
-rw-r--r--content/browser/net/url_request_slow_download_job.h6
-rw-r--r--content/browser/plugin_process_host.h3
-rw-r--r--content/browser/renderer_host/browser_render_process_host.h8
-rw-r--r--content/browser/renderer_host/p2p/socket_host.h3
-rw-r--r--content/browser/renderer_host/p2p/socket_host_tcp.h2
-rw-r--r--content/browser/renderer_host/p2p/socket_host_tcp_server.h3
-rw-r--r--content/browser/renderer_host/p2p/socket_host_udp.h3
-rw-r--r--content/browser/renderer_host/render_view_host_delegate.h2
-rw-r--r--content/browser/speech/speech_input_dispatcher_host.h3
-rw-r--r--content/browser/tab_contents/navigation_controller.h4
-rw-r--r--content/browser/tab_contents/navigation_controller_unittest.cc4
-rw-r--r--content/browser/tab_contents/render_view_host_manager.h4
27 files changed, 55 insertions, 47 deletions
diff --git a/content/browser/accessibility/browser_accessibility.h b/content/browser/accessibility/browser_accessibility.h
index 1426e5c..80a0250 100644
--- a/content/browser/accessibility/browser_accessibility.h
+++ b/content/browser/accessibility/browser_accessibility.h
@@ -12,6 +12,7 @@
#include "base/basictypes.h"
#include "build/build_config.h"
+#include "content/common/content_export.h"
#include "webkit/glue/webaccessibility.h"
class BrowserAccessibilityManager;
@@ -39,7 +40,7 @@ typedef std::map<WebAccessibility::StringAttribute, string16> StringAttrMap;
// APIs.
//
////////////////////////////////////////////////////////////////////////////////
-class BrowserAccessibility {
+class CONTENT_EXPORT BrowserAccessibility {
public:
// Creates a platform specific BrowserAccessibility. Ownership passes to the
// caller.
diff --git a/content/browser/accessibility/browser_accessibility_manager.h b/content/browser/accessibility/browser_accessibility_manager.h
index 0c9dde6..336c8af 100644
--- a/content/browser/accessibility/browser_accessibility_manager.h
+++ b/content/browser/accessibility/browser_accessibility_manager.h
@@ -34,7 +34,7 @@ class CONTENT_EXPORT BrowserAccessibilityDelegate {
virtual gfx::Rect GetViewBounds() const = 0;
};
-class BrowserAccessibilityFactory {
+class CONTENT_EXPORT BrowserAccessibilityFactory {
public:
virtual ~BrowserAccessibilityFactory() {}
@@ -44,7 +44,7 @@ class BrowserAccessibilityFactory {
};
// Manages a tree of BrowserAccessibility objects.
-class BrowserAccessibilityManager {
+class CONTENT_EXPORT BrowserAccessibilityManager {
public:
// Creates the platform specific BrowserAccessibilityManager. Ownership passes
// to the caller.
diff --git a/content/browser/browser_main.h b/content/browser/browser_main.h
index f45c72b..60abacd 100644
--- a/content/browser/browser_main.h
+++ b/content/browser/browser_main.h
@@ -127,4 +127,6 @@ class CONTENT_EXPORT BrowserMainParts {
} // namespace content
+CONTENT_EXPORT int BrowserMain(const MainFunctionParams& parameters);
+
#endif // CONTENT_BROWSER_BROWSER_MAIN_H_
diff --git a/content/browser/download/download_file_manager.h b/content/browser/download/download_file_manager.h
index 0838e40..20a2b6a 100644
--- a/content/browser/download/download_file_manager.h
+++ b/content/browser/download/download_file_manager.h
@@ -68,13 +68,13 @@ class URLRequestContextGetter;
}
// Manages all in progress downloads.
-class DownloadFileManager
+class CONTENT_EXPORT DownloadFileManager
: public base::RefCountedThreadSafe<DownloadFileManager> {
public:
explicit DownloadFileManager(ResourceDispatcherHost* rdh);
// Called on shutdown on the UI thread.
- CONTENT_EXPORT void Shutdown();
+ void Shutdown();
// Called on UI thread to make DownloadFileManager start the download.
void StartDownload(DownloadCreateInfo* info);
diff --git a/content/browser/download/download_item.h b/content/browser/download/download_item.h
index 2a9b8b9..c3d78ac 100644
--- a/content/browser/download/download_item.h
+++ b/content/browser/download/download_item.h
@@ -338,10 +338,7 @@ class CONTENT_EXPORT DownloadItem {
std::string DebugString(bool verbose) const;
-#ifdef UNIT_TEST
- // Mock opening downloads (for testing only).
- void TestMockDownloadOpen() { open_enabled_ = false; }
-#endif
+ void MockDownloadOpenForTesting() { open_enabled_ = false; }
private:
// Construction common to all constructors. |active| should be true for new
diff --git a/content/browser/download/download_types.h b/content/browser/download/download_types.h
index 952b195..7ee8043 100644
--- a/content/browser/download/download_types.h
+++ b/content/browser/download/download_types.h
@@ -24,7 +24,7 @@ class IOBuffer;
// waiting for the task to run on the file thread. Access to the write buffers
// is synchronized via the lock. Each entry in 'contents' represents one data
// buffer and its size in bytes.
-struct DownloadBuffer {
+struct CONTENT_EXPORT DownloadBuffer {
DownloadBuffer();
~DownloadBuffer();
diff --git a/content/browser/geolocation/access_token_store.h b/content/browser/geolocation/access_token_store.h
index e40bb92..804f22b 100644
--- a/content/browser/geolocation/access_token_store.h
+++ b/content/browser/geolocation/access_token_store.h
@@ -45,8 +45,9 @@ class AccessTokenStore : public base::RefCountedThreadSafe<AccessTokenStore>,
// so it is efficient to piggyback it onto this request.
// Takes ownership of |callback|.
// Returns a handle which can subsequently be used with CancelRequest().
- Handle LoadAccessTokens(CancelableRequestConsumerBase* consumer,
- LoadAccessTokensCallbackType* callback);
+ CONTENT_EXPORT Handle LoadAccessTokens(
+ CancelableRequestConsumerBase* consumer,
+ LoadAccessTokensCallbackType* callback);
virtual void SaveAccessToken(
const GURL& server_url, const string16& access_token) = 0;
diff --git a/content/browser/in_process_webkit/dom_storage_browsertest.cc b/content/browser/in_process_webkit/dom_storage_browsertest.cc
index c7eb882..93fc04d 100644
--- a/content/browser/in_process_webkit/dom_storage_browsertest.cc
+++ b/content/browser/in_process_webkit/dom_storage_browsertest.cc
@@ -38,7 +38,8 @@ IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, ClearLocalState) {
{
TestingProfile profile;
WebKitContext *webkit_context = profile.GetWebKitContext();
- webkit_context->dom_storage_context()->set_data_path(temp_dir.path());
+ webkit_context->dom_storage_context()->
+ set_data_path_for_testing(temp_dir.path());
webkit_context->set_clear_local_state_on_exit(true);
}
// Make sure we wait until the destructor has run.
diff --git a/content/browser/in_process_webkit/dom_storage_context.h b/content/browser/in_process_webkit/dom_storage_context.h
index 09b0ef6..84acb5b 100644
--- a/content/browser/in_process_webkit/dom_storage_context.h
+++ b/content/browser/in_process_webkit/dom_storage_context.h
@@ -109,10 +109,9 @@ class CONTENT_EXPORT DOMStorageContext {
clear_local_state_on_exit_ = clear_local_state;
}
-#ifdef UNIT_TEST
- // For unit tests allow to override the |data_path_|.
- void set_data_path(const FilePath& data_path) { data_path_ = data_path; }
-#endif
+ void set_data_path_for_testing(const FilePath& data_path) {
+ data_path_ = data_path;
+ }
private:
diff --git a/content/browser/in_process_webkit/indexed_db_browsertest.cc b/content/browser/in_process_webkit/indexed_db_browsertest.cc
index 06d1603..9390481 100644
--- a/content/browser/in_process_webkit/indexed_db_browsertest.cc
+++ b/content/browser/in_process_webkit/indexed_db_browsertest.cc
@@ -146,7 +146,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ClearLocalState) {
// With the levelDB backend, these are directories.
WebKitContext *webkit_context = profile.GetWebKitContext();
IndexedDBContext* idb_context = webkit_context->indexed_db_context();
- idb_context->set_data_path(temp_dir.path());
+ idb_context->set_data_path_for_testing(temp_dir.path());
protected_path = idb_context->GetIndexedDBFilePath(
DatabaseUtil::GetOriginIdentifier(kProtectedOrigin));
unprotected_path = idb_context->GetIndexedDBFilePath(
@@ -195,7 +195,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ClearSessionOnlyDatabases) {
// Override the storage policy with our own.
idb_context->special_storage_policy_ = special_storage_policy;
- idb_context->set_data_path(temp_dir.path());
+ idb_context->set_data_path_for_testing(temp_dir.path());
normal_path = idb_context->GetIndexedDBFilePath(
DatabaseUtil::GetOriginIdentifier(kNormalOrigin));
diff --git a/content/browser/in_process_webkit/indexed_db_context.h b/content/browser/in_process_webkit/indexed_db_context.h
index 4094109..a7207e6 100644
--- a/content/browser/in_process_webkit/indexed_db_context.h
+++ b/content/browser/in_process_webkit/indexed_db_context.h
@@ -75,10 +75,10 @@ class CONTENT_EXPORT IndexedDBContext
quota::QuotaManagerProxy* quota_manager_proxy();
-#ifdef UNIT_TEST
// For unit tests allow to override the |data_path_|.
- void set_data_path(const FilePath& data_path) { data_path_ = data_path; }
-#endif
+ void set_data_path_for_testing(const FilePath& data_path) {
+ data_path_ = data_path;
+ }
private:
FRIEND_TEST(ExtensionServiceTest, ClearExtensionData);
diff --git a/content/browser/in_process_webkit/indexed_db_quota_client.h b/content/browser/in_process_webkit/indexed_db_quota_client.h
index 29ded7b..8b2838e 100644
--- a/content/browser/in_process_webkit/indexed_db_quota_client.h
+++ b/content/browser/in_process_webkit/indexed_db_quota_client.h
@@ -10,6 +10,7 @@
#include "base/memory/ref_counted.h"
#include "base/message_loop_proxy.h"
+#include "content/common/content_export.h"
#include "webkit/quota/quota_client.h"
#include "webkit/quota/quota_task.h"
#include "webkit/quota/quota_types.h"
@@ -22,10 +23,10 @@ class IndexedDBContext;
class IndexedDBQuotaClient : public quota::QuotaClient,
public quota::QuotaTaskObserver {
public:
- IndexedDBQuotaClient(
+ CONTENT_EXPORT IndexedDBQuotaClient(
base::MessageLoopProxy* tracker_thread,
IndexedDBContext* indexed_db_context);
- virtual ~IndexedDBQuotaClient();
+ CONTENT_EXPORT virtual ~IndexedDBQuotaClient();
// QuotaClient method overrides
virtual ID id() const OVERRIDE;
diff --git a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc
index 72fdc49..1ce0d5d 100644
--- a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc
+++ b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc
@@ -47,7 +47,7 @@ class IndexedDBQuotaClientTest : public testing::Test {
FilePath indexeddb_dir = temp_dir_.path().Append(
IndexedDBContext::kIndexedDBDirectory);
ASSERT_TRUE(file_util::CreateDirectory(indexeddb_dir));
- idb_context()->set_data_path(indexeddb_dir);
+ idb_context()->set_data_path_for_testing(indexeddb_dir);
}
~IndexedDBQuotaClientTest() {
diff --git a/content/browser/intents/intent_injector.h b/content/browser/intents/intent_injector.h
index f658446..60d5cb9 100644
--- a/content/browser/intents/intent_injector.h
+++ b/content/browser/intents/intent_injector.h
@@ -9,6 +9,7 @@
#include "base/basictypes.h"
#include "base/string16.h"
#include "content/browser/tab_contents/tab_contents_observer.h"
+#include "content/common/content_export.h"
#include "content/common/intents_messages.h"
class RenderViewHost;
@@ -26,7 +27,7 @@ class Message;
// logic will create one of these to take care of passing intent data down into
// the context of the service, which will be running in the TabContents on which
// this class is an observer. Deletes itself when the tab is closed.
-class IntentInjector : public TabContentsObserver {
+class CONTENT_EXPORT IntentInjector : public TabContentsObserver {
public:
// |tab_contents| must not be NULL.
explicit IntentInjector(TabContents* tab_contents);
diff --git a/content/browser/net/url_request_failed_dns_job.h b/content/browser/net/url_request_failed_dns_job.h
index 852371f..da1042e 100644
--- a/content/browser/net/url_request_failed_dns_job.h
+++ b/content/browser/net/url_request_failed_dns_job.h
@@ -21,7 +21,7 @@ class URLRequestFailedDnsJob : public net::URLRequestJob {
const std::string& scheme);
// A test URL that can be used in UI tests.
- static const char kTestUrl[];
+ CONTENT_EXPORT static const char kTestUrl[];
// Adds the testing URLs to the net::URLRequestFilter.
CONTENT_EXPORT static void AddUrlHandler();
diff --git a/content/browser/net/url_request_slow_download_job.h b/content/browser/net/url_request_slow_download_job.h
index 9cbde81..01aae0a 100644
--- a/content/browser/net/url_request_slow_download_job.h
+++ b/content/browser/net/url_request_slow_download_job.h
@@ -34,9 +34,9 @@ class URLRequestSlowDownloadJob : public net::URLRequestJob {
const std::string& scheme);
// Test URLs.
- static const char kUnknownSizeUrl[];
- static const char kKnownSizeUrl[];
- static const char kFinishDownloadUrl[];
+ CONTENT_EXPORT static const char kUnknownSizeUrl[];
+ CONTENT_EXPORT static const char kKnownSizeUrl[];
+ CONTENT_EXPORT static const char kFinishDownloadUrl[];
// Adds the testing URLs to the net::URLRequestFilter.
CONTENT_EXPORT static void AddUrlHandler();
diff --git a/content/browser/plugin_process_host.h b/content/browser/plugin_process_host.h
index 8cfc249..ae051ef 100644
--- a/content/browser/plugin_process_host.h
+++ b/content/browser/plugin_process_host.h
@@ -16,6 +16,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "content/browser/browser_child_process_host.h"
+#include "content/common/content_export.h"
#include "webkit/plugins/webplugininfo.h"
#include "ui/gfx/native_widget_types.h"
@@ -41,7 +42,7 @@ class GURL;
// starting the plugin process when a plugin is created that doesn't already
// have a process. After that, most of the communication is directly between
// the renderer and plugin processes.
-class PluginProcessHost : public BrowserChildProcessHost {
+class CONTENT_EXPORT PluginProcessHost : public BrowserChildProcessHost {
public:
class Client {
public:
diff --git a/content/browser/renderer_host/browser_render_process_host.h b/content/browser/renderer_host/browser_render_process_host.h
index 456de48..794cc76 100644
--- a/content/browser/renderer_host/browser_render_process_host.h
+++ b/content/browser/renderer_host/browser_render_process_host.h
@@ -15,6 +15,7 @@
#include "base/synchronization/waitable_event_watcher.h"
#include "base/timer.h"
#include "content/browser/child_process_launcher.h"
+#include "content/common/content_export.h"
#include "content/browser/renderer_host/render_process_host.h"
#include "ui/gfx/surface/transport_dib.h"
@@ -41,9 +42,10 @@ class WaitableEvent;
// keeps a list of RenderView (renderer) and TabContents (browser) which
// are correlated with IDs. This way, the Views and the corresponding ViewHosts
// communicate through the two process objects.
-class BrowserRenderProcessHost : public RenderProcessHost,
- public ChildProcessLauncher::Client,
- public base::WaitableEventWatcher::Delegate {
+class CONTENT_EXPORT BrowserRenderProcessHost
+ : public RenderProcessHost,
+ public ChildProcessLauncher::Client,
+ public base::WaitableEventWatcher::Delegate {
public:
explicit BrowserRenderProcessHost(content::BrowserContext* browser_context);
virtual ~BrowserRenderProcessHost();
diff --git a/content/browser/renderer_host/p2p/socket_host.h b/content/browser/renderer_host/p2p/socket_host.h
index a3af7b3..e69ed259 100644
--- a/content/browser/renderer_host/p2p/socket_host.h
+++ b/content/browser/renderer_host/p2p/socket_host.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_H_
#define CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_H_
+#include "content/common/content_export.h"
#include "content/common/p2p_sockets.h"
#include "ipc/ipc_message.h"
@@ -13,7 +14,7 @@
namespace content {
// Base class for P2P sockets.
-class P2PSocketHost {
+class CONTENT_EXPORT P2PSocketHost {
public:
// Creates P2PSocketHost of the specific type.
static P2PSocketHost* Create(IPC::Message::Sender* message_sender,
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.h b/content/browser/renderer_host/p2p/socket_host_tcp.h
index c2757cd..e92b0f0 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp.h
+++ b/content/browser/renderer_host/p2p/socket_host_tcp.h
@@ -24,7 +24,7 @@ class StreamSocket;
namespace content {
-class P2PSocketHostTcp : public P2PSocketHost {
+class CONTENT_EXPORT P2PSocketHostTcp : public P2PSocketHost {
public:
P2PSocketHostTcp(IPC::Message::Sender* message_sender,
int routing_id, int id);
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server.h b/content/browser/renderer_host/p2p/socket_host_tcp_server.h
index 110075e..f964774 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp_server.h
+++ b/content/browser/renderer_host/p2p/socket_host_tcp_server.h
@@ -12,6 +12,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "content/browser/renderer_host/p2p/socket_host.h"
+#include "content/common/content_export.h"
#include "content/common/p2p_sockets.h"
#include "net/socket/tcp_server_socket.h"
@@ -21,7 +22,7 @@ class StreamSocket;
namespace content {
-class P2PSocketHostTcpServer : public P2PSocketHost {
+class CONTENT_EXPORT P2PSocketHostTcpServer : public P2PSocketHost {
public:
P2PSocketHostTcpServer(IPC::Message::Sender* message_sender,
int routing_id, int id);
diff --git a/content/browser/renderer_host/p2p/socket_host_udp.h b/content/browser/renderer_host/p2p/socket_host_udp.h
index d49f2c4a..83be566 100644
--- a/content/browser/renderer_host/p2p/socket_host_udp.h
+++ b/content/browser/renderer_host/p2p/socket_host_udp.h
@@ -13,13 +13,14 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "content/browser/renderer_host/p2p/socket_host.h"
+#include "content/common/content_export.h"
#include "content/common/p2p_sockets.h"
#include "net/base/ip_endpoint.h"
#include "net/udp/udp_server_socket.h"
namespace content {
-class P2PSocketHostUdp : public P2PSocketHost {
+class CONTENT_EXPORT P2PSocketHostUdp : public P2PSocketHost {
public:
P2PSocketHostUdp(IPC::Message::Sender* message_sender,
int routing_id, int id);
diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h
index 428a5bf..d807111 100644
--- a/content/browser/renderer_host/render_view_host_delegate.h
+++ b/content/browser/renderer_host/render_view_host_delegate.h
@@ -160,7 +160,7 @@ class CONTENT_EXPORT RenderViewHostDelegate : public IPC::Channel::Listener {
// Functions for managing switching of Renderers. For TabContents, this is
// implemented by the RenderViewHostManager
- class RendererManagement {
+ class CONTENT_EXPORT RendererManagement {
public:
// Notification whether we should close the page, after an explicit call to
// AttemptToClosePage. This is called before a cross-site request or before
diff --git a/content/browser/speech/speech_input_dispatcher_host.h b/content/browser/speech/speech_input_dispatcher_host.h
index 4642bcb..8dbb65e 100644
--- a/content/browser/speech/speech_input_dispatcher_host.h
+++ b/content/browser/speech/speech_input_dispatcher_host.h
@@ -8,6 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "content/browser/browser_message_filter.h"
#include "content/browser/speech/speech_input_manager.h"
+#include "content/common/content_export.h"
#include "net/url_request/url_request_context_getter.h"
struct SpeechInputHostMsg_StartRecognition_Params;
@@ -38,7 +39,7 @@ class SpeechInputDispatcherHost : public BrowserMessageFilter,
bool* message_was_ok);
// Singleton manager setter useful for tests.
- static void set_manager(SpeechInputManager* manager) {
+ CONTENT_EXPORT static void set_manager(SpeechInputManager* manager) {
manager_ = manager;
}
diff --git a/content/browser/tab_contents/navigation_controller.h b/content/browser/tab_contents/navigation_controller.h
index d63a1ed..dff4d76 100644
--- a/content/browser/tab_contents/navigation_controller.h
+++ b/content/browser/tab_contents/navigation_controller.h
@@ -311,11 +311,9 @@ class CONTENT_EXPORT NavigationController {
static void DisablePromptOnRepost();
// Maximum number of entries before we start removing entries from the front.
-#ifdef UNIT_TEST
- static void set_max_entry_count(size_t max_entry_count) {
+ static void set_max_entry_count_for_testing(size_t max_entry_count) {
max_entry_count_ = max_entry_count;
}
-#endif
static size_t max_entry_count() { return max_entry_count_; }
// Cancels a repost that brought up a warning.
diff --git a/content/browser/tab_contents/navigation_controller_unittest.cc b/content/browser/tab_contents/navigation_controller_unittest.cc
index 88ad37b..47c61e6 100644
--- a/content/browser/tab_contents/navigation_controller_unittest.cc
+++ b/content/browser/tab_contents/navigation_controller_unittest.cc
@@ -1387,7 +1387,7 @@ TEST_F(NavigationControllerTest, EnforceMaxNavigationCount) {
size_t original_count = NavigationController::max_entry_count();
const int kMaxEntryCount = 5;
- NavigationController::set_max_entry_count(kMaxEntryCount);
+ NavigationController::set_max_entry_count_for_testing(kMaxEntryCount);
int url_index;
// Load up to the max count, all entries should be there.
@@ -1429,7 +1429,7 @@ TEST_F(NavigationControllerTest, EnforceMaxNavigationCount) {
EXPECT_EQ(controller().GetEntryAtIndex(0)->url(),
GURL("http:////www.a.com/4"));
- NavigationController::set_max_entry_count(original_count);
+ NavigationController::set_max_entry_count_for_testing(original_count);
}
// Tests that we can do a restore and navigate to the restored entries and
diff --git a/content/browser/tab_contents/render_view_host_manager.h b/content/browser/tab_contents/render_view_host_manager.h
index 022c9f3..df33f08 100644
--- a/content/browser/tab_contents/render_view_host_manager.h
+++ b/content/browser/tab_contents/render_view_host_manager.h
@@ -29,7 +29,7 @@ class BrowserContext;
// Manages RenderViewHosts for a TabContents. Normally there is only one and
// it is easy to do. But we can also have transitions of processes (and hence
// RenderViewHosts) that can get complex.
-class RenderViewHostManager
+class CONTENT_EXPORT RenderViewHostManager
: public RenderViewHostDelegate::RendererManagement,
public NotificationObserver {
public:
@@ -106,7 +106,7 @@ class RenderViewHostManager
// Returns the view associated with the current RenderViewHost, or NULL if
// there is no current one.
- CONTENT_EXPORT RenderWidgetHostView* GetRenderWidgetHostView() const;
+ RenderWidgetHostView* GetRenderWidgetHostView() const;
// Returns the pending render view host, or NULL if there is no pending one.
RenderViewHost* pending_render_view_host() const {